From ddc85ef84ba7c89590f1fa794a01d9ccbfd8bcc1 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Mon, 17 Mar 2014 16:16:33 +0100 Subject: use initramfsarchive for test framework --- target/config/Config.in | 1 - 1 file changed, 1 deletion(-) (limited to 'target') diff --git a/target/config/Config.in b/target/config/Config.in index 79f067bf3..3e8176148 100644 --- a/target/config/Config.in +++ b/target/config/Config.in @@ -760,7 +760,6 @@ config ADK_TARGET_SUFFIX choice prompt "Target firmware type" depends on !ADK_CHOOSE_TARGET_SYSTEM && !ADK_CHOOSE_TARGET_ARCH && !ADK_TOOLCHAIN -default ADK_TARGET_ROOTFS_INITRAMFSARCHIVE if ADK_PKG_TEST default ADK_TARGET_ROOTFS_ARCHIVE config ADK_TARGET_ROOTFS_INITRAMFS -- cgit v1.2.3 From 2b78ac230fd5678a900a0607d1e67f9bb83e0df3 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Mon, 17 Mar 2014 16:45:46 +0100 Subject: fix wording --- target/linux/config/Config.in.debug | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'target') diff --git a/target/linux/config/Config.in.debug b/target/linux/config/Config.in.debug index 23c0bd8d2..019c439d8 100644 --- a/target/linux/config/Config.in.debug +++ b/target/linux/config/Config.in.debug @@ -30,7 +30,7 @@ config ADK_KERNEL_EARLY_PRINTK default n config ADK_KERNEL_PRINTK - prompt "Enable printk to save space and quieten bootup" + prompt "printk support (disable to save space and quieten bootup)" boolean select ADK_KERNEL_EARLY_PRINTK default y @@ -39,7 +39,7 @@ config ADK_KERNEL_PRINTK Disable printk to save space and quieten bootup. config ADK_KERNEL_PRINTK_TIME - prompt "Enable timing information for printk" + prompt "timing information for printk" boolean depends on ADK_KERNEL_PRINTK default n -- cgit v1.2.3 From 803b9757e040cc1a9090de4ac5572290c83d31fe Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Mon, 17 Mar 2014 19:04:45 +0100 Subject: remove kernel choice, always use 64 bit for 64bit target --- target/arm/kernel/qemu-arm-versatilepb | 1 + target/config/Config.in | 64 ++++++---------------------------- target/linux/config/Config.in.kernel | 5 ++- target/mips/kernel/qemu-mips64 | 1 - target/mips/kernel/qemu-mips64el | 1 - target/ppc64/kernel/qemu-ppc64 | 1 - target/sparc64/kernel/qemu-sparc64 | 1 - target/x86_64/kernel/qemu-x86_64 | 1 - 8 files changed, 16 insertions(+), 59 deletions(-) (limited to 'target') diff --git a/target/arm/kernel/qemu-arm-versatilepb b/target/arm/kernel/qemu-arm-versatilepb index f208772d0..29a82ccf6 100644 --- a/target/arm/kernel/qemu-arm-versatilepb +++ b/target/arm/kernel/qemu-arm-versatilepb @@ -1,3 +1,4 @@ +CONFIG_ARM=y CONFIG_ARM_PATCH_PHYS_VIRT=y CONFIG_ARCH_VERSATILE=y CONFIG_ARCH_VERSATILE_PB=y diff --git a/target/config/Config.in b/target/config/Config.in index 3e8176148..38004d7e3 100644 --- a/target/config/Config.in +++ b/target/config/Config.in @@ -73,7 +73,7 @@ source "target/config/Config.in.system" config ADK_LINUX_MIPS64 boolean - default y if ADK_LINUX_MIPS && ADK_TARGET_KERNEL64 + default y if ADK_LINUX_MIPS && ADK_LINUX_64 choice prompt "Toolchain options" @@ -86,21 +86,6 @@ config ADK_TOOLCHAIN_ARCHIVE endchoice -choice -prompt "Target Kernel" -depends on ADK_TARGET_SYSTEM_LEMOTE_YEELONG \ - || ADK_TARGET_SYSTEM_QEMU_MIPS64 \ - || ADK_TARGET_SYSTEM_QEMU_MIPS64EL \ - || ADK_LINUX_X86_64 - -config ADK_TARGET_KERNEL64 - boolean "64 Bit Kernel" - -config ADK_TARGET_KERNEL32 - boolean "32 Bit Kernel" - -endchoice - config ADK_32 boolean @@ -143,7 +128,7 @@ config ADK_TARGET_MIPS_ABI choice prompt "Target ABI" -depends on ADK_TARGET_KERNEL64 && ADK_LINUX_MIPS && !ADK_TOOLCHAIN +depends on ADK_LINUX_64 && ADK_LINUX_MIPS && !ADK_TOOLCHAIN config ADK_TARGET_ABI_N32 boolean "N32 ABI (new)" @@ -161,7 +146,7 @@ endchoice choice prompt "Target ABI" -depends on ADK_TARGET_KERNEL64 && ADK_LINUX_X86_64 && !ADK_TOOLCHAIN +depends on ADK_LINUX_64 && ADK_LINUX_X86_64 && !ADK_TOOLCHAIN config ADK_TARGET_ABI_64 boolean "64 Bit ABI" @@ -224,7 +209,6 @@ depends on ADK_TARGET_SYSTEM_QEMU_MICROBLAZE || ADK_TARGET_SYSTEM_QEMU_MICROBLAZ config ADK_TARGET_QEMU_MICROBLAZE_MODEL_ML605 boolean "Xilinx ml605" - select ADK_TARGET_WITH_MTD config ADK_TARGET_QEMU_MICROBLAZE_MODEL_S3ADSP1800 boolean "Xilinx Spartan S3ADSP1800" @@ -267,7 +251,7 @@ config ADK_TARGET_QEMU_WITH_BLOCK boolean "enabled" select ADK_KERNEL_SCSI_SYM53C8XX_2 if ADK_TARGET_QEMU_ARM_MODEL_VERSATILEPB select ADK_KERNEL_MTD_M25P80 if ADK_TARGET_QEMU_MICROBLAZE_MODEL_ML605 - select ADK_KERNEL_ATA_PIIX if ADK_LINUX_MIPS || ADK_TARGET_SYSTEM_QEMU_I686 + select ADK_KERNEL_ATA_PIIX if ADK_LINUX_MIPS || ADK_TARGET_SYSTEM_QEMU_I686 || ADK_TARGET_SYSTEM_QEMU_X86_64 select ADK_KERNEL_PATA_MACIO if ADK_TARGET_SYSTEM_QEMU_PPC select ADK_KERNEL_SCSI_IBMVSCSI if ADK_TARGET_SYSTEM_QEMU_PPC64 select ADK_KERNEL_SCSI_SUNESP if ADK_TARGET_SYSTEM_QEMU_SPARC @@ -338,23 +322,7 @@ config ADK_LINUX_ARM_WITH_THUMB endchoice - -choice -prompt "Broadcom BCM47xx Model" -depends on ADK_TARGET_SYSTEM_BROADCOM_BCM47XX - -config ADK_TARGET_BROADCOM_MODEL_LINKSYS_WRT54G - boolean "Linksys WRT54g" - -config ADK_TARGET_BROADCOM_MODEL_LINKSYS_WRT54GS - boolean "Linksys WRT54gs" - -config ADK_TARGET_BROADCOM_MODEL_ASUS_WL500GP - boolean "Asus WL500gP" - -endchoice - -# hardware features +# hardware features, do not use for qemu config ADK_TARGET_WITH_USB boolean @@ -658,15 +626,11 @@ config ADK_glibc config ADK_musl boolean -config ADK_libc - boolean - config ADK_TARGET_LIBC string default "uclibc" if ADK_uclibc default "glibc" if ADK_glibc default "musl" if ADK_musl - default "libc" if ADK_libc source "target/linux/config/Config.in.kernel" @@ -722,12 +686,6 @@ config ADK_TARGET_LIB_MUSL help http://musl-libc.org -config ADK_TARGET_LIB_LIBC - prompt "Native C library" - boolean - select ADK_libc - depends on ADK_LINUX_NATIVE - endchoice config ADK_TARGET_SUFFIX @@ -737,24 +695,24 @@ config ADK_TARGET_SUFFIX default "gnuabi64" if ADK_TARGET_LIB_GLIBC && ADK_n64 default "gnuabin32" if ADK_TARGET_LIB_GLIBC && ADK_n32 default "gnuabi32" if ADK_TARGET_LIB_GLIBC && ADK_o32 - default "gnu32" if ADK_TARGET_LIB_GLIBC && ADK_32 && ADK_TARGET_KERNEL64 - default "gnux32" if ADK_TARGET_LIB_GLIBC && ADK_x32 && ADK_TARGET_KERNEL64 + default "gnu32" if ADK_TARGET_LIB_GLIBC && ADK_32 && ADK_LINUX_64 + default "gnux32" if ADK_TARGET_LIB_GLIBC && ADK_x32 && ADK_LINUX_64 default "gnu" if ADK_TARGET_LIB_GLIBC default "uclibcgnueabihf" if ADK_TARGET_LIB_UCLIBC && ADK_eabihf default "uclibcgnueabi" if ADK_TARGET_LIB_UCLIBC && ADK_eabi default "uclibcabi64" if ADK_TARGET_LIB_UCLIBC && ADK_n64 default "uclibcabin32" if ADK_TARGET_LIB_UCLIBC && ADK_n32 default "uclibcabi32" if ADK_TARGET_LIB_UCLIBC && ADK_o32 - default "uclibc32" if ADK_TARGET_LIB_UCLIBC && ADK_32 && ADK_TARGET_KERNEL64 - default "uclibcx32" if ADK_TARGET_LIB_UCLIBC && ADK_x32 && ADK_TARGET_KERNEL64 + default "uclibc32" if ADK_TARGET_LIB_UCLIBC && ADK_32 && ADK_LINUX_64 + default "uclibcx32" if ADK_TARGET_LIB_UCLIBC && ADK_x32 && ADK_LINUX_64 default "uclibc" if ADK_TARGET_LIB_UCLIBC default "muslgnueabihf" if ADK_TARGET_LIB_MUSL && ADK_eabihf default "muslgnueabi" if ADK_TARGET_LIB_MUSL && ADK_eabi default "muslabi64" if ADK_TARGET_LIB_MUSL && ADK_n64 default "muslabin32" if ADK_TARGET_LIB_MUSL && ADK_n32 default "muslabi32" if ADK_TARGET_LIB_MUSL && ADK_o32 - default "musl32" if ADK_TARGET_LIB_MUSL && ADK_32 && ADK_TARGET_KERNEL64 - default "muslx32" if ADK_TARGET_LIB_MUSL && ADK_x32 && ADK_TARGET_KERNEL64 + default "musl32" if ADK_TARGET_LIB_MUSL && ADK_32 && ADK_LINUX_64 + default "muslx32" if ADK_TARGET_LIB_MUSL && ADK_x32 && ADK_LINUX_64 default "musl" if ADK_TARGET_LIB_MUSL choice diff --git a/target/linux/config/Config.in.kernel b/target/linux/config/Config.in.kernel index 221a373df..650bc8729 100644 --- a/target/linux/config/Config.in.kernel +++ b/target/linux/config/Config.in.kernel @@ -98,7 +98,7 @@ config ADK_KERNEL_PCI config ADK_KERNEL_64BIT boolean - default y if ADK_TARGET_KERNEL64 + default y if ADK_LINUX_64 config ADK_KERNEL_CPU_MIPS64 boolean @@ -106,6 +106,9 @@ config ADK_KERNEL_CPU_MIPS64 config ADK_KERNEL_CPU_MIPS64_R1 boolean +config ADK_KERNEL_CPU_MIPS64_R2 + boolean + config ADK_KERNEL_PREEMPT boolean diff --git a/target/mips/kernel/qemu-mips64 b/target/mips/kernel/qemu-mips64 index d4ef42c15..5ceba460c 100644 --- a/target/mips/kernel/qemu-mips64 +++ b/target/mips/kernel/qemu-mips64 @@ -2,7 +2,6 @@ CONFIG_MIPS=y CONFIG_MIPS_MALTA=y CONFIG_CPU_BIG_ENDIAN=y CONFIG_CPU_MIPS64_R1=y -CONFIG_64BIT=y CONFIG_PAGE_SIZE_4KB=y CONFIG_PCI=y CONFIG_PCI_DOMAINS=y diff --git a/target/mips/kernel/qemu-mips64el b/target/mips/kernel/qemu-mips64el index 684b187be..383b7f160 100644 --- a/target/mips/kernel/qemu-mips64el +++ b/target/mips/kernel/qemu-mips64el @@ -2,7 +2,6 @@ CONFIG_MIPS=y CONFIG_MIPS_MALTA=y CONFIG_CPU_LITTLE_ENDIAN=y CONFIG_CPU_MIPS64_R1=y -CONFIG_64BIT=y CONFIG_PAGE_SIZE_4KB=y CONFIG_PCI=y CONFIG_PCI_DOMAINS=y diff --git a/target/ppc64/kernel/qemu-ppc64 b/target/ppc64/kernel/qemu-ppc64 index 0eb40bd77..ebf952146 100644 --- a/target/ppc64/kernel/qemu-ppc64 +++ b/target/ppc64/kernel/qemu-ppc64 @@ -8,7 +8,6 @@ CONFIG_PPC_FPU=y CONFIG_PPC_STD_MMU=y CONFIG_PPC_STD_MMU_64=y CONFIG_PPC_DOORBELL=y -CONFIG_64BIT=y CONFIG_PPC_OF=y CONFIG_PPC_UDBG_16550=y CONFIG_PPC_PSERIES=y diff --git a/target/sparc64/kernel/qemu-sparc64 b/target/sparc64/kernel/qemu-sparc64 index a2b048860..e3cd03068 100644 --- a/target/sparc64/kernel/qemu-sparc64 +++ b/target/sparc64/kernel/qemu-sparc64 @@ -1,6 +1,5 @@ CONFIG_SPARC=y CONFIG_SPARC64=y -CONFIG_64BIT=y CONFIG_PCI=y CONFIG_PCI_SYSCALL=y CONFIG_PCI_DOMAINS=y diff --git a/target/x86_64/kernel/qemu-x86_64 b/target/x86_64/kernel/qemu-x86_64 index e0183cc39..baad58c81 100644 --- a/target/x86_64/kernel/qemu-x86_64 +++ b/target/x86_64/kernel/qemu-x86_64 @@ -1,5 +1,4 @@ CONFIG_X86=y -CONFIG_64BIT=y CONFIG_X86_64=y CONFIG_GENERIC_CPU=y CONFIG_PROCESSOR_SELECT=y -- cgit v1.2.3 From d714919ee99c1ef6a2b7cc369b1c78624ad956fe Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Tue, 18 Mar 2014 01:35:19 +0100 Subject: use archive without kernel --- target/arm/Makefile | 4 ++-- target/m68k/Makefile | 4 ++-- target/microblaze/Makefile | 4 ++-- target/mips/Makefile | 4 ++-- target/ppc/Makefile | 4 ++-- target/ppc64/Makefile | 4 ++-- target/sh/Makefile | 4 ++-- target/sparc/Makefile | 4 ++-- target/sparc64/Makefile | 4 ++-- target/x86/Makefile | 5 ++--- target/x86_64/Makefile | 4 ++-- 11 files changed, 22 insertions(+), 23 deletions(-) (limited to 'target') diff --git a/target/arm/Makefile b/target/arm/Makefile index a652003eb..a2bd23a8b 100644 --- a/target/arm/Makefile +++ b/target/arm/Makefile @@ -71,10 +71,10 @@ ifeq ($(ADK_TARGET_SYSTEM_QEMU_ARM)$(ADK_TARGET_SYSTEM_QEMU_ARMHF),y) endif endif ifeq ($(ADK_TARGET_FS),initramfsarchive) -imageinstall: $(FW_DIR)/$(ROOTFSTARBALL) +imageinstall: $(FW_DIR)/$(ROOTFSUSERTARBALL) @cp $(KERNEL) $(FW_DIR)/$(TARGET_KERNEL) @echo 'The kernel file is: $(FW_DIR)/${TARGET_KERNEL}' - @echo "The RootFS tarball is: $(FW_DIR)/$(ROOTFSTARBALL)" + @echo "The RootFS tarball is: $(FW_DIR)/$(ROOTFSUSERTARBALL)" endif ifeq ($(ADK_TARGET_FS),initramfs) imageinstall: $(FW_DIR)/$(INITRAMFS) diff --git a/target/m68k/Makefile b/target/m68k/Makefile index d68393b84..0e7324c25 100644 --- a/target/m68k/Makefile +++ b/target/m68k/Makefile @@ -16,10 +16,10 @@ imageinstall: $(FW_DIR)/$(ROOTFSTARBALL) @echo "The RootFS tarball is: $(FW_DIR)/$(ROOTFSTARBALL)" endif ifeq ($(ADK_TARGET_FS),initramfsarchive) -imageinstall: $(FW_DIR)/$(ROOTFSTARBALL) +imageinstall: $(FW_DIR)/$(ROOTFSUSERTARBALL) @cp $(KERNEL) $(FW_DIR)/$(TARGET_KERNEL) @echo 'The kernel file is: $(FW_DIR)/${TARGET_KERNEL}' - @echo "The RootFS tarball is: $(FW_DIR)/$(ROOTFSTARBALL)" + @echo "The RootFS tarball is: $(FW_DIR)/$(ROOTFSUSERTARBALL)" endif ifeq ($(ADK_TARGET_FS),initramfs) imageinstall: $(FW_DIR)/$(INITRAMFS) diff --git a/target/microblaze/Makefile b/target/microblaze/Makefile index c60545e56..5ab2345e7 100644 --- a/target/microblaze/Makefile +++ b/target/microblaze/Makefile @@ -62,8 +62,8 @@ imageinstall: $(FW_DIR)/$(ROOTFSTARBALL) @echo "The RootFS tarball is: $(FW_DIR)/$(ROOTFSTARBALL)" endif ifeq ($(ADK_TARGET_FS),initramfsarchive) -imageinstall: $(FW_DIR)/$(ROOTFSTARBALL) +imageinstall: $(FW_DIR)/$(ROOTFSUSERTARBALL) @cp $(KERNEL) $(FW_DIR)/$(TARGET_KERNEL) @echo 'The kernel file is: $(FW_DIR)/${TARGET_KERNEL}' - @echo "The RootFS tarball is: $(FW_DIR)/$(ROOTFSTARBALL)" + @echo "The RootFS tarball is: $(FW_DIR)/$(ROOTFSUSERTARBALL)" endif diff --git a/target/mips/Makefile b/target/mips/Makefile index 9fd479d5d..436b570e3 100644 --- a/target/mips/Makefile +++ b/target/mips/Makefile @@ -113,10 +113,10 @@ ifeq ($(ADK_TARGET_SYSTEM_LEMOTE_YEELONG),y) endif endif ifeq ($(ADK_TARGET_FS),initramfsarchive) -imageinstall: $(FW_DIR)/$(ROOTFSTARBALL) +imageinstall: $(FW_DIR)/$(ROOTFSUSERTARBALL) @cp $(KERNEL) $(FW_DIR)/$(TARGET_KERNEL) @echo 'The kernel file is: $(FW_DIR)/${TARGET_KERNEL}' - @echo "The RootFS tarball is: $(FW_DIR)/$(ROOTFSTARBALL)" + @echo "The RootFS tarball is: $(FW_DIR)/$(ROOTFSUSERTARBALL)" endif ifeq ($(ADK_TARGET_FS),initramfs) imageinstall: $(FW_DIR)/$(INITRAMFS) diff --git a/target/ppc/Makefile b/target/ppc/Makefile index ceb31e5f5..aae63f1c0 100644 --- a/target/ppc/Makefile +++ b/target/ppc/Makefile @@ -23,10 +23,10 @@ ifeq ($(ADK_HARDWARE_QEMU),y) endif endif ifeq ($(ADK_TARGET_FS),initramfsarchive) -imageinstall: $(FW_DIR)/$(ROOTFSTARBALL) +imageinstall: $(FW_DIR)/$(ROOTFSUSERTARBALL) @cp $(KERNEL) $(FW_DIR)/$(TARGET_KERNEL) @echo 'The kernel file is: $(FW_DIR)/${TARGET_KERNEL}' - @echo "The RootFS tarball is: $(FW_DIR)/$(ROOTFSTARBALL)" + @echo "The RootFS tarball is: $(FW_DIR)/$(ROOTFSUSERTARBALL)" endif ifeq ($(ADK_TARGET_FS),initramfs) imageinstall: $(FW_DIR)/$(INITRAMFS) diff --git a/target/ppc64/Makefile b/target/ppc64/Makefile index 0ad0843c0..6ee949a09 100644 --- a/target/ppc64/Makefile +++ b/target/ppc64/Makefile @@ -23,10 +23,10 @@ ifeq ($(ADK_HARDWARE_QEMU),y) endif endif ifeq ($(ADK_TARGET_FS),initramfsarchive) -imageinstall: $(FW_DIR)/$(ROOTFSTARBALL) +imageinstall: $(FW_DIR)/$(ROOTFSUSERTARBALL) @cp $(KERNEL) $(FW_DIR)/$(TARGET_KERNEL) @echo 'The kernel file is: $(FW_DIR)/${TARGET_KERNEL}' - @echo "The RootFS tarball is: $(FW_DIR)/$(ROOTFSTARBALL)" + @echo "The RootFS tarball is: $(FW_DIR)/$(ROOTFSUSERTARBALL)" endif ifeq ($(ADK_TARGET_FS),initramfs) imageinstall: $(FW_DIR)/$(INITRAMFS) diff --git a/target/sh/Makefile b/target/sh/Makefile index 160ed6b74..0d5706eb3 100644 --- a/target/sh/Makefile +++ b/target/sh/Makefile @@ -23,10 +23,10 @@ ifneq ($(ADK_HARDWARE_QEMU),) endif endif ifeq ($(ADK_TARGET_FS),initramfsarchive) -imageinstall: $(FW_DIR)/$(ROOTFSTARBALL) +imageinstall: $(FW_DIR)/$(ROOTFSUSERTARBALL) @cp $(KERNEL) $(FW_DIR)/$(TARGET_KERNEL) @echo 'The kernel file is: $(FW_DIR)/${TARGET_KERNEL}' - @echo "The RootFS tarball is: $(FW_DIR)/$(ROOTFSTARBALL)" + @echo "The RootFS tarball is: $(FW_DIR)/$(ROOTFSUSERTARBALL)" endif ifeq ($(ADK_TARGET_FS),initramfs) imageinstall: $(FW_DIR)/$(INITRAMFS) diff --git a/target/sparc/Makefile b/target/sparc/Makefile index abe521e66..1e15ee7f0 100644 --- a/target/sparc/Makefile +++ b/target/sparc/Makefile @@ -22,10 +22,10 @@ ifeq ($(ADK_TARGET_SYSTEM_QEMU_SPARC),y) endif endif ifeq ($(ADK_TARGET_FS),initramfsarchive) -imageinstall: $(FW_DIR)/$(ROOTFSTARBALL) +imageinstall: $(FW_DIR)/$(ROOTFSUSERTARBALL) @cp $(KERNEL) $(FW_DIR)/$(TARGET_KERNEL) @echo 'The kernel file is: $(FW_DIR)/${TARGET_KERNEL}' - @echo "The RootFS tarball is: $(FW_DIR)/$(ROOTFSTARBALL)" + @echo "The RootFS tarball is: $(FW_DIR)/$(ROOTFSUSERTARBALL)" endif ifeq ($(ADK_TARGET_FS),initramfs) imageinstall: $(FW_DIR)/$(INITRAMFS) diff --git a/target/sparc64/Makefile b/target/sparc64/Makefile index 0d3dc560b..882189284 100644 --- a/target/sparc64/Makefile +++ b/target/sparc64/Makefile @@ -33,10 +33,10 @@ ifeq ($(ADK_TARGET_SYSTEM_QEMU_SPARC64),y) endif endif ifeq ($(ADK_TARGET_FS),initramfsarchive) -imageinstall: $(FW_DIR)/$(ROOTFSTARBALL) +imageinstall: $(FW_DIR)/$(ROOTFSUSERTARBALL) @cp $(KERNEL) $(FW_DIR)/$(TARGET_KERNEL) @echo 'The kernel file is: $(FW_DIR)/${TARGET_KERNEL}' - @echo "The RootFS tarball is: $(FW_DIR)/$(ROOTFSTARBALL)" + @echo "The RootFS tarball is: $(FW_DIR)/$(ROOTFSUSERTARBALL)" endif ifeq ($(ADK_TARGET_FS),initramfs) imageinstall: $(FW_DIR)/$(INITRAMFS) diff --git a/target/x86/Makefile b/target/x86/Makefile index 489d4dd1d..15d980d7c 100644 --- a/target/x86/Makefile +++ b/target/x86/Makefile @@ -14,7 +14,6 @@ imageinstall: $(FW_DIR)/$(ROOTFSTARBALL) @echo "The RootFS tarball is: $(FW_DIR)/$(ROOTFSTARBALL)" @echo "To install everything to CompactFlash use scripts/genext2.sh" endif - ifeq ($(ADK_TARGET_FS),cf) imageinstall: $(FW_DIR)/$(ROOTFSTARBALL) @echo "The RootFS tarball is: $(FW_DIR)/$(ROOTFSTARBALL)" @@ -43,10 +42,10 @@ ifeq ($(ADK_HARDWARE_VBOX),y) endif endif ifeq ($(ADK_TARGET_FS),initramfsarchive) -imageinstall: $(FW_DIR)/$(ROOTFSTARBALL) +imageinstall: $(FW_DIR)/$(ROOTFSUSERTARBALL) @cp $(KERNEL) $(FW_DIR)/$(TARGET_KERNEL) @echo 'The kernel file is: $(FW_DIR)/${TARGET_KERNEL}' - @echo "The RootFS tarball is: $(FW_DIR)/$(ROOTFSTARBALL)" + @echo "The RootFS tarball is: $(FW_DIR)/$(ROOTFSUSERTARBALL)" endif ifeq ($(ADK_TARGET_FS),usb) imageinstall: $(FW_DIR)/$(ROOTFSTARBALL) diff --git a/target/x86_64/Makefile b/target/x86_64/Makefile index 7087c9ca1..c94c3a1a6 100644 --- a/target/x86_64/Makefile +++ b/target/x86_64/Makefile @@ -21,10 +21,10 @@ ifeq ($(ADK_TARGET_SYSTEM_QEMU_X86_64),y) endif endif ifeq ($(ADK_TARGET_FS),initramfsarchive) -imageinstall: $(FW_DIR)/$(ROOTFSTARBALL) +imageinstall: $(FW_DIR)/$(ROOTFSUSERTARBALL) @cp $(KERNEL) $(FW_DIR)/$(TARGET_KERNEL) @echo 'The kernel file is: $(FW_DIR)/${TARGET_KERNEL}' - @echo "The RootFS tarball is: $(FW_DIR)/$(ROOTFSTARBALL)" + @echo "The RootFS tarball is: $(FW_DIR)/$(ROOTFSUSERTARBALL)" endif ifeq ($(ADK_TARGET_FS),usb) imageinstall: $(FW_DIR)/$(ROOTFSTARBALL) -- cgit v1.2.3 From 300e48e56f135fb7bfd472a03df70c8c4f4db90a Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Tue, 18 Mar 2014 15:19:33 +0100 Subject: strip static libraries, use cortex a9 for toolchains --- target/arm/sys-available/toolchain-arm | 3 ++- target/arm/sys-available/toolchain-armhf | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) (limited to 'target') diff --git a/target/arm/sys-available/toolchain-arm b/target/arm/sys-available/toolchain-arm index c6bb00b43..23febc50e 100644 --- a/target/arm/sys-available/toolchain-arm +++ b/target/arm/sys-available/toolchain-arm @@ -7,5 +7,6 @@ config ADK_TARGET_SYSTEM_TOOLCHAIN_ARM select ADK_eabi select ADK_TOOLCHAIN select ADK_TARGET_PACKAGE_TGZ + select ADK_CPU_CORTEX_A9 help - ARM toolchain (soft float). + ARM toolchain (soft float) for Cortex A9. diff --git a/target/arm/sys-available/toolchain-armhf b/target/arm/sys-available/toolchain-armhf index 89383f44f..bf671481c 100644 --- a/target/arm/sys-available/toolchain-armhf +++ b/target/arm/sys-available/toolchain-armhf @@ -7,6 +7,7 @@ config ADK_TARGET_SYSTEM_TOOLCHAIN_ARMHF select ADK_toolchain_armhf select ADK_TOOLCHAIN select ADK_TARGET_PACKAGE_TGZ + select ADK_CPU_CORTEX_A9 help - ARM toolchain (hard float). + ARM toolchain (hard float) for Cortex A9. -- cgit v1.2.3