diff options
78 files changed, 286 insertions, 378 deletions
@@ -18,14 +18,30 @@ source "target/config/Config.in.os" source "target/config/Config.in.hardware" source "target/config/Config.in.boards" source "target/config/Config.in.kernelfmt" + +menu "Hardware configuration" source "target/config/Config.in.arch" -source "target/config/Config.in.endian" source "target/config/Config.in.system" -source "target/config/Config.in.systemopts" source "target/config/Config.in.subsystem" source "target/config/Config.in.qemuopts" +source "target/config/Config.in.endian" +source "target/config/Config.in.mmu" source "target/config/Config.in.cpu" source "target/config/Config.in.addons" +endmenu + +menu "C Library configuration" + visible if (ADK_TARGET_OS_LINUX || ADK_TARGET_OS_WALDUX) && !ADK_APPLIANCE_TOOLCHAIN && !ADK_TARGET_CHOOSE_ARCH +source "target/config/Config.in.libc" +source "target/config/Config.in.threads" +source "target/config/Config.in.binfmt" +source "target/config/Config.in.instructions" +source "target/config/Config.in.fpu" +source "target/config/Config.in.float" +source "target/config/Config.in.abi" +source "target/config/Config.in.libs" +source "target/config/Config.in.uclibc-ng" +endmenu comment "After you saved your configuration once, you shouldn't change anything above" depends on (ADK_TARGET_OS_LINUX || ADK_TARGET_OS_WALDUX) && !ADK_APPLIANCE_TOOLCHAIN && !ADK_TARGET_CHOOSE_ARCH @@ -90,12 +106,6 @@ endmenu menu "Toolchain settings" visible if !ADK_TARGET_CHOOSE_ARCH -source "target/config/Config.in.archopts" -source "target/config/Config.in.fpu" -source "target/config/Config.in.float" -source "target/config/Config.in.binfmt" -source "target/config/Config.in.libc" -source "target/config/Config.in.abi" source "target/config/Config.in.binutils" source "target/config/Config.in.compiler" source "target/config/Config.in.gdb" diff --git a/mk/vars.mk b/mk/vars.mk index 96962fcce..64797537f 100644 --- a/mk/vars.mk +++ b/mk/vars.mk @@ -28,6 +28,9 @@ endif ifneq ($(ADK_TARGET_BINFMT),) ADK_SUFFIX:= $(ADK_SUFFIX)_$(ADK_TARGET_BINFMT) endif +ifeq ($(ADK_TARGET_WITH_MMU),) +ADK_SUFFIX:= $(ADK_SUFFIX)_nommu +endif # some global dirs BASE_DIR:= $(ADK_TOPDIR) diff --git a/package/busybox/Config.in.manual b/package/busybox/Config.in.manual index ab4928e48..a6437d0e8 100644 --- a/package/busybox/Config.in.manual +++ b/package/busybox/Config.in.manual @@ -13,7 +13,7 @@ config ADK_PACKAGE_BUSYBOX choice prompt "Choose predefined set of applets" depends on ADK_PACKAGE_BUSYBOX -default ADK_PACKAGE_BUSYBOX_MINIMAL if ADK_TARGET_WITHOUT_MMU +default ADK_PACKAGE_BUSYBOX_MINIMAL if ADK_TARGET_UCLINUX config ADK_PACKAGE_BUSYBOX_DEFAULT bool "activate standard set of applets" diff --git a/package/busybox/config/Config.in b/package/busybox/config/Config.in index fee58a930..868f0b9ff 100644 --- a/package/busybox/config/Config.in +++ b/package/busybox/config/Config.in @@ -529,8 +529,8 @@ config BUSYBOX_PIE config BUSYBOX_NOMMU bool "Force NOMMU build" - default y if ADK_TARGET_WITHOUT_MMU - default n + default n if ADK_TARGET_WITH_MMU + default y help Busybox tries to detect whether architecture it is being built against supports MMU or not. If this detection fails, diff --git a/target/aarch64/systems/qemu-aarch64 b/target/aarch64/systems/qemu-aarch64 index 8f8baa264..90407b32e 100644 --- a/target/aarch64/systems/qemu-aarch64 +++ b/target/aarch64/systems/qemu-aarch64 @@ -1,6 +1,6 @@ config ADK_TARGET_SYSTEM_QEMU_AARCH64 bool "Qemu Emulator" - depends on ADK_TARGET_LITTLE_ENDIAN + select ADK_TARGET_LITTLE_ENDIAN select ADK_TARGET_CPU_AARCH_CORTEX_A57 select ADK_TARGET_QEMU select ADK_TARGET_KERNEL_IMAGE diff --git a/target/aarch64/systems/raspberry-pi3-64 b/target/aarch64/systems/raspberry-pi3-64 index 03f1d755d..5a22f9284 100644 --- a/target/aarch64/systems/raspberry-pi3-64 +++ b/target/aarch64/systems/raspberry-pi3-64 @@ -1,6 +1,6 @@ config ADK_TARGET_SYSTEM_RASPBERRY_PI3_64 bool "Raspberry PI 3 (AARCH64)" - depends on ADK_TARGET_LITTLE_ENDIAN + select ADK_TARGET_LITTLE_ENDIAN select ADK_TARGET_CPU_AARCH64_CORTEX_A53 select ADK_TARGET_BOARD_BCM28XX select ADK_TARGET_WITH_VGA diff --git a/target/aarch64/systems/raspberry-pi3p-64 b/target/aarch64/systems/raspberry-pi3p-64 index 84bf13fff..cadae56dc 100644 --- a/target/aarch64/systems/raspberry-pi3p-64 +++ b/target/aarch64/systems/raspberry-pi3p-64 @@ -1,6 +1,6 @@ config ADK_TARGET_SYSTEM_RASPBERRY_PI3P_64 bool "Raspberry PI 3 Model B+ (AARCH64)" - depends on ADK_TARGET_LITTLE_ENDIAN + select ADK_TARGET_LITTLE_ENDIAN select ADK_TARGET_CPU_AARCH64_CORTEX_A53 select ADK_TARGET_BOARD_BCM28XX select ADK_TARGET_WITH_VGA diff --git a/target/arc/kernel/nsim-arcv1 b/target/arc/kernel/nsim-arcv1 deleted file mode 100644 index e13a1b63d..000000000 --- a/target/arc/kernel/nsim-arcv1 +++ /dev/null @@ -1,5 +0,0 @@ -CONFIG_ARC=y -CONFIG_ARC_PLAT_SIM=y -CONFIG_ISA_ARCOMPACT=y -CONFIG_ARC_CPU_770=y -CONFIG_ARC_BUILTIN_DTB_NAME="nsim_700" diff --git a/target/arc/kernel/nsim-arcv2 b/target/arc/kernel/nsim-arcv2 deleted file mode 100644 index 38fd1c27e..000000000 --- a/target/arc/kernel/nsim-arcv2 +++ /dev/null @@ -1,4 +0,0 @@ -CONFIG_ARC=y -CONFIG_ARC_PLAT_SIM=y -CONFIG_ISA_ARCV2=y -CONFIG_ARC_BUILTIN_DTB_NAME="nsim_hs" diff --git a/target/arc/kernel/synopsys-nsim b/target/arc/kernel/synopsys-nsim new file mode 100644 index 000000000..416867241 --- /dev/null +++ b/target/arc/kernel/synopsys-nsim @@ -0,0 +1,2 @@ +CONFIG_ARC=y +CONFIG_ARC_PLAT_SIM=y diff --git a/target/arc/systems/nsim-arcv1 b/target/arc/systems/nsim-arcv1 deleted file mode 100644 index 65706b24f..000000000 --- a/target/arc/systems/nsim-arcv1 +++ /dev/null @@ -1,9 +0,0 @@ -config ADK_TARGET_SYSTEM_NSIM_ARCV1 - bool "Synopsys NSIM Emulator (ARCv1)" - select ADK_TARGET_CPU_ARC_ARC700 - select ADK_TARGET_WITH_NET - select ADK_TARGET_WITH_SERIAL - select ADK_TARGET_KERNEL_WITH_COMPRESSION - help - Support for NSIM Emulator for ARCv1. - diff --git a/target/arc/systems/nsim-arcv2 b/target/arc/systems/nsim-arcv2 deleted file mode 100644 index c56b16c3a..000000000 --- a/target/arc/systems/nsim-arcv2 +++ /dev/null @@ -1,9 +0,0 @@ -config ADK_TARGET_SYSTEM_NSIM_ARCV2 - bool "Synopsys NSIM Emulator (ARCv2)" - select ADK_TARGET_CPU_ARC_ARC_HS - select ADK_TARGET_WITH_NET - select ADK_TARGET_WITH_SERIAL - select ADK_TARGET_KERNEL_WITH_COMPRESSION - help - Support for NSIM Emulator for ARCv2. - diff --git a/target/arc/systems/synopsys-nsim b/target/arc/systems/synopsys-nsim new file mode 100644 index 000000000..fe57e2642 --- /dev/null +++ b/target/arc/systems/synopsys-nsim @@ -0,0 +1,8 @@ +config ADK_TARGET_SYSTEM_SYNOPSYS_NSIM + bool "Synopsys NSIM Emulator" + select ADK_TARGET_WITH_NET + select ADK_TARGET_WITH_SERIAL + select ADK_TARGET_KERNEL_WITH_COMPRESSION + help + Support for Synopsys NSIM Emulator. + diff --git a/target/arm/Makefile b/target/arm/Makefile index 44eedd2cc..59b457d12 100644 --- a/target/arm/Makefile +++ b/target/arm/Makefile @@ -32,7 +32,7 @@ endif ifeq ($(ADK_TARGET_SYSTEM_QEMU_ARM_REALVIEW_EB_MPCORE),y) QEMU_ARGS+=-M realview-eb-mpcore -net user -net nic -dtb $(FW_DIR)/arm-realview-eb-11mp-ctrevb.dtb endif -ifeq ($(ADK_TARGET_SYSTEM_QEMU_ARM_VERSATILEPB)$(ADK_TARGET_SYSTEM_QEMU_ARM_VERSATILEPB_NOMMU),y) +ifeq ($(ADK_TARGET_SYSTEM_QEMU_ARM_VERSATILEPB),y) QEMU_ARGS+=-M versatilepb -net user -net nic,model=smc91c111 -dtb $(FW_DIR)/versatile-pb.dtb endif ifeq ($(ADK_TARGET_SYSTEM_QEMU_ARM_VEXPRESS_A9),y) @@ -176,7 +176,7 @@ ifeq ($(ADK_TARGET_SYSTEM_QEMU_ARM_REALVIEW_EB_MPCORE),y) env $(KERNEL_MAKE_ENV) $(MAKE) -C "${LINUX_DIR}" $(KERNEL_MAKE_OPTS) \ arm-realview-eb-11mp-ctrevb.dtb $(MAKE_TRACE) endif -ifeq ($(ADK_TARGET_SYSTEM_QEMU_ARM_VERSATILEPB)$(ADK_TARGET_SYSTEM_QEMU_ARM_VERSATILEPB_NOMMU),y) +ifeq ($(ADK_TARGET_SYSTEM_QEMU_ARM_VERSATILEPB),y) env $(KERNEL_MAKE_ENV) $(MAKE) -C "${LINUX_DIR}" $(KERNEL_MAKE_OPTS) \ versatile-pb.dtb $(MAKE_TRACE) endif diff --git a/target/arm/kernel/qemu-arm-versatilepb b/target/arm/kernel/qemu-arm-versatilepb index 43e9620df..74717d283 100644 --- a/target/arm/kernel/qemu-arm-versatilepb +++ b/target/arm/kernel/qemu-arm-versatilepb @@ -1,6 +1,16 @@ CONFIG_ARM=y +CONFIG_ARM_SINGLE_ARCH_VERSATILE=y CONFIG_ARCH_VERSATILE=y -CONFIG_PCI_VERSATILE=y CONFIG_KUSER_HELPERS=y CONFIG_ATAGS=y CONFIG_USE_OF=y +CONFIG_SET_MEM_PARAM=y +CONFIG_DRAM_BASE=0x00000000 +CONFIG_DRAM_SIZE=0x08000000 +CONFIG_ARCH_VERSATILE_PB=y +CONFIG_MACH_VERSATILE_AB=y +CONFIG_PLAT_VERSATILE_CLOCK=y +CONFIG_PLAT_VERSATILE_SCHED_CLOCK=y +CONFIG_PLAT_VERSATILE=y +CONFIG_VECTORS_BASE=0x00000000 +CONFIG_PHYS_OFFSET=0x00000000 diff --git a/target/arm/kernel/qemu-arm-versatilepb-nommu b/target/arm/kernel/qemu-arm-versatilepb-nommu deleted file mode 100644 index 74717d283..000000000 --- a/target/arm/kernel/qemu-arm-versatilepb-nommu +++ /dev/null @@ -1,16 +0,0 @@ -CONFIG_ARM=y -CONFIG_ARM_SINGLE_ARCH_VERSATILE=y -CONFIG_ARCH_VERSATILE=y -CONFIG_KUSER_HELPERS=y -CONFIG_ATAGS=y -CONFIG_USE_OF=y -CONFIG_SET_MEM_PARAM=y -CONFIG_DRAM_BASE=0x00000000 -CONFIG_DRAM_SIZE=0x08000000 -CONFIG_ARCH_VERSATILE_PB=y -CONFIG_MACH_VERSATILE_AB=y -CONFIG_PLAT_VERSATILE_CLOCK=y -CONFIG_PLAT_VERSATILE_SCHED_CLOCK=y -CONFIG_PLAT_VERSATILE=y -CONFIG_VECTORS_BASE=0x00000000 -CONFIG_PHYS_OFFSET=0x00000000 diff --git a/target/arm/systems/banana-pro b/target/arm/systems/banana-pro index a29da767f..9af9ba68f 100644 --- a/target/arm/systems/banana-pro +++ b/target/arm/systems/banana-pro @@ -1,7 +1,7 @@ config ADK_TARGET_SYSTEM_BANANA_PRO bool "Banana Pro" depends on ADK_TARGET_OS_LINUX || ADK_TARGET_OS_WALDUX - depends on ADK_TARGET_LITTLE_ENDIAN + select ADK_TARGET_LITTLE_ENDIAN select ADK_TARGET_CPU_ARM_CORTEX_A7 select ADK_TARGET_CPU_WITH_NEON select ADK_TARGET_WITH_VGA diff --git a/target/arm/systems/beaglebone-black b/target/arm/systems/beaglebone-black index 222836b14..28102411f 100644 --- a/target/arm/systems/beaglebone-black +++ b/target/arm/systems/beaglebone-black @@ -1,7 +1,7 @@ config ADK_TARGET_SYSTEM_BEAGLEBONE_BLACK bool "BeagleBone Black" depends on ADK_TARGET_OS_LINUX || ADK_TARGET_OS_WALDUX - depends on ADK_TARGET_LITTLE_ENDIAN + select ADK_TARGET_LITTLE_ENDIAN select ADK_TARGET_CPU_ARM_CORTEX_A8 select ADK_TARGET_CPU_WITH_NEON select ADK_TARGET_WITH_VGA diff --git a/target/arm/systems/kinetis-k70 b/target/arm/systems/kinetis-k70 index 8eee07c39..419bf6b23 100644 --- a/target/arm/systems/kinetis-k70 +++ b/target/arm/systems/kinetis-k70 @@ -1,7 +1,7 @@ config ADK_TARGET_SYSTEM_KINETIS_K70 bool "Kinetis K70" depends on ADK_TARGET_OS_LINUX || ADK_TARGET_OS_WALDUX - depends on ADK_TARGET_LITTLE_ENDIAN + select ADK_TARGET_LITTLE_ENDIAN select ADK_TARGET_CPU_ARM_CORTEX_M3 select ADK_TARGET_ARCH_ARM_WITH_THUMB select ADK_TARGET_WITH_SERIAL diff --git a/target/arm/systems/linksys-nslu2 b/target/arm/systems/linksys-nslu2 index 32e3b6ddb..65d9b1420 100644 --- a/target/arm/systems/linksys-nslu2 +++ b/target/arm/systems/linksys-nslu2 @@ -1,7 +1,7 @@ config ADK_TARGET_SYSTEM_LINKSYS_NSLU2 bool "Linksys NSLU2" depends on ADK_TARGET_OS_LINUX || ADK_TARGET_OS_WALDUX - depends on ADK_TARGET_BIG_ENDIAN + select ADK_TARGET_BIG_ENDIAN select ADK_TARGET_CPU_ARM_XSCALE select ADK_TARGET_WITH_USB select ADK_TARGET_WITH_PCI diff --git a/target/arm/systems/orange-pi0 b/target/arm/systems/orange-pi0 index f4b8cdc30..1ec19ecb4 100644 --- a/target/arm/systems/orange-pi0 +++ b/target/arm/systems/orange-pi0 @@ -1,7 +1,7 @@ config ADK_TARGET_SYSTEM_ORANGE_PI0 bool "Orange PI Zero" depends on ADK_TARGET_OS_LINUX || ADK_TARGET_OS_WALDUX - depends on ADK_TARGET_LITTLE_ENDIAN + select ADK_TARGET_LITTLE_ENDIAN select ADK_TARGET_CPU_ARM_CORTEX_A7 select ADK_TARGET_CPU_WITH_NEON select ADK_TARGET_WITH_SERIAL diff --git a/target/arm/systems/phytec-wega b/target/arm/systems/phytec-wega index 924f1f481..29b41a034 100644 --- a/target/arm/systems/phytec-wega +++ b/target/arm/systems/phytec-wega @@ -1,7 +1,7 @@ config ADK_TARGET_SYSTEM_PHYTEC_WEGA bool "Phytec Wega" depends on ADK_TARGET_OS_LINUX || ADK_TARGET_OS_WALDUX - depends on ADK_TARGET_LITTLE_ENDIAN + select ADK_TARGET_LITTLE_ENDIAN select ADK_TARGET_CPU_ARM_CORTEX_A8 select ADK_TARGET_WITH_VGA select ADK_TARGET_WITH_SERIAL diff --git a/target/arm/systems/qemu-arm-lm3s6965evb b/target/arm/systems/qemu-arm-lm3s6965evb index c204006b5..a567034cd 100644 --- a/target/arm/systems/qemu-arm-lm3s6965evb +++ b/target/arm/systems/qemu-arm-lm3s6965evb @@ -1,7 +1,7 @@ config ADK_TARGET_SYSTEM_QEMU_ARM_LM3S6965EVB bool "Qemu Emulator (lm3s6965evb)" depends on ADK_TARGET_OS_FROSTED - depends on ADK_TARGET_LITTLE_ENDIAN + select ADK_TARGET_LITTLE_ENDIAN select ADK_TARGET_CPU_ARM_CORTEX_M3 select ADK_TARGET_ARCH_ARM_WITH_THUMB select ADK_TARGET_QEMU diff --git a/target/arm/systems/qemu-arm-realview-eb-mpcore b/target/arm/systems/qemu-arm-realview-eb-mpcore index 0633ef43d..abf23cab6 100644 --- a/target/arm/systems/qemu-arm-realview-eb-mpcore +++ b/target/arm/systems/qemu-arm-realview-eb-mpcore @@ -1,7 +1,7 @@ config ADK_TARGET_SYSTEM_QEMU_ARM_REALVIEW_EB_MPCORE bool "Qemu Emulator (Realview/EB-Mpcore)" depends on ADK_TARGET_OS_LINUX || ADK_TARGET_OS_WALDUX - depends on ADK_TARGET_LITTLE_ENDIAN + select ADK_TARGET_LITTLE_ENDIAN select ADK_TARGET_CPU_ARM_ARM11MPCORE select ADK_TARGET_QEMU select ADK_TARGET_WITH_SMP diff --git a/target/arm/systems/qemu-arm-spitz b/target/arm/systems/qemu-arm-spitz index 8d19c66d3..3eb9564de 100644 --- a/target/arm/systems/qemu-arm-spitz +++ b/target/arm/systems/qemu-arm-spitz @@ -1,7 +1,7 @@ config ADK_TARGET_SYSTEM_QEMU_ARM_SPITZ bool "Qemu Emulator (Spitz PDA)" depends on ADK_TARGET_OS_LINUX || ADK_TARGET_OS_WALDUX - depends on ADK_TARGET_LITTLE_ENDIAN + select ADK_TARGET_LITTLE_ENDIAN select ADK_TARGET_CPU_ARM_XSCALE select ADK_TARGET_QEMU select ADK_TARGET_KERNEL_ZIMAGE diff --git a/target/arm/systems/qemu-arm-terrier b/target/arm/systems/qemu-arm-terrier index 1c8ef995d..135b9e7e8 100644 --- a/target/arm/systems/qemu-arm-terrier +++ b/target/arm/systems/qemu-arm-terrier @@ -1,7 +1,7 @@ config ADK_TARGET_SYSTEM_QEMU_ARM_TERRIER bool "Qemu Emulator (Terrier PDA)" depends on ADK_TARGET_OS_LINUX || ADK_TARGET_OS_WALDUX - depends on ADK_TARGET_LITTLE_ENDIAN + select ADK_TARGET_LITTLE_ENDIAN select ADK_TARGET_CPU_ARM_XSCALE select ADK_TARGET_QEMU select ADK_TARGET_KERNEL_ZIMAGE diff --git a/target/arm/systems/qemu-arm-versatilepb b/target/arm/systems/qemu-arm-versatilepb index bc4afb25b..95347eabc 100644 --- a/target/arm/systems/qemu-arm-versatilepb +++ b/target/arm/systems/qemu-arm-versatilepb @@ -1,7 +1,7 @@ config ADK_TARGET_SYSTEM_QEMU_ARM_VERSATILEPB bool "Qemu Emulator (Versatile/PB)" depends on ADK_TARGET_OS_LINUX || ADK_TARGET_OS_WALDUX - depends on ADK_TARGET_LITTLE_ENDIAN + select ADK_TARGET_LITTLE_ENDIAN select ADK_TARGET_CPU_ARM_ARM926EJ_S select ADK_TARGET_QEMU select ADK_TARGET_KERNEL_ZIMAGE diff --git a/target/arm/systems/qemu-arm-versatilepb-nommu b/target/arm/systems/qemu-arm-versatilepb-nommu deleted file mode 100644 index c3a9a4035..000000000 --- a/target/arm/systems/qemu-arm-versatilepb-nommu +++ /dev/null @@ -1,11 +0,0 @@ -config ADK_TARGET_SYSTEM_QEMU_ARM_VERSATILEPB_NOMMU - bool "Qemu Emulator (Versatile/PB) no MMU" - depends on ADK_TARGET_OS_LINUX || ADK_TARGET_OS_WALDUX - depends on ADK_TARGET_LITTLE_ENDIAN - select ADK_TARGET_CPU_ARM_ARM926EJ_S_NOMMU - select ADK_TARGET_QEMU - select ADK_TARGET_KERNEL_ZIMAGE - select ADK_TARGET_KERNEL_WITH_COMPRESSION - help - Qemu Emulator for ARM architecture (Versatile/PB) without MMU. - diff --git a/target/arm/systems/qemu-arm-vexpress-a9 b/target/arm/systems/qemu-arm-vexpress-a9 index c384419d2..2f6f173d3 100644 --- a/target/arm/systems/qemu-arm-vexpress-a9 +++ b/target/arm/systems/qemu-arm-vexpress-a9 @@ -1,7 +1,7 @@ config ADK_TARGET_SYSTEM_QEMU_ARM_VEXPRESS_A9 bool "Qemu Emulator (Vexpress A9)" depends on ADK_TARGET_OS_LINUX || ADK_TARGET_OS_WALDUX - depends on ADK_TARGET_LITTLE_ENDIAN + select ADK_TARGET_LITTLE_ENDIAN select ADK_TARGET_CPU_ARM_CORTEX_A9 select ADK_TARGET_QEMU select ADK_TARGET_KERNEL_ZIMAGE diff --git a/target/arm/systems/raspberry-pi b/target/arm/systems/raspberry-pi index 41a6bee17..35eb2f1ef 100644 --- a/target/arm/systems/raspberry-pi +++ b/target/arm/systems/raspberry-pi @@ -1,7 +1,7 @@ config ADK_TARGET_SYSTEM_RASPBERRY_PI bool "Raspberry PI" depends on ADK_TARGET_OS_LINUX || ADK_TARGET_OS_WALDUX - depends on ADK_TARGET_LITTLE_ENDIAN + select ADK_TARGET_LITTLE_ENDIAN select ADK_TARGET_CPU_ARM_ARM1176JZF_S select ADK_TARGET_BOARD_BCM28XX select ADK_TARGET_WITH_VGA diff --git a/target/arm/systems/raspberry-pi0 b/target/arm/systems/raspberry-pi0 index dbca5db33..255825294 100644 --- a/target/arm/systems/raspberry-pi0 +++ b/target/arm/systems/raspberry-pi0 @@ -1,7 +1,7 @@ config ADK_TARGET_SYSTEM_RASPBERRY_PI0 bool "Raspberry PI Zero W" depends on ADK_TARGET_OS_LINUX || ADK_TARGET_OS_WALDUX - depends on ADK_TARGET_LITTLE_ENDIAN + select ADK_TARGET_LITTLE_ENDIAN select ADK_TARGET_CPU_ARM_ARM1176JZF_S select ADK_TARGET_BOARD_BCM28XX select ADK_TARGET_WITH_VGA diff --git a/target/arm/systems/raspberry-pi2 b/target/arm/systems/raspberry-pi2 index 375eafb96..38a8738a5 100644 --- a/target/arm/systems/raspberry-pi2 +++ b/target/arm/systems/raspberry-pi2 @@ -1,7 +1,7 @@ config ADK_TARGET_SYSTEM_RASPBERRY_PI2 bool "Raspberry PI 2" depends on ADK_TARGET_OS_LINUX || ADK_TARGET_OS_WALDUX - depends on ADK_TARGET_LITTLE_ENDIAN + select ADK_TARGET_LITTLE_ENDIAN select ADK_TARGET_CPU_ARM_CORTEX_A7 select ADK_TARGET_BOARD_BCM28XX select ADK_TARGET_WITH_VGA diff --git a/target/arm/systems/raspberry-pi3 b/target/arm/systems/raspberry-pi3 index 26b7e402b..f11459c66 100644 --- a/target/arm/systems/raspberry-pi3 +++ b/target/arm/systems/raspberry-pi3 @@ -1,7 +1,8 @@ config ADK_TARGET_SYSTEM_RASPBERRY_PI3 bool "Raspberry PI 3" depends on ADK_TARGET_OS_LINUX || ADK_TARGET_OS_WALDUX - depends on ADK_TARGET_LITTLE_ENDIAN + select ADK_TARGET_LITTLE_ENDIAN + select ADK_TARGET_WITH_MMU select ADK_TARGET_CPU_ARM_CORTEX_A53 select ADK_TARGET_BOARD_BCM28XX select ADK_TARGET_WITH_VGA diff --git a/target/arm/systems/raspberry-pi3p b/target/arm/systems/raspberry-pi3p index ca2562355..98539ce2e 100644 --- a/target/arm/systems/raspberry-pi3p +++ b/target/arm/systems/raspberry-pi3p @@ -1,7 +1,7 @@ config ADK_TARGET_SYSTEM_RASPBERRY_PI3P bool "Raspberry PI 3 Model B+" depends on ADK_TARGET_OS_LINUX || ADK_TARGET_OS_WALDUX - depends on ADK_TARGET_LITTLE_ENDIAN + select ADK_TARGET_LITTLE_ENDIAN select ADK_TARGET_CPU_ARM_CORTEX_A53 select ADK_TARGET_BOARD_BCM28XX select ADK_TARGET_WITH_VGA diff --git a/target/arm/systems/sharp-zaurus b/target/arm/systems/sharp-zaurus index e452c8e7b..b791767ef 100644 --- a/target/arm/systems/sharp-zaurus +++ b/target/arm/systems/sharp-zaurus @@ -1,7 +1,7 @@ config ADK_TARGET_SYSTEM_SHARP_ZAURUS bool "Sharp Zaurus CL3200 (Terrier)" depends on ADK_TARGET_OS_LINUX || ADK_TARGET_OS_WALDUX - depends on ADK_TARGET_LITTLE_ENDIAN + select ADK_TARGET_LITTLE_ENDIAN select ADK_TARGET_CPU_ARM_XSCALE select ADK_TARGET_CPU_WITH_IWMMXT select ADK_TARGET_WITH_VGA diff --git a/target/arm/systems/solidrun-clearfog b/target/arm/systems/solidrun-clearfog index d57dbc774..2dc20a1d7 100644 --- a/target/arm/systems/solidrun-clearfog +++ b/target/arm/systems/solidrun-clearfog @@ -1,8 +1,7 @@ config ADK_TARGET_SYSTEM_SOLIDRUN_CLEARFOG bool "Solidrun Clearfog Embedded Systems" depends on ADK_TARGET_OS_LINUX || ADK_TARGET_OS_WALDUX - depends on ADK_EXPERIMENTAL - depends on ADK_TARGET_LITTLE_ENDIAN + select ADK_TARGET_LITTLE_ENDIAN select ADK_TARGET_CPU_ARM_CORTEX_A9 select ADK_TARGET_WITH_SMP select ADK_TARGET_WITH_VGA diff --git a/target/arm/systems/solidrun-imx6 b/target/arm/systems/solidrun-imx6 index e15721a40..edc3b4b98 100644 --- a/target/arm/systems/solidrun-imx6 +++ b/target/arm/systems/solidrun-imx6 @@ -1,7 +1,7 @@ config ADK_TARGET_SYSTEM_SOLIDRUN_IMX6 bool "Solidrun IMX6 Embedded Systems" depends on ADK_TARGET_OS_LINUX || ADK_TARGET_OS_WALDUX - depends on ADK_TARGET_LITTLE_ENDIAN + select ADK_TARGET_LITTLE_ENDIAN select ADK_TARGET_CPU_ARM_CORTEX_A9 select ADK_TARGET_WITH_VGA select ADK_TARGET_WITH_SERIAL diff --git a/target/arm/systems/st-stm32f407-discovery b/target/arm/systems/st-stm32f407-discovery index d2b269258..44ff39904 100644 --- a/target/arm/systems/st-stm32f407-discovery +++ b/target/arm/systems/st-stm32f407-discovery @@ -1,7 +1,7 @@ config ADK_TARGET_SYSTEM_ST_STM32F407_DISCOVERY bool "STMicroelectronics STM32F407 Discovery" depends on ADK_TARGET_OS_FROSTED - depends on ADK_TARGET_LITTLE_ENDIAN + select ADK_TARGET_LITTLE_ENDIAN select ADK_TARGET_CPU_ARM_CORTEX_M4 select ADK_TARGET_ARCH_ARM_WITH_THUMB select ADK_TARGET_WITH_SERIAL diff --git a/target/arm/systems/st-stm32f429 b/target/arm/systems/st-stm32f429 index 97c445e6b..d13b1150b 100644 --- a/target/arm/systems/st-stm32f429 +++ b/target/arm/systems/st-stm32f429 @@ -1,7 +1,7 @@ config ADK_TARGET_SYSTEM_ST_STM32F429 bool "STMicroelectronics STM32F429" - depends on ADK_TARGET_LITTLE_ENDIAN depends on ADK_TARGET_OS_LINUX || ADK_TARGET_OS_WALDUX + select ADK_TARGET_LITTLE_ENDIAN select ADK_TARGET_CPU_ARM_CORTEX_M4 select ADK_TARGET_ARCH_ARM_WITH_THUMB select ADK_TARGET_WITH_SERIAL diff --git a/target/arm/systems/st-stm32f429-discovery b/target/arm/systems/st-stm32f429-discovery index 6a8a7a225..57b5c0220 100644 --- a/target/arm/systems/st-stm32f429-discovery +++ b/target/arm/systems/st-stm32f429-discovery @@ -1,7 +1,7 @@ config ADK_TARGET_SYSTEM_ST_STM32F429_DISCOVERY bool "STMicroelectronics STM32F429 Discovery" depends on ADK_TARGET_OS_FROSTED - depends on ADK_TARGET_LITTLE_ENDIAN + select ADK_TARGET_LITTLE_ENDIAN select ADK_TARGET_CPU_ARM_CORTEX_M4 select ADK_TARGET_ARCH_ARM_WITH_THUMB select ADK_TARGET_WITH_SERIAL diff --git a/target/arm/systems/st-stm32f769 b/target/arm/systems/st-stm32f769 index 224995444..11dad65c3 100644 --- a/target/arm/systems/st-stm32f769 +++ b/target/arm/systems/st-stm32f769 @@ -1,7 +1,7 @@ config ADK_TARGET_SYSTEM_ST_STM32F769 bool "STMicroelectronics STM32F769" - depends on ADK_TARGET_LITTLE_ENDIAN depends on ADK_TARGET_OS_LINUX || ADK_TARGET_OS_WALDUX + select ADK_TARGET_LITTLE_ENDIAN select ADK_TARGET_CPU_ARM_CORTEX_M7 select ADK_TARGET_HARD_FLOAT_DP select ADK_TARGET_ARCH_ARM_WITH_THUMB diff --git a/target/config/Config.in.addons b/target/config/Config.in.addons index 0c1e003c6..241ff1b20 100644 --- a/target/config/Config.in.addons +++ b/target/config/Config.in.addons @@ -2,7 +2,43 @@ # material, please see the LICENCE file in the top-level directory. choice -prompt "Optional hardware configuration" +prompt "GPU memory size" +depends on ADK_TARGET_BOARD_BCM28XX +default ADK_TARGET_GPU_MEM_256 if ADK_PACKAGE_KODI + +config ADK_TARGET_GPU_MEM_16 + bool "16" + help + use minimal 16 MB. + +config ADK_TARGET_GPU_MEM_64 + bool "64" + help + use 64 MB. + +config ADK_TARGET_GPU_MEM_128 + bool "128" + help + use 128 MB. + +config ADK_TARGET_GPU_MEM_256 + bool "256" + help + use 256 MB. + +endchoice + +config ADK_TARGET_GPU_MEM + int + default 16 if ADK_TARGET_GPU_MEM_16 + default 64 if ADK_TARGET_GPU_MEM_64 + default 128 if ADK_TARGET_GPU_MEM_128 + default 256 if ADK_TARGET_GPU_MEM_256 + depends on ADK_TARGET_BOARD_BCM28XX + + +choice +prompt "Serial or Bluetooth" depends on ( ADK_TARGET_OS_LINUX || ADK_TARGET_OS_WALDUX ) \ && ( ADK_TARGET_SYSTEM_RASPBERRY_PI3 \ || ADK_TARGET_SYSTEM_RASPBERRY_PI3P \ @@ -25,7 +61,7 @@ config ADK_TARGET_HARDWARE_RPI3_NONE endchoice choice -prompt "Audio Board" +prompt "Audio Board Addon" depends on (ADK_TARGET_OS_LINUX || ADK_TARGET_OS_WALDUX) && ADK_TARGET_BOARD_BCM28XX config ADK_TARGET_HARDWARE_NONE diff --git a/target/config/Config.in.binfmt b/target/config/Config.in.binfmt index 750f1990a..b48ff1cbf 100644 --- a/target/config/Config.in.binfmt +++ b/target/config/Config.in.binfmt @@ -2,8 +2,8 @@ # material, please see the LICENCE file in the top-level directory. choice -prompt "Binary Format" -depends on ADK_TARGET_OS_LINUX || ADK_TARGET_OS_WALDUX +prompt "Binary format" +depends on (ADK_TARGET_OS_LINUX || ADK_TARGET_OS_WALDUX) && !ADK_APPLIANCE_TOOLCHAIN && !ADK_TARGET_CHOOSE_ARCH config ADK_TARGET_BINFMT_ELF bool "ELF" @@ -13,7 +13,8 @@ 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 \ + depends on !ADK_TARGET_WITH_MMU + depends on ADK_TARGET_ARCH_ARM || ADK_TARGET_ARCH_M68K || ADK_TARGET_ARCH_SH || ADK_TARGET_ARCH_XTENSA \ || ADK_TARGET_ARCH_H8300 || ADK_TARGET_ARCH_LM32 || ADK_TARGET_ARCH_BFIN config ADK_TARGET_BINFMT_FDPIC diff --git a/target/config/Config.in.cpu b/target/config/Config.in.cpu index 93845b36e..635baad43 100644 --- a/target/config/Config.in.cpu +++ b/target/config/Config.in.cpu @@ -81,7 +81,6 @@ config ADK_TARGET_CPU_ARM_ARM1176JZF_S select ADK_TARGET_SUPPORTS_THREADS select ADK_TARGET_SUPPORTS_NPTL select ADK_TARGET_SUPPORTS_LT - select ADK_TARGET_WITH_MMU select ADK_TARGET_CPU_WITH_FPU_VFP depends on ADK_TARGET_ARCH_ARM @@ -90,15 +89,6 @@ config ADK_TARGET_CPU_ARM_ARM926EJ_S select ADK_TARGET_SUPPORTS_THREADS select ADK_TARGET_SUPPORTS_NPTL select ADK_TARGET_SUPPORTS_LT - select ADK_TARGET_WITH_MMU - depends on ADK_TARGET_ARCH_ARM - -config ADK_TARGET_CPU_ARM_ARM926EJ_S_NOMMU - bool "arm926ej-s (noMMU)" - select ADK_TARGET_SUPPORTS_THREADS - select ADK_TARGET_SUPPORTS_LT - select ADK_TARGET_WITHOUT_MMU - select ADK_TARGET_UCLINUX depends on ADK_TARGET_ARCH_ARM config ADK_TARGET_CPU_ARM_ARM11MPCORE @@ -106,7 +96,6 @@ config ADK_TARGET_CPU_ARM_ARM11MPCORE select ADK_TARGET_SUPPORTS_THREADS select ADK_TARGET_SUPPORTS_NPTL select ADK_TARGET_SUPPORTS_LT - select ADK_TARGET_WITH_MMU select ADK_TARGET_CPU_WITH_FPU_VFPV3 depends on ADK_TARGET_ARCH_ARM @@ -115,7 +104,6 @@ config ADK_TARGET_CPU_ARM_CORTEX_A5 select ADK_TARGET_SUPPORTS_THREADS select ADK_TARGET_SUPPORTS_NPTL select ADK_TARGET_SUPPORTS_LT - select ADK_TARGET_WITH_MMU select ADK_TARGET_CPU_WITH_FPU_VFPV3 select ADK_TARGET_CPU_WITH_NEON select ADK_TARGET_CPU_WITH_THUMB2 @@ -126,7 +114,6 @@ config ADK_TARGET_CPU_ARM_CORTEX_A7 select ADK_TARGET_SUPPORTS_THREADS select ADK_TARGET_SUPPORTS_NPTL select ADK_TARGET_SUPPORTS_LT - select ADK_TARGET_WITH_MMU select ADK_TARGET_CPU_WITH_FPU_VFPV4 select ADK_TARGET_CPU_WITH_NEON select ADK_TARGET_CPU_WITH_THUMB2 @@ -137,7 +124,6 @@ config ADK_TARGET_CPU_ARM_CORTEX_A8 select ADK_TARGET_SUPPORTS_THREADS select ADK_TARGET_SUPPORTS_NPTL select ADK_TARGET_SUPPORTS_LT - select ADK_TARGET_WITH_MMU select ADK_TARGET_CPU_WITH_FPU_VFPV3 select ADK_TARGET_CPU_WITH_NEON select ADK_TARGET_CPU_WITH_THUMB2 @@ -148,7 +134,6 @@ config ADK_TARGET_CPU_ARM_CORTEX_A9 select ADK_TARGET_SUPPORTS_THREADS select ADK_TARGET_SUPPORTS_NPTL select ADK_TARGET_SUPPORTS_LT - select ADK_TARGET_WITH_MMU select ADK_TARGET_CPU_WITH_FPU_VFPV3 select ADK_TARGET_CPU_WITH_NEON select ADK_TARGET_CPU_WITH_THUMB2 @@ -159,7 +144,6 @@ config ADK_TARGET_CPU_ARM_CORTEX_A15 select ADK_TARGET_SUPPORTS_THREADS select ADK_TARGET_SUPPORTS_NPTL select ADK_TARGET_SUPPORTS_LT - select ADK_TARGET_WITH_MMU select ADK_TARGET_CPU_WITH_FPU_VFPV4 select ADK_TARGET_CPU_WITH_NEON depends on ADK_TARGET_ARCH_ARM @@ -169,7 +153,6 @@ config ADK_TARGET_CPU_ARM_CORTEX_A17 select ADK_TARGET_SUPPORTS_THREADS select ADK_TARGET_SUPPORTS_NPTL select ADK_TARGET_SUPPORTS_LT - select ADK_TARGET_WITH_MMU select ADK_TARGET_CPU_WITH_FPU_VFPV4 select ADK_TARGET_CPU_WITH_NEON depends on ADK_TARGET_ARCH_ARM @@ -179,7 +162,6 @@ config ADK_TARGET_CPU_ARM_CORTEX_A53 select ADK_TARGET_SUPPORTS_THREADS select ADK_TARGET_SUPPORTS_NPTL select ADK_TARGET_SUPPORTS_LT - select ADK_TARGET_WITH_MMU select ADK_TARGET_CPU_WITH_FPU_VFPV4 select ADK_TARGET_CPU_WITH_NEON depends on ADK_TARGET_ARCH_ARM @@ -189,7 +171,6 @@ config ADK_TARGET_CPU_ARM_CORTEX_A57 select ADK_TARGET_SUPPORTS_THREADS select ADK_TARGET_SUPPORTS_NPTL select ADK_TARGET_SUPPORTS_LT - select ADK_TARGET_WITH_MMU select ADK_TARGET_CPU_WITH_FPU_VFPV4 select ADK_TARGET_CPU_WITH_NEON depends on ADK_TARGET_ARCH_ARM @@ -198,8 +179,6 @@ config ADK_TARGET_CPU_ARM_CORTEX_M7 bool "cortex-m7" select ADK_TARGET_SUPPORTS_THREADS select ADK_TARGET_SUPPORTS_LT - select ADK_TARGET_UCLINUX - select ADK_TARGET_WITHOUT_MMU select ADK_TARGET_CPU_WITH_THUMB2 select ADK_TARGET_CPU_WITH_FPU_FPV5 depends on ADK_TARGET_ARCH_ARM @@ -208,8 +187,6 @@ config ADK_TARGET_CPU_ARM_CORTEX_M4 bool "cortex-m4" select ADK_TARGET_SUPPORTS_THREADS select ADK_TARGET_SUPPORTS_LT - select ADK_TARGET_UCLINUX - select ADK_TARGET_WITHOUT_MMU select ADK_TARGET_CPU_WITH_THUMB2 select ADK_TARGET_CPU_WITH_FPU_FPV4 depends on ADK_TARGET_ARCH_ARM @@ -218,8 +195,6 @@ config ADK_TARGET_CPU_ARM_CORTEX_M3 bool "cortex-m3" select ADK_TARGET_SUPPORTS_THREADS select ADK_TARGET_SUPPORTS_LT - select ADK_TARGET_UCLINUX - select ADK_TARGET_WITHOUT_MMU select ADK_TARGET_CPU_WITH_THUMB2 depends on ADK_TARGET_ARCH_ARM @@ -227,8 +202,6 @@ config ADK_TARGET_CPU_ARM_CORTEX_M0 bool "cortex-m0" select ADK_TARGET_SUPPORTS_THREADS select ADK_TARGET_SUPPORTS_LT - select ADK_TARGET_UCLINUX - select ADK_TARGET_WITHOUT_MMU select ADK_TARGET_CPU_WITH_THUMB2 depends on ADK_TARGET_ARCH_ARM @@ -237,7 +210,6 @@ config ADK_TARGET_CPU_ARM_XSCALE select ADK_TARGET_SUPPORTS_THREADS select ADK_TARGET_SUPPORTS_NPTL select ADK_TARGET_SUPPORTS_LT - select ADK_TARGET_WITH_MMU depends on ADK_TARGET_ARCH_ARM # avr32 @@ -253,210 +225,180 @@ config ADK_TARGET_CPU_BFIN_BF512 bool "bf512" select ADK_TARGET_SUPPORTS_THREADS select ADK_TARGET_SUPPORTS_LT - select ADK_TARGET_WITHOUT_MMU depends on ADK_TARGET_ARCH_BFIN config ADK_TARGET_CPU_BFIN_BF514 bool "bf514" select ADK_TARGET_SUPPORTS_THREADS select ADK_TARGET_SUPPORTS_LT - select ADK_TARGET_WITHOUT_MMU depends on ADK_TARGET_ARCH_BFIN config ADK_TARGET_CPU_BFIN_BF516 bool "bf516" select ADK_TARGET_SUPPORTS_THREADS select ADK_TARGET_SUPPORTS_LT - select ADK_TARGET_WITHOUT_MMU depends on ADK_TARGET_ARCH_BFIN config ADK_TARGET_CPU_BFIN_BF518 bool "bf518" select ADK_TARGET_SUPPORTS_THREADS select ADK_TARGET_SUPPORTS_LT - select ADK_TARGET_WITHOUT_MMU depends on ADK_TARGET_ARCH_BFIN config ADK_TARGET_CPU_BFIN_BF522 bool "bf522" select ADK_TARGET_SUPPORTS_THREADS select ADK_TARGET_SUPPORTS_LT - select ADK_TARGET_WITHOUT_MMU depends on ADK_TARGET_ARCH_BFIN config ADK_TARGET_CPU_BFIN_BF523 bool "bf523" select ADK_TARGET_SUPPORTS_THREADS select ADK_TARGET_SUPPORTS_LT - select ADK_TARGET_WITHOUT_MMU depends on ADK_TARGET_ARCH_BFIN config ADK_TARGET_CPU_BFIN_BF524 bool "bf524" select ADK_TARGET_SUPPORTS_THREADS select ADK_TARGET_SUPPORTS_LT - select ADK_TARGET_WITHOUT_MMU depends on ADK_TARGET_ARCH_BFIN config ADK_TARGET_CPU_BFIN_BF525 bool "bf525" select ADK_TARGET_SUPPORTS_THREADS select ADK_TARGET_SUPPORTS_LT - select ADK_TARGET_WITHOUT_MMU depends on ADK_TARGET_ARCH_BFIN config ADK_TARGET_CPU_BFIN_BF526 bool "bf526" select ADK_TARGET_SUPPORTS_THREADS select ADK_TARGET_SUPPORTS_LT - select ADK_TARGET_WITHOUT_MMU depends on ADK_TARGET_ARCH_BFIN config ADK_TARGET_CPU_BFIN_BF527 bool "bf527" select ADK_TARGET_SUPPORTS_THREADS select ADK_TARGET_SUPPORTS_LT - select ADK_TARGET_WITHOUT_MMU depends on ADK_TARGET_ARCH_BFIN config ADK_TARGET_CPU_BFIN_BF531 bool "bf531" select ADK_TARGET_SUPPORTS_THREADS select ADK_TARGET_SUPPORTS_LT - select ADK_TARGET_WITHOUT_MMU depends on ADK_TARGET_ARCH_BFIN config ADK_TARGET_CPU_BFIN_BF532 bool "bf532" select ADK_TARGET_SUPPORTS_THREADS select ADK_TARGET_SUPPORTS_LT - select ADK_TARGET_WITHOUT_MMU depends on ADK_TARGET_ARCH_BFIN config ADK_TARGET_CPU_BFIN_BF533 bool "bf533" select ADK_TARGET_SUPPORTS_THREADS select ADK_TARGET_SUPPORTS_LT - select ADK_TARGET_WITHOUT_MMU depends on ADK_TARGET_ARCH_BFIN config ADK_TARGET_CPU_BFIN_BF534 bool "bf534" select ADK_TARGET_SUPPORTS_THREADS select ADK_TARGET_SUPPORTS_LT - select ADK_TARGET_WITHOUT_MMU depends on ADK_TARGET_ARCH_BFIN config ADK_TARGET_CPU_BFIN_BF536 bool "bf536" select ADK_TARGET_SUPPORTS_THREADS select ADK_TARGET_SUPPORTS_LT - select ADK_TARGET_WITHOUT_MMU depends on ADK_TARGET_ARCH_BFIN config ADK_TARGET_CPU_BFIN_BF537 bool "bf537" select ADK_TARGET_SUPPORTS_THREADS select ADK_TARGET_SUPPORTS_LT - select ADK_TARGET_WITHOUT_MMU depends on ADK_TARGET_ARCH_BFIN config ADK_TARGET_CPU_BFIN_BF538 bool "bf538" select ADK_TARGET_SUPPORTS_THREADS select ADK_TARGET_SUPPORTS_LT - select ADK_TARGET_WITHOUT_MMU depends on ADK_TARGET_ARCH_BFIN config ADK_TARGET_CPU_BFIN_BF539 bool "bf539" select ADK_TARGET_SUPPORTS_THREADS select ADK_TARGET_SUPPORTS_LT - select ADK_TARGET_WITHOUT_MMU depends on ADK_TARGET_ARCH_BFIN config ADK_TARGET_CPU_BFIN_BF542 bool "bf542" select ADK_TARGET_SUPPORTS_THREADS select ADK_TARGET_SUPPORTS_LT - select ADK_TARGET_WITHOUT_MMU depends on ADK_TARGET_ARCH_BFIN config ADK_TARGET_CPU_BFIN_BF544 bool "bf544" select ADK_TARGET_SUPPORTS_THREADS select ADK_TARGET_SUPPORTS_LT - select ADK_TARGET_WITHOUT_MMU depends on ADK_TARGET_ARCH_BFIN config ADK_TARGET_CPU_BFIN_BF547 bool "bf547" select ADK_TARGET_SUPPORTS_THREADS select ADK_TARGET_SUPPORTS_LT - select ADK_TARGET_WITHOUT_MMU depends on ADK_TARGET_ARCH_BFIN config ADK_TARGET_CPU_BFIN_BF548 bool "bf548" select ADK_TARGET_SUPPORTS_THREADS select ADK_TARGET_SUPPORTS_LT - select ADK_TARGET_WITHOUT_MMU depends on ADK_TARGET_ARCH_BFIN config ADK_TARGET_CPU_BFIN_BF549 bool "bf549" select ADK_TARGET_SUPPORTS_THREADS select ADK_TARGET_SUPPORTS_LT - select ADK_TARGET_WITHOUT_MMU depends on ADK_TARGET_ARCH_BFIN config ADK_TARGET_CPU_BFIN_BF542M bool "bf542m" select ADK_TARGET_SUPPORTS_THREADS select ADK_TARGET_SUPPORTS_LT - select ADK_TARGET_WITHOUT_MMU depends on ADK_TARGET_ARCH_BFIN config ADK_TARGET_CPU_BFIN_BF544M bool "bf544m" select ADK_TARGET_SUPPORTS_THREADS select ADK_TARGET_SUPPORTS_LT - select ADK_TARGET_WITHOUT_MMU depends on ADK_TARGET_ARCH_BFIN config ADK_TARGET_CPU_BFIN_BF547M bool "bf547m" select ADK_TARGET_SUPPORTS_THREADS select ADK_TARGET_SUPPORTS_LT - select ADK_TARGET_WITHOUT_MMU depends on ADK_TARGET_ARCH_BFIN config ADK_TARGET_CPU_BFIN_BF548M bool "bf548m" select ADK_TARGET_SUPPORTS_THREADS select ADK_TARGET_SUPPORTS_LT - select ADK_TARGET_WITHOUT_MMU depends on ADK_TARGET_ARCH_BFIN config ADK_TARGET_CPU_BFIN_BF549M bool "bf549m" select ADK_TARGET_SUPPORTS_THREADS select ADK_TARGET_SUPPORTS_LT - select ADK_TARGET_WITHOUT_MMU depends on ADK_TARGET_ARCH_BFIN config ADK_TARGET_CPU_BFIN_BF561 bool "bf561" select ADK_TARGET_SUPPORTS_THREADS select ADK_TARGET_SUPPORTS_LT - select ADK_TARGET_WITHOUT_MMU depends on ADK_TARGET_ARCH_BFIN config ADK_TARGET_CPU_BFIN_BF592 bool "bf592" select ADK_TARGET_SUPPORTS_THREADS select ADK_TARGET_SUPPORTS_LT - select ADK_TARGET_WITHOUT_MMU depends on ADK_TARGET_ARCH_BFIN # c6x @@ -465,7 +407,6 @@ config ADK_TARGET_CPU_C6X select ADK_TARGET_SUPPORTS_THREADS select ADK_TARGET_SUPPORTS_LT select ADK_TARGET_UCLINUX - select ADK_TARGET_WITHOUT_MMU depends on ADK_TARGET_ARCH_C6X # cr16 @@ -525,24 +466,20 @@ config ADK_TARGET_CPU_EPIPHANY # fr-v config ADK_TARGET_CPU_FRV bool "fr-v" - select ADK_TARGET_WITHOUT_MMU depends on ADK_TARGET_ARCH_FRV # ft32 config ADK_TARGET_CPU_FT32 bool "ft32" - select ADK_TARGET_WITHOUT_MMU depends on ADK_TARGET_ARCH_FT32 # h8/300 config ADK_TARGET_CPU_H8300H bool "h8300h" - select ADK_TARGET_WITHOUT_MMU depends on ADK_TARGET_ARCH_H8300 config ADK_TARGET_CPU_H8S bool "h8s" - select ADK_TARGET_WITHOUT_MMU depends on ADK_TARGET_ARCH_H8300 # hppa @@ -568,7 +505,6 @@ config ADK_TARGET_CPU_IA64 config ADK_TARGET_CPU_LM32 bool "lm32" select ADK_TARGET_UCLINUX - select ADK_TARGET_WITHOUT_MMU depends on ADK_TARGET_ARCH_LM32 # coldfire @@ -578,7 +514,6 @@ config ADK_TARGET_CPU_CF_51 select ADK_TARGET_SUPPORTS_LT select ADK_TARGET_CPU_CF select ADK_TARGET_UCLINUX - select ADK_TARGET_WITHOUT_MMU depends on ADK_TARGET_ARCH_M68K config ADK_TARGET_CPU_CF_5206 @@ -587,7 +522,6 @@ config ADK_TARGET_CPU_CF_5206 select ADK_TARGET_SUPPORTS_LT select ADK_TARGET_CPU_CF select ADK_TARGET_UCLINUX - select ADK_TARGET_WITHOUT_MMU depends on ADK_TARGET_ARCH_M68K config ADK_TARGET_CPU_CF_5206E @@ -596,7 +530,6 @@ config ADK_TARGET_CPU_CF_5206E select ADK_TARGET_SUPPORTS_LT select ADK_TARGET_CPU_CF select ADK_TARGET_UCLINUX - select ADK_TARGET_WITHOUT_MMU depends on ADK_TARGET_ARCH_M68K config ADK_TARGET_CPU_CF_5208 @@ -605,7 +538,6 @@ config ADK_TARGET_CPU_CF_5208 select ADK_TARGET_SUPPORTS_LT select ADK_TARGET_CPU_CF select ADK_TARGET_UCLINUX - select ADK_TARGET_WITHOUT_MMU depends on ADK_TARGET_ARCH_M68K config ADK_TARGET_CPU_CF_5211A @@ -614,7 +546,6 @@ config ADK_TARGET_CPU_CF_5211A select ADK_TARGET_SUPPORTS_LT select ADK_TARGET_CPU_CF select ADK_TARGET_UCLINUX - select ADK_TARGET_WITHOUT_MMU depends on ADK_TARGET_ARCH_M68K config ADK_TARGET_CPU_CF_5213 @@ -623,7 +554,6 @@ config ADK_TARGET_CPU_CF_5213 select ADK_TARGET_SUPPORTS_LT select ADK_TARGET_CPU_CF select ADK_TARGET_UCLINUX - select ADK_TARGET_WITHOUT_MMU depends on ADK_TARGET_ARCH_M68K config ADK_TARGET_CPU_CF_5216 @@ -632,7 +562,6 @@ config ADK_TARGET_CPU_CF_5216 select ADK_TARGET_SUPPORTS_LT select ADK_TARGET_CPU_CF select ADK_TARGET_UCLINUX - select ADK_TARGET_WITHOUT_MMU depends on ADK_TARGET_ARCH_M68K config ADK_TARGET_CPU_CF_52235 @@ -641,7 +570,6 @@ config ADK_TARGET_CPU_CF_52235 select ADK_TARGET_SUPPORTS_LT select ADK_TARGET_CPU_CF select ADK_TARGET_UCLINUX - select ADK_TARGET_WITHOUT_MMU depends on ADK_TARGET_ARCH_M68K config ADK_TARGET_CPU_CF_5225 @@ -650,7 +578,6 @@ config ADK_TARGET_CPU_CF_5225 select ADK_TARGET_SUPPORTS_LT select ADK_TARGET_CPU_CF select ADK_TARGET_UCLINUX - select ADK_TARGET_WITHOUT_MMU depends on ADK_TARGET_ARCH_M68K config ADK_TARGET_CPU_CF_52259 @@ -659,7 +586,6 @@ config ADK_TARGET_CPU_CF_52259 select ADK_TARGET_SUPPORTS_LT select ADK_TARGET_CPU_CF select ADK_TARGET_UCLINUX - select ADK_TARGET_WITHOUT_MMU depends on ADK_TARGET_ARCH_M68K config ADK_TARGET_CPU_CF_5235 @@ -668,7 +594,6 @@ config ADK_TARGET_CPU_CF_5235 select ADK_TARGET_SUPPORTS_LT select ADK_TARGET_CPU_CF select ADK_TARGET_UCLINUX - select ADK_TARGET_WITHOUT_MMU depends on ADK_TARGET_ARCH_M68K config ADK_TARGET_CPU_CF_5249 @@ -677,7 +602,6 @@ config ADK_TARGET_CPU_CF_5249 select ADK_TARGET_SUPPORTS_LT select ADK_TARGET_CPU_CF select ADK_TARGET_UCLINUX - select ADK_TARGET_WITHOUT_MMU depends on ADK_TARGET_ARCH_M68K config ADK_TARGET_CPU_CF_5250 @@ -686,7 +610,6 @@ config ADK_TARGET_CPU_CF_5250 select ADK_TARGET_SUPPORTS_LT select ADK_TARGET_CPU_CF select ADK_TARGET_UCLINUX - select ADK_TARGET_WITHOUT_MMU depends on ADK_TARGET_ARCH_M68K config ADK_TARGET_CPU_CF_5271 @@ -695,7 +618,6 @@ config ADK_TARGET_CPU_CF_5271 select ADK_TARGET_SUPPORTS_LT select ADK_TARGET_CPU_CF select ADK_TARGET_UCLINUX - select ADK_TARGET_WITHOUT_MMU depends on ADK_TARGET_ARCH_M68K config ADK_TARGET_CPU_CF_5272 @@ -704,7 +626,6 @@ config ADK_TARGET_CPU_CF_5272 select ADK_TARGET_SUPPORTS_LT select ADK_TARGET_CPU_CF select ADK_TARGET_UCLINUX - select ADK_TARGET_WITHOUT_MMU depends on ADK_TARGET_ARCH_M68K config ADK_TARGET_CPU_CF_5275 @@ -713,7 +634,6 @@ config ADK_TARGET_CPU_CF_5275 select ADK_TARGET_SUPPORTS_LT select ADK_TARGET_CPU_CF select ADK_TARGET_UCLINUX - select ADK_TARGET_WITHOUT_MMU depends on ADK_TARGET_ARCH_M68K config ADK_TARGET_CPU_CF_5282 @@ -722,7 +642,6 @@ config ADK_TARGET_CPU_CF_5282 select ADK_TARGET_SUPPORTS_LT select ADK_TARGET_CPU_CF select ADK_TARGET_UCLINUX - select ADK_TARGET_WITHOUT_MMU depends on ADK_TARGET_ARCH_M68K config ADK_TARGET_CPU_CF_53017 @@ -731,7 +650,6 @@ config ADK_TARGET_CPU_CF_53017 select ADK_TARGET_SUPPORTS_LT select ADK_TARGET_CPU_CF select ADK_TARGET_UCLINUX - select ADK_TARGET_WITHOUT_MMU depends on ADK_TARGET_ARCH_M68K config ADK_TARGET_CPU_CF_5307 @@ -740,7 +658,6 @@ config ADK_TARGET_CPU_CF_5307 select ADK_TARGET_SUPPORTS_LT select ADK_TARGET_CPU_CF select ADK_TARGET_UCLINUX - select ADK_TARGET_WITHOUT_MMU depends on ADK_TARGET_ARCH_M68K config ADK_TARGET_CPU_CF_5328 @@ -749,7 +666,6 @@ config ADK_TARGET_CPU_CF_5328 select ADK_TARGET_SUPPORTS_LT select ADK_TARGET_CPU_CF select ADK_TARGET_UCLINUX - select ADK_TARGET_WITHOUT_MMU depends on ADK_TARGET_ARCH_M68K config ADK_TARGET_CPU_CF_5329 @@ -758,7 +674,6 @@ config ADK_TARGET_CPU_CF_5329 select ADK_TARGET_SUPPORTS_LT select ADK_TARGET_CPU_CF select ADK_TARGET_UCLINUX - select ADK_TARGET_WITHOUT_MMU depends on ADK_TARGET_ARCH_M68K config ADK_TARGET_CPU_CF_5373 @@ -767,7 +682,6 @@ config ADK_TARGET_CPU_CF_5373 select ADK_TARGET_SUPPORTS_LT select ADK_TARGET_CPU_CF select ADK_TARGET_UCLINUX - select ADK_TARGET_WITHOUT_MMU depends on ADK_TARGET_ARCH_M68K config ADK_TARGET_CPU_CF_5407 @@ -776,7 +690,6 @@ config ADK_TARGET_CPU_CF_5407 select ADK_TARGET_SUPPORTS_LT select ADK_TARGET_CPU_CF select ADK_TARGET_UCLINUX - select ADK_TARGET_WITHOUT_MMU depends on ADK_TARGET_ARCH_M68K config ADK_TARGET_CPU_CF_5475 @@ -1216,7 +1129,6 @@ config ADK_TARGET_CPU_RISCV64_RV64IMAC # rx config ADK_TARGET_CPU_RX bool "rx" - select ADK_TARGET_WITHOUT_MMU depends on ADK_TARGET_ARCH_RX # s390 @@ -1238,7 +1150,6 @@ config ADK_TARGET_CPU_SH_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 @@ -1246,14 +1157,12 @@ config ADK_TARGET_CPU_SH_SH2 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_SH2A bool "sh2a" select ADK_TARGET_SUPPORTS_THREADS select ADK_TARGET_SUPPORTS_LT - select ADK_TARGET_WITHOUT_MMU depends on ADK_TARGET_ARCH_SH config ADK_TARGET_CPU_SH_SH3 @@ -1327,7 +1236,6 @@ config ADK_TARGET_CPU_TILE_TILEGX # v850 config ADK_TARGET_CPU_V850 bool "v850" - select ADK_TARGET_WITHOUT_MMU depends on ADK_TARGET_ARCH_V850 # x86 @@ -1800,7 +1708,6 @@ config ADK_TARGET_CPU_XTENSA_DC233C select ADK_TARGET_SUPPORTS_THREADS select ADK_TARGET_SUPPORTS_NPTL select ADK_TARGET_SUPPORTS_LT - select ADK_TARGET_WITH_MMU select ADK_TARGET_KERNEL_UIMAGE select ADK_LINUX_KERNEL_XTENSA_VARIANT_DC233C if ADK_TARGET_OS_LINUX select ADK_LINUX_KERNEL_INITIALIZE_XTENSA_MMU_INSIDE_VMLINUX if ADK_TARGET_OS_LINUX @@ -1814,7 +1721,6 @@ config ADK_TARGET_CPU_XTENSA_DC232B select ADK_TARGET_SUPPORTS_THREADS select ADK_TARGET_SUPPORTS_NPTL select ADK_TARGET_SUPPORTS_LT - select ADK_TARGET_WITH_MMU select ADK_TARGET_KERNEL_UIMAGE select ADK_LINUX_KERNEL_XTENSA_VARIANT_DC232B if ADK_TARGET_OS_LINUX select ADK_WALDUX_KERNEL_XTENSA_VARIANT_DC232B if ADK_TARGET_OS_WALDUX @@ -1825,8 +1731,6 @@ config ADK_TARGET_CPU_XTENSA_DE212 depends on ADK_TARGET_LITTLE_ENDIAN select ADK_TARGET_SUPPORTS_THREADS select ADK_TARGET_SUPPORTS_LT - select ADK_TARGET_WITHOUT_MMU - select ADK_TARGET_UCLINUX select ADK_TARGET_KERNEL_IMAGE select ADK_LINUX_KERNEL_XTENSA_VARIANT_CUSTOM if ADK_TARGET_OS_LINUX select ADK_WALDUX_KERNEL_XTENSA_VARIANT_CUSTOM if ADK_TARGET_OS_WALDUX @@ -1838,7 +1742,6 @@ config ADK_TARGET_CPU_XTENSA_KC705_BE select ADK_TARGET_SUPPORTS_THREADS select ADK_TARGET_SUPPORTS_NPTL select ADK_TARGET_SUPPORTS_LT - select ADK_TARGET_WITH_MMU select ADK_TARGET_KERNEL_UIMAGE select ADK_LINUX_KERNEL_XTENSA_VARIANT_DC233C if ADK_TARGET_OS_LINUX select ADK_WALDUX_KERNEL_XTENSA_VARIANT_DC233C if ADK_TARGET_OS_WALDUX @@ -1850,7 +1753,6 @@ config ADK_TARGET_CPU_XTENSA_FSF select ADK_TARGET_SUPPORTS_THREADS select ADK_TARGET_SUPPORTS_NPTL select ADK_TARGET_SUPPORTS_LT - select ADK_TARGET_WITH_MMU select ADK_TARGET_KERNEL_ZIMAGE select ADK_LINUX_KERNEL_XTENSA_VARIANT_FSF if ADK_TARGET_OS_LINUX select ADK_WALDUX_KERNEL_XTENSA_VARIANT_FSF if ADK_TARGET_OS_WALDUX diff --git a/target/config/Config.in.endian b/target/config/Config.in.endian index 6803d5d25..4382b8f45 100644 --- a/target/config/Config.in.endian +++ b/target/config/Config.in.endian @@ -3,27 +3,42 @@ choice ADK_TARGET_ENDIAN_MODE prompt "Endianess" -depends on ADK_TARGET_ARCH_ARC \ - || ADK_TARGET_ARCH_AARCH64 \ - || ADK_TARGET_ARCH_ARM \ - || ADK_TARGET_ARCH_CSKY \ - || ADK_TARGET_ARCH_C6X \ - || ADK_TARGET_ARCH_MICROBLAZE \ - || ADK_TARGET_ARCH_MIPS \ - || ADK_TARGET_ARCH_MIPS64 \ - || ADK_TARGET_ARCH_NDS32 \ - || ADK_TARGET_ARCH_PPC64 \ - || ADK_TARGET_ARCH_SH \ - || ADK_TARGET_ARCH_XTENSA +depends on ADK_TARGET_SYSTEM_GENERIC_ARC \ + || ADK_TARGET_SYSTEM_GENERIC_AARCH64 \ + || ADK_TARGET_SYSTEM_GENERIC_ARM \ + || ADK_TARGET_SYSTEM_GENERIC_CSKY \ + || ADK_TARGET_SYSTEM_GENERIC_C6X \ + || ADK_TARGET_SYSTEM_GENERIC_MICROBLAZE \ + || ADK_TARGET_SYSTEM_GENERIC_MIPS \ + || ADK_TARGET_SYSTEM_GENERIC_MIPS64 \ + || ADK_TARGET_SYSTEM_GENERIC_NDS32 \ + || ADK_TARGET_SYSTEM_GENERIC_PPC64 \ + || ADK_TARGET_SYSTEM_GENERIC_SH \ + || ADK_TARGET_SYSTEM_GENERIC_XTENSA \ + || ADK_TARGET_SYSTEM_SYNOPSYS_NSIM \ + || ADK_TARGET_SYSTEM_QEMU_MICROBLAZE_ML605 \ + || ADK_TARGET_SYSTEM_QEMU_MICROBLAZE_S3ADSP1800 \ + || ADK_TARGET_SYSTEM_QEMU_MIPS \ + || ADK_TARGET_SYSTEM_QEMU_MIPS64 \ + || ADK_TARGET_SYSTEM_QEMU_SH \ + || ADK_TARGET_SYSTEM_QEMU_XTENSA -config ADK_TARGET_LITTLE_ENDIAN +config ADK_TARGET_WITH_LITTLE_ENDIAN bool "little" + select ADK_TARGET_LITTLE_ENDIAN -config ADK_TARGET_BIG_ENDIAN +config ADK_TARGET_WITH_BIG_ENDIAN bool "big" + select ADK_TARGET_BIG_ENDIAN endchoice +config ADK_TARGET_LITTLE_ENDIAN + bool + +config ADK_TARGET_BIG_ENDIAN + bool + config ADK_TARGET_ENDIAN_SUFFIX string default "le" if ADK_TARGET_LITTLE_ENDIAN && (ADK_TARGET_ARCH_NDS32 || ADK_TARGET_ARCH_PPC64) diff --git a/target/config/Config.in.hardware b/target/config/Config.in.hardware index f136bbebc..a7d21e55c 100644 --- a/target/config/Config.in.hardware +++ b/target/config/Config.in.hardware @@ -110,13 +110,5 @@ config ADK_TARGET_WITH_USB_BOOT config ADK_TARGET_WITH_SMP bool -config ADK_TARGET_WITH_MMU - bool - select ADK_LINUX_KERNEL_MMU if ADK_TARGET_OS_LINUX - select ADK_WALDUX_KERNEL_MMU if ADK_TARGET_OS_WALDUX - -config ADK_TARGET_WITHOUT_MMU - bool - config ADK_TARGET_WITH_IOMMU bool diff --git a/target/config/Config.in.archopts b/target/config/Config.in.instructions index 9393a5ac8..9393a5ac8 100644 --- a/target/config/Config.in.archopts +++ b/target/config/Config.in.instructions diff --git a/target/config/Config.in.libc b/target/config/Config.in.libc index 46a3559b2..e16164119 100644 --- a/target/config/Config.in.libc +++ b/target/config/Config.in.libc @@ -2,11 +2,12 @@ # material, please see the LICENCE file in the top-level directory. choice -prompt "C library" +prompt "Target C library" +depends on !ADK_APPLIANCE_TOOLCHAIN && !ADK_TARGET_CHOOSE_ARCH default ADK_TARGET_LIB_UCLIBC_NG if ADK_TARGET_OS_LINUX || ADK_TARGET_OS_WALDUX config ADK_TARGET_LIB_UCLIBC_NG - bool "uClibc-ng embedded C library" + bool "uClibc-ng" select ADK_PACKAGE_LIBGCC depends on (\ ADK_TARGET_ARCH_AARCH64 || \ @@ -43,7 +44,7 @@ config ADK_TARGET_LIB_UCLIBC_NG https://uclibc-ng.org config ADK_TARGET_LIB_MUSL - bool "musl C library" + bool "musl" select ADK_PACKAGE_LIBGCC depends on (\ ADK_TARGET_ARCH_AARCH64 || \ @@ -62,7 +63,7 @@ config ADK_TARGET_LIB_MUSL http://musl-libc.org config ADK_TARGET_LIB_GLIBC - bool "GNU C library" + bool "glibc" select ADK_PACKAGE_LIBGCC depends on (\ ADK_TARGET_ARCH_AARCH64 || \ @@ -91,7 +92,7 @@ config ADK_TARGET_LIB_GLIBC http://www.gnu.org/libc config ADK_TARGET_LIB_NEWLIB - bool "newlib C library" + bool "newlib" select ADK_TARGET_WITHOUT_THREADS depends on (\ ADK_TARGET_ARCH_AARCH64 || \ @@ -139,7 +140,8 @@ config ADK_TARGET_LIB_NEWLIB endchoice choice -prompt "C library version" +prompt "Target C library version" +depends on !ADK_APPLIANCE_TOOLCHAIN && !ADK_TARGET_CHOOSE_ARCH config ADK_TARGET_LIB_UCLIBC_NG_1_0_30 bool "1.0.30" @@ -147,7 +149,7 @@ config ADK_TARGET_LIB_UCLIBC_NG_1_0_30 config ADK_TARGET_LIB_UCLIBC_NG_GIT bool "git" - depends on ADK_TARGET_LIB_UCLIBC_NG + depends on ADK_TARGET_LIB_UCLIBC_NG && ADK_EXPERIMENTAL config ADK_TARGET_LIB_GLIBC_2_27 bool "2.27" @@ -159,7 +161,7 @@ config ADK_TARGET_LIB_GLIBC_CSKY config ADK_TARGET_LIB_GLIBC_GIT bool "git" - depends on ADK_TARGET_LIB_GLIBC && !ADK_TARGET_ARCH_CSKY + depends on ADK_TARGET_LIB_GLIBC && !ADK_TARGET_ARCH_CSKY && ADK_EXPERIMENTAL config ADK_TARGET_LIB_MUSL_1_1_19 bool "1.1.19" @@ -167,7 +169,7 @@ config ADK_TARGET_LIB_MUSL_1_1_19 config ADK_TARGET_LIB_MUSL_GIT bool "git" - depends on ADK_TARGET_LIB_MUSL + depends on ADK_TARGET_LIB_MUSL && ADK_EXPERIMENTAL config ADK_TARGET_LIB_NEWLIB_3_0_0 bool "3.0.0" @@ -186,36 +188,10 @@ config ADK_TARGET_LIB_NEWLIB_FROSTED config ADK_TARGET_LIB_NEWLIB_GIT bool "git" - depends on ADK_TARGET_LIB_NEWLIB && !ADK_TARGET_OS_FROSTED - -endchoice - -choice -prompt "Threading" -depends on ADK_TARGET_LIB_UCLIBC_NG - -config ADK_TARGET_WITH_NPTL - bool "enable NPTL" - depends on ADK_TARGET_SUPPORTS_NPTL && ADK_TARGET_SUPPORTS_THREADS - -config ADK_TARGET_WITH_LT - bool "enable Linuxthreads" - depends on ADK_TARGET_SUPPORTS_LT && ADK_TARGET_SUPPORTS_THREADS - -config ADK_TARGET_WITHOUT_THREADS - bool "disable threads" + depends on ADK_TARGET_LIB_NEWLIB && !ADK_TARGET_OS_FROSTED && ADK_EXPERIMENTAL endchoice -config ADK_TARGET_SUPPORTS_THREADS - bool - -config ADK_TARGET_SUPPORTS_NPTL - bool - -config ADK_TARGET_SUPPORTS_LT - bool - config ADK_TARGET_LIBC_UTILS bool default n if ADK_TARGET_ARCH_C6X @@ -254,7 +230,7 @@ config ADK_TARGET_SUFFIX default "gnu" if ADK_TARGET_LIB_GLIBC default "uclibceabihf" if ADK_TARGET_LIB_UCLIBC_NG && ADK_TARGET_ARCH_ARM && ADK_TARGET_HARD_FLOAT default "uclibceabi" if ADK_TARGET_LIB_UCLIBC_NG && ADK_TARGET_ARCH_ARM - default "uclinuxeabi" if ADK_TARGET_LIB_UCLIBC_NG && ADK_TARGET_ARCH_ARM && ADK_TARGET_WITHOUT_MMU + default "uclinuxeabi" if ADK_TARGET_LIB_UCLIBC_NG && ADK_TARGET_ARCH_ARM && ADK_TARGET_UCLINUX default "uclibcabi64" if ADK_TARGET_LIB_UCLIBC_NG && ADK_TARGET_ABI_N64 default "uclibcabin32" if ADK_TARGET_LIB_UCLIBC_NG && ADK_TARGET_ABI_N32 default "uclibcabi32" if ADK_TARGET_LIB_UCLIBC_NG && ADK_TARGET_ABI_O32 diff --git a/target/config/Config.in.libs b/target/config/Config.in.libs new file mode 100644 index 000000000..46734c842 --- /dev/null +++ b/target/config/Config.in.libs @@ -0,0 +1,28 @@ +# This file is part of the OpenADK project. OpenADK is copyrighted +# material, please see the LICENCE file in the top-level directory. + +choice +depends on ADK_TARGET_OS_LINUX || ADK_TARGET_OS_WALDUX +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 + 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 + at runtime. Full static builds are only supported for musl libc. + +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 + +config ADK_TARGET_USE_STATIC_AND_SHARED_LIBS + bool "Create static and shared libraries and link statically" + depends on !ADK_TARGET_BINFMT_FLAT && !ADK_TARGET_BINFMT_DSBT + +endchoice diff --git a/target/config/Config.in.mmu b/target/config/Config.in.mmu new file mode 100644 index 000000000..53a477486 --- /dev/null +++ b/target/config/Config.in.mmu @@ -0,0 +1,9 @@ +# This file is part of the OpenADK project. OpenADK is copyrighted +# material, please see the LICENCE file in the top-level directory. + +config ADK_TARGET_WITH_MMU + bool "MMU" + depends on !ADK_APPLIANCE_TOOLCHAIN && !ADK_TARGET_CHOOSE_ARCH + select ADK_LINUX_KERNEL_MMU if ADK_TARGET_OS_LINUX + select ADK_WALDUX_KERNEL_MMU if ADK_TARGET_OS_WALDUX + default y diff --git a/target/config/Config.in.runtime b/target/config/Config.in.runtime index b78b1a88b..5403df361 100644 --- a/target/config/Config.in.runtime +++ b/target/config/Config.in.runtime @@ -52,7 +52,7 @@ endchoice choice prompt "system for /dev management" depends on !ADK_APPLIANCE_TOOLCHAIN -default ADK_RUNTIME_DEV_STATIC if ADK_TARGET_WITHOUT_MMU || ADK_TARGET_ARCH_CRIS +default ADK_RUNTIME_DEV_STATIC if ADK_TARGET_ARCH_CRIS || ADK_TARGET_UCLINUX default ADK_RUNTIME_DEV_MDEV config ADK_RUNTIME_DEV_MDEV @@ -377,7 +377,6 @@ config ADK_RUNTIME_CONSOLE_SERIAL_DEVICE default "ttyARC0" if ADK_TARGET_SYSTEM_NSIM_ARCV1 \ || ADK_TARGET_SYSTEM_NSIM_ARCV2 default "ttyAMA0" if ADK_TARGET_SYSTEM_QEMU_ARM_VERSATILEPB \ - || ADK_TARGET_SYSTEM_QEMU_ARM_VERSATILEPB_NOMMU \ || ADK_TARGET_SYSTEM_QEMU_ARM_REALVIEW_EB_MPCORE \ || ADK_TARGET_SYSTEM_QEMU_ARM_VEXPRESS_A9 \ || ADK_TARGET_SYSTEM_QEMU_AARCH64 @@ -426,7 +425,7 @@ config ADK_RUNTIME_KBD_LAYOUT choice prompt "initial login shell for the root user" -default ADK_ROOTSH_HUSH if ADK_TARGET_WITHOUT_MMU +default ADK_ROOTSH_HUSH if ADK_TARGET_UCLINUX default ADK_ROOTSH_MKSH config ADK_ROOTSH_MKSH @@ -481,7 +480,7 @@ endchoice choice prompt "system /bin/sh (POSIX script shell)" -default ADK_BINSH_HUSH if ADK_TARGET_WITHOUT_MMU +default ADK_BINSH_HUSH if ADK_TARGET_UCLINUX default ADK_BINSH_MKSH config ADK_BINSH_MKSH diff --git a/target/config/Config.in.systemopts b/target/config/Config.in.systemopts deleted file mode 100644 index e0b77042d..000000000 --- a/target/config/Config.in.systemopts +++ /dev/null @@ -1,38 +0,0 @@ -# This file is part of the OpenADK project. OpenADK is copyrighted -# material, please see the LICENCE file in the top-level directory. - -choice -prompt "GPU memory size" -depends on ADK_TARGET_BOARD_BCM28XX -default ADK_TARGET_GPU_MEM_256 if ADK_PACKAGE_KODI - -config ADK_TARGET_GPU_MEM_16 - bool "16" - help - use minimal 16 MB. - -config ADK_TARGET_GPU_MEM_64 - bool "64" - help - use 64 MB. - -config ADK_TARGET_GPU_MEM_128 - bool "128" - help - use 128 MB. - -config ADK_TARGET_GPU_MEM_256 - bool "256" - help - use 256 MB. - -endchoice - -config ADK_TARGET_GPU_MEM - int - default 16 if ADK_TARGET_GPU_MEM_16 - default 64 if ADK_TARGET_GPU_MEM_64 - default 128 if ADK_TARGET_GPU_MEM_128 - default 256 if ADK_TARGET_GPU_MEM_256 - depends on ADK_TARGET_BOARD_BCM28XX - diff --git a/target/config/Config.in.threads b/target/config/Config.in.threads new file mode 100644 index 000000000..b0bb2f452 --- /dev/null +++ b/target/config/Config.in.threads @@ -0,0 +1,28 @@ +# This file is part of the OpenADK project. OpenADK is copyrighted +# material, please see the LICENCE file in the top-level directory. + +choice +prompt "Threading mode" +depends on ADK_TARGET_LIB_UCLIBC_NG + +config ADK_TARGET_WITH_NPTL + bool "NPTL" + depends on ADK_TARGET_SUPPORTS_NPTL && ADK_TARGET_SUPPORTS_THREADS && ADK_TARGET_WITH_MMU + +config ADK_TARGET_WITH_LT + bool "Linuxthreads" + depends on ADK_TARGET_SUPPORTS_LT && ADK_TARGET_SUPPORTS_THREADS + +config ADK_TARGET_WITHOUT_THREADS + bool "none" + +endchoice + +config ADK_TARGET_SUPPORTS_THREADS + bool + +config ADK_TARGET_SUPPORTS_NPTL + bool + +config ADK_TARGET_SUPPORTS_LT + bool diff --git a/target/config/Config.in.toolchain b/target/config/Config.in.toolchain index 0a6011917..499e67011 100644 --- a/target/config/Config.in.toolchain +++ b/target/config/Config.in.toolchain @@ -1,49 +1,6 @@ # This file is part of the OpenADK project. OpenADK is copyrighted # material, please see the LICENCE file in the top-level directory. -choice -depends on ADK_TARGET_OS_LINUX || ADK_TARGET_OS_WALDUX -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 - 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 - at runtime. Full static builds are only supported for musl libc. - -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 - -config ADK_TARGET_USE_STATIC_AND_SHARED_LIBS - bool "Create static and shared libraries and link statically" - depends on !ADK_TARGET_BINFMT_FLAT && !ADK_TARGET_BINFMT_DSBT - -endchoice - -config ADK_TARGET_LIBC_WITH_LOCALE - bool "Enable locale support" - depends on ADK_TARGET_LIB_UCLIBC_NG - select BUSYBOX_LOCALE_SUPPORT if ADK_PACKAGE_BUSYBOX - -config ADK_TARGET_LIBC_WITH_LIBINTL - bool "Enable libintl stub support" - depends on ADK_TARGET_LIB_UCLIBC_NG - help - Enables uClibc-ng libintl stub. - -config ADK_TARGET_LIBC_WITH_LIBICONV - bool "Enable basic libiconv" - depends on ADK_TARGET_LIB_UCLIBC_NG && !ADK_PACKAGE_LIBICONV - help - Enables uClibc-ng included basic libiconv support. - config ADK_TARGET_CFLAGS_OPT string default "-Os -pipe" if ADK_TARGET_CFLAGS_OPT_OS diff --git a/target/config/Config.in.uclibc-ng b/target/config/Config.in.uclibc-ng new file mode 100644 index 000000000..8c6974fbf --- /dev/null +++ b/target/config/Config.in.uclibc-ng @@ -0,0 +1,19 @@ +# This file is part of the OpenADK project. OpenADK is copyrighted +# material, please see the LICENCE file in the top-level directory. + +config ADK_TARGET_LIBC_WITH_LOCALE + bool "Enable locale support" + depends on ADK_TARGET_LIB_UCLIBC_NG + select BUSYBOX_LOCALE_SUPPORT if ADK_PACKAGE_BUSYBOX + +config ADK_TARGET_LIBC_WITH_LIBINTL + bool "Enable libintl stub support" + depends on ADK_TARGET_LIB_UCLIBC_NG + help + Enables uClibc-ng libintl stub. + +config ADK_TARGET_LIBC_WITH_LIBICONV + bool "Enable basic libiconv" + depends on ADK_TARGET_LIB_UCLIBC_NG && !ADK_PACKAGE_LIBICONV + help + Enables uClibc-ng included basic libiconv support. diff --git a/target/linux/Config.in b/target/linux/Config.in index 59d24d43f..e4da0762b 100644 --- a/target/linux/Config.in +++ b/target/linux/Config.in @@ -19,6 +19,7 @@ source target/linux/config/Config.in.audio source target/linux/config/Config.in.multimedia source target/linux/config/Config.in.crypto source target/linux/config/Config.in.misc +source target/linux/config/Config.in.arc source target/linux/config/Config.in.arm source target/linux/config/Config.in.mips source target/linux/config/Config.in.xtensa diff --git a/target/linux/Config.in.kernelversion b/target/linux/Config.in.kernelversion index ceffb3326..9e8b9c5da 100644 --- a/target/linux/Config.in.kernelversion +++ b/target/linux/Config.in.kernelversion @@ -72,7 +72,6 @@ config ADK_TARGET_LINUX_KERNEL_VERSION_4_4 depends on !ADK_TARGET_CPU_MIPS64_MIPS64R6 depends on !ADK_TARGET_SYSTEM_NUMATO_MIMASV2 depends on !ADK_TARGET_SYSTEM_ORANGE_PI0 - depends on !ADK_TARGET_SYSTEM_QEMU_ARM_VERSATILEPB_NOMMU config ADK_TARGET_LINUX_KERNEL_VERSION_4_1 bool "4.1.51" @@ -88,7 +87,6 @@ config ADK_TARGET_LINUX_KERNEL_VERSION_4_1 depends on !ADK_TARGET_ARCH_RISCV64 depends on !ADK_TARGET_SYSTEM_KINETIS_K70 depends on !ADK_TARGET_SYSTEM_QEMU_M68K_MCF5208 - depends on !ADK_TARGET_SYSTEM_QEMU_ARM_VERSATILEPB_NOMMU depends on !ADK_TARGET_CPU_MIPS_MIPS32R6 depends on !ADK_TARGET_CPU_MIPS64_MIPS64R6 depends on !ADK_TARGET_SYSTEM_ORANGE_PI0 @@ -111,7 +109,6 @@ config ADK_TARGET_LINUX_KERNEL_VERSION_3_16 depends on !ADK_TARGET_SYSTEM_KINETIS_K70 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 @@ -140,7 +137,6 @@ config ADK_TARGET_LINUX_KERNEL_VERSION_3_2 depends on !ADK_TARGET_SYSTEM_KINETIS_K70 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 @@ -163,7 +159,6 @@ config ADK_TARGET_LINUX_KERNEL_VERSION_2_6_32 depends on !ADK_TARGET_SYSTEM_KINETIS_K70 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/linux/config/Config.in.arc b/target/linux/config/Config.in.arc new file mode 100644 index 000000000..e1b7f8f94 --- /dev/null +++ b/target/linux/config/Config.in.arc @@ -0,0 +1,25 @@ +# This file is part of the OpenADK project. OpenADK is copyrighted +# material, please see the LICENCE file in the top-level directory. + +config ADK_LINUX_KERNEL_ISA_ARCOMPACT + bool + depends on ADK_TARGET_ARCH_ARC + default y if ADK_TARGET_CPU_ARC_ARC700 + +config ADK_LINUX_KERNEL_ARC_CPU_770 + bool + depends on ADK_TARGET_ARCH_ARC + default y if ADK_TARGET_CPU_ARC_ARC700 + +config ADK_LINUX_KERNEL_ISA_ARCV2 + bool + depends on ADK_TARGET_ARCH_ARC + default y if ADK_TARGET_CPU_ARC_ARC_HS + +config ADK_LINUX_KERNEL_ARC_BUILTIN_DTB_NAME + string + depends on ADK_TARGET_ARCH_ARC + default "nsim_hs" if ADK_TARGET_CPU_ARC_ARC_HS + default "nsim_700" if ADK_TARGET_CPU_ARC_ARC700 + + diff --git a/target/linux/config/Config.in.arm b/target/linux/config/Config.in.arm index 6456e1af8..3442d53f5 100644 --- a/target/linux/config/Config.in.arm +++ b/target/linux/config/Config.in.arm @@ -5,9 +5,3 @@ config ADK_LINUX_KERNEL_ARM_PATCH_PHYS_VIRT bool depends on ADK_TARGET_ARCH_ARM -config ADK_LINUX_KERNEL_ARCH_VERSATILE_PB - bool - select ADK_LINUX_KERNEL_ARM_PATCH_PHYS_VIRT - default y if !ADK_TARGET_WITH_DEVICETREE - depends on ADK_TARGET_ARCH_ARM - diff --git a/target/linux/config/Config.in.bus b/target/linux/config/Config.in.bus index cddabdeb1..c826ef83a 100644 --- a/target/linux/config/Config.in.bus +++ b/target/linux/config/Config.in.bus @@ -8,9 +8,9 @@ config ADK_LINUX_KERNEL_PCI || ADK_TARGET_QEMU \ || ADK_TARGET_VBOX \ || ADK_TARGET_GENERIC - default n if ADK_TARGET_SYSTEM_QEMU_ARM_VERSATILEPB_NOMMU default n if ADK_TARGET_CPU_XTENSA_DE212 default n if ADK_TARGET_SYSTEM_GENERIC_NDS32 + default n if ADK_TARGET_SYSTEM_QEMU_ARM_VERSATILEPB default y config ADK_LINUX_KERNEL_PCI_QUIRKS diff --git a/target/linux/config/Config.in.ethernet b/target/linux/config/Config.in.ethernet index 304ecf7e0..48b4d29ec 100644 --- a/target/linux/config/Config.in.ethernet +++ b/target/linux/config/Config.in.ethernet @@ -243,10 +243,8 @@ config ADK_LINUX_KERNEL_SMC91X select ADK_LINUX_KERNEL_NET_VENDOR_SMSC select ADK_LINUX_KERNEL_GPIOLIB depends on ADK_TARGET_SYSTEM_QEMU_ARM_VERSATILEPB || \ - ADK_TARGET_SYSTEM_QEMU_ARM_VERSATILEPB_NOMMU || \ ADK_TARGET_SYSTEM_QEMU_ARM_REALVIEW_EB_MPCORE default y if ADK_TARGET_SYSTEM_QEMU_ARM_VERSATILEPB - default y if ADK_TARGET_SYSTEM_QEMU_ARM_VERSATILEPB_NOMMU default y if ADK_TARGET_SYSTEM_QEMU_ARM_REALVIEW_EB_MPCORE default n help diff --git a/target/linux/config/Config.in.serial b/target/linux/config/Config.in.serial index 3944c50d6..6508e8f21 100644 --- a/target/linux/config/Config.in.serial +++ b/target/linux/config/Config.in.serial @@ -244,13 +244,11 @@ config ADK_LINUX_KERNEL_SERIAL_AMBA_PL011 depends on ADK_TARGET_BOARD_BCM28XX \ || ADK_TARGET_SYSTEM_QEMU_ARM_REALVIEW_EB_MPCORE \ || ADK_TARGET_SYSTEM_QEMU_ARM_VERSATILEPB \ - || ADK_TARGET_SYSTEM_QEMU_ARM_VERSATILEPB_NOMMU \ || ADK_TARGET_SYSTEM_QEMU_ARM_VEXPRESS_A9 default y if ADK_TARGET_SYSTEM_RASPBERRY_PI default y if ADK_TARGET_SYSTEM_RASPBERRY_PI2 default y if ADK_TARGET_SYSTEM_QEMU_ARM_REALVIEW_EB_MPCORE default y if ADK_TARGET_SYSTEM_QEMU_ARM_VERSATILEPB - default y if ADK_TARGET_SYSTEM_QEMU_ARM_VERSATILEPB_NOMMU default y if ADK_TARGET_SYSTEM_QEMU_ARM_VEXPRESS_A9 default n help diff --git a/target/m68k/systems/qemu-m68k-q800 b/target/m68k/systems/qemu-m68k-q800 index f6d2b3785..0970103fb 100644 --- a/target/m68k/systems/qemu-m68k-q800 +++ b/target/m68k/systems/qemu-m68k-q800 @@ -1,6 +1,7 @@ config ADK_TARGET_SYSTEM_QEMU_M68K_Q800 bool "Qemu M68K (Q800)" select ADK_TARGET_QEMU + select ADK_TARGET_WITH_MMU select ADK_TARGET_CPU_M68K_68040 select ADK_TARGET_KERNEL_ZIMAGE select ADK_TARGET_KERNEL_WITH_COMPRESSION diff --git a/target/mips/systems/dragino-ms14s b/target/mips/systems/dragino-ms14s index 5a91b3897..a80e27769 100644 --- a/target/mips/systems/dragino-ms14s +++ b/target/mips/systems/dragino-ms14s @@ -1,7 +1,6 @@ config ADK_TARGET_SYSTEM_DRAGINO_MS14S bool "Dragino2 ms14-s" - depends on ADK_EXPERIMENTAL - depends on ADK_TARGET_BIG_ENDIAN + select ADK_TARGET_BIG_ENDIAN select ADK_TARGET_CPU_MIPS_MIPS32 select ADK_TARGET_BOARD_ATH79 select ADK_TARGET_WITH_WATCHDOG diff --git a/target/mips/systems/imgtec-ci20 b/target/mips/systems/imgtec-ci20 index 28ad203b0..3a91f03f6 100644 --- a/target/mips/systems/imgtec-ci20 +++ b/target/mips/systems/imgtec-ci20 @@ -1,6 +1,6 @@ config ADK_TARGET_SYSTEM_IMGTEC_CI20 bool "Imagination Creator CI20" - depends on ADK_TARGET_LITTLE_ENDIAN + select ADK_TARGET_LITTLE_ENDIAN select ADK_TARGET_CPU_MIPS_MIPS32R2 select ADK_TARGET_WITH_SERIAL select ADK_TARGET_WITH_NAND diff --git a/target/mips/systems/mikrotik-rb4xx b/target/mips/systems/mikrotik-rb4xx index c03c2ccd7..e3e1c06fd 100644 --- a/target/mips/systems/mikrotik-rb4xx +++ b/target/mips/systems/mikrotik-rb4xx @@ -1,6 +1,6 @@ config ADK_TARGET_SYSTEM_MIKROTIK_RB4XX bool "Mikrotik Routerboard 4xx" - depends on ADK_TARGET_BIG_ENDIAN + select ADK_TARGET_BIG_ENDIAN select ADK_TARGET_CPU_MIPS_MIPS32 select ADK_TARGET_BOARD_ATH79 select ADK_TARGET_WITH_MINIPCI diff --git a/target/mips/systems/mikrotik-rb532 b/target/mips/systems/mikrotik-rb532 index 3d8c68454..8866c181c 100644 --- a/target/mips/systems/mikrotik-rb532 +++ b/target/mips/systems/mikrotik-rb532 @@ -1,6 +1,6 @@ config ADK_TARGET_SYSTEM_MIKROTIK_RB532 bool "Mikrotik Routerboard 532" - depends on ADK_TARGET_LITTLE_ENDIAN + select ADK_TARGET_LITTLE_ENDIAN select ADK_TARGET_CPU_MIPS_MIPS32 select ADK_TARGET_WITH_SERIAL select ADK_TARGET_WITH_MINIPCI diff --git a/target/mips/systems/sgi-indy b/target/mips/systems/sgi-indy index 56dc82e31..0eff206b6 100644 --- a/target/mips/systems/sgi-indy +++ b/target/mips/systems/sgi-indy @@ -1,6 +1,6 @@ config ADK_TARGET_SYSTEM_SGI_INDY bool "SGI Indy" - depends on ADK_TARGET_BIG_ENDIAN + select ADK_TARGET_BIG_ENDIAN select ADK_TARGET_WITH_SERIAL select ADK_TARGET_WITH_NET select ADK_TARGET_WITH_NETDEVICE diff --git a/target/mips64/systems/lemote-yeelong b/target/mips64/systems/lemote-yeelong index 2ff1d75a9..25bd1c00a 100644 --- a/target/mips64/systems/lemote-yeelong +++ b/target/mips64/systems/lemote-yeelong @@ -1,6 +1,6 @@ config ADK_TARGET_SYSTEM_LEMOTE_YEELONG bool "Lemote Yeelong laptop" - depends on ADK_TARGET_LITTLE_ENDIAN + select ADK_TARGET_LITTLE_ENDIAN select ADK_TARGET_CPU_MIPS64_LOONGSON2F select ADK_TARGET_WITH_USB_BOOT select ADK_TARGET_WITH_USB diff --git a/target/mips64/systems/sgi-o2 b/target/mips64/systems/sgi-o2 index 2a54c7b2e..b6a480251 100644 --- a/target/mips64/systems/sgi-o2 +++ b/target/mips64/systems/sgi-o2 @@ -1,6 +1,6 @@ config ADK_TARGET_SYSTEM_SGI_O2 bool "SGI O2" - depends on ADK_TARGET_BIG_ENDIAN + select ADK_TARGET_BIG_ENDIAN select ADK_TARGET_CPU_MIPS64_MIPS4 select ADK_TARGET_WITH_SERIAL select ADK_TARGET_WITH_NET diff --git a/target/nds32/systems/andes-ag101p b/target/nds32/systems/andes-ag101p index 31d35a479..18900e765 100644 --- a/target/nds32/systems/andes-ag101p +++ b/target/nds32/systems/andes-ag101p @@ -1,6 +1,6 @@ config ADK_TARGET_SYSTEM_ANDES_AG101P bool "Andes Technology AG101P" - depends on ADK_TARGET_LITTLE_ENDIAN + select ADK_TARGET_LITTLE_ENDIAN select ADK_TARGET_WITH_SERIAL select ADK_TARGET_WITH_NET select ADK_TARGET_WITH_NETDEVICE diff --git a/target/ppc/systems/mac-mini b/target/ppc/systems/mac-mini index be327872c..9b3e97c17 100644 --- a/target/ppc/systems/mac-mini +++ b/target/ppc/systems/mac-mini @@ -1,6 +1,5 @@ config ADK_TARGET_SYSTEM_APPLE_MACMINI bool "Apple Mac mini" - depends on ADK_EXPERIMENTAL select ADK_TARGET_CPU_PPC select ADK_TARGET_WITH_PCI select ADK_TARGET_WITH_NET diff --git a/target/sh/systems/numato-mimasv2 b/target/sh/systems/numato-mimasv2 index e14d4ce71..3b7b7f460 100644 --- a/target/sh/systems/numato-mimasv2 +++ b/target/sh/systems/numato-mimasv2 @@ -1,5 +1,6 @@ config ADK_TARGET_SYSTEM_NUMATO_MIMASV2 bool "Numato Mimas v2 FPGA" + select ADK_TARGET_BIG_ENDIAN select ADK_TARGET_CPU_SH_J2 select ADK_TARGET_WITH_SERIAL select ADK_TARGET_WITH_BLOCK diff --git a/target/sparc/systems/sun-voyager b/target/sparc/systems/sun-voyager index 4b034acde..a700918a4 100644 --- a/target/sparc/systems/sun-voyager +++ b/target/sparc/systems/sun-voyager @@ -1,6 +1,5 @@ config ADK_TARGET_SYSTEM_SUN_VOYAGER bool "Sun Voyager" - depends on ADK_EXPERIMENTAL select ADK_TARGET_CPU_SPARC_V8 select ADK_TARGET_WITH_VGA select ADK_TARGET_WITH_NET diff --git a/target/waldux/config/Config.in.bus b/target/waldux/config/Config.in.bus index 4ce83eaa0..be809754e 100644 --- a/target/waldux/config/Config.in.bus +++ b/target/waldux/config/Config.in.bus @@ -8,7 +8,6 @@ config ADK_WALDUX_KERNEL_PCI || ADK_TARGET_QEMU \ || ADK_TARGET_VBOX \ || ADK_TARGET_GENERIC - default n if ADK_TARGET_SYSTEM_QEMU_ARM_VERSATILEPB_NOMMU default n if ADK_TARGET_CPU_XTENSA_DE212 default n if ADK_TARGET_SYSTEM_GENERIC_NDS32 default y diff --git a/target/waldux/config/Config.in.ethernet b/target/waldux/config/Config.in.ethernet index 037eca7f9..040402100 100644 --- a/target/waldux/config/Config.in.ethernet +++ b/target/waldux/config/Config.in.ethernet @@ -223,10 +223,8 @@ config ADK_WALDUX_KERNEL_SMC91X select ADK_WALDUX_KERNEL_NET_VENDOR_SMSC select ADK_WALDUX_KERNEL_GPIOLIB depends on ADK_TARGET_SYSTEM_QEMU_ARM_VERSATILEPB || \ - ADK_TARGET_SYSTEM_QEMU_ARM_VERSATILEPB_NOMMU || \ ADK_TARGET_SYSTEM_QEMU_ARM_REALVIEW_EB_MPCORE default y if ADK_TARGET_SYSTEM_QEMU_ARM_VERSATILEPB - default y if ADK_TARGET_SYSTEM_QEMU_ARM_VERSATILEPB_NOMMU default y if ADK_TARGET_SYSTEM_QEMU_ARM_REALVIEW_EB_MPCORE default n help diff --git a/target/waldux/config/Config.in.serial b/target/waldux/config/Config.in.serial index 471f9f142..8ab2148fa 100644 --- a/target/waldux/config/Config.in.serial +++ b/target/waldux/config/Config.in.serial @@ -238,13 +238,11 @@ config ADK_WALDUX_KERNEL_SERIAL_AMBA_PL011 depends on ADK_TARGET_BOARD_BCM28XX \ || ADK_TARGET_SYSTEM_QEMU_ARM_REALVIEW_EB_MPCORE \ || ADK_TARGET_SYSTEM_QEMU_ARM_VERSATILEPB \ - || ADK_TARGET_SYSTEM_QEMU_ARM_VERSATILEPB_NOMMU \ || ADK_TARGET_SYSTEM_QEMU_ARM_VEXPRESS_A9 default y if ADK_TARGET_SYSTEM_RASPBERRY_PI default y if ADK_TARGET_SYSTEM_RASPBERRY_PI2 default y if ADK_TARGET_SYSTEM_QEMU_ARM_REALVIEW_EB_MPCORE default y if ADK_TARGET_SYSTEM_QEMU_ARM_VERSATILEPB - default y if ADK_TARGET_SYSTEM_QEMU_ARM_VERSATILEPB_NOMMU default y if ADK_TARGET_SYSTEM_QEMU_ARM_VEXPRESS_A9 default n help diff --git a/toolchain/uclibc-ng/Makefile b/toolchain/uclibc-ng/Makefile index 70f4c762f..9c4d3dac0 100644 --- a/toolchain/uclibc-ng/Makefile +++ b/toolchain/uclibc-ng/Makefile @@ -123,7 +123,7 @@ endif ifeq ($(ADK_TARGET_UCLINUX),y) $(SED) 's/.*\(ARCH_USE_MMU\).*/# \1 is not set/' ${WRKBUILD}/.config endif -ifeq ($(ADK_TARGET_WITHOUT_MMU),y) +ifeq ($(ADK_TARGET_WITH_MMU),) $(SED) 's/.*\(ARCH_USE_MMU\).*/# \1 is not set/' ${WRKBUILD}/.config endif ifeq ($(ADK_TARGET_WITH_NPTL),y) @@ -187,7 +187,7 @@ endif # arm ifeq ($(ADK_TARGET_ARCH_ARM),y) -ifeq ($(ADK_TARGET_WITHOUT_MMU),y) +ifeq ($(ADK_TARGET_WITH_MMU),) $(SED) 's/.*\(DOPIC\).*/# \1 is not set/' ${WRKBUILD}/.config endif ifeq ($(ADK_TARGET_ARCH_ARM_WITH_THUMB),y) @@ -282,7 +282,7 @@ endif # m68k ifeq ($(ADK_TARGET_ARCH_M68K),y) -ifeq ($(ADK_TARGET_WITHOUT_MMU),y) +ifeq ($(ADK_TARGET_WITH_MMU),) ifeq ($(ADK_TARGET_BINFMT_FLAT_ONE)$(ADK_TARGET_BINFMT_FLAT_SEP_DATA),y) $(SED) 's/.*\(DOPIC\).*/# \1 is not set/' ${WRKBUILD}/.config endif |