diff options
Diffstat (limited to 'target/config')
| -rw-r--r-- | target/config/Config.in.binutils | 19 | ||||
| -rw-r--r-- | target/config/Config.in.cmdline | 1 | ||||
| -rw-r--r-- | target/config/Config.in.compiler | 42 | ||||
| -rw-r--r-- | target/config/Config.in.cpu | 47 | ||||
| -rw-r--r-- | target/config/Config.in.float | 7 | ||||
| -rw-r--r-- | target/config/Config.in.fpu | 3 | ||||
| -rw-r--r-- | target/config/Config.in.gdb | 8 | ||||
| -rw-r--r-- | target/config/Config.in.kernelfmt | 33 | ||||
| -rw-r--r-- | target/config/Config.in.libc | 14 | ||||
| -rw-r--r-- | target/config/Config.in.qemuopts | 24 | ||||
| -rw-r--r-- | target/config/Config.in.rootfs | 7 | ||||
| -rw-r--r-- | target/config/Config.in.runtime | 20 | ||||
| -rw-r--r-- | target/config/Config.in.toolchain | 8 | ||||
| -rw-r--r-- | target/config/Config.in.tools | 14 |
14 files changed, 172 insertions, 75 deletions
diff --git a/target/config/Config.in.binutils b/target/config/Config.in.binutils index 2d45e62d6..3e141d4d6 100644 --- a/target/config/Config.in.binutils +++ b/target/config/Config.in.binutils @@ -8,14 +8,22 @@ default ADK_TOOLCHAIN_BINUTILS_ARC if ADK_TARGET_CPU_ARC_ARC64 default ADK_TOOLCHAIN_BINUTILS_AVR32 if ADK_TARGET_ARCH_AVR32 default ADK_TOOLCHAIN_BINUTILS_KVX if ADK_TARGET_ARCH_KVX default ADK_TOOLCHAIN_BINUTILS_NDS32 if ADK_TARGET_ARCH_NDS32 -default ADK_TOOLCHAIN_BINUTILS_2_43 +default ADK_TOOLCHAIN_BINUTILS_2_26 if ADK_TARGET_ARCH_BFIN && ADK_TARGET_BINFMT_FDPIC +default ADK_TOOLCHAIN_BINUTILS_2_43_1 if ADK_TARGET_ARCH_NIOS2 +default ADK_TOOLCHAIN_BINUTILS_2_43_1 if ADK_TARGET_ARCH_X86_64 +default ADK_TOOLCHAIN_BINUTILS_2_44 config ADK_TOOLCHAIN_BINUTILS_GIT bool "git" depends on !ADK_TARGET_ARCH_AVR32 -config ADK_TOOLCHAIN_BINUTILS_2_43 - bool "2.43" +config ADK_TOOLCHAIN_BINUTILS_2_44 + bool "2.44" + depends on !ADK_TARGET_ARCH_AVR32 + depends on !ADK_TARGET_ARCH_NIOS2 + +config ADK_TOOLCHAIN_BINUTILS_2_43_1 + bool "2.43.1" depends on !ADK_TARGET_ARCH_AVR32 config ADK_TOOLCHAIN_BINUTILS_2_42 @@ -47,6 +55,11 @@ config ADK_TOOLCHAIN_BINUTILS_2_37 depends on !ADK_TARGET_ARCH_AVR32 depends on !ADK_TARGET_ARCH_KVX +config ADK_TOOLCHAIN_BINUTILS_2_26 + bool "2.26" + depends on !ADK_TARGET_ARCH_AVR32 + depends on !ADK_TARGET_ARCH_KVX + config ADK_TOOLCHAIN_BINUTILS_ARC bool "arc-2023.09" depends on ADK_TARGET_ARCH_ARC diff --git a/target/config/Config.in.cmdline b/target/config/Config.in.cmdline index 782f51efe..fa163c36b 100644 --- a/target/config/Config.in.cmdline +++ b/target/config/Config.in.cmdline @@ -3,6 +3,7 @@ config ADK_TARGET_CMDLINE string "Kernel commandline" + depends on !ADK_TARGET_NO_KERNEL default "fbcon=rotate:1" if ADK_TARGET_SYSTEM_SHARP_ZAURUS default "geodewdt.nowayout=1" if ADK_TARGET_MODEL_PCENGINES_ALIX1C default "kinetis_platform=k70-som" if ADK_TARGET_SYSTEM_KINETIS_K70 diff --git a/target/config/Config.in.compiler b/target/config/Config.in.compiler index d744915dc..57dcf54e3 100644 --- a/target/config/Config.in.compiler +++ b/target/config/Config.in.compiler @@ -20,10 +20,9 @@ default ADK_TOOLCHAIN_GCC_LM32 if ADK_TARGET_ARCH_LM32 default ADK_TOOLCHAIN_GCC_METAG if ADK_TARGET_ARCH_METAG default ADK_TOOLCHAIN_GCC_NDS32 if ADK_TARGET_SYSTEM_ANDES_AG101P default ADK_TOOLCHAIN_GCC_7 if ADK_TARGET_ARCH_C6X # ICE with newer GCC -default ADK_TOOLCHAIN_GCC_9 if ADK_TARGET_ARCH_BFIN && ADK_TARGET_BINFMT_FDPIC default ADK_TOOLCHAIN_GCC_10 if ADK_TARGET_ARCH_CRIS # no longer supported default ADK_TOOLCHAIN_GCC_10 if ADK_TARGET_CPU_SH_J2 # j2.patch -default ADK_TOOLCHAIN_GCC_13 +default ADK_TOOLCHAIN_GCC_14 config ADK_TOOLCHAIN_GCC_GIT bool "git" @@ -31,6 +30,12 @@ config ADK_TOOLCHAIN_GCC_GIT depends on !ADK_TARGET_ARCH_METAG depends on !ADK_TARGET_ARCH_NDS32 +config ADK_TOOLCHAIN_GCC_15 + bool "15.1.0" + depends on !ADK_TARGET_ARCH_AVR32 + depends on !ADK_TARGET_ARCH_CRIS + depends on !ADK_TARGET_ARCH_METAG + config ADK_TOOLCHAIN_GCC_14 bool "14.2.0" depends on !ADK_TARGET_ARCH_AVR32 @@ -98,6 +103,39 @@ config ADK_TOOLCHAIN_GCC_7 depends on !ADK_TARGET_ARCH_OR1K depends on !ADK_TARGET_ARCH_LOONGARCH +config ADK_TOOLCHAIN_GCC_6 + bool "6.5.0" + depends on !ADK_TARGET_ARCH_ARC + depends on !ADK_TARGET_ARCH_AVR32 + depends on !ADK_TARGET_ARCH_CSKY + depends on !ADK_TARGET_ARCH_HPPA + depends on !ADK_TARGET_ARCH_METAG + depends on !ADK_TARGET_ARCH_NDS32 + depends on !ADK_TARGET_ARCH_OR1K + depends on !ADK_TARGET_ARCH_LOONGARCH + +config ADK_TOOLCHAIN_GCC_5 + bool "5.5.0" + depends on !ADK_TARGET_ARCH_ARC + depends on !ADK_TARGET_ARCH_AVR32 + depends on !ADK_TARGET_ARCH_CSKY + depends on !ADK_TARGET_ARCH_HPPA + depends on !ADK_TARGET_ARCH_METAG + depends on !ADK_TARGET_ARCH_NDS32 + depends on !ADK_TARGET_ARCH_OR1K + depends on !ADK_TARGET_ARCH_LOONGARCH + +config ADK_TOOLCHAIN_GCC_4 + bool "4.9.4" + depends on !ADK_TARGET_ARCH_ARC + depends on !ADK_TARGET_ARCH_AVR32 + depends on !ADK_TARGET_ARCH_CSKY + depends on !ADK_TARGET_ARCH_HPPA + depends on !ADK_TARGET_ARCH_METAG + depends on !ADK_TARGET_ARCH_NDS32 + depends on !ADK_TARGET_ARCH_OR1K + depends on !ADK_TARGET_ARCH_LOONGARCH + config ADK_TOOLCHAIN_GCC_ARC bool "arc-2023.09" depends on ADK_TARGET_ARCH_ARC diff --git a/target/config/Config.in.cpu b/target/config/Config.in.cpu index 4c9cd3b1b..e0a91b003 100644 --- a/target/config/Config.in.cpu +++ b/target/config/Config.in.cpu @@ -93,6 +93,7 @@ config ADK_TARGET_CPU_ARC_ARCHS select ADK_TARGET_SUPPORTS_NPTL select ADK_TARGET_SUPPORTS_LT select ADK_TARGET_WITH_MMU + select ADK_TARGET_CPU_WITH_FPU depends on ADK_TARGET_ARCH_ARC config ADK_TARGET_CPU_ARC_ARC32 @@ -789,6 +790,7 @@ config ADK_TARGET_CPU_CF_5475 select ADK_TARGET_SUPPORTS_LT select ADK_TARGET_CPU_CF select ADK_TARGET_WITH_MMU + select ADK_TARGET_CPU_WITH_FPU depends on ADK_TARGET_ARCH_M68K config ADK_TARGET_CPU_CF_54418 @@ -998,6 +1000,16 @@ config ADK_TARGET_CPU_MIPS64_MIPS64R6 select ADK_LINUX_KERNEL_CPU_MIPS64_R6 if ADK_TARGET_OS_LINUX depends on ADK_TARGET_ARCH_MIPS64 +config ADK_TARGET_CPU_MIPS64_LOONGSON2E + bool "loongson2e" + select ADK_LINUX_64 + select ADK_TARGET_SUPPORTS_THREADS + select ADK_TARGET_SUPPORTS_LT + select ADK_TARGET_SUPPORTS_NPTL + select ADK_TARGET_WITH_MMU + select ADK_TARGET_CPU_WITH_FPU + depends on ADK_TARGET_ARCH_MIPS64 + config ADK_TARGET_CPU_MIPS64_LOONGSON2F bool "loongson2f" select ADK_LINUX_64 @@ -1048,6 +1060,7 @@ config ADK_TARGET_CPU_OR1K select ADK_TARGET_SUPPORTS_LT select ADK_TARGET_SUPPORTS_NPTL select ADK_TARGET_WITH_MMU + select ADK_TARGET_CPU_WITH_FPU depends on ADK_TARGET_ARCH_OR1K # ppc32 @@ -1194,6 +1207,14 @@ config ADK_TARGET_CPU_PPC64_POWERPC64 depends on ADK_TARGET_BIG_ENDIAN # riscv +config ADK_TARGET_CPU_RISCV32_RV32IMADC + bool "rv32imadc" + select ADK_TARGET_SUPPORTS_THREADS + select ADK_TARGET_SUPPORTS_NPTL if ADK_TARGET_WITH_MMU + select ADK_TARGET_SUPPORTS_LT + select ADK_TARGET_ABI_ILP32D + depends on ADK_TARGET_ARCH_RISCV32 + config ADK_TARGET_CPU_RISCV32_RV32IMAC bool "rv32imac" select ADK_TARGET_SUPPORTS_THREADS @@ -1218,14 +1239,6 @@ config ADK_TARGET_CPU_RISCV32_RV32IMAFC select ADK_TARGET_ABI_ILP32F depends on ADK_TARGET_ARCH_RISCV32 -config ADK_TARGET_CPU_RISCV32_RV32IMADC - bool "rv32imadc" - select ADK_TARGET_SUPPORTS_THREADS - select ADK_TARGET_SUPPORTS_NPTL if ADK_TARGET_WITH_MMU - select ADK_TARGET_SUPPORTS_LT - select ADK_TARGET_ABI_ILP32D - depends on ADK_TARGET_ARCH_RISCV32 - config ADK_TARGET_CPU_RISCV32_RV32IMAFDC bool "rv32imafdc" select ADK_TARGET_SUPPORTS_THREADS if ADK_TARGET_WITH_MMU @@ -1233,6 +1246,14 @@ config ADK_TARGET_CPU_RISCV32_RV32IMAFDC select ADK_TARGET_SUPPORTS_LT if ADK_TARGET_WITH_MMU depends on ADK_TARGET_ARCH_RISCV32 +config ADK_TARGET_CPU_RISCV64_RV64IMADC + bool "rv64imadc" + select ADK_TARGET_SUPPORTS_THREADS + select ADK_TARGET_SUPPORTS_NPTL if ADK_TARGET_WITH_MMU + select ADK_TARGET_SUPPORTS_LT + select ADK_TARGET_ABI_LP64D + depends on ADK_TARGET_ARCH_RISCV64 + config ADK_TARGET_CPU_RISCV64_RV64IMAC bool "rv64imac" select ADK_TARGET_SUPPORTS_THREADS @@ -1257,14 +1278,6 @@ config ADK_TARGET_CPU_RISCV64_RV64IMAFC select ADK_TARGET_ABI_LP64F depends on ADK_TARGET_ARCH_RISCV64 -config ADK_TARGET_CPU_RISCV64_RV64IMADC - bool "rv64imadc" - select ADK_TARGET_SUPPORTS_THREADS - select ADK_TARGET_SUPPORTS_NPTL if ADK_TARGET_WITH_MMU - select ADK_TARGET_SUPPORTS_LT - select ADK_TARGET_ABI_LP64D - depends on ADK_TARGET_ARCH_RISCV64 - config ADK_TARGET_CPU_RISCV64_RV64IMAFDC bool "rv64imafdc" select ADK_TARGET_SUPPORTS_THREADS if ADK_TARGET_WITH_MMU @@ -2092,6 +2105,7 @@ config ADK_TARGET_GCC_ARCH default "k8" if ADK_TARGET_CPU_X86_64_K8 default "k8-sse3" if ADK_TARGET_CPU_X86_64_K8_SSE3 default "knl" if ADK_TARGET_CPU_X86_64_KNL + default "loongson2e" if ADK_TARGET_CPU_MIPS64_LOONGSON2E default "loongson2f" if ADK_TARGET_CPU_MIPS64_LOONGSON2F default "r4400" if ADK_TARGET_CPU_MIPS_R4400 default "r4600" if ADK_TARGET_CPU_MIPS_R4600 @@ -2268,6 +2282,7 @@ config ADK_TARGET_CPU_TYPE default "mips64" if ADK_TARGET_CPU_MIPS64_MIPS64 default "mips64r2" if ADK_TARGET_CPU_MIPS64_MIPS64R2 default "mips64r6" if ADK_TARGET_CPU_MIPS64_MIPS64R6 + default "mips64" if ADK_TARGET_CPU_MIPS64_LOONGSON2E default "mips64" if ADK_TARGET_CPU_MIPS64_LOONGSON2F default "ppc64" if ADK_TARGET_ARCH_PPC64 default "nds32" if ADK_TARGET_CPU_NDS32 diff --git a/target/config/Config.in.float b/target/config/Config.in.float index 3fd79d2b9..38d77d027 100644 --- a/target/config/Config.in.float +++ b/target/config/Config.in.float @@ -3,11 +3,13 @@ choice ADK_TARGET_FLOAT_MODE prompt "Float configuration" -depends on ADK_TARGET_ARCH_ARM || \ +depends on ADK_TARGET_ARCH_ARC || \ + ADK_TARGET_ARCH_ARM || \ ADK_TARGET_ARCH_CSKY || \ ADK_TARGET_ARCH_M68K || \ ADK_TARGET_ARCH_MIPS || \ ADK_TARGET_ARCH_NIOS2 || \ + ADK_TARGET_ARCH_OR1K || \ ADK_TARGET_ARCH_PPC config ADK_TARGET_HARD_FLOAT @@ -34,7 +36,8 @@ endchoice config ADK_TARGET_FLOAT string - depends on !ADK_TARGET_ARCH_M68K \ + depends on !ADK_TARGET_ARCH_ARC \ + && !ADK_TARGET_ARCH_M68K \ && !ADK_TARGET_ARCH_NIOS2 default "hard" if ADK_TARGET_HARD_FLOAT || ADK_TARGET_HARD_FLOAT_SP || ADK_TARGET_HARD_FLOAT_DP default "soft" if ADK_TARGET_SOFT_FLOAT diff --git a/target/config/Config.in.fpu b/target/config/Config.in.fpu index 1018937cd..0c4614bb0 100644 --- a/target/config/Config.in.fpu +++ b/target/config/Config.in.fpu @@ -21,7 +21,8 @@ config ADK_TARGET_ARCH_ARM_WITH_NEON config ADK_TARGET_FPU string - depends on ADK_TARGET_ARCH_ARM + depends on ADK_TARGET_ARCH_ARC || ADK_TARGET_ARCH_ARM + default "fpus" if ADK_TARGET_CPU_WITH_FPU && ADK_TARGET_ARCH_ARC default "vfp" if ADK_TARGET_CPU_WITH_FPU_VFP default "vfpv3-fp16" if ADK_TARGET_CPU_ARM_CORTEX_A5 && !ADK_TARGET_ARCH_ARM_WITH_NEON default "vfpv4" if ADK_TARGET_CPU_ARM_CORTEX_A7 && !ADK_TARGET_ARCH_ARM_WITH_NEON diff --git a/target/config/Config.in.gdb b/target/config/Config.in.gdb index d8daac66e..f1a09ca9e 100644 --- a/target/config/Config.in.gdb +++ b/target/config/Config.in.gdb @@ -21,7 +21,7 @@ choice prompt "GNU debugger version" depends on ADK_TOOLCHAIN_WITH_GDB default ADK_TOOLCHAIN_GDB_H8300_GIT if ADK_TARGET_ARCH_H8300 -default ADK_TOOLCHAIN_GDB_15_1 +default ADK_TOOLCHAIN_GDB_16_2 config ADK_TOOLCHAIN_GDB_GIT bool "git" @@ -33,6 +33,12 @@ config ADK_TOOLCHAIN_GDB_H8300_GIT bool "h8300-git" depends on ADK_TARGET_ARCH_H8300 +config ADK_TOOLCHAIN_GDB_16_2 + bool "16.2" + depends on !ADK_TARGET_ARCH_AVR32 + depends on !ADK_TARGET_ARCH_H8300 + depends on !ADK_TARGET_ARCH_NDS32 + config ADK_TOOLCHAIN_GDB_15_1 bool "15.1" depends on !ADK_TARGET_ARCH_AVR32 diff --git a/target/config/Config.in.kernelfmt b/target/config/Config.in.kernelfmt index 23d800d24..d4ea880ca 100644 --- a/target/config/Config.in.kernelfmt +++ b/target/config/Config.in.kernelfmt @@ -13,12 +13,18 @@ config ADK_TARGET_KERNEL_LINUXBIN config ADK_TARGET_KERNEL_IMAGE bool +config ADK_TARGET_KERNEL_IMAGE_GZ + bool + config ADK_TARGET_KERNEL_UIMAGE bool config ADK_TARGET_KERNEL_UIMAGEBIN bool +config ADK_TARGET_KERNEL_UIMAGEGZ + bool + config ADK_TARGET_KERNEL_BZIMAGE bool @@ -52,8 +58,10 @@ config ADK_TARGET_KERNEL_LOADER config ADK_TARGET_KERNEL string default "loader" if ADK_TARGET_KERNEL_LOADER + default "vmImage.gz" if ADK_TARGET_KERNEL_IMAGE_GZ default "uImage" if ADK_TARGET_KERNEL_UIMAGE default "uImage.bin" if ADK_TARGET_KERNEL_UIMAGEBIN + default "uImage.gz" if ADK_TARGET_KERNEL_UIMAGEGZ default "zImage" if ADK_TARGET_KERNEL_ZIMAGE default "Image" if ADK_TARGET_KERNEL_IMAGE default "linux.bin" if ADK_TARGET_KERNEL_LINUXBIN @@ -69,6 +77,9 @@ config ADK_TARGET_KERNEL default "bzImage" if ADK_TARGET_SYSTEM_GENERIC_X86_64 || ADK_TARGET_SYSTEM_GENERIC_X86 default "vmlinux" +config ADK_TARGET_NO_KERNEL + bool + config ADK_TARGET_KERNEL_WITH_COMPRESSION bool @@ -80,6 +91,26 @@ config ADK_TARGET_KERNEL_LOADADDR default 0x40008000 if ADK_TARGET_SYSTEM_ORANGE_PI0 default 0xc0008000 if ADK_TARGET_SYSTEM_ST_STM32F746G +config ADK_TARGET_KERNEL_VENDORED_DTB + bool + default y + default n if ADK_TARGET_LINUX_KERNEL_VERSION_6_1 + default n if ADK_TARGET_LINUX_KERNEL_VERSION_5_15 + default n if ADK_TARGET_LINUX_KERNEL_VERSION_5_10 + default n if ADK_TARGET_LINUX_KERNEL_VERSION_5_4 + default n if ADK_TARGET_LINUX_KERNEL_VERSION_4_19 + default n if ADK_TARGET_LINUX_KERNEL_VERSION_4_14 + default n if ADK_TARGET_LINUX_KERNEL_VERSION_4_9 + default n if ADK_TARGET_LINUX_KERNEL_VERSION_4_4 + default n if ADK_TARGET_LINUX_KERNEL_VERSION_3_16 + default n if ADK_TARGET_LINUX_KERNEL_VERSION_3_4 + default n if ADK_TARGET_LINUX_KERNEL_VERSION_2_6_32 + help + Starting with linux-6.5, DTB files sit in vendor-specific + sub-directories. + config ADK_TARGET_KERNEL_APPEND_DTB string - default "armada-xp-synology-ds414" if ADK_TARGET_SYSTEM_SYNOLOGY_DS414 + default "armada-xp-synology-ds414" if ADK_TARGET_SYSTEM_SYNOLOGY_DS414 && !ADK_TARGET_KERNEL_VENDORED_DTB + default "marvell/armada-xp-synology-ds414" if ADK_TARGET_SYSTEM_SYNOLOGY_DS414 && ADK_TARGET_KERNEL_VENDORED_DTB + default "intel/ixp/intel-ixp42x-linksys-nslu2" if ADK_TARGET_SYSTEM_LINKSYS_NSLU2 && ADK_TARGET_KERNEL_VENDORED_DTB diff --git a/target/config/Config.in.libc b/target/config/Config.in.libc index aff202edf..7f3157976 100644 --- a/target/config/Config.in.libc +++ b/target/config/Config.in.libc @@ -79,13 +79,11 @@ config ADK_TARGET_LIB_GLIBC ADK_TARGET_ARCH_ARM || \ ADK_TARGET_ARCH_CSKY || \ ADK_TARGET_ARCH_HPPA || \ - ADK_TARGET_ARCH_IA64 || \ ADK_TARGET_ARCH_LOONGARCH || \ ADK_TARGET_ARCH_M68K || \ ADK_TARGET_ARCH_MICROBLAZE || \ ADK_TARGET_ARCH_MIPS || \ ADK_TARGET_ARCH_MIPS64 || \ - ADK_TARGET_ARCH_NIOS2 || \ ADK_TARGET_ARCH_OR1K || \ ADK_TARGET_ARCH_PPC || \ ADK_TARGET_ARCH_PPC64 || \ @@ -150,16 +148,16 @@ choice prompt "Target C library version" depends on !ADK_TARGET_CHOOSE_ARCH -config ADK_TARGET_LIB_UCLIBC_NG_1_0_50 - bool "1.0.50" +config ADK_TARGET_LIB_UCLIBC_NG_1_0_52 + bool "1.0.52" depends on ADK_TARGET_LIB_UCLIBC_NG config ADK_TARGET_LIB_UCLIBC_NG_GIT bool "git" depends on ADK_TARGET_LIB_UCLIBC_NG && ADK_EXPERIMENTAL -config ADK_TARGET_LIB_GLIBC_2_40 - bool "2.40" +config ADK_TARGET_LIB_GLIBC_2_41 + bool "2.41" depends on ADK_TARGET_LIB_GLIBC config ADK_TARGET_LIB_GLIBC_GIT @@ -200,9 +198,9 @@ config ADK_TARGET_LIBC config ADK_LIBC_VERSION string - default "1.0.50" if ADK_TARGET_LIB_UCLIBC_NG_1_0_50 + default "1.0.52" if ADK_TARGET_LIB_UCLIBC_NG_1_0_52 default "1.2.5" if ADK_TARGET_LIB_MUSL_1_2_5 - default "2.40" if ADK_TARGET_LIB_GLIBC_2_40 + default "2.41" if ADK_TARGET_LIB_GLIBC_2_40 default "4.4.0" if ADK_TARGET_LIB_NEWLIB_4_4_0 default "git" if ADK_TARGET_LIB_UCLIBC_NG_GIT || \ ADK_TARGET_LIB_MUSL_GIT || \ diff --git a/target/config/Config.in.qemuopts b/target/config/Config.in.qemuopts index 78c608b49..d2bc23139 100644 --- a/target/config/Config.in.qemuopts +++ b/target/config/Config.in.qemuopts @@ -4,14 +4,8 @@ config ADK_QEMU_ARGS string default "-vga std" if ADK_TARGET_QEMU_WITH_GRAPHIC - default "" if ADK_TARGET_QEMU_WITH_GRAPHIC_ONLY default "-nographic" -config ADK_TARGET_QEMU_WITH_GRAPHIC_ONLY - bool - select ADK_TARGET_WITH_VGA - depends on ADK_TARGET_SYSTEM_QEMU_ARM_SPITZ || ADK_TARGET_SYSTEM_QEMU_ARM_TERRIER - config ADK_TARGET_QEMU_WITH_BLOCK bool select ADK_TARGET_WITH_BLOCK @@ -29,18 +23,12 @@ config ADK_TARGET_QEMU_WITH_BLOCK select ADK_LINUX_KERNEL_SCSI_SUNESP if ADK_TARGET_SYSTEM_QEMU_SPARC select ADK_LINUX_KERNEL_PATA_CMD64X if ADK_TARGET_SYSTEM_QEMU_SPARC64 select ADK_LINUX_KERNEL_PATA_PLATFORM if ADK_TARGET_SYSTEM_QEMU_SH - select ADK_LINUX_KERNEL_PATA_PXA if ADK_TARGET_QEMU_ARM_SPITZ \ - || ADK_TARGET_SYSTEM_QEMU_ARM_TERRIER select ADK_LINUX_KERNEL_MMC_ARMMMCI if ADK_TARGET_SYSTEM_QEMU_ARM_VEXPRESS_A9 select ADK_LINUX_KERNEL_BLK_DEV_CMD64X if ADK_TARGET_SYSTEM_QEMU_ALPHA menu "Qemu system configuration" depends on ADK_TARGET_QEMU && (ADK_TARGET_SYSTEM_QEMU_X86_64 \ - || ADK_TARGET_SYSTEM_QEMU_RISCV32 \ - || ADK_TARGET_SYSTEM_QEMU_RISCV64 \ - || ADK_TARGET_SYSTEM_QEMU_CSKY \ || ADK_TARGET_SYSTEM_QEMU_X86 \ - || ADK_TARGET_SYSTEM_QEMU_AARCH64 \ || ADK_TARGET_SYSTEM_QEMU_ARC \ || ADK_TARGET_SYSTEM_QEMU_M68K_VIRT \ || ADK_TARGET_SYSTEM_QEMU_SPARC64) @@ -95,20 +83,8 @@ endchoice choice prompt "Qemu Emulation using VirtIO drivers" depends on ADK_TARGET_SYSTEM_QEMU_SPARC64 || \ - ADK_TARGET_SYSTEM_QEMU_AARCH64 || \ - ADK_TARGET_SYSTEM_QEMU_ARC || \ - ADK_TARGET_SYSTEM_QEMU_CSKY || \ - ADK_TARGET_SYSTEM_QEMU_M68K_VIRT || \ - ADK_TARGET_SYSTEM_QEMU_RISCV32 || \ - ADK_TARGET_SYSTEM_QEMU_RISCV64 || \ ADK_TARGET_SYSTEM_QEMU_X86 || \ ADK_TARGET_SYSTEM_QEMU_X86_64 -default ADK_TARGET_QEMU_WITH_VIRTIO if ADK_TARGET_SYSTEM_QEMU_AARCH64 -default ADK_TARGET_QEMU_WITH_VIRTIO if ADK_TARGET_SYSTEM_QEMU_ARC -default ADK_TARGET_QEMU_WITH_VIRTIO if ADK_TARGET_SYSTEM_QEMU_CSKY -default ADK_TARGET_QEMU_WITH_VIRTIO if ADK_TARGET_SYSTEM_QEMU_RISCV32 -default ADK_TARGET_QEMU_WITH_VIRTIO if ADK_TARGET_SYSTEM_QEMU_RISCV64 -default ADK_TARGET_QEMU_WITH_VIRTIO if ADK_TARGET_SYSTEM_QEMU_M68K_VIRT config ADK_TARGET_QEMU_WITHOUT_VIRTIO bool "disabled" diff --git a/target/config/Config.in.rootfs b/target/config/Config.in.rootfs index 5c658fd02..403a2739f 100644 --- a/target/config/Config.in.rootfs +++ b/target/config/Config.in.rootfs @@ -59,8 +59,8 @@ config ADK_TARGET_ROOTFS_INITRAMFS config ADK_TARGET_ROOTFS_SQUASHFS bool "Compressed read-only root filesystem (squashfs)" - select ADK_KERNEL_SQUASHFS - select ADK_HOST_NEED_SQUASHFS + select ADK_LINUX_KERNEL_SQUASHFS + select ADK_HOST_NEED_SQUASHFS_TOOLS select ADK_HOST_NEED_QEMU if ADK_TARGET_QEMU select ADK_TARGET_QEMU_WITH_BLOCK if ADK_TARGET_QEMU depends on ADK_TARGET_WITH_MTD \ @@ -101,8 +101,7 @@ config ADK_TARGET_ROOTFS_NFSROOT select ADK_LINUX_KERNEL_IP_PNP_DHCP if ADK_TARGET_OS_LINUX depends on !ADK_TARGET_QEMU && \ !ADK_TARGET_SIM && \ - !ADK_TARGET_SYSTEM_ARANYM_M68K && \ - !ADK_TARGET_SYSTEM_LINKSYS_NSLU2 + !ADK_TARGET_SYSTEM_ARANYM_M68K depends on ADK_TARGET_WITH_NETDEVICE help Root filesystem mounted via NFS. (DHCP) diff --git a/target/config/Config.in.runtime b/target/config/Config.in.runtime index 438d4791e..e1a5600f6 100644 --- a/target/config/Config.in.runtime +++ b/target/config/Config.in.runtime @@ -22,10 +22,18 @@ config ADK_RUNTIME_INIT_SYSV depends on ADK_PACKAGE_BUSYBOX && \ !ADK_TARGET_SYSTEM_SIPEED_MAIX_BIT +config ADK_RUNTIME_INIT_TOYBOX + bool "Use toybox init" + select ADK_PACKAGE_TOYBOX + config ADK_RUNTIME_INIT_SIMPLEINIT bool "Use a very simple init" select ADK_PACKAGE_SIMPLEINIT +config ADK_RUNTIME_INIT_MINIINIT + bool "Use a minimal init" + select ADK_PACKAGE_MINIINIT + endchoice choice @@ -421,6 +429,12 @@ config ADK_ROOTSH_HUSH help hush shell from busybox. +config ADK_ROOTSH_TOYSH + bool "toysh (Shell compatible with non-MMU systems)" + select ADK_PACKAGE_TOYBOX if !ADK_APPLIANCE_TOOLCHAIN + help + ToyBox shell. + config ADK_ROOTSH_SASH bool "sash (Shell compatible with non-MMU systems)" select ADK_PACKAGE_SASH if !ADK_APPLIANCE_TOOLCHAIN @@ -480,6 +494,12 @@ config ADK_BINSH_HUSH help hush shell. +config ADK_BINSH_TOYSH + bool "toysh (toybox Shell)" + select ADK_PACKAGE_TOYBOX if !ADK_APPLIANCE_TOOLCHAIN + help + sash shell. + config ADK_BINSH_SASH bool "sash (Standalone Shell)" select ADK_PACKAGE_SASH if !ADK_APPLIANCE_TOOLCHAIN diff --git a/target/config/Config.in.toolchain b/target/config/Config.in.toolchain index 144f92a9b..7b5bc2d5b 100644 --- a/target/config/Config.in.toolchain +++ b/target/config/Config.in.toolchain @@ -85,14 +85,6 @@ config ADK_TARGET_USE_LD_BIND_NOW config ADK_TARGET_USE_LD_GC bool "Use LD garbage collection for all packages" -config ADK_TOOLCHAIN_WITH_GOLD - bool "Enable building of GOLD linker" - -config ADK_TARGET_USE_GOLD - bool "Use GOLD as default linker" - depends on ADK_TOOLCHAIN_WITH_GOLD - depends on ADK_TARGET_LIB_GLIBC # can not be build with GOLD (glibc 2.24 checked) - config ADK_TARGET_USE_GNU_HASHSTYLE bool "Use GNU hashstyle for all packages" depends on !ADK_TARGET_ARCH_MIPS diff --git a/target/config/Config.in.tools b/target/config/Config.in.tools index cdeeb90ed..0a0a0ef81 100644 --- a/target/config/Config.in.tools +++ b/target/config/Config.in.tools @@ -39,9 +39,9 @@ config ADK_HOST_BUILD_LIBTOOL bool default y -config ADK_HOST_BUILD_LIBRESSL +config ADK_HOST_BUILD_OPENSSL bool - default n + default y config ADK_HOST_BUILD_PKGCONF bool @@ -133,6 +133,10 @@ config ADK_HOST_BUILD_STLINK bool default n +config ADK_HOST_BUILD_UPSLUG2 + bool + default n + config ADK_HOST_BUILD_TAR bool default n @@ -280,13 +284,13 @@ config ADK_HOST_BUILD_OPKG default y if ADK_HOST_NEED_OPKG default n -config ADK_HOST_NEED_SQUASHFS +config ADK_HOST_NEED_SQUASHFS_TOOLS bool default n -config ADK_HOST_BUILD_SQUASHFS +config ADK_HOST_BUILD_SQUASHFS_TOOLS bool - default y if ADK_HOST_NEED_SQUASHFS + default y if ADK_HOST_NEED_SQUASHFS_TOOLS default n config ADK_HOST_NEED_SYSLINUX |