diff options
Diffstat (limited to 'target/config')
| -rw-r--r-- | target/config/Config.in.binfmt | 3 | ||||
| -rw-r--r-- | target/config/Config.in.binutils | 3 | ||||
| -rw-r--r-- | target/config/Config.in.compiler | 3 | ||||
| -rw-r--r-- | target/config/Config.in.cpu | 14 | ||||
| -rw-r--r-- | target/config/Config.in.kernelcfg | 4 | ||||
| -rw-r--r-- | target/config/Config.in.kernelcmd | 1 | ||||
| -rw-r--r-- | target/config/Config.in.kernelversion | 16 | ||||
| -rw-r--r-- | target/config/Config.in.libc | 4 | ||||
| -rw-r--r-- | target/config/Config.in.runtime | 1 | ||||
| -rw-r--r-- | target/config/Config.in.toolchain | 3 | ||||
| -rw-r--r-- | target/config/Config.in.tools | 4 |
11 files changed, 50 insertions, 6 deletions
diff --git a/target/config/Config.in.binfmt b/target/config/Config.in.binfmt index 13e28f6b5..03f2c6003 100644 --- a/target/config/Config.in.binfmt +++ b/target/config/Config.in.binfmt @@ -12,12 +12,13 @@ config ADK_TARGET_BINFMT_ELF config ADK_TARGET_BINFMT_FLAT bool "FLAT" select ADK_TARGET_UCLINUX if ADK_TARGET_ARCH_BFIN + depends on ADK_TARGET_LIB_UCLIBC_NG depends on (ADK_TARGET_ARCH_ARM || ADK_TARGET_ARCH_M68K || ADK_TARGET_ARCH_SH || ADK_TARGET_ARCH_XTENSA) && ADK_TARGET_WITHOUT_MMU \ || ADK_TARGET_ARCH_H8300 || ADK_TARGET_ARCH_LM32 || ADK_TARGET_ARCH_BFIN config ADK_TARGET_BINFMT_FDPIC bool "FDPIC" - depends on ADK_TARGET_ARCH_BFIN || ADK_TARGET_ARCH_FRV + depends on ADK_TARGET_ARCH_BFIN || ADK_TARGET_ARCH_FRV || (ADK_TARGET_CPU_SH_J2 && ADK_TARGET_LIB_MUSL) config ADK_TARGET_BINFMT_DSBT bool "DSBT" diff --git a/target/config/Config.in.binutils b/target/config/Config.in.binutils index fa29adb99..e05a8c0bd 100644 --- a/target/config/Config.in.binutils +++ b/target/config/Config.in.binutils @@ -13,6 +13,7 @@ default ADK_TOOLCHAIN_BINUTILS_2_27 if ADK_TARGET_ARCH_FRV default ADK_TOOLCHAIN_BINUTILS_2_27 if ADK_TARGET_ARCH_H8300 default ADK_TOOLCHAIN_BINUTILS_2_27 if ADK_TARGET_ARCH_NIOS2 default ADK_TOOLCHAIN_BINUTILS_2_27 if ADK_TARGET_ARCH_XTENSA && ADK_TARGET_LITTLE_ENDIAN +default ADK_TOOLCHAIN_BINUTILS_2_27 if ADK_TARGET_SYSTEM_NUMATO_MIMASV2 default ADK_TOOLCHAIN_BINUTILS_2_26_1 config ADK_TOOLCHAIN_BINUTILS_GIT @@ -38,6 +39,7 @@ config ADK_TOOLCHAIN_BINUTILS_2_26_1 depends on !ADK_TARGET_ARCH_H8300 depends on !ADK_TARGET_ARCH_LM32 depends on !ADK_TARGET_ARCH_NDS32 + depends on !ADK_TARGET_SYSTEM_NUMATO_MIMASV2 config ADK_TOOLCHAIN_BINUTILS_2_25_1 bool "2.25.1" @@ -49,6 +51,7 @@ config ADK_TOOLCHAIN_BINUTILS_2_25_1 depends on !ADK_TARGET_ARCH_MOXIE depends on !ADK_TARGET_ARCH_NDS32 depends on !ADK_TARGET_CPU_CRIS_CRISV10 + depends on !ADK_TARGET_SYSTEM_NUMATO_MIMASV2 config ADK_TOOLCHAIN_BINUTILS_NDS32 bool "2.24-nds32" diff --git a/target/config/Config.in.compiler b/target/config/Config.in.compiler index 7c1dc7d3d..b804334a5 100644 --- a/target/config/Config.in.compiler +++ b/target/config/Config.in.compiler @@ -33,6 +33,7 @@ default ADK_TOOLCHAIN_GCC_6 if ADK_TARGET_ARCH_FRV default ADK_TOOLCHAIN_GCC_6 if ADK_TARGET_ARCH_M32R default ADK_TOOLCHAIN_GCC_6 if ADK_TARGET_CPU_MIPS_MIPS32R6 || ADK_TARGET_CPU_MIPS64_MIPS64R6 default ADK_TOOLCHAIN_GCC_6 if ADK_TARGET_LIB_MUSL && ADK_TARGET_ARCH_S390 +default ADK_TOOLCHAIN_GCC_6 if ADK_TARGET_SYSTEM_NUMATO_MIMASV2 default ADK_TOOLCHAIN_GCC_5 config ADK_TOOLCHAIN_GCC_GIT @@ -71,6 +72,7 @@ config ADK_TOOLCHAIN_GCC_5 depends on !(ADK_TARGET_LIB_GLIBC && ADK_TARGET_ARCH_SH) depends on !ADK_TARGET_CPU_MIPS_MIPS32R6 depends on !ADK_TARGET_CPU_MIPS64_MIPS64R6 + depends on !ADK_TARGET_SYSTEM_NUMATO_MIMASV2 config ADK_TOOLCHAIN_GCC_4_9 bool "4.9.4" @@ -87,6 +89,7 @@ config ADK_TOOLCHAIN_GCC_4_9 depends on !ADK_TARGET_ARCH_TILE depends on !ADK_TARGET_CPU_MIPS_MIPS32R6 depends on !ADK_TARGET_CPU_MIPS64_MIPS64R6 + depends on !ADK_TARGET_SYSTEM_NUMATO_MIMASV2 config ADK_TOOLCHAIN_GCC_OR1K bool "or1k" diff --git a/target/config/Config.in.cpu b/target/config/Config.in.cpu index f0d1b71c4..7cea653de 100644 --- a/target/config/Config.in.cpu +++ b/target/config/Config.in.cpu @@ -980,10 +980,19 @@ config ADK_TARGET_CPU_S390_Z900 depends on ADK_TARGET_ARCH_S390 # sh +config ADK_TARGET_CPU_SH_J2 + bool "j2" + select ADK_TARGET_SUPPORTS_THREADS + select ADK_TARGET_SUPPORTS_NPTL if ADK_TARGET_LIB_MUSL + select ADK_TARGET_SUPPORTS_LT if ADK_TARGET_LIB_UCLIBC_NG + select ADK_TARGET_WITHOUT_MMU + depends on ADK_TARGET_ARCH_SH + config ADK_TARGET_CPU_SH_SH2 bool "sh2" select ADK_TARGET_SUPPORTS_THREADS - select ADK_TARGET_SUPPORTS_LT + select ADK_TARGET_SUPPORTS_NPTL if ADK_TARGET_LIB_MUSL + select ADK_TARGET_SUPPORTS_LT if ADK_TARGET_LIB_UCLIBC_NG select ADK_TARGET_WITHOUT_MMU depends on ADK_TARGET_ARCH_SH @@ -1815,6 +1824,7 @@ config ADK_TARGET_CPU_FLAGS default "-mcpu=v32" if ADK_TARGET_CPU_CRIS_CRISV32 default "-mmetac=2.1" if ADK_TARGET_CPU_METAG default "-mcpu=v7.10.d" if ADK_TARGET_CPU_MICROBLAZE + default "-mj2" if ADK_TARGET_CPU_SH_J2 default "-m2" if ADK_TARGET_CPU_SH_SH2 default "-m2a" if ADK_TARGET_CPU_SH_SH2A default "-m3" if ADK_TARGET_CPU_SH_SH3 @@ -1921,6 +1931,7 @@ config ADK_TARGET_CPU_TYPE default "fsf" if ADK_TARGET_CPU_XTENSA_FSF default "crisv10" if ADK_TARGET_CPU_CRIS_CRISV10 default "crisv32" if ADK_TARGET_CPU_CRIS_CRISV32 + default "j2" if ADK_TARGET_CPU_SH_J2 default "sh2" if ADK_TARGET_CPU_SH_SH2 default "sh2a" if ADK_TARGET_CPU_SH_SH2A default "sh3" if ADK_TARGET_CPU_SH_SH3 @@ -1977,6 +1988,7 @@ config ADK_TARGET_CPU_ARCH default "s390x" if ADK_TARGET_ARCH_S390 default "sh2" if ADK_TARGET_CPU_SH_SH2 && ADK_TARGET_LITTLE_ENDIAN default "sh2eb" if ADK_TARGET_CPU_SH_SH2 && ADK_TARGET_BIG_ENDIAN + default "sh2eb" if ADK_TARGET_CPU_SH_J2 && ADK_TARGET_BIG_ENDIAN default "sh2a" if ADK_TARGET_CPU_SH_SH2A default "sh3" if ADK_TARGET_CPU_SH_SH3 && ADK_TARGET_LITTLE_ENDIAN default "sh3eb" if ADK_TARGET_CPU_SH_SH3 && ADK_TARGET_BIG_ENDIAN diff --git a/target/config/Config.in.kernelcfg b/target/config/Config.in.kernelcfg index eb971fdf8..f9f5ec491 100644 --- a/target/config/Config.in.kernelcfg +++ b/target/config/Config.in.kernelcfg @@ -21,7 +21,7 @@ config ADK_TARGET_KERNEL_USE_CUSTOMCONFIG endchoice config ADK_TARGET_KERNEL_DEFCONFIG - string + string "Defconfig name" depends on ADK_TARGET_KERNEL_USE_DEFCONFIG default "bcmrpi_defconfig" if ADK_TARGET_SYSTEM_RASPBERRY_PI default "bcm2709_defconfig" if ADK_TARGET_SYSTEM_RASPBERRY_PI2 @@ -34,6 +34,8 @@ config ADK_TARGET_KERNEL_DEFCONFIG default "10m50_defconfig" if ADK_TARGET_SYSTEM_QEMU_NIOS2 default "orca_defconfig" if ADK_TARGET_SYSTEM_ANDES_AG101P default "bb.org_defconfig" if ADK_TARGET_SYSTEM_BEAGLEBONE_BLACK + default "j2_defconfig" if ADK_TARGET_SYSTEM_NUMATO_MIMASV2 + default "" config ADK_TARGET_KERNEL_CUSTOMCONFIG_PATH string "Kernel configuration file location" diff --git a/target/config/Config.in.kernelcmd b/target/config/Config.in.kernelcmd index d630eb86c..5a2b30599 100644 --- a/target/config/Config.in.kernelcmd +++ b/target/config/Config.in.kernelcmd @@ -9,5 +9,6 @@ config ADK_TARGET_CMDLINE default "metag_da.console_poll=1" if ADK_TARGET_SYSTEM_QEMU_METAG default "earlycon=uart8250,mmio32,0x9d050020,115200n8 console=ttyS0,115200n8" if ADK_TARGET_CPU_XTENSA_DE212 default "earlyprintk=uart8250-32bit,0x99600000" if ADK_TARGET_SYSTEM_ANDES_AG101P + default "earlycon noiotrap" if ADK_TARGET_SYSTEM_NUMATO_MIMASV2 default "" diff --git a/target/config/Config.in.kernelversion b/target/config/Config.in.kernelversion index f6da4281b..5f50bbcbf 100644 --- a/target/config/Config.in.kernelversion +++ b/target/config/Config.in.kernelversion @@ -13,6 +13,7 @@ default ADK_TARGET_KERNEL_VERSION_GIT if ADK_TARGET_ARCH_LM32 default ADK_TARGET_KERNEL_VERSION_4_4 if ADK_TARGET_ARCH_CRIS default ADK_TARGET_KERNEL_VERSION_4_4 if ADK_TARGET_ARCH_METAG default ADK_TARGET_KERNEL_VERSION_4_4 if ADK_TARGET_SYSTEM_QEMU_ARM_VERSATILEPB_NOMMU +default ADK_TARGET_KERNEL_VERSION_4_9 if ADK_TARGET_SYSTEM_NUMATO_MIMASV2 default ADK_TARGET_KERNEL_VERSION_4_8 config ADK_TARGET_KERNEL_VERSION_GIT @@ -23,12 +24,20 @@ config ADK_TARGET_KERNEL_VERSION_GIT select ADK_TARGET_KERNEL_IMAGE if ADK_TARGET_SYSTEM_SOLIDRUN_IMX6 select ADK_TARGET_KERNEL_IMAGE if ADK_TARGET_SYSTEM_BEAGLEBONE_BLACK +config ADK_TARGET_KERNEL_VERSION_4_9 + bool "4.9" + depends on !ADK_TARGET_ARCH_CRIS + depends on !ADK_TARGET_ARCH_METAG + depends on !ADK_TARGET_ARCH_NDS32 + depends on !ADK_TARGET_SYSTEM_QEMU_ARM_VERSATILEPB_NOMMU + config ADK_TARGET_KERNEL_VERSION_4_8 bool "4.8.11" depends on !ADK_TARGET_ARCH_CRIS depends on !ADK_TARGET_ARCH_METAG depends on !ADK_TARGET_ARCH_NDS32 depends on !ADK_TARGET_SYSTEM_QEMU_ARM_VERSATILEPB_NOMMU + depends on !ADK_TARGET_SYSTEM_NUMATO_MIMASV2 config ADK_TARGET_KERNEL_VERSION_4_4 bool "4.4.30" @@ -38,6 +47,7 @@ config ADK_TARGET_KERNEL_VERSION_4_4 depends on !ADK_TARGET_CPU_MIPS_MIPS32R6 depends on !ADK_TARGET_CPU_MIPS64_MIPS64R6 depends on !ADK_TARGET_SYSTEM_QEMU_M68K_MCF5208 + depends on !ADK_TARGET_SYSTEM_NUMATO_MIMASV2 config ADK_TARGET_KERNEL_VERSION_4_1 bool "4.1.35" @@ -70,6 +80,7 @@ config ADK_TARGET_KERNEL_VERSION_3_18 depends on !ADK_TARGET_SYSTEM_BEAGLEBONE_BLACK depends on !ADK_TARGET_SYSTEM_QEMU_M68K_MCF5208 depends on !ADK_TARGET_SYSTEM_QEMU_ARM_VERSATILEPB_NOMMU + depends on !ADK_TARGET_SYSTEM_NUMATO_MIMASV2 depends on !ADK_TARGET_CPU_MIPS_MIPS32R6 depends on !ADK_TARGET_CPU_MIPS64_MIPS64R6 @@ -89,6 +100,7 @@ config ADK_TARGET_KERNEL_VERSION_3_12 depends on !ADK_TARGET_SYSTEM_SOLIDRUN_IMX6 depends on !ADK_TARGET_SYSTEM_QEMU_M68K_MCF5208 depends on !ADK_TARGET_SYSTEM_QEMU_ARM_VERSATILEPB_NOMMU + depends on !ADK_TARGET_SYSTEM_NUMATO_MIMASV2 depends on !ADK_TARGET_CPU_MIPS_MIPS32R6 depends on !ADK_TARGET_CPU_MIPS64_MIPS64R6 @@ -109,6 +121,7 @@ config ADK_TARGET_KERNEL_VERSION_3_10 depends on !ADK_TARGET_SYSTEM_SOLIDRUN_IMX6 depends on !ADK_TARGET_SYSTEM_QEMU_M68K_MCF5208 depends on !ADK_TARGET_SYSTEM_QEMU_ARM_VERSATILEPB_NOMMU + depends on !ADK_TARGET_SYSTEM_NUMATO_MIMASV2 depends on !ADK_TARGET_CPU_MIPS_MIPS32R6 depends on !ADK_TARGET_CPU_MIPS64_MIPS64R6 @@ -127,6 +140,7 @@ config ADK_TARGET_KERNEL_VERSION_3_4 depends on !ADK_TARGET_SYSTEM_SOLIDRUN_IMX6 depends on !ADK_TARGET_SYSTEM_QEMU_M68K_MCF5208 depends on !ADK_TARGET_SYSTEM_QEMU_ARM_VERSATILEPB_NOMMU + depends on !ADK_TARGET_SYSTEM_NUMATO_MIMASV2 depends on !ADK_TARGET_CPU_MIPS_MIPS32R6 depends on !ADK_TARGET_CPU_MIPS64_MIPS64R6 @@ -146,6 +160,7 @@ config ADK_TARGET_KERNEL_VERSION_3_2 depends on !ADK_TARGET_SYSTEM_SOLIDRUN_IMX6 depends on !ADK_TARGET_SYSTEM_QEMU_M68K_MCF5208 depends on !ADK_TARGET_SYSTEM_QEMU_ARM_VERSATILEPB_NOMMU + depends on !ADK_TARGET_SYSTEM_NUMATO_MIMASV2 depends on !ADK_TARGET_CPU_MIPS_MIPS32R6 depends on !ADK_TARGET_CPU_MIPS64_MIPS64R6 @@ -165,6 +180,7 @@ config ADK_TARGET_KERNEL_VERSION_2_6_32 depends on !ADK_TARGET_SYSTEM_SOLIDRUN_IMX6 depends on !ADK_TARGET_SYSTEM_QEMU_M68K_MCF5208 depends on !ADK_TARGET_SYSTEM_QEMU_ARM_VERSATILEPB_NOMMU + depends on !ADK_TARGET_SYSTEM_NUMATO_MIMASV2 depends on !ADK_TARGET_CPU_MIPS_MIPS32R6 depends on !ADK_TARGET_CPU_MIPS64_MIPS64R6 diff --git a/target/config/Config.in.libc b/target/config/Config.in.libc index 009b327a2..c384434fa 100644 --- a/target/config/Config.in.libc +++ b/target/config/Config.in.libc @@ -76,7 +76,8 @@ config ADK_TARGET_LIB_GLIBC ADK_TARGET_ARCH_PPC || \ ADK_TARGET_ARCH_PPC64 || \ ADK_TARGET_ARCH_S390 || \ - ADK_TARGET_ARCH_SH || \ + ADK_TARGET_CPU_SH_SH4 || \ + ADK_TARGET_CPU_SH_SH4A || \ ADK_TARGET_ARCH_SPARC || \ ADK_TARGET_ARCH_SPARC64 || \ ADK_TARGET_ARCH_TILE || \ @@ -273,6 +274,7 @@ config ADK_TARGET_SUFFIX default "muslabi32" if ADK_TARGET_LIB_MUSL && ADK_TARGET_ABI_O32 default "musl32" if ADK_TARGET_LIB_MUSL && ADK_TARGET_ABI_32 && ADK_LINUX_64 default "muslx32" if ADK_TARGET_LIB_MUSL && ADK_TARGET_ABI_X32 && ADK_LINUX_64 + default "muslfdpic" if ADK_TARGET_LIB_MUSL && ADK_TARGET_BINFMT_FDPIC default "musl" if ADK_TARGET_LIB_MUSL default "eabi" if ADK_TARGET_LIB_NEWLIB && ADK_TARGET_ARCH_ARM default "elf" if ADK_TARGET_LIB_NEWLIB diff --git a/target/config/Config.in.runtime b/target/config/Config.in.runtime index 6dc61e668..22bce28f2 100644 --- a/target/config/Config.in.runtime +++ b/target/config/Config.in.runtime @@ -361,7 +361,6 @@ config ADK_RUNTIME_CONSOLE_SERIAL_SPEED || ADK_TARGET_QEMU \ || ADK_TARGET_SIM default "9600" if ADK_TARGET_SYSTEM_FON_FON2100 - default "9600" if ADK_TARGET_SYSTEM_NUMATO_MIMASV2 default "9600" if ADK_TARGET_SYSTEM_SGI_O2 default "38400" if ADK_TARGET_SYSTEM_PCENGINES_WRAP default "38400" if ADK_TARGET_SYSTEM_ANDES_AG101P diff --git a/target/config/Config.in.toolchain b/target/config/Config.in.toolchain index 33c5eacb4..3cf310e68 100644 --- a/target/config/Config.in.toolchain +++ b/target/config/Config.in.toolchain @@ -7,11 +7,11 @@ bool "Library support" config ADK_TARGET_USE_SHARED_LIBS_ONLY bool "Create shared libraries only and link dynamically" + depends on !ADK_TARGET_BINFMT_FLAT && !ADK_TARGET_BINFMT_DSBT config ADK_TARGET_USE_STATIC_LIBS_ONLY bool "Create static libraries only and link statically" select BUSYBOX_STATIC - depends on !ADK_TARGET_BINFMT_FLAT && !ADK_TARGET_BINFMT_DSBT help Useful for debugging of dynamic linker problems. Be aware of the fact, that uClibc and glibc still requires libgcc_so.so.1 for pthread_cancel. Glibc also requires libnss_*.so libraries @@ -19,6 +19,7 @@ config ADK_TARGET_USE_STATIC_LIBS_ONLY config ADK_TARGET_USE_SHARED_AND_STATIC_LIBS bool "Create shared and static libraries and link dynamically" + depends on !ADK_TARGET_BINFMT_FLAT && !ADK_TARGET_BINFMT_DSBT endchoice diff --git a/target/config/Config.in.tools b/target/config/Config.in.tools index 7b8bb219c..4d4fb73e5 100644 --- a/target/config/Config.in.tools +++ b/target/config/Config.in.tools @@ -23,6 +23,10 @@ config ADK_HOST_BUILD_BISON bool default y +config ADK_HOST_BUILD_DTC + bool + default n + config ADK_HOST_BUILD_FAKEROOT bool default n |