diff options
Diffstat (limited to 'target')
-rw-r--r-- | target/aarch64/target.mk | 4 | ||||
-rw-r--r-- | target/arm/Makefile | 10 | ||||
-rw-r--r-- | target/arm/target.mk | 4 | ||||
-rw-r--r-- | target/m68k/target.mk | 4 | ||||
-rw-r--r-- | target/microblaze/Makefile | 8 | ||||
-rw-r--r-- | target/microblaze/target.mk | 4 | ||||
-rw-r--r-- | target/mips/Makefile | 8 | ||||
-rw-r--r-- | target/mips/target.mk | 4 | ||||
-rw-r--r-- | target/mips64/Makefile | 8 | ||||
-rw-r--r-- | target/mips64/target.mk | 4 | ||||
-rw-r--r-- | target/ppc/Makefile | 8 | ||||
-rw-r--r-- | target/ppc/target.mk | 4 | ||||
-rw-r--r-- | target/ppc64/Makefile | 8 | ||||
-rw-r--r-- | target/ppc64/target.mk | 4 | ||||
-rw-r--r-- | target/sh/Makefile | 8 | ||||
-rw-r--r-- | target/sh/target.mk | 4 | ||||
-rw-r--r-- | target/sparc/Makefile | 8 | ||||
-rw-r--r-- | target/sparc/target.mk | 4 | ||||
-rw-r--r-- | target/sparc64/Makefile | 10 | ||||
-rw-r--r-- | target/sparc64/target.mk | 4 | ||||
-rw-r--r-- | target/x86/Makefile | 8 | ||||
-rw-r--r-- | target/x86/target.mk | 4 | ||||
-rw-r--r-- | target/x86_64/Makefile | 8 | ||||
-rw-r--r-- | target/x86_64/target.mk | 4 |
24 files changed, 46 insertions, 98 deletions
diff --git a/target/aarch64/target.mk b/target/aarch64/target.mk deleted file mode 100644 index 95a9f3337..000000000 --- a/target/aarch64/target.mk +++ /dev/null @@ -1,4 +0,0 @@ -include $(TOPDIR)/mk/kernel-ver.mk -ARCH:= arm64 -CPU_ARCH:= $(ADK_TARGET_CPU_ARCH) -TARGET_CFLAGS_ARCH:= $(ADK_TARGET_CFLAGS) diff --git a/target/arm/Makefile b/target/arm/Makefile index b1bded531..71c8293c4 100644 --- a/target/arm/Makefile +++ b/target/arm/Makefile @@ -29,7 +29,7 @@ ifeq ($(ADK_TARGET_QEMU_ARM_MODEL_VEXPRESS_A9),y) QEMU_ARGS+=-M vexpress-a9 -cpu cortex-a9 -net user -net nic,model=lan9118 endif ifeq ($(ADK_TARGET_QEMU_WITH_VIRTIO),y) -QEMU_ARGS+=-drive file=qemu-${CPU_ARCH}.img,if=virtio,index=0 -net nic,model=virtio -net user +QEMU_ARGS+=-drive file=qemu-${ADK_TARGET_CPU_ARCH}.img,if=virtio,index=0 -net nic,model=virtio -net user endif # target helper text @@ -39,9 +39,9 @@ targethelp: ifeq ($(ADK_TARGET_QEMU_ARM_MODEL_VERSATILEPB)$(ADK_TARGET_QEMU_ARM_MODEL_TERRIER)$(ADK_TARGET_QEMU_ARM_MODEL_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-${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_RASPBERRY_PI),y) @echo "Use following command to install it on SD card:" @@ -61,7 +61,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) @@ -74,7 +74,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/arm/target.mk b/target/arm/target.mk deleted file mode 100644 index 87db1e279..000000000 --- a/target/arm/target.mk +++ /dev/null @@ -1,4 +0,0 @@ -include $(TOPDIR)/mk/kernel-ver.mk -ARCH:= arm -CPU_ARCH:= $(ADK_TARGET_CPU_ARCH) -TARGET_CFLAGS_ARCH:= $(ADK_TARGET_CFLAGS) diff --git a/target/m68k/target.mk b/target/m68k/target.mk deleted file mode 100644 index 80b1424a6..000000000 --- a/target/m68k/target.mk +++ /dev/null @@ -1,4 +0,0 @@ -include $(TOPDIR)/mk/kernel-ver.mk -ARCH:= m68k -CPU_ARCH:= $(ADK_TARGET_CPU_ARCH) -TARGET_CFLAGS_ARCH:= $(ADK_TARGET_CFLAGS) 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) diff --git a/target/mips/Makefile b/target/mips/Makefile index c18658ce7..25b77ee39 100644 --- a/target/mips/Makefile +++ b/target/mips/Makefile @@ -21,9 +21,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_MIKROTIK_RB532),y) @echo "Use following command to install it on CF card:" @@ -39,7 +39,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) @@ -52,7 +52,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),nfsroot) diff --git a/target/mips/target.mk b/target/mips/target.mk deleted file mode 100644 index 8b13be890..000000000 --- a/target/mips/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) 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) diff --git a/target/ppc/Makefile b/target/ppc/Makefile index b3845672f..a43b57114 100644 --- a/target/ppc/Makefile +++ b/target/ppc/Makefile @@ -21,9 +21,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 endif ifeq ($(ADK_TARGET_FS),initramfs) @@ -32,7 +32,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) @@ -45,7 +45,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/ppc/target.mk b/target/ppc/target.mk deleted file mode 100644 index 47ae3121f..000000000 --- a/target/ppc/target.mk +++ /dev/null @@ -1,4 +0,0 @@ -include $(TOPDIR)/mk/kernel-ver.mk -ARCH:= powerpc -CPU_ARCH:= ppc -TARGET_CFLAGS_ARCH:= $(ADK_TARGET_CFLAGS) -Wl,--secure-plt diff --git a/target/ppc64/Makefile b/target/ppc64/Makefile index 0f0b0c03a..27bc62e12 100644 --- a/target/ppc64/Makefile +++ b/target/ppc64/Makefile @@ -20,9 +20,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 endif ifeq ($(ADK_TARGET_FS),initramfs) @@ -31,7 +31,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) @@ -44,7 +44,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/ppc64/target.mk b/target/ppc64/target.mk deleted file mode 100644 index 5a0ecc30f..000000000 --- a/target/ppc64/target.mk +++ /dev/null @@ -1,4 +0,0 @@ -include $(TOPDIR)/mk/kernel-ver.mk -ARCH:= powerpc -CPU_ARCH:= ppc64 -TARGET_CFLAGS_ARCH:= $(ADK_TARGET_CFLAGS) diff --git a/target/sh/Makefile b/target/sh/Makefile index b89e6e740..581ddf6dc 100644 --- a/target/sh/Makefile +++ b/target/sh/Makefile @@ -25,9 +25,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 endif ifeq ($(ADK_TARGET_FS),initramfs) @@ -36,7 +36,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) @@ -49,7 +49,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/sh/target.mk b/target/sh/target.mk deleted file mode 100644 index 408dd12c5..000000000 --- a/target/sh/target.mk +++ /dev/null @@ -1,4 +0,0 @@ -include $(TOPDIR)/mk/kernel-ver.mk -ARCH:= sh -CPU_ARCH:= $(ADK_TARGET_CPU_ARCH) -TARGET_CFLAGS_ARCH:= $(ADK_TARGET_CFLAGS) diff --git a/target/sparc/Makefile b/target/sparc/Makefile index 0b7dd1ce9..c8fed4d87 100644 --- a/target/sparc/Makefile +++ b/target/sparc/Makefile @@ -19,9 +19,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 endif ifeq ($(ADK_TARGET_FS),initramfs) @@ -30,7 +30,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) @@ -43,7 +43,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/sparc/target.mk b/target/sparc/target.mk deleted file mode 100644 index 960a7cf19..000000000 --- a/target/sparc/target.mk +++ /dev/null @@ -1,4 +0,0 @@ -include $(TOPDIR)/mk/kernel-ver.mk -ARCH:= sparc -CPU_ARCH:= sparc -TARGET_CFLAGS_ARCH:= $(ADK_TARGET_CFLAGS) diff --git a/target/sparc64/Makefile b/target/sparc64/Makefile index 51b1fa89b..ee0b10dad 100644 --- a/target/sparc64/Makefile +++ b/target/sparc64/Makefile @@ -14,7 +14,7 @@ QEMU_ARGS+=${ADK_QEMU_ARGS} ifeq ($(ADK_TARGET_QEMU_WITH_VIRTIO),y) QEMU_ARGS+=-net nic,model=virtio -net user ifeq ($(ADK_TARGET_FS),archive) -QEMU_ARGS+=-drive file=qemu-${CPU_ARCH}.img,if=virtio,index=0 +QEMU_ARGS+=-drive file=qemu-${ADK_TARGET_CPU_ARCH}.img,if=virtio,index=0 endif endif @@ -25,9 +25,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 endif ifeq ($(ADK_TARGET_FS),initramfs) @@ -36,7 +36,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) @@ -49,7 +49,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/sparc64/target.mk b/target/sparc64/target.mk deleted file mode 100644 index dda789e55..000000000 --- a/target/sparc64/target.mk +++ /dev/null @@ -1,4 +0,0 @@ -include $(TOPDIR)/mk/kernel-ver.mk -ARCH:= sparc -CPU_ARCH:= sparc64 -TARGET_CFLAGS_ARCH:= $(ADK_TARGET_CFLAGS) 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) diff --git a/target/x86_64/Makefile b/target/x86_64/Makefile index ccb8c9766..e49d23029 100644 --- a/target/x86_64/Makefile +++ b/target/x86_64/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_64/target.mk b/target/x86_64/target.mk deleted file mode 100644 index f381673fa..000000000 --- a/target/x86_64/target.mk +++ /dev/null @@ -1,4 +0,0 @@ -include $(TOPDIR)/mk/kernel-ver.mk -ARCH:= x86 -CPU_ARCH:= x86_64 -TARGET_CFLAGS_ARCH:= $(ADK_TARGET_CFLAGS) |