diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2014-06-02 11:11:56 +0200 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2014-06-02 17:13:35 +0200 |
| commit | 48758993b09a96f83c2bd190a5586421c90428e7 (patch) | |
| tree | 28e4554cb26cc1294d06d6241b255d9e20190deb /target/x86 | |
| parent | 8a2c6310e1e2764865ef684217130ed713d654e7 (diff) | |
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
Diffstat (limited to 'target/x86')
| -rw-r--r-- | target/x86/Makefile | 8 | ||||
| -rw-r--r-- | target/x86/target.mk | 4 |
2 files changed, 4 insertions, 8 deletions
diff --git a/target/x86/Makefile b/target/x86/Makefile index 19bca57ab..a4d3ee58c 100644 --- a/target/x86/Makefile +++ b/target/x86/Makefile @@ -31,18 +31,18 @@ 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:" ifeq ($(ADK_TARGET_QEMU_WITH_BOOTLOADER),y) - @echo 'qemu-system-${QEMU_ARCH} ${QEMU_ARGS} qemu-${CPU_ARCH}.img' + @echo 'qemu-system-${QEMU_ARCH} ${QEMU_ARGS} qemu-${ADK_TARGET_CPU_ARCH}.img' else - @echo 'qemu-system-${QEMU_ARCH} ${QEMU_ARGS} -kernel $(FW_DIR)/$(TARGET_KERNEL) qemu-${CPU_ARCH}.img' + @echo 'qemu-system-${QEMU_ARCH} ${QEMU_ARGS} -kernel $(FW_DIR)/$(TARGET_KERNEL) qemu-${ADK_TARGET_CPU_ARCH}.img' endif endif ifeq ($(ADK_HARDWARE_VBOX),y) @cp $(KERNEL) $(FW_DIR)/$(TARGET_KERNEL) @echo "Use following command to create a VirtualBox Image:" - @echo "./scripts/create.sh -T vdi vbox-${CPU_ARCH}.img $(FW_DIR)/$(ROOTFSTARBALL)" + @echo "./scripts/create.sh -T vdi vbox-${ADK_TARGET_CPU_ARCH}.img $(FW_DIR)/$(ROOTFSTARBALL)" endif endif ifeq ($(ADK_TARGET_FS),initramfs) diff --git a/target/x86/target.mk b/target/x86/target.mk deleted file mode 100644 index ecb811221..000000000 --- a/target/x86/target.mk +++ /dev/null @@ -1,4 +0,0 @@ -include $(TOPDIR)/mk/kernel-ver.mk -ARCH:= x86 -CPU_ARCH:= $(strip $(subst ",, $(ADK_TARGET_CPU_ARCH))) -TARGET_CFLAGS_ARCH:= $(ADK_TARGET_CFLAGS) |