diff options
Diffstat (limited to 'target')
| -rw-r--r-- | target/appliances/000default | 6 | ||||
| -rw-r--r-- | target/appliances/kodi | 34 | ||||
| -rw-r--r-- | target/appliances/mpd | 61 | ||||
| -rw-r--r-- | target/config/Config.in.abi.choice | 15 | ||||
| -rw-r--r-- | target/config/Config.in.abi.default | 10 | ||||
| -rw-r--r-- | target/config/Config.in.adk | 1 | ||||
| -rw-r--r-- | target/config/Config.in.arm.choice | 2 | ||||
| -rw-r--r-- | target/config/Config.in.cpu | 38 | ||||
| -rw-r--r-- | target/config/Config.in.cris.choice | 2 | ||||
| -rw-r--r-- | target/config/Config.in.endian.choice | 7 | ||||
| -rw-r--r-- | target/config/Config.in.kernelversion.choice | 2 | ||||
| -rw-r--r-- | target/config/Config.in.libc.choice | 56 | ||||
| -rw-r--r-- | target/config/Config.in.libc.default | 8 | ||||
| -rw-r--r-- | target/config/Config.in.target | 49 | ||||
| -rw-r--r-- | target/config/Config.in.toolchain | 85 | ||||
| -rw-r--r-- | target/config/Config.in.x86.choice | 2 | ||||
| -rw-r--r-- | target/linux/config/Config.in.debug | 2 | ||||
| -rw-r--r-- | target/linux/config/Config.in.kernel | 8 | ||||
| -rw-r--r-- | target/linux/config/Config.in.kvm | 2 | ||||
| -rw-r--r-- | target/linux/config/Config.in.leds | 1 | ||||
| -rw-r--r-- | target/xtensa/Config.in | 9 |
21 files changed, 242 insertions, 158 deletions
diff --git a/target/appliances/000default b/target/appliances/000default new file mode 100644 index 000000000..9c8aac7d0 --- /dev/null +++ b/target/appliances/000default @@ -0,0 +1,6 @@ +config ADK_APPLIANCE_NEW + prompt "create a new appliance" + boolean + help + Create a new appliance from scratch. + diff --git a/target/appliances/kodi b/target/appliances/kodi new file mode 100644 index 000000000..7b1c61c53 --- /dev/null +++ b/target/appliances/kodi @@ -0,0 +1,34 @@ +config ADK_APPLIANCE_KODI + prompt "kodi multimedia appliance" + boolean + select ADK_TARGET_ARCH_ARM + select ADK_TARGET_SYSTEM_RASPBERRY_PI + select ADK_TARGET_LIB_GLIBC + select ADK_PACKAGE_GLIBC + select ADK_PACKAGE_GLIBC_GCONV + select ADK_PACKAGE_KODI + select ADK_PACKAGE_KODI_WITH_SMB + select ADK_PACKAGE_KODI_WITH_NFS + select ADK_PACKAGE_KODI_WITH_SSH + select ADK_PACKAGE_KODI_WITH_CEC + select ADK_PACKAGE_KODI_WITH_RTMP + select ADK_PACKAGE_KODI_WITH_BLURAY + select ADK_PACKAGE_HTOP + select ADK_PACKAGE_DROPBEAR + select ADK_PACKAGE_DROPBEAR_WITH_UTMP + select ADK_PACKAGE_SCREEN + select ADK_PACKAGE_VIM + select ADK_PACKAGE_E2FSCK + select ADK_PACKAGE_ALSA_UTILS + select ADK_PACKAGE_ALSA_UTILS_WITH_ALSAMIXER + select BUSYBOX_NTPD + select ADK_QUIET_KERNEL + select ADK_RUNTIME_QUIET_INIT + select ADK_RUNTIME_START_SERVICES + select ADK_RUNTIME_START_DROPBEAR + select ADK_RUNTIME_START_BUSYBOX_NTPD + select ADK_RUNTIME_START_BUSYBOX_SYSLOGD + select ADK_RUNTIME_START_KODI + help + Create a small kodi multimedia appliance. + diff --git a/target/appliances/mpd b/target/appliances/mpd new file mode 100644 index 000000000..a391217f8 --- /dev/null +++ b/target/appliances/mpd @@ -0,0 +1,61 @@ +config ADK_APPLIANCE_MPD + prompt "music player daemon appliance" + boolean + select ADK_TARGET_ARCH_ARM + select ADK_TARGET_SYSTEM_RASPBERRY_PI + select ADK_PACKAGE_MPD + select ADK_PACKAGE_MPD_WITH_ALSA + select ADK_PACKAGE_MPD_WITH_PULSE + select ADK_PACKAGE_MPD_WITH_MP3 + select ADK_PACKAGE_MPD_WITH_MP4 + select ADK_PACKAGE_MPD_WITH_OGG + select ADK_PACKAGE_MPD_WITH_OPUS + select ADK_PACKAGE_MPD_WITH_FLAC + select ADK_PACKAGE_MPD_WITH_WAV + select ADK_PACKAGE_MPD_WITH_MMS + select ADK_PACKAGE_MPD_WITH_FFMPEG + select ADK_PACKAGE_MPD_WITH_SHOUT + select ADK_PACKAGE_MPD_WITH_CURL + select ADK_PACKAGE_MPD_WITH_SAMPLERATE + select ADK_PACKAGE_MPD_WITH_SNDFILE + select ADK_PACKAGE_MPD_WITH_HTTPD + select ADK_PACKAGE_CIFS_UTILS + select ADK_PACKAGE_LIBMPDCLIENT + select ADK_PACKAGE_MPG123 + select ADK_PACKAGE_MPC + select ADK_PACKAGE_FILE + select ADK_PACKAGE_HTOP + select ADK_PACKAGE_DROPBEAR + select ADK_PACKAGE_DROPBEAR_WITH_UTMP + select ADK_PACKAGE_FFMPEG + select ADK_PACKAGE_FFPROBE + select ADK_PACKAGE_LIBFFMPEG + select ADK_PACKAGE_LIBFFMPEG_WITH_X264 + select ADK_PACKAGE_LIBFFMPEG_WITH_AAC + select ADK_PACKAGE_LIBFFMPEG_WITH_MP3 + select ADK_PACKAGE_LIBFFMPEG_WITH_VP8 + select ADK_PACKAGE_LIBFFMPEG_WITH_THEORA + select ADK_PACKAGE_LIBFFMPEG_WITH_XVID + select ADK_PACKAGE_LIBFFMPEG_WITH_VORBIS + select ADK_PACKAGE_SCREEN + select ADK_PACKAGE_VIM + select ADK_PACKAGE_E2FSCK + select ADK_PACKAGE_ALSA_UTILS + select ADK_PACKAGE_ALSA_UTILS_WITH_ALSAMIXER + select BUSYBOX_NTPD + select ADK_RUNTIME_START_SERVICES + select ADK_RUNTIME_START_DROPBEAR + select ADK_RUNTIME_START_BUSYBOX_NTPD + select ADK_RUNTIME_START_BUSYBOX_SYSLOGD + select ADK_RUNTIME_START_MPD + select ADK_RUNTIME_START_BKEYMAPS + select ADK_RUNTIME_START_ALSA_UTILS + select ADK_KERNEL_USB_HID + select ADK_TARGET_USB_KEYBOARD + select ADK_TARGET_USB_MOUSE + select ADK_KERNEL_INPUT_KEYBOARD + select ADK_KERNEL_INPUT_MOUSE + select ADK_KERNEL_INPUT_EVDEV + help + Create a small music player daemon appliance. + diff --git a/target/config/Config.in.abi.choice b/target/config/Config.in.abi.choice index 74e599ead..3c47b517d 100644 --- a/target/config/Config.in.abi.choice +++ b/target/config/Config.in.abi.choice @@ -2,9 +2,8 @@ # material, please see the LICENCE file in the top-level directory. choice -prompt "Target ABI" -depends on !ADK_CHOOSE_TARGET_ARCH && !ADK_CHOOSE_TARGET_SYSTEM -depends on ADK_LINUX_MIPS64 +prompt "ABI" +depends on ADK_TARGET_ARCH_MIPS64 config ADK_TARGET_ABI_N32 boolean "N32 ABI" @@ -21,9 +20,8 @@ config ADK_TARGET_ABI_O32 endchoice choice -prompt "Target ABI" -depends on !ADK_CHOOSE_TARGET_ARCH && !ADK_CHOOSE_TARGET_SYSTEM -depends on ADK_LINUX_X86_64 +prompt "ABI" +depends on ADK_TARGET_ARCH_X86_64 config ADK_TARGET_ABI_64 boolean "64 Bit ABI" @@ -36,9 +34,8 @@ config ADK_TARGET_ABI_X32 endchoice choice -prompt "Target ABI" -depends on !ADK_CHOOSE_TARGET_ARCH && !ADK_CHOOSE_TARGET_SYSTEM -depends on ADK_LINUX_ARM +prompt "ABI" +depends on ADK_TARGET_ARCH_ARM depends on ADK_TARGET_CPU_WITH_FPU || ADK_TARGET_SYSTEM_QEMU_ARM || ADK_TARGET_TOOLCHAIN config ADK_TARGET_ABI_EABIHF diff --git a/target/config/Config.in.abi.default b/target/config/Config.in.abi.default index 7a66c54a8..80de3eaf8 100644 --- a/target/config/Config.in.abi.default +++ b/target/config/Config.in.abi.default @@ -35,7 +35,7 @@ config ADK_TARGET_ABI default "eabihf" if ADK_eabihf config ADK_TARGET_MIPS_ABI - depends on ADK_LINUX_MIPS64 + depends on ADK_TARGET_ARCH_MIPS64 string default "32" if ADK_o32 default "n32" if ADK_n32 @@ -48,10 +48,10 @@ config ADK_TARGET_LIBC_PATH default "libx32" if ADK_x32 default "lib64" if ADK_n64 \ || ADK_64 \ - || ADK_LINUX_AARCH64 \ - || ADK_LINUX_SPARC64 \ - || ADK_LINUX_PPC64 \ - || ADK_LINUX_X86_64 + || ADK_TARGET_ARCH_AARCH64 \ + || ADK_TARGET_ARCH_SPARC64 \ + || ADK_TARGET_ARCH_PPC64 \ + || ADK_TARGET_ARCH_X86_64 default "lib" config ADK_TARGET_ABI_CFLAGS diff --git a/target/config/Config.in.adk b/target/config/Config.in.adk index dabcc1bd0..07fe735ce 100644 --- a/target/config/Config.in.adk +++ b/target/config/Config.in.adk @@ -2,6 +2,7 @@ # material, please see the LICENCE file in the top-level directory. menu "Global ADK settings" + visible if !ADK_CHOOSE_APPLIANCE config ADK_HOST string "webserver for packages and distfiles" diff --git a/target/config/Config.in.arm.choice b/target/config/Config.in.arm.choice index eaae2fe5e..a91c511c2 100644 --- a/target/config/Config.in.arm.choice +++ b/target/config/Config.in.arm.choice @@ -3,7 +3,7 @@ choice ADK_TARGET_ARM_CPU_ARCH prompt "CPU architecture and family" -depends on ADK_TARGET_TOOLCHAIN && ADK_LINUX_ARM +depends on ADK_TARGET_TOOLCHAIN && ADK_TARGET_ARCH_ARM config ADK_CPU_ARMV7A_CORTEX_A9 boolean "cortex-a9 (armv7-a)" diff --git a/target/config/Config.in.cpu b/target/config/Config.in.cpu index 4e77bcf63..cc4d1c6bc 100644 --- a/target/config/Config.in.cpu +++ b/target/config/Config.in.cpu @@ -136,13 +136,13 @@ config ADK_CPU_AVR32 config ADK_TARGET_CPU_ARCH string - default "aarch64" if ADK_LINUX_AARCH64 && ADK_little - default "alpha" if ADK_LINUX_ALPHA - default "armv5te" if ADK_LINUX_ARM && ADK_little && ADK_armv5te - default "armv6" if ADK_LINUX_ARM && ADK_little && ADK_armv6 - default "armv7a" if ADK_LINUX_ARM && ADK_little && ADK_armv7a - default "arm" if ADK_LINUX_ARM && ADK_little - default "armeb" if ADK_LINUX_ARM && ADK_big + default "aarch64" if ADK_TARGET_ARCH_AARCH64 && ADK_little + default "alpha" if ADK_TARGET_ARCH_ALPHA + default "armv5te" if ADK_TARGET_ARCH_ARM && ADK_little && ADK_armv5te + default "armv6" if ADK_TARGET_ARCH_ARM && ADK_little && ADK_armv6 + default "armv7a" if ADK_TARGET_ARCH_ARM && ADK_little && ADK_armv7a + default "arm" if ADK_TARGET_ARCH_ARM && ADK_little + default "armeb" if ADK_TARGET_ARCH_ARM && ADK_big default "arc" if ADK_CPU_ARC && ADK_little default "arceb" if ADK_CPU_ARC && ADK_big default "avr32" if ADK_CPU_AVR32 @@ -157,21 +157,21 @@ config ADK_TARGET_CPU_ARCH default "i686" if ADK_CPU_PENTIUM_M default "i686" if ADK_CPU_ATOM default "i686" if ADK_CPU_ATHLON - default "m68k" if ADK_LINUX_M68K - default "microblaze" if ADK_LINUX_MICROBLAZE && ADK_big - default "microblazeel" if ADK_LINUX_MICROBLAZE && ADK_little - default "mips64" if ADK_LINUX_MIPS64 && ADK_big - default "mips64el" if ADK_LINUX_MIPS64 && ADK_little - default "mips" if ADK_LINUX_MIPS && ADK_big - default "mipsel" if ADK_LINUX_MIPS && ADK_little + default "m68k" if ADK_TARGET_ARCH_M68K + default "microblaze" if ADK_TARGET_ARCH_MICROBLAZE && ADK_big + default "microblazeel" if ADK_TARGET_ARCH_MICROBLAZE && ADK_little + default "mips64" if ADK_TARGET_ARCH_MIPS64 && ADK_big + default "mips64el" if ADK_TARGET_ARCH_MIPS64 && ADK_little + default "mips" if ADK_TARGET_ARCH_MIPS && ADK_big + default "mipsel" if ADK_TARGET_ARCH_MIPS && ADK_little default "ppc" if ADK_CPU_PPC default "ppc" if ADK_CPU_PPC_440 default "ppc64" if ADK_CPU_PPC64 - default "sh4" if ADK_LINUX_SH && ADK_little - default "sh4eb" if ADK_LINUX_SH && ADK_big - default "sparc" if ADK_LINUX_SPARC - default "sparc64" if ADK_LINUX_SPARC64 + default "sh4" if ADK_TARGET_ARCH_SH && ADK_little + default "sh4eb" if ADK_TARGET_ARCH_SH && ADK_big + default "sparc" if ADK_TARGET_ARCH_SPARC + default "sparc64" if ADK_TARGET_ARCH_SPARC64 default "tilegx" if ADK_CPU_TILE default "x86_64" if ADK_CPU_X86_64 default "x86_64" if ADK_CPU_AMDFAM10 - default "xtensa" if ADK_LINUX_XTENSA + default "xtensa" if ADK_TARGET_ARCH_XTENSA diff --git a/target/config/Config.in.cris.choice b/target/config/Config.in.cris.choice index 55a6a8997..b55801bbb 100644 --- a/target/config/Config.in.cris.choice +++ b/target/config/Config.in.cris.choice @@ -3,7 +3,7 @@ choice ADK_TARGET_CRIS_CPU_ARCH prompt "CPU architecture" -depends on ADK_TARGET_TOOLCHAIN && ADK_LINUX_CRIS +depends on ADK_TARGET_TOOLCHAIN && ADK_TARGET_ARCH_CRIS config ADK_CPU_CRIS_V10 boolean "cris v10" diff --git a/target/config/Config.in.endian.choice b/target/config/Config.in.endian.choice index d89184ab0..4645b7111 100644 --- a/target/config/Config.in.endian.choice +++ b/target/config/Config.in.endian.choice @@ -2,10 +2,9 @@ # material, please see the LICENCE file in the top-level directory. choice ADK_TARGET_ENDIAN_MODE -prompt "Target Endianess" -depends on !ADK_CHOOSE_TARGET_ARCH && !ADK_CHOOSE_TARGET_SYSTEM -depends on ADK_LINUX_SH || ADK_LINUX_MIPS || ADK_LINUX_MICROBLAZE \ - || ADK_LINUX_MIPS64 || ADK_LINUX_ARC || ADK_LINUX_ARM || ADK_LINUX_C6X +prompt "Endianess" +depends on ADK_TARGET_ARCH_SH || ADK_TARGET_ARCH_MIPS || ADK_TARGET_ARCH_MICROBLAZE \ + || ADK_TARGET_ARCH_MIPS64 || ADK_TARGET_ARCH_ARC || ADK_TARGET_ARCH_ARM || ADK_TARGET_ARCH_C6X depends on !ADK_TARGET_SYSTEM_MIKROTIK_RB532 depends on !ADK_TARGET_SYSTEM_DRAGINO_MS14S depends on !ADK_TARGET_SYSTEM_LEMOTE_YEELONG diff --git a/target/config/Config.in.kernelversion.choice b/target/config/Config.in.kernelversion.choice index 7a9cf94bb..806bf1d5e 100644 --- a/target/config/Config.in.kernelversion.choice +++ b/target/config/Config.in.kernelversion.choice @@ -3,7 +3,7 @@ choice prompt "Kernel Version" -depends on !ADK_CHOOSE_TARGET_ARCH && !ADK_CHOOSE_TARGET_SYSTEM && ADK_TARGET_KERNEL_CUSTOMISING +depends on ADK_TARGET_KERNEL_CUSTOMISING default ADK_KERNEL_VERSION_3_14_26 if ADK_TARGET_SYSTEM_SOLIDRUN_IMX6 default ADK_KERNEL_VERSION_3_17.5 diff --git a/target/config/Config.in.libc.choice b/target/config/Config.in.libc.choice index 69296c05c..6e63c0c37 100644 --- a/target/config/Config.in.libc.choice +++ b/target/config/Config.in.libc.choice @@ -2,20 +2,19 @@ # material, please see the LICENCE file in the top-level directory. choice -prompt "Target C library" -depends on !ADK_CHOOSE_TARGET_SYSTEM && !ADK_CHOOSE_TARGET_ARCH +prompt "C library" config ADK_TARGET_LIB_UCLIBC_NG prompt "uClibc-ng embedded C library" boolean select ADK_uclibc_ng depends on \ - !ADK_LINUX_AARCH64 && \ - !ADK_LINUX_ALPHA && \ - !ADK_LINUX_MICROBLAZE && \ - !ADK_LINUX_SPARC64 && \ - !ADK_LINUX_PPC64 && \ - !ADK_LINUX_TILE && \ + !ADK_TARGET_ARCH_AARCH64 && \ + !ADK_TARGET_ARCH_ALPHA && \ + !ADK_TARGET_ARCH_MICROBLAZE && \ + !ADK_TARGET_ARCH_SPARC64 && \ + !ADK_TARGET_ARCH_PPC64 && \ + !ADK_TARGET_ARCH_TILE && \ !ADK_x32 help http://uclibc-ng.org @@ -26,13 +25,13 @@ config ADK_TARGET_LIB_MUSL select ADK_musl depends on !ADK_TARGET_UCLINUX depends on \ - ADK_LINUX_ARM || \ - ADK_LINUX_MICROBLAZE || \ - ADK_LINUX_MIPS || \ - ADK_LINUX_PPC || \ - ADK_LINUX_SH || \ - ADK_LINUX_X86 || \ - ADK_LINUX_X86_64 + ADK_TARGET_ARCH_ARM || \ + ADK_TARGET_ARCH_MICROBLAZE || \ + ADK_TARGET_ARCH_MIPS || \ + ADK_TARGET_ARCH_PPC || \ + ADK_TARGET_ARCH_SH || \ + ADK_TARGET_ARCH_X86 || \ + ADK_TARGET_ARCH_X86_64 help http://musl-libc.org @@ -40,11 +39,11 @@ config ADK_TARGET_LIB_GLIBC prompt "GNU C library" boolean select ADK_glibc - depends on !ADK_LINUX_ARC - depends on !ADK_LINUX_AVR32 - depends on !ADK_LINUX_BFIN - depends on !ADK_LINUX_CRIS - depends on !ADK_LINUX_XTENSA + depends on !ADK_TARGET_ARCH_ARC + depends on !ADK_TARGET_ARCH_AVR32 + depends on !ADK_TARGET_ARCH_BFIN + depends on !ADK_TARGET_ARCH_CRIS + depends on !ADK_TARGET_ARCH_XTENSA depends on !ADK_TARGET_UCLINUX help http://www.gnu.org/libc @@ -54,13 +53,13 @@ config ADK_TARGET_LIB_UCLIBC boolean select ADK_uclibc depends on \ - !ADK_LINUX_AARCH64 && \ - !ADK_LINUX_ALPHA && \ - !ADK_LINUX_CRIS && \ - !ADK_LINUX_MICROBLAZE && \ - !ADK_LINUX_SPARC64 && \ - !ADK_LINUX_PPC64 && \ - !ADK_LINUX_TILE && \ + !ADK_TARGET_ARCH_AARCH64 && \ + !ADK_TARGET_ARCH_ALPHA && \ + !ADK_TARGET_ARCH_CRIS && \ + !ADK_TARGET_ARCH_MICROBLAZE && \ + !ADK_TARGET_ARCH_SPARC64 && \ + !ADK_TARGET_ARCH_PPC64 && \ + !ADK_TARGET_ARCH_TILE && \ !ADK_x32 help http://uclibc.org @@ -68,8 +67,7 @@ config ADK_TARGET_LIB_UCLIBC endchoice choice -prompt "Target C library version" -depends on !ADK_CHOOSE_TARGET_SYSTEM && !ADK_CHOOSE_TARGET_ARCH +prompt "C library version" config ADK_TARGET_LIB_UCLIBC_NG_GIT prompt "git" diff --git a/target/config/Config.in.libc.default b/target/config/Config.in.libc.default index ba4d93294..6b4350ce6 100644 --- a/target/config/Config.in.libc.default +++ b/target/config/Config.in.libc.default @@ -32,10 +32,10 @@ config ADK_LIBC_VERSION config ADK_TARGET_WITH_NPTL boolean - default n if ADK_TARGET_LIB_UCLIBC_NG && ADK_LINUX_CRIS - default n if ADK_TARGET_LIB_UCLIBC && ADK_LINUX_CRIS - default n if ADK_TARGET_LIB_UCLIBC_NG && ADK_LINUX_M68K - default n if ADK_TARGET_LIB_UCLIBC && ADK_LINUX_M68K + default n if ADK_TARGET_LIB_UCLIBC_NG && ADK_TARGET_ARCH_CRIS + default n if ADK_TARGET_LIB_UCLIBC && ADK_TARGET_ARCH_CRIS + default n if ADK_TARGET_LIB_UCLIBC_NG && ADK_TARGET_ARCH_M68K + default n if ADK_TARGET_LIB_UCLIBC && ADK_TARGET_ARCH_M68K default y config ADK_TARGET_SUFFIX diff --git a/target/config/Config.in.target b/target/config/Config.in.target index 286c3521b..fd998d611 100644 --- a/target/config/Config.in.target +++ b/target/config/Config.in.target @@ -74,22 +74,22 @@ config ADK_TARGET_CMDLINE default "" choice -prompt "Target firmware type" -depends on !ADK_CHOOSE_TARGET_SYSTEM && !ADK_CHOOSE_TARGET_ARCH && !ADK_TARGET_TOOLCHAIN +prompt "Firmware type" +depends on !ADK_TARGET_TOOLCHAIN default ADK_TARGET_ROOTFS_ARCHIVE config ADK_TARGET_ROOTFS_INITRAMFS boolean "initramfs filesystem" depends on \ ADK_TARGET_QEMU || \ - ADK_LINUX_M68K || \ - ADK_LINUX_ARM || \ - ADK_LINUX_MICROBLAZE || \ - ADK_LINUX_MIPS || \ - ADK_LINUX_PPC || \ - ADK_LINUX_SPARC || \ - ADK_LINUX_X86 || \ - ADK_LINUX_X86_64 + ADK_TARGET_ARCH_M68K || \ + ADK_TARGET_ARCH_ARM || \ + ADK_TARGET_ARCH_MICROBLAZE || \ + ADK_TARGET_ARCH_MIPS || \ + ADK_TARGET_ARCH_PPC || \ + ADK_TARGET_ARCH_SPARC || \ + ADK_TARGET_ARCH_X86 || \ + ADK_TARGET_ARCH_X86_64 depends on !ADK_TARGET_VBOX depends on !ADK_TARGET_SYSTEM_MIKROTIK_RB532 select ADK_KERNEL_BLK_DEV_INITRD @@ -98,18 +98,18 @@ config ADK_TARGET_ROOTFS_INITRAMFS config ADK_TARGET_ROOTFS_INITRAMFSPIGGYBACK boolean "initramfs filesystem included into kernel image" - select ADK_LINUX_INITRAMFS_BUILTIN + select ADK_TARGET_ARCH_INITRAMFS_BUILTIN depends on \ ADK_TARGET_QEMU || \ - ADK_LINUX_AARCH64 || \ - ADK_LINUX_ARM || \ - ADK_LINUX_M68K || \ - ADK_LINUX_MICROBLAZE || \ - ADK_LINUX_MIPS || \ - ADK_LINUX_PPC || \ - ADK_LINUX_SPARC || \ - ADK_LINUX_X86 || \ - ADK_LINUX_X86_64 + ADK_TARGET_ARCH_AARCH64 || \ + ADK_TARGET_ARCH_ARM || \ + ADK_TARGET_ARCH_M68K || \ + ADK_TARGET_ARCH_MICROBLAZE || \ + ADK_TARGET_ARCH_MIPS || \ + ADK_TARGET_ARCH_PPC || \ + ADK_TARGET_ARCH_SPARC || \ + ADK_TARGET_ARCH_X86 || \ + ADK_TARGET_ARCH_X86_64 depends on !ADK_TARGET_VBOX depends on !ADK_TARGET_SYSTEM_MIKROTIK_RB532 help @@ -186,7 +186,7 @@ config ADK_TARGET_ROOTFS_ISO select ADK_HOST_NEED_SYSLINUX select ADK_TARGET_QEMU_WITH_BLOCK if ADK_TARGET_QEMU depends on ADK_HOST_LINUX - depends on ADK_LINUX_X86 + depends on ADK_TARGET_ARCH_X86 help Use this option to create a bootable ISO image. @@ -266,9 +266,8 @@ config ADK_PACKAGE_SUFFIX help choice -prompt "Target package format" +prompt "Package format" default ADK_TARGET_PACKAGE_TXZ -depends on !ADK_CHOOSE_TARGET_SYSTEM && !ADK_CHOOSE_TARGET_ARCH config ADK_TARGET_PACKAGE_TXZ boolean @@ -291,9 +290,9 @@ config ADK_TARGET_BINFMT_FLAT boolean choice -prompt "Target GPU Memory" +prompt "GPU memory size" depends on ADK_TARGET_SYSTEM_RASPBERRY_PI -default ADK_TARGET_GPU_MEM_128 if ADK_PACKAGE_XBMC +default ADK_TARGET_GPU_MEM_128 if ADK_PACKAGE_KODI config ADK_TARGET_GPU_MEM_16 prompt "16" diff --git a/target/config/Config.in.toolchain b/target/config/Config.in.toolchain index 7d4dbad74..487992834 100644 --- a/target/config/Config.in.toolchain +++ b/target/config/Config.in.toolchain @@ -2,7 +2,7 @@ # material, please see the LICENCE file in the top-level directory. menu "Toolchain settings" -depends on !ADK_CHOOSE_TARGET_ARCH && !ADK_CHOOSE_TARGET_SYSTEM + visible if !ADK_CHOOSE_APPLIANCE config ADK_VENDOR string "Vendor name" @@ -16,93 +16,92 @@ prompt "GCC version" config ADK_TOOLCHAIN_GCC_4_4_7 prompt "4.4.7" boolean - depends on ADK_LINUX_AVR32 + depends on ADK_TARGET_ARCH_AVR32 config ADK_TOOLCHAIN_GCC_4_5_4 prompt "4.5.4" boolean - depends on ADK_LINUX_BFIN + depends on ADK_TARGET_ARCH_BFIN config ADK_TOOLCHAIN_GCC_4_7_4 prompt "4.7.4" boolean - depends on ADK_LINUX_CRIS || ADK_LINUX_C6X + depends on ADK_TARGET_ARCH_CRIS || ADK_TARGET_ARCH_C6X config ADK_TOOLCHAIN_GCC_4_8_0_ARC prompt "4.8.0-arc" boolean - depends on ADK_LINUX_ARC + depends on ADK_TARGET_ARCH_ARC config ADK_TOOLCHAIN_GCC_4_8_3 prompt "4.8.3" boolean - depends on !ADK_LINUX_BFIN - depends on !ADK_LINUX_AARCH64 - depends on !ADK_LINUX_ARC - depends on !ADK_LINUX_AVR32 - depends on !ADK_LINUX_CRIS - depends on !ADK_LINUX_TILE - depends on !ADK_LINUX_C6X + depends on !ADK_TARGET_ARCH_BFIN + depends on !ADK_TARGET_ARCH_AARCH64 + depends on !ADK_TARGET_ARCH_ARC + depends on !ADK_TARGET_ARCH_AVR32 + depends on !ADK_TARGET_ARCH_CRIS + depends on !ADK_TARGET_ARCH_TILE + depends on !ADK_TARGET_ARCH_C6X config ADK_TOOLCHAIN_GCC_4_9_2 prompt "4.9.2" boolean - depends on !ADK_LINUX_BFIN - depends on !ADK_LINUX_ARC - depends on !ADK_LINUX_AVR32 - depends on !ADK_LINUX_CRIS - depends on !ADK_LINUX_C6X + depends on !ADK_TARGET_ARCH_BFIN + depends on !ADK_TARGET_ARCH_ARC + depends on !ADK_TARGET_ARCH_AVR32 + depends on !ADK_TARGET_ARCH_CRIS + depends on !ADK_TARGET_ARCH_C6X config ADK_TOOLCHAIN_GCC_GIT prompt "git" boolean select ADK_DISABLE_CHECKSUM - depends on !ADK_LINUX_BFIN - depends on !ADK_LINUX_ARC - depends on !ADK_LINUX_AVR32 - depends on !ADK_LINUX_CRIS + depends on !ADK_TARGET_ARCH_BFIN + depends on !ADK_TARGET_ARCH_ARC + depends on !ADK_TARGET_ARCH_AVR32 + depends on !ADK_TARGET_ARCH_CRIS endchoice choice prompt "Binutils version" -depends on !ADK_CHOOSE_TARGET_SYSTEM && !ADK_CHOOSE_TARGET_ARCH config ADK_TOOLCHAIN_BINUTILS_2_20_1 prompt "2.20.1" boolean - depends on ADK_LINUX_AVR32 + depends on ADK_TARGET_ARCH_AVR32 config ADK_TOOLCHAIN_BINUTILS_2_22 prompt "2.22" boolean - depends on ADK_LINUX_BFIN \ - || ADK_LINUX_CRIS \ - || ADK_LINUX_M68K + depends on ADK_TARGET_ARCH_BFIN \ + || ADK_TARGET_ARCH_CRIS \ + || ADK_TARGET_ARCH_M68K config ADK_TOOLCHAIN_BINUTILS_2_23_ARC prompt "2.23-arc" boolean - depends on ADK_LINUX_ARC + depends on ADK_TARGET_ARCH_ARC config ADK_TOOLCHAIN_BINUTILS_2_24 prompt "2.24" boolean - depends on !ADK_LINUX_BFIN - depends on !ADK_LINUX_ARC - depends on !ADK_LINUX_AVR32 - depends on !ADK_LINUX_CRIS - depends on !ADK_LINUX_M68K + depends on !ADK_TARGET_ARCH_BFIN + depends on !ADK_TARGET_ARCH_ARC + depends on !ADK_TARGET_ARCH_AVR32 + depends on !ADK_TARGET_ARCH_CRIS + depends on !ADK_TARGET_ARCH_M68K config ADK_TOOLCHAIN_BINUTILS_GIT prompt "git" boolean select ADK_DISABLE_CHECKSUM - depends on !ADK_LINUX_BFIN - depends on !ADK_LINUX_ARC - depends on !ADK_LINUX_AVR32 - depends on !ADK_LINUX_CRIS - depends on !ADK_LINUX_M68K + depends on !ADK_TARGET_ARCH_BFIN + depends on !ADK_TARGET_ARCH_ARC + depends on !ADK_TARGET_ARCH_AVR32 + depends on !ADK_TARGET_ARCH_CRIS + depends on !ADK_TARGET_ARCH_M68K endchoice @@ -131,12 +130,12 @@ config ADK_TARGET_CFLAGS_OPT_O0 endchoice -config ADK_LINUX_ARM_WITH_THUMB +config ADK_TARGET_ARCH_ARM_WITH_THUMB prompt "Use THUMB2 only mode" boolean select ADK_KERNEL_THUMB2_KERNEL default n - depends on ADK_LINUX_ARM + depends on ADK_TARGET_ARCH_ARM help Experimental option. Use with care. @@ -188,15 +187,15 @@ config ADK_TARGET_USE_GOLD prompt "Use GOLD as linker for all packages" boolean select ADK_TOOLCHAIN_WITH_GOLD - depends on !ADK_LINUX_MIPS - depends on !ADK_LINUX_MIPS64 + depends on !ADK_TARGET_ARCH_MIPS + depends on !ADK_TARGET_ARCH_MIPS64 default n config ADK_TARGET_USE_GNU_HASHSTYLE prompt "Use GNU hashstyle for all packages" boolean - depends on !ADK_LINUX_MIPS - depends on !ADK_LINUX_MIPS64 + depends on !ADK_TARGET_ARCH_MIPS + depends on !ADK_TARGET_ARCH_MIPS64 default n help Performance optimization for applications with lot of shared library diff --git a/target/config/Config.in.x86.choice b/target/config/Config.in.x86.choice index 2314db767..c95768793 100644 --- a/target/config/Config.in.x86.choice +++ b/target/config/Config.in.x86.choice @@ -3,7 +3,7 @@ choice ADK_TARGET_X86_CPU_ARCH prompt "CPU architecture" -depends on (ADK_TARGET_SYSTEM_QEMU_X86 || ADK_TARGET_SYSTEM_GENERIC_PC || ADK_TARGET_SYSTEM_VBOX_X86 || ADK_TARGET_TOOLCHAIN) && ADK_LINUX_X86 +depends on (ADK_TARGET_SYSTEM_QEMU_X86 || ADK_TARGET_SYSTEM_GENERIC_PC || ADK_TARGET_SYSTEM_VBOX_X86 || ADK_TARGET_TOOLCHAIN) && ADK_TARGET_ARCH_X86 default ADK_CPU_I486 config ADK_CPU_I486 diff --git a/target/linux/config/Config.in.debug b/target/linux/config/Config.in.debug index e3965123c..a2287f5f5 100644 --- a/target/linux/config/Config.in.debug +++ b/target/linux/config/Config.in.debug @@ -122,7 +122,7 @@ config ADK_KERNEL_OPROFILE prompt "Oprofile support" tristate select ADK_KERNEL_PROFILING - depends on !ADK_LINUX_M68K + depends on !ADK_TARGET_ARCH_M68K default m if ADK_PACKAGE_OPROFILE default n help diff --git a/target/linux/config/Config.in.kernel b/target/linux/config/Config.in.kernel index b1a6d30f6..dcc7b5ed1 100644 --- a/target/linux/config/Config.in.kernel +++ b/target/linux/config/Config.in.kernel @@ -110,7 +110,7 @@ config ADK_KERNEL_CPU_MIPS64_R2 # ARM specific config ADK_KERNEL_AEABI boolean - default y if ADK_LINUX_ARM + default y if ADK_TARGET_ARCH_ARM config ADK_KERNEL_THUMB2_KERNEL boolean @@ -142,7 +142,7 @@ config ADK_KERNEL_COMP_LZ4 select ADK_KERNEL_RD_LZ4 select ADK_KERNEL_KERNEL_LZ4 select ADK_KERNEL_INITRAMFS_COMPRESSION_LZ4 - depends on ADK_LINUX_X86 || ADK_LINUX_ARM + depends on ADK_TARGET_ARCH_X86 || ADK_TARGET_ARCH_ARM depends on !ADK_TARGET_SYSTEM_RASPBERRY_PI config ADK_KERNEL_COMP_LZMA @@ -205,12 +205,12 @@ config ADK_KERNEL_CC_OPTIMIZE_FOR_SIZE prompt "Optimize for size" boolean # does not boot in qemu - depends on !ADK_LINUX_MICROBLAZE + depends on !ADK_TARGET_ARCH_MICROBLAZE default y choice prompt "Page size" -depends on ADK_LINUX_MIPS64 +depends on ADK_TARGET_ARCH_MIPS64 default ADK_KERNEL_PAGE_SIZE_16KB if ADK_TARGET_SYSTEM_LEMOTE_YEELONG default ADK_KERNEL_PAGE_SIZE_4KB diff --git a/target/linux/config/Config.in.kvm b/target/linux/config/Config.in.kvm index 5bba30871..4dfd93b12 100644 --- a/target/linux/config/Config.in.kvm +++ b/target/linux/config/Config.in.kvm @@ -1,5 +1,5 @@ menu "Virtualization" -depends on (ADK_LINUX_X86_64 || ADK_LINUX_X86) && ADK_TARGET_CPU_WITH_VT +depends on (ADK_TARGET_ARCH_X86_64 || ADK_TARGET_ARCH_X86) && ADK_TARGET_CPU_WITH_VT config ADK_KERNEL_VIRTUALIZATION bool diff --git a/target/linux/config/Config.in.leds b/target/linux/config/Config.in.leds index f0001fc41..db855dccf 100644 --- a/target/linux/config/Config.in.leds +++ b/target/linux/config/Config.in.leds @@ -11,7 +11,6 @@ config ADK_KERNEL_LEDS_TRIGGERS config ADK_KERNEL_LEDS_CLASS boolean - depends on !ADK_KERNEL_LEDS_CLASS menu "LEDS driver support" depends on ADK_TARGET_WITH_LEDS diff --git a/target/xtensa/Config.in b/target/xtensa/Config.in deleted file mode 100644 index 511328716..000000000 --- a/target/xtensa/Config.in +++ /dev/null @@ -1,9 +0,0 @@ -choice -depends on ADK_LINUX_XTENSA && !ADK_CHOOSE_TARGET_ARCH -prompt "Target system" - -config ADK_CHOOSE_TARGET_SYSTEM_XTENSA - boolean "Choose target system" - -source "target/xtensa/Config.in.systems" -endchoice |