From 48758993b09a96f83c2bd190a5586421c90428e7 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb 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/microblaze/Makefile | 8 ++++---- target/microblaze/target.mk | 4 ---- 2 files changed, 4 insertions(+), 8 deletions(-) delete mode 100644 target/microblaze/target.mk (limited to 'target/microblaze') diff --git a/target/microblaze/Makefile b/target/microblaze/Makefile index 6efcf777f..bda87da84 100644 --- a/target/microblaze/Makefile +++ b/target/microblaze/Makefile @@ -24,7 +24,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-archive) @@ -37,7 +37,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 ifeq ($(ADK_TARGET_FS),squashfs) @@ -46,7 +46,7 @@ targethelp: @echo "The RootFS image is: $(FW_DIR)/$(ROOTFSSQUASHFS)" ifeq ($(ADK_TARGET_QEMU),y) @echo "Start qemu with following options:" - @echo 'qemu-system-${CPU_ARCH} $(QEMU_ARGS) -nographic -kernel $(FW_DIR)/$(TARGET_KERNEL) -pflash $(FW_DIR)/$(ROOTFSSQUASHFS)' + @echo 'qemu-system-${ADK_TARGET_CPU_ARCH} $(QEMU_ARGS) -nographic -kernel $(FW_DIR)/$(TARGET_KERNEL) -pflash $(FW_DIR)/$(ROOTFSSQUASHFS)' endif endif ifeq ($(ADK_TARGET_FS),jffs2) @@ -55,7 +55,7 @@ targethelp: @echo "The RootFS image is: $(FW_DIR)/$(ROOTFSSQUASHFS)" ifeq ($(ADK_TARGET_QEMU),y) @echo "Start qemu with following options:" - @echo 'qemu-system-${CPU_ARCH} $(QEMU_ARGS) -nographic -kernel $(FW_DIR)/$(TARGET_KERNEL) -pflash $(FW_DIR)/$(ROOTFSSQUASHFS)' + @echo 'qemu-system-${ADK_TARGET_CPU_ARCH} $(QEMU_ARGS) -nographic -kernel $(FW_DIR)/$(TARGET_KERNEL) -pflash $(FW_DIR)/$(ROOTFSSQUASHFS)' endif endif diff --git a/target/microblaze/target.mk b/target/microblaze/target.mk deleted file mode 100644 index c179123f9..000000000 --- a/target/microblaze/target.mk +++ /dev/null @@ -1,4 +0,0 @@ -include $(TOPDIR)/mk/kernel-ver.mk -ARCH:= microblaze -CPU_ARCH:= $(ADK_TARGET_CPU_ARCH) -TARGET_CFLAGS_ARCH:= $(ADK_TARGET_CFLAGS) -- cgit v1.2.3