From 08317fa541a10bd2e385479d73e99348cc2351dd Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Fri, 25 May 2018 13:36:17 +0200 Subject: rework hardware and C library settings Make the menu system for configuration more intuitive. First choose operating system, then hardware, starting with architecture. Then choose either generic or a sample system. When choosing a sample be more strict in case of MMU or Endianess selection, so a misconfiguration isn't possible. Furthermore put a new top level menu for C library configuration and add Binary format, Instruction set, version selection, float type and any C library specific options. Refactor the duplicate definition of Qemu system versatile and Synopsys NSIM. --- target/arm/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'target/arm/Makefile') diff --git a/target/arm/Makefile b/target/arm/Makefile index 44eedd2cc..59b457d12 100644 --- a/target/arm/Makefile +++ b/target/arm/Makefile @@ -32,7 +32,7 @@ endif ifeq ($(ADK_TARGET_SYSTEM_QEMU_ARM_REALVIEW_EB_MPCORE),y) QEMU_ARGS+=-M realview-eb-mpcore -net user -net nic -dtb $(FW_DIR)/arm-realview-eb-11mp-ctrevb.dtb endif -ifeq ($(ADK_TARGET_SYSTEM_QEMU_ARM_VERSATILEPB)$(ADK_TARGET_SYSTEM_QEMU_ARM_VERSATILEPB_NOMMU),y) +ifeq ($(ADK_TARGET_SYSTEM_QEMU_ARM_VERSATILEPB),y) QEMU_ARGS+=-M versatilepb -net user -net nic,model=smc91c111 -dtb $(FW_DIR)/versatile-pb.dtb endif ifeq ($(ADK_TARGET_SYSTEM_QEMU_ARM_VEXPRESS_A9),y) @@ -176,7 +176,7 @@ ifeq ($(ADK_TARGET_SYSTEM_QEMU_ARM_REALVIEW_EB_MPCORE),y) env $(KERNEL_MAKE_ENV) $(MAKE) -C "${LINUX_DIR}" $(KERNEL_MAKE_OPTS) \ arm-realview-eb-11mp-ctrevb.dtb $(MAKE_TRACE) endif -ifeq ($(ADK_TARGET_SYSTEM_QEMU_ARM_VERSATILEPB)$(ADK_TARGET_SYSTEM_QEMU_ARM_VERSATILEPB_NOMMU),y) +ifeq ($(ADK_TARGET_SYSTEM_QEMU_ARM_VERSATILEPB),y) env $(KERNEL_MAKE_ENV) $(MAKE) -C "${LINUX_DIR}" $(KERNEL_MAKE_OPTS) \ versatile-pb.dtb $(MAKE_TRACE) endif -- cgit v1.2.3