From 48758993b09a96f83c2bd190a5586421c90428e7 Mon Sep 17 00:00:00 2001
From: Waldemar Brodkorb <wbx@openadk.org>
Date: Mon, 2 Jun 2014 11:11:56 +0200
Subject: refactor CPU_ARCH/ARCH variables
After Joerg asked me about the difference between
ADK_TARGET_ARCH and ADK_TARGET_CPU_ARCH I recognized many duplication
of variables for this information.
These patch fixes this up. Use make cleandir && make menuconfig && make
---
target/mips64/Makefile | 8 ++++----
target/mips64/target.mk | 4 ----
2 files changed, 4 insertions(+), 8 deletions(-)
delete mode 100644 target/mips64/target.mk
(limited to 'target/mips64')
diff --git a/target/mips64/Makefile b/target/mips64/Makefile
index e5507e9d1..237c8d75a 100644
--- a/target/mips64/Makefile
+++ b/target/mips64/Makefile
@@ -48,9 +48,9 @@ targethelp:
ifeq ($(ADK_TARGET_QEMU),y)
@echo 'The kernel file is: $(FW_DIR)/${TARGET_KERNEL}'
@echo "Use following command to create a QEMU Image:"
- @echo "./scripts/create.sh qemu-${CPU_ARCH}.img $(FW_DIR)/$(ROOTFSTARBALL)"
+ @echo "./scripts/create.sh qemu-${ADK_TARGET_CPU_ARCH}.img $(FW_DIR)/$(ROOTFSTARBALL)"
@echo "Start qemu with following options:"
- @echo 'qemu-system-${CPU_ARCH} ${QEMU_ARGS} -kernel $(FW_DIR)/$(TARGET_KERNEL) qemu-${CPU_ARCH}.img'
+ @echo 'qemu-system-${ADK_TARGET_CPU_ARCH} ${QEMU_ARGS} -kernel $(FW_DIR)/$(TARGET_KERNEL) qemu-${ADK_TARGET_CPU_ARCH}.img'
endif
ifeq ($(ADK_TARGET_SYSTEM_LEMOTE_YEELONG),y)
@echo "Startup the Lemote Yeelong and type del to enter PMON:"
@@ -69,7 +69,7 @@ targethelp:
@echo 'The initramfs image is: ${FW_DIR}/${INITRAMFS}'
ifeq ($(ADK_TARGET_QEMU),y)
@echo "Start qemu with following command line:"
- @echo 'qemu-system-${CPU_ARCH} ${QEMU_ARGS} -kernel $(FW_DIR)/$(TARGET_KERNEL) -initrd ${FW_DIR}/${INITRAMFS}'
+ @echo 'qemu-system-${ADK_TARGET_CPU_ARCH} ${QEMU_ARGS} -kernel $(FW_DIR)/$(TARGET_KERNEL) -initrd ${FW_DIR}/${INITRAMFS}'
endif
endif
ifeq ($(ADK_TARGET_FS),initramfs-piggyback)
@@ -77,7 +77,7 @@ targethelp:
@echo 'The kernel+initramfs file is: $(FW_DIR)/${TARGET_KERNEL}'
ifeq ($(ADK_TARGET_QEMU),y)
@echo "Start qemu with following command line:"
- @echo 'qemu-system-${CPU_ARCH} ${QEMU_ARGS} -kernel $(FW_DIR)/$(TARGET_KERNEL)'
+ @echo 'qemu-system-${ADK_TARGET_CPU_ARCH} ${QEMU_ARGS} -kernel $(FW_DIR)/$(TARGET_KERNEL)'
endif
endif
diff --git a/target/mips64/target.mk b/target/mips64/target.mk
deleted file mode 100644
index 8b13be890..000000000
--- a/target/mips64/target.mk
+++ /dev/null
@@ -1,4 +0,0 @@
-include $(TOPDIR)/mk/kernel-ver.mk
-ARCH:= mips
-CPU_ARCH:= $(ADK_TARGET_CPU_ARCH)
-TARGET_CFLAGS_ARCH:= $(ADK_TARGET_CFLAGS)
--
cgit v1.2.3