diff options
author | Waldemar Brodkorb <wbx@openadk.org> | 2014-03-17 20:16:13 +0100 |
---|---|---|
committer | Waldemar Brodkorb <wbx@openadk.org> | 2014-03-17 20:16:13 +0100 |
commit | 2d79a4d91d7f403a60cc2452fb96ec7bc0876535 (patch) | |
tree | b3d5071c4b0f73426a00a82f239b750346313781 /target | |
parent | 777ba90340ac177369918daf0f66a27f97a8d911 (diff) | |
parent | 803b9757e040cc1a9090de4ac5572290c83d31fe (diff) |
Merge branch 'master' of git+ssh://openadk.org/git/openadk
Diffstat (limited to 'target')
-rw-r--r-- | target/arm/kernel/qemu-arm-versatilepb | 1 | ||||
-rw-r--r-- | target/config/Config.in | 64 | ||||
-rw-r--r-- | target/linux/config/Config.in.debug | 4 | ||||
-rw-r--r-- | target/linux/config/Config.in.kernel | 5 | ||||
-rw-r--r-- | target/mips/kernel/qemu-mips64 | 1 | ||||
-rw-r--r-- | target/mips/kernel/qemu-mips64el | 1 | ||||
-rw-r--r-- | target/ppc64/kernel/qemu-ppc64 | 1 | ||||
-rw-r--r-- | target/sparc64/kernel/qemu-sparc64 | 1 | ||||
-rw-r--r-- | target/x86_64/kernel/qemu-x86_64 | 1 |
9 files changed, 18 insertions, 61 deletions
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.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 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 |