summaryrefslogtreecommitdiff
path: root/target/arm/Makefile
diff options
context:
space:
mode:
authorWaldemar Brodkorb <wbx@openadk.org>2015-09-02 15:52:02 +0200
committerWaldemar Brodkorb <wbx@openadk.org>2015-09-02 15:55:11 +0200
commit1f94ff184c4fc6d74b8147370600e29a71415729 (patch)
treec2afec72181046f62cdef0521c1e1815db357f8e /target/arm/Makefile
parent05374459533dd3d3a8e2bdfa5c68a791a893e290 (diff)
refactor kernel mini.config.
We do not need to manually set mini.config file anymore. Every target system, even Qemu emulating different models get it its own. Cleaner and simpler to add new targets.
Diffstat (limited to 'target/arm/Makefile')
-rw-r--r--target/arm/Makefile12
1 files changed, 6 insertions, 6 deletions
diff --git a/target/arm/Makefile b/target/arm/Makefile
index a86a4ac2e..3bc254ca6 100644
--- a/target/arm/Makefile
+++ b/target/arm/Makefile
@@ -14,16 +14,16 @@ KERNEL:=$(LINUX_DIR)/arch/arm/boot/uImage
endif
QEMU_ARGS:=${ADK_QEMU_ARGS}
-ifeq ($(ADK_TARGET_QEMU_ARM_MODEL_SPITZ),y)
+ifeq ($(ADK_TARGET_SYSTEM_QEMU_ARM_SPITZ),y)
QEMU_ARGS+=-M spitz
endif
-ifeq ($(ADK_TARGET_QEMU_ARM_MODEL_TERRIER),y)
+ifeq ($(ADK_TARGET_SYSTEM_QEMU_ARM_TERRIER),y)
QEMU_ARGS+=-M terrier
endif
-ifeq ($(ADK_TARGET_QEMU_ARM_MODEL_VERSATILEPB),y)
+ifeq ($(ADK_TARGET_SYSTEM_QEMU_ARM_VERSATILEPB),y)
QEMU_ARGS+=-M versatilepb -net user -net nic,model=smc91c111
endif
-ifeq ($(ADK_TARGET_QEMU_ARM_MODEL_VEXPRESS_A9),y)
+ifeq ($(ADK_TARGET_SYSTEM_QEMU_ARM_VEXPRESS_A9),y)
QEMU_ARGS+=-M vexpress-a9 -cpu cortex-a9 -m 256 -net user -net nic,model=lan9118 -dtb $(FW_DIR)/vexpress-v2p-ca9.dtb
endif
ifeq ($(ADK_TARGET_QEMU_WITH_VIRTIO),y)
@@ -34,7 +34,7 @@ endif
ifeq ($(ADK_TARGET_FS),archive)
targethelp:
@echo "The RootFS tarball is: $(FW_DIR)/$(ROOTFSTARBALL)"
-ifeq ($(ADK_TARGET_QEMU_ARM_MODEL_VERSATILEPB)$(ADK_TARGET_QEMU_ARM_MODEL_TERRIER)$(ADK_TARGET_QEMU_ARM_MODEL_SPITZ),y)
+ifeq ($(ADK_TARGET_SYSTEM_QEMU_ARM_VERSATILEPB)$(ADK_TARGET_SYSTEM_QEMU_ARM_TERRIER)$(ADK_TARGET_SYSTEM_QEMU_ARM_SPITZ),y)
@echo 'The kernel file is: $(FW_DIR)/${TARGET_KERNEL}'
@echo "Use following command to create a QEMU Image:"
@echo "./scripts/create.sh qemu-${ADK_TARGET_CPU_ARCH}.img $(FW_DIR)/$(ROOTFSTARBALL)"
@@ -131,7 +131,7 @@ kernel-install: kernel-strip
@cp $(BUILD_DIR)/$(TARGET_KERNEL) $(FW_DIR)/$(TARGET_KERNEL)
dtb-install:
-ifeq ($(ADK_TARGET_QEMU_ARM_MODEL_VEXPRESS_A9),y)
+ifeq ($(ADK_TARGET_SYSTEM_QEMU_ARM_VEXPRESS_A9),y)
env $(KERNEL_MAKE_ENV) $(MAKE) -C "${LINUX_DIR}" $(KERNEL_MAKE_OPTS) \
dtbs $(MAKE_TRACE)
endif