From 185f430dbf2c36415930941eced92723824950d6 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Mon, 30 Sep 2019 17:54:28 +0200 Subject: remove unfinished alternative os porting efforts --- Config.in | 33 +- adk/tools/pkgmaker.c | 1 - mk/build.mk | 12 - mk/image.mk | 16 +- mk/kernel-build.mk | 20 +- mk/vars.mk | 16 +- mk/waldux-ver.mk | 16 - mk/waldux.mk | 10 - package/busybox/config/networking/Config.in | 1 - rules.mk | 4 - scripts/create-menu | 4 +- target/Makefile | 42 +- target/arm/systems/banana-pro | 2 +- target/arm/systems/beaglebone-black | 2 +- target/arm/systems/kinetis-k70 | 2 +- target/arm/systems/linksys-nslu2 | 2 +- target/arm/systems/orange-pi0 | 2 +- target/arm/systems/phytec-wega | 2 +- target/arm/systems/qemu-arm-lm3s6965evb | 16 - target/arm/systems/qemu-arm-realview-eb-mpcore | 2 +- target/arm/systems/qemu-arm-spitz | 2 +- target/arm/systems/qemu-arm-terrier | 2 +- target/arm/systems/qemu-arm-versatilepb | 2 +- target/arm/systems/qemu-arm-vexpress-a9 | 2 +- target/arm/systems/qemu-arm-xilinx-zynq | 2 +- target/arm/systems/raspberry-pi | 2 +- target/arm/systems/raspberry-pi0 | 2 +- target/arm/systems/raspberry-pi2 | 2 +- target/arm/systems/raspberry-pi3 | 2 +- target/arm/systems/raspberry-pi3p | 2 +- target/arm/systems/sharp-zaurus | 2 +- target/arm/systems/solidrun-clearfog | 2 +- target/arm/systems/solidrun-imx6 | 2 +- target/arm/systems/st-stm32f407-discovery | 22 - target/arm/systems/st-stm32f429 | 2 +- target/arm/systems/st-stm32f429-discovery | 22 - target/arm/systems/st-stm32f769 | 2 +- target/config/Config.in.addons | 15 +- target/config/Config.in.binfmt | 2 +- target/config/Config.in.cpu | 12 - target/config/Config.in.float | 5 +- target/config/Config.in.instructions | 2 - target/config/Config.in.libc | 19 +- target/config/Config.in.libs | 2 +- target/config/Config.in.mmu | 1 - target/config/Config.in.os | 24 - target/config/Config.in.qemuopts | 40 -- target/config/Config.in.rootfs | 27 - target/config/Config.in.runtime | 6 - target/config/Config.in.toolchain | 2 +- target/config/Config.in.tools | 12 +- target/frosted/Config.in | 800 ------------------------- target/frosted/Config.in.apps | 154 ----- target/frosted/Makefile | 28 - target/frosted/arch.lst | 1 - target/rtems/Config.in | 0 target/rtems/Makefile | 33 - target/rtems/arch.lst | 14 - target/waldux/Config.in | 28 - target/waldux/Config.in.kernelcfg | 49 -- target/waldux/Config.in.kernelversion | 33 - target/waldux/arch.lst | 30 - target/waldux/config/Config.in.arm | 13 - target/waldux/config/Config.in.audio | 283 --------- target/waldux/config/Config.in.block | 717 ---------------------- target/waldux/config/Config.in.bluetooth | 186 ------ target/waldux/config/Config.in.bus | 25 - target/waldux/config/Config.in.compression | 137 ----- target/waldux/config/Config.in.cpu | 100 ---- target/waldux/config/Config.in.crypto | 553 ----------------- target/waldux/config/Config.in.debug | 135 ----- target/waldux/config/Config.in.dma | 81 --- target/waldux/config/Config.in.ethernet | 534 ----------------- target/waldux/config/Config.in.flash | 191 ------ target/waldux/config/Config.in.fs | 263 -------- target/waldux/config/Config.in.fsnet | 163 ----- target/waldux/config/Config.in.fsopts | 12 - target/waldux/config/Config.in.gpio | 48 -- target/waldux/config/Config.in.graphics | 352 ----------- target/waldux/config/Config.in.i2c | 91 --- target/waldux/config/Config.in.input | 199 ------ target/waldux/config/Config.in.ipsec | 61 -- target/waldux/config/Config.in.ipvs | 104 ---- target/waldux/config/Config.in.kernel | 272 --------- target/waldux/config/Config.in.kvm | 39 -- target/waldux/config/Config.in.leds | 83 --- target/waldux/config/Config.in.lib | 53 -- target/waldux/config/Config.in.mips | 33 - target/waldux/config/Config.in.misc | 147 ----- target/waldux/config/Config.in.multimedia | 114 ---- target/waldux/config/Config.in.netdevice | 9 - target/waldux/config/Config.in.netfilter | 131 ---- target/waldux/config/Config.in.netfilter.core | 195 ------ target/waldux/config/Config.in.netfilter.ebt | 218 ------- target/waldux/config/Config.in.netfilter.ip4 | 119 ---- target/waldux/config/Config.in.netfilter.ip6 | 132 ---- target/waldux/config/Config.in.network | 267 --------- target/waldux/config/Config.in.nfc | 37 -- target/waldux/config/Config.in.nls | 471 --------------- target/waldux/config/Config.in.part | 14 - target/waldux/config/Config.in.pcmcia | 48 -- target/waldux/config/Config.in.pm | 82 --- target/waldux/config/Config.in.regmap | 19 - target/waldux/config/Config.in.regulator | 37 -- target/waldux/config/Config.in.rtc | 67 --- target/waldux/config/Config.in.sched | 282 --------- target/waldux/config/Config.in.serial | 334 ----------- target/waldux/config/Config.in.spi | 83 --- target/waldux/config/Config.in.thermal | 26 - target/waldux/config/Config.in.usb | 378 ------------ target/waldux/config/Config.in.virtio | 44 -- target/waldux/config/Config.in.watchdog | 103 ---- target/waldux/config/Config.in.wireless | 344 ----------- target/waldux/config/Config.in.xtensa | 22 - target/waldux/kernel.config | 29 - target/waldux/kernel.control | 5 - target/zephyr/Config.in | 0 target/zephyr/Makefile | 33 - target/zephyr/arch.lst | 4 - toolchain/Makefile | 2 +- toolchain/elf2flt/Makefile.inc | 6 - toolchain/gcc/Makefile | 8 +- toolchain/newlib/Makefile | 9 - toolchain/newlib/Makefile.inc | 8 - toolchain/waldux-headers/Makefile | 43 -- 125 files changed, 67 insertions(+), 10149 deletions(-) delete mode 100644 mk/waldux-ver.mk delete mode 100644 mk/waldux.mk delete mode 100644 target/arm/systems/qemu-arm-lm3s6965evb delete mode 100644 target/arm/systems/st-stm32f407-discovery delete mode 100644 target/arm/systems/st-stm32f429-discovery delete mode 100644 target/frosted/Config.in delete mode 100644 target/frosted/Config.in.apps delete mode 100644 target/frosted/Makefile delete mode 100644 target/frosted/arch.lst delete mode 100644 target/rtems/Config.in delete mode 100644 target/rtems/Makefile delete mode 100644 target/rtems/arch.lst delete mode 100644 target/waldux/Config.in delete mode 100644 target/waldux/Config.in.kernelcfg delete mode 100644 target/waldux/Config.in.kernelversion delete mode 100644 target/waldux/arch.lst delete mode 100644 target/waldux/config/Config.in.arm delete mode 100644 target/waldux/config/Config.in.audio delete mode 100644 target/waldux/config/Config.in.block delete mode 100644 target/waldux/config/Config.in.bluetooth delete mode 100644 target/waldux/config/Config.in.bus delete mode 100644 target/waldux/config/Config.in.compression delete mode 100644 target/waldux/config/Config.in.cpu delete mode 100644 target/waldux/config/Config.in.crypto delete mode 100644 target/waldux/config/Config.in.debug delete mode 100644 target/waldux/config/Config.in.dma delete mode 100644 target/waldux/config/Config.in.ethernet delete mode 100644 target/waldux/config/Config.in.flash delete mode 100644 target/waldux/config/Config.in.fs delete mode 100644 target/waldux/config/Config.in.fsnet delete mode 100644 target/waldux/config/Config.in.fsopts delete mode 100644 target/waldux/config/Config.in.gpio delete mode 100644 target/waldux/config/Config.in.graphics delete mode 100644 target/waldux/config/Config.in.i2c delete mode 100644 target/waldux/config/Config.in.input delete mode 100644 target/waldux/config/Config.in.ipsec delete mode 100644 target/waldux/config/Config.in.ipvs delete mode 100644 target/waldux/config/Config.in.kernel delete mode 100644 target/waldux/config/Config.in.kvm delete mode 100644 target/waldux/config/Config.in.leds delete mode 100644 target/waldux/config/Config.in.lib delete mode 100644 target/waldux/config/Config.in.mips delete mode 100644 target/waldux/config/Config.in.misc delete mode 100644 target/waldux/config/Config.in.multimedia delete mode 100644 target/waldux/config/Config.in.netdevice delete mode 100644 target/waldux/config/Config.in.netfilter delete mode 100644 target/waldux/config/Config.in.netfilter.core delete mode 100644 target/waldux/config/Config.in.netfilter.ebt delete mode 100644 target/waldux/config/Config.in.netfilter.ip4 delete mode 100644 target/waldux/config/Config.in.netfilter.ip6 delete mode 100644 target/waldux/config/Config.in.network delete mode 100644 target/waldux/config/Config.in.nfc delete mode 100644 target/waldux/config/Config.in.nls delete mode 100644 target/waldux/config/Config.in.part delete mode 100644 target/waldux/config/Config.in.pcmcia delete mode 100644 target/waldux/config/Config.in.pm delete mode 100644 target/waldux/config/Config.in.regmap delete mode 100644 target/waldux/config/Config.in.regulator delete mode 100644 target/waldux/config/Config.in.rtc delete mode 100644 target/waldux/config/Config.in.sched delete mode 100644 target/waldux/config/Config.in.serial delete mode 100644 target/waldux/config/Config.in.spi delete mode 100644 target/waldux/config/Config.in.thermal delete mode 100644 target/waldux/config/Config.in.usb delete mode 100644 target/waldux/config/Config.in.virtio delete mode 100644 target/waldux/config/Config.in.watchdog delete mode 100644 target/waldux/config/Config.in.wireless delete mode 100644 target/waldux/config/Config.in.xtensa delete mode 100644 target/waldux/kernel.config delete mode 100644 target/waldux/kernel.control delete mode 100644 target/zephyr/Config.in delete mode 100644 target/zephyr/Makefile delete mode 100644 target/zephyr/arch.lst delete mode 100644 toolchain/waldux-headers/Makefile diff --git a/Config.in b/Config.in index eaf7f5692..e1a4135d9 100644 --- a/Config.in +++ b/Config.in @@ -31,7 +31,7 @@ source "target/config/Config.in.addons" endmenu menu "C Library configuration" - visible if (ADK_TARGET_OS_LINUX || ADK_TARGET_OS_WALDUX) && !ADK_TARGET_CHOOSE_ARCH + visible if ADK_TARGET_OS_LINUX && !ADK_TARGET_CHOOSE_ARCH source "target/config/Config.in.libc" source "target/config/Config.in.threads" source "target/config/Config.in.binfmt" @@ -44,17 +44,17 @@ 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 + depends on ADK_TARGET_OS_LINUX && !ADK_APPLIANCE_TOOLCHAIN && !ADK_TARGET_CHOOSE_ARCH source "target/config/Config.in.tasks" menu "Firmware configuration" - visible if (ADK_TARGET_OS_LINUX || ADK_TARGET_OS_WALDUX) && !ADK_APPLIANCE_TOOLCHAIN && !ADK_TARGET_CHOOSE_ARCH + visible if ADK_TARGET_OS_LINUX && !ADK_APPLIANCE_TOOLCHAIN && !ADK_TARGET_CHOOSE_ARCH source "target/config/Config.in.rootfs" endmenu menu "Package selection" - visible if (ADK_TARGET_OS_LINUX || ADK_TARGET_OS_WALDUX) && !ADK_APPLIANCE_TOOLCHAIN && !ADK_TARGET_CHOOSE_ARCH + visible if ADK_TARGET_OS_LINUX && !ADK_APPLIANCE_TOOLCHAIN && !ADK_TARGET_CHOOSE_ARCH source "package/Config.in.auto.global" source "package/Config.in" menu "Package options" @@ -63,7 +63,7 @@ endmenu endmenu menu "Runtime configuration" - visible if (ADK_TARGET_OS_LINUX || ADK_TARGET_OS_WALDUX) && !ADK_APPLIANCE_TOOLCHAIN && !ADK_TARGET_CHOOSE_ARCH + visible if ADK_TARGET_OS_LINUX && !ADK_APPLIANCE_TOOLCHAIN && !ADK_TARGET_CHOOSE_ARCH source "target/config/Config.in.runtime" endmenu @@ -80,29 +80,6 @@ source "target/linux/Config.in" endmenu endmenu -menu "Waldux Kernel configuration" - visible if ADK_TARGET_OS_WALDUX && !ADK_TARGET_CHOOSE_ARCH -source "target/waldux/Config.in.kernelversion" -source "target/waldux/Config.in.kernelcfg" -source "target/waldux/config/Config.in.compression" -source "target/config/Config.in.cmdline" - -menu "Advanced Waldux Kernel configuration" - visible if ADK_TARGET_OS_WALDUX && ADK_TARGET_KERNEL_CUSTOMISING && !ADK_APPLIANCE_TOOLCHAIN && !ADK_TARGET_CHOOSE_ARCH && !ADK_TARGET_WALDUX_KERNEL_USE_DEFCONFIG && !ADK_TARGET_WALDUX_KERNEL_USE_CUSTOMCONFIG -source "target/waldux/Config.in" -endmenu -endmenu - -menu "Frosted kernel configuration" - visible if ADK_TARGET_OS_FROSTED && !ADK_TARGET_CHOOSE_ARCH -source "target/frosted/Config.in" -endmenu - -menu "Frosted application configuration" - visible if ADK_TARGET_OS_FROSTED && !ADK_TARGET_CHOOSE_ARCH -source "target/frosted/Config.in.apps" -endmenu - menu "Toolchain settings" visible if !ADK_TARGET_CHOOSE_ARCH diff --git a/adk/tools/pkgmaker.c b/adk/tools/pkgmaker.c index 62ddf548a..451300548 100644 --- a/adk/tools/pkgmaker.c +++ b/adk/tools/pkgmaker.c @@ -942,7 +942,6 @@ int main() { token = strtok(pkg_kdepends, " "); while (token != NULL) { fprintf(cfg, "\tselect ADK_LINUX_KERNEL_%s m if ADK_TARGET_OS_LINUX\n", toupperstr(token)); - fprintf(cfg, "\tselect ADK_WALDUX_KERNEL_%s m if ADK_TARGET_OS_WALDUX\n", toupperstr(token)); token = strtok(NULL, " "); } free(pkg_kdepends); diff --git a/mk/build.mk b/mk/build.mk index 5c0dbf761..c34b71c01 100644 --- a/mk/build.mk +++ b/mk/build.mk @@ -179,18 +179,6 @@ else ifeq ($(ADK_TARGET_OS_BAREMETAL),y) $(MAKE) -f mk/build.mk package/hostcompile toolchain/final endif -ifeq ($(ADK_TARGET_OS_RTEMS),y) - $(MAKE) -f mk/build.mk package/hostcompile toolchain/final target/compile target/install target/targethelp -endif -ifeq ($(ADK_TARGET_OS_FROSTED),y) - $(MAKE) -f mk/build.mk package/hostcompile toolchain/final target/config-prepare target/compile target/install target/targethelp -endif -ifeq ($(ADK_TARGET_OS_ZEPHYR),y) - $(MAKE) -f mk/build.mk package/hostcompile toolchain/final target/compile target/install target/targethelp -endif -ifeq ($(ADK_TARGET_OS_WALDUX),y) - $(MAKE) -f mk/build.mk package/hostcompile toolchain/final target/config-prepare target/compile package_clean package/compile root_clean package/install target/install package_index -endif ifeq ($(ADK_TARGET_OS_LINUX),y) $(MAKE) -f mk/build.mk package/hostcompile toolchain/final target/config-prepare target/compile package_clean package/compile root_clean package/install target/install package_index endif diff --git a/mk/image.mk b/mk/image.mk index 3021fac91..1cd343701 100644 --- a/mk/image.mk +++ b/mk/image.mk @@ -7,7 +7,7 @@ else FAKEROOT:= endif -ifeq ($(ADK_TARGET_OS_LINUX)$(ADK_TARGET_OS_WALDUX),y) +ifeq ($(ADK_TARGET_OS_LINUX),y) # relative paths, like 'mksh' or '../usr/bin/foosh' ifeq (${ADK_BINSH_ASH},y) BINSH:=ash @@ -262,7 +262,7 @@ createinitramfs: ${STAGING_TARGET_DIR}/${INITRAMFS}_list echo 'CONFIG_INITRAMFS_ROOT_GID=0'; \ echo 'CONFIG_INITRAMFS_IS_LARGE=n'; \ ) >> ${LINUX_DIR}/.config -ifeq ($(ADK_LINUX_KERNEL_COMP_XZ)$(ADK_WALDUX_KERNEL_COMP_XZ),y) +ifeq ($(ADK_LINUX_KERNEL_COMP_XZ),y) echo "CONFIG_RD_BZIP2=n" >> ${LINUX_DIR}/.config echo "CONFIG_RD_GZIP=n" >> ${LINUX_DIR}/.config echo "CONFIG_RD_LZMA=n" >> ${LINUX_DIR}/.config @@ -278,7 +278,7 @@ ifeq ($(ADK_LINUX_KERNEL_COMP_XZ)$(ADK_WALDUX_KERNEL_COMP_XZ),y) echo "CONFIG_XZ_DEC_SPARC=n" >> ${LINUX_DIR}/.config echo "CONFIG_XZ_DEC_TEST=n" >> ${LINUX_DIR}/.config endif -ifeq ($(ADK_LINUX_KERNEL_COMP_LZ4)$(ADK_WALDUX_KERNEL_COMP_LZ4),y) +ifeq ($(ADK_LINUX_KERNEL_COMP_LZ4),y) echo "CONFIG_RD_XZ=n" >> ${LINUX_DIR}/.config echo "CONFIG_RD_BZIP2=n" >> ${LINUX_DIR}/.config echo "CONFIG_RD_GZIP=n" >> ${LINUX_DIR}/.config @@ -287,7 +287,7 @@ ifeq ($(ADK_LINUX_KERNEL_COMP_LZ4)$(ADK_WALDUX_KERNEL_COMP_LZ4),y) echo "CONFIG_RD_LZMA=n" >> ${LINUX_DIR}/.config echo "CONFIG_INITRAMFS_COMPRESSION_LZ4=y" >> ${LINUX_DIR}/.config endif -ifeq ($(ADK_LINUX_KERNEL_COMP_LZMA)$(ADK_WALDUX_KERNEL_COMP_LZMA),y) +ifeq ($(ADK_LINUX_KERNEL_COMP_LZMA),y) echo "CONFIG_RD_XZ=n" >> ${LINUX_DIR}/.config echo "CONFIG_RD_BZIP2=n" >> ${LINUX_DIR}/.config echo "CONFIG_RD_GZIP=n" >> ${LINUX_DIR}/.config @@ -296,7 +296,7 @@ ifeq ($(ADK_LINUX_KERNEL_COMP_LZMA)$(ADK_WALDUX_KERNEL_COMP_LZMA),y) echo "CONFIG_RD_LZMA=y" >> ${LINUX_DIR}/.config echo "CONFIG_INITRAMFS_COMPRESSION_LZMA=y" >> ${LINUX_DIR}/.config endif -ifeq ($(ADK_LINUX_KERNEL_COMP_LZO)$(ADK_WALDUX_KERNEL_COMP_LZO),y) +ifeq ($(ADK_LINUX_KERNEL_COMP_LZO),y) echo "CONFIG_RD_XZ=n" >> ${LINUX_DIR}/.config echo "CONFIG_RD_BZIP2=n" >> ${LINUX_DIR}/.config echo "CONFIG_RD_GZIP=n" >> ${LINUX_DIR}/.config @@ -305,7 +305,7 @@ ifeq ($(ADK_LINUX_KERNEL_COMP_LZO)$(ADK_WALDUX_KERNEL_COMP_LZO),y) echo "CONFIG_RD_LZO=y" >> ${LINUX_DIR}/.config echo "CONFIG_INITRAMFS_COMPRESSION_LZO=y" >> ${LINUX_DIR}/.config endif -ifeq ($(ADK_LINUX_KERNEL_COMP_GZIP)$(ADK_WALDUX_KERNEL_COMP_GZIP),y) +ifeq ($(ADK_LINUX_KERNEL_COMP_GZIP),y) echo "CONFIG_RD_XZ=n" >> ${LINUX_DIR}/.config echo "CONFIG_RD_BZIP2=n" >> ${LINUX_DIR}/.config echo "CONFIG_RD_LZO=n" >> ${LINUX_DIR}/.config @@ -314,7 +314,7 @@ ifeq ($(ADK_LINUX_KERNEL_COMP_GZIP)$(ADK_WALDUX_KERNEL_COMP_GZIP),y) echo "CONFIG_RD_GZIP=y" >> ${LINUX_DIR}/.config echo "CONFIG_INITRAMFS_COMPRESSION_GZIP=y" >> ${LINUX_DIR}/.config endif -ifeq ($(ADK_LINUX_KERNEL_COMP_BZIP2)$(ADK_WALDUX_KERNEL_COMP_BZIP2),y) +ifeq ($(ADK_LINUX_KERNEL_COMP_BZIP2),y) echo "CONFIG_RD_XZ=n" >> ${LINUX_DIR}/.config echo "CONFIG_RD_GZIP=n" >> ${LINUX_DIR}/.config echo "CONFIG_RD_LZMA=n" >> ${LINUX_DIR}/.config @@ -323,7 +323,7 @@ ifeq ($(ADK_LINUX_KERNEL_COMP_BZIP2)$(ADK_WALDUX_KERNEL_COMP_BZIP2),y) echo "CONFIG_RD_BZIP2=y" >> ${LINUX_DIR}/.config echo "CONFIG_INITRAMFS_COMPRESSION_BZIP2=y" >> ${LINUX_DIR}/.config endif -ifeq ($(ADK_LINUX_KERNEL_COMPRESS_NONE)$(ADK_WALDUX_KERNEL_COMPRESS_NONE),y) +ifeq ($(ADK_LINUX_KERNEL_COMPRESS_NONE),y) echo "CONFIG_RD_XZ=n" >> ${LINUX_DIR}/.config echo "CONFIG_RD_BZIP2=n" >> ${LINUX_DIR}/.config echo "CONFIG_RD_LZO=n" >> ${LINUX_DIR}/.config diff --git a/mk/kernel-build.mk b/mk/kernel-build.mk index fb7ffc955..bd6d511a1 100644 --- a/mk/kernel-build.mk +++ b/mk/kernel-build.mk @@ -9,15 +9,9 @@ include $(ADK_TOPDIR)/mk/kernel-vars.mk ifeq ($(ADK_TARGET_OS_LINUX),y) KERNEL_MODULES_USED:=$(shell grep ^ADK_LINUX_KERNEL $(ADK_TOPDIR)/.config|grep =m) endif -ifeq ($(ADK_TARGET_OS_WALDUX),y) -KERNEL_MODULES_USED:=$(shell grep ^ADK_WALDUX_KERNEL $(ADK_TOPDIR)/.config|grep =m) -endif ifeq ($(ADK_TARGET_LINUX_KERNEL_USE_CUSTOMCONFIG),y) KERNEL_MODULES_USED:=$(shell grep -s =m $(ADK_TOPDIR)/$(ADK_TARGET_LINUX_KERNEL_CUSTOMCONFIG_PATH)) endif -ifeq ($(ADK_TARGET_WALDUX_KERNEL_USE_CUSTOMCONFIG),y) -KERNEL_MODULES_USED:=$(shell grep -s =m $(ADK_TOPDIR)/$(ADK_TARGET_WALDUX_KERNEL_CUSTOMCONFIG_PATH)) -endif KERNEL_FILE:=$(ADK_TARGET_KERNEL) KERNEL_TARGET:=$(ADK_TARGET_KERNEL) @@ -61,7 +55,7 @@ $(LINUX_DIR)/.prepared: $(TOOLCHAIN_BUILD_DIR)/w-$(PKG_NAME)-$(PKG_VERSION)-$(PK mkdir -p $(LINUX_BUILD_DIR)/kmod-control touch $@ -ifeq ($(ADK_TARGET_LINUX_KERNEL_USE_MINICONFIG)$(ADK_TARGET_WALDUX_KERNEL_USE_MINICONFIG),y) +ifeq ($(ADK_TARGET_LINUX_KERNEL_USE_MINICONFIG),y) $(LINUX_DIR)/.config: $(BUILD_DIR)/.kernelconfig endif @@ -69,15 +63,11 @@ ifeq ($(ADK_TARGET_LINUX_KERNEL_USE_CUSTOMCONFIG),y) $(ADK_TOPDIR)/$(ADK_TARGET_LINUX_KERNEL_CUSTOMCONFIG_PATH): $(LINUX_DIR)/.config: $(ADK_TOPDIR)/$(ADK_TARGET_LINUX_KERNEL_CUSTOMCONFIG_PATH) endif -ifeq ($(ADK_TARGET_WALDUX_KERNEL_USE_CUSTOMCONFIG),y) -$(ADK_TOPDIR)/$(ADK_TARGET_WALDUX_KERNEL_CUSTOMCONFIG_PATH): -$(LINUX_DIR)/.config: $(ADK_TOPDIR)/$(ADK_TARGET_WALDUX_KERNEL_CUSTOMCONFIG_PATH) -endif $(LINUX_DIR)/.config: $(LINUX_DIR)/.prepared $(START_TRACE) "target/$(ADK_TARGET_ARCH)-kernel-configure.. " echo "-${KERNEL_RELEASE}" >${LINUX_DIR}/localversion -ifeq ($(ADK_TARGET_LINUX_KERNEL_USE_DEFCONFIG)$(ADK_TARGET_WALDUX_KERNEL_USE_DEFCONFIG),y) +ifeq ($(ADK_TARGET_LINUX_KERNEL_USE_DEFCONFIG),y) ${KERNEL_MAKE_ENV} $(MAKE) -C "${LINUX_DIR}" ${KERNEL_MAKE_OPTS} $(ADK_TARGET_KERNEL_DEFCONFIG) $(MAKE_TRACE) else ifeq ($(ADK_TARGET_LINUX_KERNEL_USE_CUSTOMCONFIG),y) @if [ ! -f $(ADK_TOPDIR)/$(ADK_TARGET_LINUX_KERNEL_CUSTOMCONFIG_PATH) ];then \ @@ -85,12 +75,6 @@ else ifeq ($(ADK_TARGET_LINUX_KERNEL_USE_CUSTOMCONFIG),y) exit 1; \ fi ${KERNEL_MAKE_ENV} $(MAKE) -C "${LINUX_DIR}" ${KERNEL_MAKE_OPTS} KCONFIG_ALLCONFIG=$(ADK_TOPDIR)/$(ADK_TARGET_LINUX_KERNEL_CUSTOMCONFIG_PATH) allnoconfig $(MAKE_TRACE) -else ifeq ($(ADK_TARGET_WALDUX_KERNEL_USE_CUSTOMCONFIG),y) - @if [ ! -f $(ADK_TOPDIR)/$(ADK_TARGET_WALDUX_KERNEL_CUSTOMCONFIG_PATH) ];then \ - echo "no kernel configuration found in $(ADK_TOPDIR)/$(ADK_TARGET_WALDUX_KERNEL_CUSTOMCONFIG_PATH)"; \ - exit 1; \ - fi - ${KERNEL_MAKE_ENV} $(MAKE) -C "${LINUX_DIR}" ${KERNEL_MAKE_OPTS} KCONFIG_ALLCONFIG=$(ADK_TOPDIR)/$(ADK_TARGET_WALDUX_KERNEL_CUSTOMCONFIG_PATH) allnoconfig $(MAKE_TRACE) else $(CP) $(BUILD_DIR)/.kernelconfig $(LINUX_DIR)/mini.config ${KERNEL_MAKE_ENV} $(MAKE) -C "${LINUX_DIR}" ${KERNEL_MAKE_OPTS} KCONFIG_ALLCONFIG=mini.config allnoconfig $(MAKE_TRACE) diff --git a/mk/vars.mk b/mk/vars.mk index eaa8c5333..b81a724a1 100644 --- a/mk/vars.mk +++ b/mk/vars.mk @@ -84,15 +84,6 @@ endif ifeq ($(ADK_TARGET_OS_BAREMETAL),y) GNU_TARGET_NAME:= $(ADK_TARGET_CPU_ARCH)-$(ADK_TARGET_SUFFIX) endif -ifeq ($(ADK_TARGET_OS_FROSTED),y) -GNU_TARGET_NAME:= $(ADK_TARGET_CPU_ARCH)-$(ADK_TARGET_OS)-$(ADK_TARGET_SUFFIX) -endif -ifeq ($(ADK_TARGET_OS_RTEMS),y) -GNU_TARGET_NAME:= $(ADK_TARGET_CPU_ARCH)-$(ADK_TARGET_OS) -endif -ifeq ($(ADK_TARGET_OS_ZEPHYR),y) -GNU_TARGET_NAME:= $(ADK_TARGET_CPU_ARCH)-$(ADK_TARGET_OS) -endif TARGET_CROSS:= $(TOOLCHAIN_DIR)/usr/bin/$(GNU_TARGET_NAME)- TARGET_COMPILER_PREFIX?=${TARGET_CROSS} @@ -176,7 +167,7 @@ TARGET_CXXFLAGS+= -m$(ADK_TARGET_FLOAT)-float endif endif -ifeq ($(ADK_TARGET_BINFMT_FLAT)$(ADK_TARGET_OS_FROSTED),y) +ifeq ($(ADK_TARGET_BINFMT_FLAT),y) TARGET_LDFLAGS+= -Wl,-elf2flt TARGET_CFLAGS+= -Wl,-elf2flt TARGET_CXXFLAGS+= -Wl,-elf2flt @@ -240,11 +231,6 @@ ifneq ($(ADK_TARGET_USE_GNU_HASHSTYLE),) TARGET_LDFLAGS+= -Wl,--hash-style=gnu endif -# special operating system flags -ifeq ($(ADK_TARGET_OS_FROSTED),y) -TARGET_CFLAGS+= -fPIC -mlong-calls -fno-common -msingle-pic-base -mno-pic-data-is-text-relative -endif - # special architecture optimization flags ifeq ($(ADK_TARGET_ARCH_XTENSA),y) ifeq ($(ADK_TARGET_BIG_ENDIAN),) diff --git a/mk/waldux-ver.mk b/mk/waldux-ver.mk deleted file mode 100644 index a88c4501b..000000000 --- a/mk/waldux-ver.mk +++ /dev/null @@ -1,16 +0,0 @@ -# This file is part of the OpenADK project. OpenADK is copyrighted -# material, please see the LICENCE file in the top-level directory. -# -# On the various kernel version variables: -# -# KERNEL_FILE_VER: version numbering used for tarball and contained -# top level directory -# KERNEL_RELEASE: OpenADK internal versioning -# KERNEL_VERSION: final kernel version how we want to identify a -# specific kernel - -ifeq ($(ADK_TARGET_WALDUX_KERNEL_VERSION_GIT),y) -KERNEL_FILE_VER:= $(ADK_TARGET_WALDUX_KERNEL_GIT) -KERNEL_RELEASE:= 1 -KERNEL_VERSION:= $(ADK_TARGET_WALDUX_KERNEL_GIT_VER)-$(KERNEL_RELEASE) -endif diff --git a/mk/waldux.mk b/mk/waldux.mk deleted file mode 100644 index 15a021a3c..000000000 --- a/mk/waldux.mk +++ /dev/null @@ -1,10 +0,0 @@ -# This file is part of the OpenADK project. OpenADK is copyrighted -# material, please see the LICENCE file in the top-level directory. - -PKG_NAME:= waldux -PKG_RELEASE:= $(KERNEL_RELEASE) -ifeq ($(ADK_TARGET_WALDUX_KERNEL_VERSION_GIT),y) -PKG_VERSION:= $(ADK_TARGET_WALDUX_KERNEL_GIT) -PKG_GIT:= $(ADK_TARGET_WALDUX_KERNEL_GIT_TYPE) -PKG_SITES:= $(ADK_TARGET_WALDUX_KERNEL_GIT_REPO) -endif diff --git a/package/busybox/config/networking/Config.in b/package/busybox/config/networking/Config.in index 8a1eeb085..8592e66ef 100644 --- a/package/busybox/config/networking/Config.in +++ b/package/busybox/config/networking/Config.in @@ -442,7 +442,6 @@ config BUSYBOX_FEATURE_IFCONFIG_BROADCAST_PLUS config BUSYBOX_IFENSLAVE bool "ifenslave" select ADK_LINUX_KERNEL_BONDING m if ADK_TARGET_OS_LINUX - select ADK_WALDUX_KERNEL_BONDING m if ADK_TARGET_OS_WALDUX default n select BUSYBOX_PLATFORM_LINUX help diff --git a/rules.mk b/rules.mk index de53ce105..758a2c163 100644 --- a/rules.mk +++ b/rules.mk @@ -75,10 +75,6 @@ ADK_TARGET_LINUX_KERNEL_GIT:= $(strip $(subst ",, $(ADK_TARGET_LINUX_KERNEL_GIT ADK_TARGET_LINUX_KERNEL_GIT_VER:= $(strip $(subst ",, $(ADK_TARGET_LINUX_KERNEL_GIT_VER))) ADK_TARGET_LINUX_KERNEL_GIT_TYPE:= $(strip $(subst ",, $(ADK_TARGET_LINUX_KERNEL_GIT_TYPE))) ADK_TARGET_LINUX_KERNEL_DEFCONFIG:= $(strip $(subst ",, $(ADK_TARGET_LINUX_KERNEL_DEFCONFIG))) -ADK_TARGET_WALDUX_KERNEL_GIT:= $(strip $(subst ",, $(ADK_TARGET_WALDUX_KERNEL_GIT))) -ADK_TARGET_WALDUX_KERNEL_GIT_VER:= $(strip $(subst ",, $(ADK_TARGET_WALDUX_KERNEL_GIT_VER))) -ADK_TARGET_WALDUX_KERNEL_GIT_TYPE:= $(strip $(subst ",, $(ADK_TARGET_WALDUX_KERNEL_GIT_TYPE))) -ADK_TARGET_WALDUX_KERNEL_DEFCONFIG:= $(strip $(subst ",, $(ADK_TARGET_WALDUX_KERNEL_DEFCONFIG))) ADK_TARGET_GENIMAGE_FILENAME:= $(strip $(subst ",, $(ADK_TARGET_GENIMAGE_FILENAME))) ADK_TARGET_ROOTDEV:= $(strip $(subst ",, $(ADK_TARGET_ROOTDEV))) diff --git a/scripts/create-menu b/scripts/create-menu index f650c1d1a..1a2aab3d0 100755 --- a/scripts/create-menu +++ b/scripts/create-menu @@ -15,7 +15,7 @@ printf "source target/config/Config.in.system.choice\n" >> target/config/Config. if [ -d "$topdir/tasks" -o -n "$ADK_CUSTOM_TASKS_DIR" ];then printf "# autogenerated via scripts/create-menu\n" > $topdir/target/config/Config.in.tasks printf "menu \"Tasks\"\n" >> $topdir/target/config/Config.in.tasks - printf "\tvisible if (ADK_TARGET_OS_LINUX || ADK_TARGET_OS_WALDUX) && !ADK_TARGET_CHOOSE_ARCH\n\n" >> $topdir/target/config/Config.in.tasks + printf "\tvisible if ADK_TARGET_OS_LINUX && !ADK_TARGET_CHOOSE_ARCH\n\n" >> $topdir/target/config/Config.in.tasks if [ -d "$topdir/tasks" ];then cat $topdir/tasks/* >> $topdir/target/config/Config.in.tasks 2>/dev/null @@ -98,7 +98,7 @@ config ADK_TARGET_CHOOSE_ARCH bool "choose architecture" EOD -for os in linux waldux frosted rtems zephyr baremetal; do +for os in linux baremetal; do for arch in $(cat $topdir/target/$os/arch.lst);do OS=$(echo $os | tr '[:lower:]' '[:upper:]') ARCH=$(echo $arch | tr '[:lower:]' '[:upper:]') diff --git a/target/Makefile b/target/Makefile index 128d272de..3a063ef84 100644 --- a/target/Makefile +++ b/target/Makefile @@ -31,17 +31,13 @@ ADK_PACKAGE_CRYPTINIT_ROOT:=$(strip $(subst ",, $(ADK_PACKAGE_CRYPTINIT_ROOT))) ADK_PACKAGE_CRYPTINIT_SWAP:=$(strip $(subst ",, $(ADK_PACKAGE_CRYPTINIT_SWAP))) ADK_PACKAGE_CMDLINE:=root=$(ADK_PACKAGE_CRYPTINIT_ROOT) swap=$(ADK_PACKAGE_CRYPTINIT_SWAP) resume=/dev/mapper/swapcrypt -ifeq ($(ADK_TARGET_OS_LINUX)$(ADK_TARGET_OS_WALDUX),y) -ifeq ($(ADK_TARGET_LINUX_KERNEL_USE_MINICONFIG)$(ADK_TARGET_WALDUX_KERNEL_USE_MINICONFIG),y) +ifeq ($(ADK_TARGET_OS_LINUX),y) +ifeq ($(ADK_TARGET_LINUX_KERNEL_USE_MINICONFIG),y) ifeq ($(ADK_TARGET_KERNEL_CUSTOMISING),y) config-prepare: $(ADK_TOPDIR)/.config ifeq ($(ADK_TARGET_OS_LINUX),y) @PATH='$(HOST_PATH)' sed -n '/^ADK_LINUX_KERNEL/s//CONFIG/p' $(ADK_TOPDIR)/.config \ >$(BUILD_DIR)/.kernelconfig.kernel -endif -ifeq ($(ADK_TARGET_OS_WALDUX),y) - @PATH='$(HOST_PATH)' sed -n '/^ADK_WALDUX_KERNEL/s//CONFIG/p' $(ADK_TOPDIR)/.config \ - >$(BUILD_DIR)/.kernelconfig.kernel endif @if [ -f $(ADK_TARGET_ARCH)/kernel/$(ADK_TARGET_SYSTEM) ];then \ cat $(ADK_TOPDIR)/target/$(ADK_TARGET_OS)/kernel.config \ @@ -106,11 +102,11 @@ ifeq ($(ADK_RUNTIME_QUIET_KERNEL),y) @$(SED) 's#^\(CONFIG_.*CMDLINE="\)\(.*\)"#\1\2 quiet loglevel=2 vt.global_cursor_default=0"#' \ $(BUILD_DIR)/.kernelconfig.board endif -ifeq ($(ADK_LINUX_KERNEL_DEBUG_WITH_KGDB)$(ADK_WALDUX_KERNEL_DEBUG_WITH_KGDB),y) +ifeq ($(ADK_LINUX_KERNEL_DEBUG_WITH_KGDB),y) @$(SED) 's#^\(CONFIG_.*CMDLINE="\)\(.*\)"#\1\2 kgdbwait kgdboc=ttyS0,115200"#' \ $(BUILD_DIR)/.kernelconfig.board endif -ifeq ($(ADK_LINUX_KERNEL_NETCONSOLE)$(ADK_WALDUX_KERNEL_NETCONSOLE),y) +ifeq ($(ADK_LINUX_KERNEL_NETCONSOLE),y) @$(SED) 's#^\(CONFIG_.*CMDLINE="\)\(.*\)"#\1\2 netconsole=@$(ADK_PARAMETER_NETCONSOLE_SRC_IP)/,@$(ADK_PARAMETER_NETCONSOLE_DST_IP)/"#' \ $(BUILD_DIR)/.kernelconfig.board endif @@ -138,36 +134,8 @@ config-prepare: $(ADK_TOPDIR)/.config endif endif -ifeq ($(ADK_TARGET_OS_FROSTED),y) -config-prepare: $(ADK_TOPDIR)/.config - @PATH='$(HOST_PATH)' sed -n '/^ADK_FROSTED_/s///p' $(ADK_TOPDIR)/.config \ - >$(BUILD_DIR)/.frosted - @PATH='$(HOST_PATH)' sed -n '/^ADK_PACKAGE_FROSTED_/s///p' $(ADK_TOPDIR)/.config \ - >$(BUILD_DIR)/.frostedapps -endif - -ifeq ($(ADK_TARGET_OS_FROSTED),y) -prepare: frosted-prepare -compile: frosted-compile -install: frosted-install -targethelp: frosted-targethelp -endif - -ifeq ($(ADK_TARGET_OS_RTEMS),y) -prepare: rtems-prepare -compile: rtems-compile -install: rtems-install -targethelp: rtems-targethelp -endif - -ifeq ($(ADK_TARGET_OS_ZEPHYR),y) -prepare: zephyr-prepare -compile: zephyr-compile -install: zephyr-install -targethelp: zephyr-targethelp -endif -ifeq ($(ADK_TARGET_OS_LINUX)$(ADK_TARGET_OS_WALDUX),y) +ifeq ($(ADK_TARGET_OS_LINUX),y) prepare: $(ADK_TARGET_ARCH)-prepare compile: $(ADK_TARGET_ARCH)-compile image: $(ADK_TARGET_ARCH)-imageclean $(ADK_TARGET_ARCH)-imageinstall diff --git a/target/arm/systems/banana-pro b/target/arm/systems/banana-pro index 9af9ba68f..6a82e0c11 100644 --- a/target/arm/systems/banana-pro +++ b/target/arm/systems/banana-pro @@ -1,6 +1,6 @@ config ADK_TARGET_SYSTEM_BANANA_PRO bool "Banana Pro" - depends on ADK_TARGET_OS_LINUX || ADK_TARGET_OS_WALDUX + depends on ADK_TARGET_OS_LINUX select ADK_TARGET_LITTLE_ENDIAN select ADK_TARGET_CPU_ARM_CORTEX_A7 select ADK_TARGET_CPU_WITH_NEON diff --git a/target/arm/systems/beaglebone-black b/target/arm/systems/beaglebone-black index 28102411f..3332d7a4d 100644 --- a/target/arm/systems/beaglebone-black +++ b/target/arm/systems/beaglebone-black @@ -1,6 +1,6 @@ config ADK_TARGET_SYSTEM_BEAGLEBONE_BLACK bool "BeagleBone Black" - depends on ADK_TARGET_OS_LINUX || ADK_TARGET_OS_WALDUX + depends on ADK_TARGET_OS_LINUX select ADK_TARGET_LITTLE_ENDIAN select ADK_TARGET_CPU_ARM_CORTEX_A8 select ADK_TARGET_CPU_WITH_NEON diff --git a/target/arm/systems/kinetis-k70 b/target/arm/systems/kinetis-k70 index 419bf6b23..624c8874e 100644 --- a/target/arm/systems/kinetis-k70 +++ b/target/arm/systems/kinetis-k70 @@ -1,6 +1,6 @@ config ADK_TARGET_SYSTEM_KINETIS_K70 bool "Kinetis K70" - depends on ADK_TARGET_OS_LINUX || ADK_TARGET_OS_WALDUX + depends on ADK_TARGET_OS_LINUX select ADK_TARGET_LITTLE_ENDIAN select ADK_TARGET_CPU_ARM_CORTEX_M3 select ADK_TARGET_ARCH_ARM_WITH_THUMB diff --git a/target/arm/systems/linksys-nslu2 b/target/arm/systems/linksys-nslu2 index 65d9b1420..72f55eadd 100644 --- a/target/arm/systems/linksys-nslu2 +++ b/target/arm/systems/linksys-nslu2 @@ -1,6 +1,6 @@ config ADK_TARGET_SYSTEM_LINKSYS_NSLU2 bool "Linksys NSLU2" - depends on ADK_TARGET_OS_LINUX || ADK_TARGET_OS_WALDUX + depends on ADK_TARGET_OS_LINUX select ADK_TARGET_BIG_ENDIAN select ADK_TARGET_CPU_ARM_XSCALE select ADK_TARGET_WITH_USB diff --git a/target/arm/systems/orange-pi0 b/target/arm/systems/orange-pi0 index 1ec19ecb4..557e78bd1 100644 --- a/target/arm/systems/orange-pi0 +++ b/target/arm/systems/orange-pi0 @@ -1,6 +1,6 @@ config ADK_TARGET_SYSTEM_ORANGE_PI0 bool "Orange PI Zero" - depends on ADK_TARGET_OS_LINUX || ADK_TARGET_OS_WALDUX + depends on ADK_TARGET_OS_LINUX select ADK_TARGET_LITTLE_ENDIAN select ADK_TARGET_CPU_ARM_CORTEX_A7 select ADK_TARGET_CPU_WITH_NEON diff --git a/target/arm/systems/phytec-wega b/target/arm/systems/phytec-wega index 29b41a034..dad4d315d 100644 --- a/target/arm/systems/phytec-wega +++ b/target/arm/systems/phytec-wega @@ -1,6 +1,6 @@ config ADK_TARGET_SYSTEM_PHYTEC_WEGA bool "Phytec Wega" - depends on ADK_TARGET_OS_LINUX || ADK_TARGET_OS_WALDUX + depends on ADK_TARGET_OS_LINUX select ADK_TARGET_LITTLE_ENDIAN select ADK_TARGET_CPU_ARM_CORTEX_A8 select ADK_TARGET_WITH_VGA diff --git a/target/arm/systems/qemu-arm-lm3s6965evb b/target/arm/systems/qemu-arm-lm3s6965evb deleted file mode 100644 index a567034cd..000000000 --- a/target/arm/systems/qemu-arm-lm3s6965evb +++ /dev/null @@ -1,16 +0,0 @@ -config ADK_TARGET_SYSTEM_QEMU_ARM_LM3S6965EVB - bool "Qemu Emulator (lm3s6965evb)" - depends on ADK_TARGET_OS_FROSTED - select ADK_TARGET_LITTLE_ENDIAN - select ADK_TARGET_CPU_ARM_CORTEX_M3 - select ADK_TARGET_ARCH_ARM_WITH_THUMB - select ADK_TARGET_QEMU - select ADK_FROSTED_ARCH_LM3SVIRT - select ADK_FROSTED_KFLASHMEM_SIZE 128 - select ADK_FROSTED_KRAMMEM_SIZE 128 - select ADK_FROSTED_TASK_STACK_SIZE_4K - select ADK_FROSTED_USART_0 - select ADK_FROSTED_MEMFS - help - Qemu Emulator for ARM architecture (lm3s6965evb) without MMU. - diff --git a/target/arm/systems/qemu-arm-realview-eb-mpcore b/target/arm/systems/qemu-arm-realview-eb-mpcore index abf23cab6..e38cc4c68 100644 --- a/target/arm/systems/qemu-arm-realview-eb-mpcore +++ b/target/arm/systems/qemu-arm-realview-eb-mpcore @@ -1,6 +1,6 @@ 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_OS_LINUX select ADK_TARGET_LITTLE_ENDIAN select ADK_TARGET_CPU_ARM_ARM11MPCORE select ADK_TARGET_QEMU diff --git a/target/arm/systems/qemu-arm-spitz b/target/arm/systems/qemu-arm-spitz index 3eb9564de..d97c5868e 100644 --- a/target/arm/systems/qemu-arm-spitz +++ b/target/arm/systems/qemu-arm-spitz @@ -1,6 +1,6 @@ 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_OS_LINUX select ADK_TARGET_LITTLE_ENDIAN select ADK_TARGET_CPU_ARM_XSCALE select ADK_TARGET_QEMU diff --git a/target/arm/systems/qemu-arm-terrier b/target/arm/systems/qemu-arm-terrier index 135b9e7e8..2fe25fc0f 100644 --- a/target/arm/systems/qemu-arm-terrier +++ b/target/arm/systems/qemu-arm-terrier @@ -1,6 +1,6 @@ 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_OS_LINUX select ADK_TARGET_LITTLE_ENDIAN select ADK_TARGET_CPU_ARM_XSCALE select ADK_TARGET_QEMU diff --git a/target/arm/systems/qemu-arm-versatilepb b/target/arm/systems/qemu-arm-versatilepb index 95347eabc..b04d1a331 100644 --- a/target/arm/systems/qemu-arm-versatilepb +++ b/target/arm/systems/qemu-arm-versatilepb @@ -1,6 +1,6 @@ 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_OS_LINUX select ADK_TARGET_LITTLE_ENDIAN select ADK_TARGET_CPU_ARM_ARM926EJ_S select ADK_TARGET_QEMU diff --git a/target/arm/systems/qemu-arm-vexpress-a9 b/target/arm/systems/qemu-arm-vexpress-a9 index 2f6f173d3..5c08f38b8 100644 --- a/target/arm/systems/qemu-arm-vexpress-a9 +++ b/target/arm/systems/qemu-arm-vexpress-a9 @@ -1,6 +1,6 @@ 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_OS_LINUX select ADK_TARGET_LITTLE_ENDIAN select ADK_TARGET_CPU_ARM_CORTEX_A9 select ADK_TARGET_QEMU diff --git a/target/arm/systems/qemu-arm-xilinx-zynq b/target/arm/systems/qemu-arm-xilinx-zynq index b3a2e1348..c00543509 100644 --- a/target/arm/systems/qemu-arm-xilinx-zynq +++ b/target/arm/systems/qemu-arm-xilinx-zynq @@ -1,6 +1,6 @@ config ADK_TARGET_SYSTEM_QEMU_ARM_XILINX_ZYNQ bool "Qemu Emulator (Xilinx Zynq)" - depends on ADK_TARGET_OS_LINUX || ADK_TARGET_OS_WALDUX + depends on ADK_TARGET_OS_LINUX 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 35eb2f1ef..7dae1c658 100644 --- a/target/arm/systems/raspberry-pi +++ b/target/arm/systems/raspberry-pi @@ -1,6 +1,6 @@ config ADK_TARGET_SYSTEM_RASPBERRY_PI bool "Raspberry PI" - depends on ADK_TARGET_OS_LINUX || ADK_TARGET_OS_WALDUX + depends on ADK_TARGET_OS_LINUX select ADK_TARGET_LITTLE_ENDIAN select ADK_TARGET_CPU_ARM_ARM1176JZF_S select ADK_TARGET_BOARD_BCM28XX diff --git a/target/arm/systems/raspberry-pi0 b/target/arm/systems/raspberry-pi0 index 255825294..26b7fa671 100644 --- a/target/arm/systems/raspberry-pi0 +++ b/target/arm/systems/raspberry-pi0 @@ -1,6 +1,6 @@ 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_OS_LINUX select ADK_TARGET_LITTLE_ENDIAN select ADK_TARGET_CPU_ARM_ARM1176JZF_S select ADK_TARGET_BOARD_BCM28XX diff --git a/target/arm/systems/raspberry-pi2 b/target/arm/systems/raspberry-pi2 index 38a8738a5..d2dedf7eb 100644 --- a/target/arm/systems/raspberry-pi2 +++ b/target/arm/systems/raspberry-pi2 @@ -1,6 +1,6 @@ config ADK_TARGET_SYSTEM_RASPBERRY_PI2 bool "Raspberry PI 2" - depends on ADK_TARGET_OS_LINUX || ADK_TARGET_OS_WALDUX + depends on ADK_TARGET_OS_LINUX select ADK_TARGET_LITTLE_ENDIAN select ADK_TARGET_CPU_ARM_CORTEX_A7 select ADK_TARGET_BOARD_BCM28XX diff --git a/target/arm/systems/raspberry-pi3 b/target/arm/systems/raspberry-pi3 index f11459c66..67af3340c 100644 --- a/target/arm/systems/raspberry-pi3 +++ b/target/arm/systems/raspberry-pi3 @@ -1,6 +1,6 @@ config ADK_TARGET_SYSTEM_RASPBERRY_PI3 bool "Raspberry PI 3" - depends on ADK_TARGET_OS_LINUX || ADK_TARGET_OS_WALDUX + depends on ADK_TARGET_OS_LINUX select ADK_TARGET_LITTLE_ENDIAN select ADK_TARGET_WITH_MMU select ADK_TARGET_CPU_ARM_CORTEX_A53 diff --git a/target/arm/systems/raspberry-pi3p b/target/arm/systems/raspberry-pi3p index 98539ce2e..d2100a948 100644 --- a/target/arm/systems/raspberry-pi3p +++ b/target/arm/systems/raspberry-pi3p @@ -1,6 +1,6 @@ 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_OS_LINUX select ADK_TARGET_LITTLE_ENDIAN select ADK_TARGET_CPU_ARM_CORTEX_A53 select ADK_TARGET_BOARD_BCM28XX diff --git a/target/arm/systems/sharp-zaurus b/target/arm/systems/sharp-zaurus index b791767ef..435d08101 100644 --- a/target/arm/systems/sharp-zaurus +++ b/target/arm/systems/sharp-zaurus @@ -1,6 +1,6 @@ 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_OS_LINUX select ADK_TARGET_LITTLE_ENDIAN select ADK_TARGET_CPU_ARM_XSCALE select ADK_TARGET_CPU_WITH_IWMMXT diff --git a/target/arm/systems/solidrun-clearfog b/target/arm/systems/solidrun-clearfog index 2dc20a1d7..5c6942e38 100644 --- a/target/arm/systems/solidrun-clearfog +++ b/target/arm/systems/solidrun-clearfog @@ -1,6 +1,6 @@ config ADK_TARGET_SYSTEM_SOLIDRUN_CLEARFOG bool "Solidrun Clearfog Embedded Systems" - depends on ADK_TARGET_OS_LINUX || ADK_TARGET_OS_WALDUX + depends on ADK_TARGET_OS_LINUX select ADK_TARGET_LITTLE_ENDIAN select ADK_TARGET_CPU_ARM_CORTEX_A9 select ADK_TARGET_WITH_SMP diff --git a/target/arm/systems/solidrun-imx6 b/target/arm/systems/solidrun-imx6 index edc3b4b98..957c21a71 100644 --- a/target/arm/systems/solidrun-imx6 +++ b/target/arm/systems/solidrun-imx6 @@ -1,6 +1,6 @@ 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_OS_LINUX select ADK_TARGET_LITTLE_ENDIAN select ADK_TARGET_CPU_ARM_CORTEX_A9 select ADK_TARGET_WITH_VGA diff --git a/target/arm/systems/st-stm32f407-discovery b/target/arm/systems/st-stm32f407-discovery deleted file mode 100644 index 44ff39904..000000000 --- a/target/arm/systems/st-stm32f407-discovery +++ /dev/null @@ -1,22 +0,0 @@ -config ADK_TARGET_SYSTEM_ST_STM32F407_DISCOVERY - bool "STMicroelectronics STM32F407 Discovery" - depends on ADK_TARGET_OS_FROSTED - select ADK_TARGET_LITTLE_ENDIAN - select ADK_TARGET_CPU_ARM_CORTEX_M4 - select ADK_TARGET_ARCH_ARM_WITH_THUMB - select ADK_TARGET_WITH_SERIAL - select ADK_HOST_BUILD_STLINK - select ADK_FROSTED_ARCH_STM32F4 - select ADK_FROSTED_ARCH_STM32F407_XG - select ADK_FROSTED_FLASH_SIZE_1MB - select ADK_FROSTED_RAM_SIZE_192KB - select ADK_FROSTED_ARCH_STM32F407 - select ADK_FROSTED_MACH_STM32F407Discovery - select ADK_FROSTED_USART_2 - select ADK_FROSTED_KFLASHMEM_SIZE 192 - select ADK_FROSTED_KRAMMEM_SIZE 128 - select ADK_FROSTED_TASK_STACK_SIZE_4K - select ADK_FROSTED_CLK_168MHZ - help - STMicroelectronics STM32F407 Discovery - diff --git a/target/arm/systems/st-stm32f429 b/target/arm/systems/st-stm32f429 index d13b1150b..64825381a 100644 --- a/target/arm/systems/st-stm32f429 +++ b/target/arm/systems/st-stm32f429 @@ -1,6 +1,6 @@ config ADK_TARGET_SYSTEM_ST_STM32F429 bool "STMicroelectronics STM32F429" - depends on ADK_TARGET_OS_LINUX || ADK_TARGET_OS_WALDUX + depends on ADK_TARGET_OS_LINUX select ADK_TARGET_LITTLE_ENDIAN select ADK_TARGET_CPU_ARM_CORTEX_M4 select ADK_TARGET_ARCH_ARM_WITH_THUMB diff --git a/target/arm/systems/st-stm32f429-discovery b/target/arm/systems/st-stm32f429-discovery deleted file mode 100644 index 57b5c0220..000000000 --- a/target/arm/systems/st-stm32f429-discovery +++ /dev/null @@ -1,22 +0,0 @@ -config ADK_TARGET_SYSTEM_ST_STM32F429_DISCOVERY - bool "STMicroelectronics STM32F429 Discovery" - depends on ADK_TARGET_OS_FROSTED - select ADK_TARGET_LITTLE_ENDIAN - select ADK_TARGET_CPU_ARM_CORTEX_M4 - select ADK_TARGET_ARCH_ARM_WITH_THUMB - select ADK_TARGET_WITH_SERIAL - select ADK_HOST_BUILD_STLINK - select ADK_FROSTED_ARCH_STM32F4 - select ADK_FROSTED_ARCH_STM32F429_XI - select ADK_FROSTED_FLASH_SIZE_2MB - select ADK_FROSTED_RAM_SIZE_256KB - select ADK_FORSTED_ARCH_STM32F429 - select ADK_FROSTED_USART_1 - select ADK_FROSTED_KFLASHMEM_SIZE 128 - select ADK_FROSTED_KRAMMEM_SIZE 64 - select ADK_FROSTED_TASK_STACK_SIZE_2K - select ADK_FROSTED_CLK_168MHZ - select ADK_FROSTED_MPU - help - STMicroelectronics STM32F429 Discovery - diff --git a/target/arm/systems/st-stm32f769 b/target/arm/systems/st-stm32f769 index 11dad65c3..b0fc0f00f 100644 --- a/target/arm/systems/st-stm32f769 +++ b/target/arm/systems/st-stm32f769 @@ -1,6 +1,6 @@ config ADK_TARGET_SYSTEM_ST_STM32F769 bool "STMicroelectronics STM32F769" - depends on ADK_TARGET_OS_LINUX || ADK_TARGET_OS_WALDUX + depends on ADK_TARGET_OS_LINUX select ADK_TARGET_LITTLE_ENDIAN select ADK_TARGET_CPU_ARM_CORTEX_M7 select ADK_TARGET_HARD_FLOAT_DP diff --git a/target/config/Config.in.addons b/target/config/Config.in.addons index f26804e4a..1a475f3df 100644 --- a/target/config/Config.in.addons +++ b/target/config/Config.in.addons @@ -39,7 +39,7 @@ config ADK_TARGET_GPU_MEM choice prompt "Serial or Bluetooth" -depends on ( ADK_TARGET_OS_LINUX || ADK_TARGET_OS_WALDUX ) \ +depends on ADK_TARGET_OS_LINUX \ && ( ADK_TARGET_SYSTEM_RASPBERRY_PI3 \ || ADK_TARGET_SYSTEM_RASPBERRY_PI3P \ || ADK_TARGET_SYSTEM_RASPBERRY_PI3_64 \ @@ -49,12 +49,10 @@ config ADK_TARGET_HARDWARE_RPI3_SERIAL bool "serial" select ADK_TARGET_HARDWARE_RPI3_NO_BT select ADK_LINUX_KERNEL_SERIAL_AMBA_PL011 if ADK_TARGET_OS_LINUX - select ADK_WALDUX_KERNEL_SERIAL_AMBA_PL011 if ADK_TARGET_OS_WALDUX config ADK_TARGET_HARDWARE_RPI3_BT bool "bluetooth" select ADK_LINUX_KERNEL_BT_HCIUART_BCM m if ADK_TARGET_OS_LINUX - select ADK_WALDUX_KERNEL_BT_HCIUART_BCM m if ADK_TARGET_OS_WALDUX config ADK_TARGET_HARDWARE_RPI3_NONE bool "none" @@ -66,7 +64,7 @@ config ADK_TARGET_HARDWARE_RPI3_NO_BT config ADK_TARGET_HARDWARE_RPI3_NO_WIFI bool "Disable wifi" - depends on ( ADK_TARGET_OS_LINUX || ADK_TARGET_OS_WALDUX ) \ + depends on ADK_TARGET_OS_LINUX \ && ( ADK_TARGET_SYSTEM_RASPBERRY_PI3 \ || ADK_TARGET_SYSTEM_RASPBERRY_PI3P \ || ADK_TARGET_SYSTEM_RASPBERRY_PI3_64 \ @@ -75,7 +73,7 @@ config ADK_TARGET_HARDWARE_RPI3_NO_WIFI choice prompt "Audio Board Addon" -depends on (ADK_TARGET_OS_LINUX || ADK_TARGET_OS_WALDUX) && ADK_TARGET_BOARD_BCM28XX +depends on ADK_TARGET_OS_LINUX && ADK_TARGET_BOARD_BCM28XX config ADK_TARGET_HARDWARE_NONE bool "No audio addon board" @@ -83,36 +81,29 @@ config ADK_TARGET_HARDWARE_NONE config ADK_TARGET_HARDWARE_HIFIBERRY_AMP bool "Hifiberry AMP" select ADK_LINUX_KERNEL_SND_BCM2708_SOC_HIFIBERRY_AMP m if ADK_TARGET_OS_LINUX - select ADK_WALDUX_KERNEL_SND_BCM2708_SOC_HIFIBERRY_AMP m if ADK_TARGET_OS_WALDUX config ADK_TARGET_HARDWARE_HIFIBERRY_DAC bool "Hifiberry DAC" select ADK_LINUX_KERNEL_SND_BCM2708_SOC_HIFIBERRY_DAC m if ADK_TARGET_OS_LINUX - select ADK_WALDUX_KERNEL_SND_BCM2708_SOC_HIFIBERRY_DAC m if ADK_TARGET_OS_WALDUX config ADK_TARGET_HARDWARE_HIFIBERRY_DACPLUS bool "Hifiberry DACPLUS" select ADK_LINUX_KERNEL_SND_BCM2708_SOC_HIFIBERRY_DACPLUS m if ADK_TARGET_OS_LINUX - select ADK_WALDUX_KERNEL_SND_BCM2708_SOC_HIFIBERRY_DACPLUS m if ADK_TARGET_OS_WALDUX config ADK_TARGET_HARDWARE_HIFIBERRY_DIGI bool "Hifiberry DIGI" select ADK_LINUX_KERNEL_SND_BCM2708_SOC_HIFIBERRY_DIGI m if ADK_TARGET_OS_LINUX - select ADK_WALDUX_KERNEL_SND_BCM2708_SOC_HIFIBERRY_DIGI m if ADK_TARGET_OS_WALDUX config ADK_TARGET_HARDWARE_RPI_DAC bool "RPI-DAC" select ADK_LINUX_KERNEL_SND_BCM2708_SOC_RPI_DAC m if ADK_TARGET_OS_LINUX - select ADK_WALDUX_KERNEL_SND_BCM2708_SOC_RPI_DAC m if ADK_TARGET_OS_WALDUX config ADK_TARGET_HARDWARE_IQAUDIO_DAC bool "IQAudio-DAC" select ADK_LINUX_KERNEL_SND_BCM2708_SOC_IQAUDIO_DAC m if ADK_TARGET_OS_LINUX - select ADK_WALDUX_KERNEL_SND_BCM2708_SOC_IQAUDIO_DAC m if ADK_TARGET_OS_WALDUX config ADK_TARGET_HARDWARE_RPI_PROTO bool "Rpi-Proto" select ADK_LINUX_KERNEL_SND_BCM2708_SOC_RPI_PROTO m if ADK_TARGET_OS_LINUX - select ADK_WALDUX_KERNEL_SND_BCM2708_SOC_RPI_PROTO m if ADK_TARGET_OS_WALDUX endchoice diff --git a/target/config/Config.in.binfmt b/target/config/Config.in.binfmt index ad2d7f770..bb837f730 100644 --- a/target/config/Config.in.binfmt +++ b/target/config/Config.in.binfmt @@ -3,7 +3,7 @@ choice prompt "Binary format" -depends on (ADK_TARGET_OS_LINUX || ADK_TARGET_OS_WALDUX) && !ADK_TARGET_CHOOSE_ARCH +depends on ADK_TARGET_OS_LINUX && !ADK_TARGET_CHOOSE_ARCH config ADK_TARGET_BINFMT_ELF bool "ELF" diff --git a/target/config/Config.in.cpu b/target/config/Config.in.cpu index 0fe43fb00..ac3559503 100644 --- a/target/config/Config.in.cpu +++ b/target/config/Config.in.cpu @@ -774,7 +774,6 @@ config ADK_TARGET_CPU_MIPS_MIPS32 select ADK_TARGET_CPU_WITH_FPU select ADK_TARGET_ARCH_MIPS_WITH_NAN_LEGACY select ADK_LINUX_KERNEL_CPU_MIPS32_R1 if ADK_TARGET_OS_LINUX - select ADK_WALDUX_KERNEL_CPU_MIPS32_R1 if ADK_TARGET_OS_WALDUX depends on ADK_TARGET_ARCH_MIPS config ADK_TARGET_CPU_MIPS_MIPS32R2 @@ -786,7 +785,6 @@ config ADK_TARGET_CPU_MIPS_MIPS32R2 select ADK_TARGET_CPU_WITH_FPU select ADK_TARGET_ARCH_MIPS_WITH_NAN_LEGACY select ADK_LINUX_KERNEL_CPU_MIPS32_R2 if ADK_TARGET_OS_LINUX - select ADK_WALDUX_KERNEL_CPU_MIPS32_R2 if ADK_TARGET_OS_WALDUX depends on ADK_TARGET_ARCH_MIPS config ADK_TARGET_CPU_MIPS_MIPS32R6 @@ -798,7 +796,6 @@ config ADK_TARGET_CPU_MIPS_MIPS32R6 select ADK_TARGET_CPU_WITH_FPU select ADK_TARGET_ARCH_MIPS_WITH_NAN_2008 select ADK_LINUX_KERNEL_CPU_MIPS32_R6 if ADK_TARGET_OS_LINUX - select ADK_WALDUX_KERNEL_CPU_MIPS32_R6 if ADK_TARGET_OS_WALDUX depends on ADK_TARGET_ARCH_MIPS config ADK_TARGET_CPU_MIPS_R4400 @@ -871,7 +868,6 @@ config ADK_TARGET_CPU_MIPS64_MIPS64 select ADK_TARGET_WITH_MMU select ADK_TARGET_ARCH_MIPS_WITH_NAN_LEGACY select ADK_LINUX_KERNEL_CPU_MIPS64_R1 if ADK_TARGET_OS_LINUX - select ADK_WALDUX_KERNEL_CPU_MIPS64_R1 if ADK_TARGET_OS_WALDUX depends on ADK_TARGET_ARCH_MIPS64 config ADK_TARGET_CPU_MIPS64_MIPS64R2 @@ -883,7 +879,6 @@ config ADK_TARGET_CPU_MIPS64_MIPS64R2 select ADK_TARGET_WITH_MMU select ADK_TARGET_ARCH_MIPS_WITH_NAN_LEGACY select ADK_LINUX_KERNEL_CPU_MIPS64_R2 if ADK_TARGET_OS_LINUX - select ADK_WALDUX_KERNEL_CPU_MIPS64_R2 if ADK_TARGET_OS_WALDUX depends on ADK_TARGET_ARCH_MIPS64 config ADK_TARGET_CPU_MIPS64_MIPS64R6 @@ -895,7 +890,6 @@ config ADK_TARGET_CPU_MIPS64_MIPS64R6 select ADK_TARGET_WITH_MMU select ADK_TARGET_ARCH_MIPS_WITH_NAN_2008 select ADK_LINUX_KERNEL_CPU_MIPS64_R6 if ADK_TARGET_OS_LINUX - select ADK_WALDUX_KERNEL_CPU_MIPS64_R6 if ADK_TARGET_OS_WALDUX depends on ADK_TARGET_ARCH_MIPS64 config ADK_TARGET_CPU_MIPS64_LOONGSON2F @@ -1712,8 +1706,6 @@ config ADK_TARGET_CPU_XTENSA_DC233C 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 - select ADK_WALDUX_KERNEL_XTENSA_VARIANT_DC233C if ADK_TARGET_OS_WALDUX - select ADK_WALDUX_KERNEL_INITIALIZE_XTENSA_MMU_INSIDE_VMLINUX if ADK_TARGET_OS_WALDUX depends on ADK_TARGET_ARCH_XTENSA config ADK_TARGET_CPU_XTENSA_DC232B @@ -1723,7 +1715,6 @@ config ADK_TARGET_CPU_XTENSA_DC232B select ADK_TARGET_SUPPORTS_LT 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 depends on ADK_TARGET_ARCH_XTENSA config ADK_TARGET_CPU_XTENSA_DE212 @@ -1732,7 +1723,6 @@ config ADK_TARGET_CPU_XTENSA_DE212 select ADK_TARGET_SUPPORTS_LT 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 depends on ADK_TARGET_ARCH_XTENSA config ADK_TARGET_CPU_XTENSA_KC705_BE @@ -1742,7 +1732,6 @@ config ADK_TARGET_CPU_XTENSA_KC705_BE select ADK_TARGET_SUPPORTS_LT 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 depends on ADK_TARGET_ARCH_XTENSA config ADK_TARGET_CPU_XTENSA_FSF @@ -1752,7 +1741,6 @@ config ADK_TARGET_CPU_XTENSA_FSF select ADK_TARGET_SUPPORTS_LT 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 depends on ADK_TARGET_ARCH_XTENSA endchoice diff --git a/target/config/Config.in.float b/target/config/Config.in.float index 4264dd437..3fd79d2b9 100644 --- a/target/config/Config.in.float +++ b/target/config/Config.in.float @@ -13,8 +13,7 @@ depends on ADK_TARGET_ARCH_ARM || \ config ADK_TARGET_HARD_FLOAT bool "hard-float" depends on ADK_TARGET_CPU_WITH_FPU \ - && !ADK_TARGET_CPU_WITH_FPU_FPV5 \ - && !ADK_TARGET_OS_FROSTED + && !ADK_TARGET_CPU_WITH_FPU_FPV5 config ADK_TARGET_HARD_FLOAT_SP bool "hard-float-single-precision" @@ -29,7 +28,7 @@ config ADK_TARGET_SOFT_FLOAT config ADK_TARGET_SOFTFP_FLOAT bool "softfp" - depends on ADK_TARGET_ARCH_ARM && !ADK_TARGET_OS_FROSTED + depends on ADK_TARGET_ARCH_ARM endchoice diff --git a/target/config/Config.in.instructions b/target/config/Config.in.instructions index 9393a5ac8..53b24b153 100644 --- a/target/config/Config.in.instructions +++ b/target/config/Config.in.instructions @@ -12,8 +12,6 @@ config ADK_TARGET_ARCH_ARM_WITH_THUMB bool "thumb" select ADK_LINUX_KERNEL_ARM_THUMB if ADK_TARGET_OS_LINUX select ADK_LINUX_KERNEL_THUMB2_KERNEL if ADK_TARGET_OS_LINUX - select ADK_WALDUX_KERNEL_ARM_THUMB if ADK_TARGET_OS_WALDUX - select ADK_WALDUX_KERNEL_THUMB2_KERNEL if ADK_TARGET_OS_WALDUX depends on ADK_TARGET_CPU_WITH_THUMB || ADK_TARGET_CPU_WITH_THUMB2 endchoice diff --git a/target/config/Config.in.libc b/target/config/Config.in.libc index b548d8fd6..d9ce17c6b 100644 --- a/target/config/Config.in.libc +++ b/target/config/Config.in.libc @@ -4,7 +4,7 @@ choice prompt "Target C library" depends on !ADK_TARGET_CHOOSE_ARCH -default ADK_TARGET_LIB_UCLIBC_NG if ADK_TARGET_OS_LINUX || ADK_TARGET_OS_WALDUX +default ADK_TARGET_LIB_UCLIBC_NG if ADK_TARGET_OS_LINUX config ADK_TARGET_LIB_UCLIBC_NG bool "uClibc-ng" @@ -40,7 +40,7 @@ config ADK_TARGET_LIB_UCLIBC_NG ADK_TARGET_ARCH_TILE || \ ADK_TARGET_ARCH_X86 || \ ADK_TARGET_ARCH_X86_64 || \ - ADK_TARGET_ARCH_XTENSA) && ADK_TARGET_OS_LINUX || ADK_TARGET_OS_WALDUX + ADK_TARGET_ARCH_XTENSA) && ADK_TARGET_OS_LINUX help https://uclibc-ng.org @@ -132,10 +132,7 @@ config ADK_TARGET_LIB_NEWLIB ADK_TARGET_ARCH_X86 || \ ADK_TARGET_ARCH_X86_64 || \ ADK_TARGET_ARCH_XTENSA) && \ - (ADK_TARGET_OS_BAREMETAL || \ - ADK_TARGET_OS_FROSTED || \ - ADK_TARGET_OS_RTEMS || \ - ADK_TARGET_OS_ZEPHYR ) + ADK_TARGET_OS_BAREMETAL help https://sourceware.org/newlib/ @@ -176,21 +173,15 @@ config ADK_TARGET_LIB_MUSL_GIT config ADK_TARGET_LIB_NEWLIB_3_0_0 bool "3.0.0" depends on ADK_TARGET_LIB_NEWLIB \ - && !ADK_TARGET_ARCH_XTENSA \ - && !ADK_TARGET_OS_FROSTED \ - && !ADK_TARGET_OS_RTEMS + && !ADK_TARGET_ARCH_XTENSA config ADK_TARGET_LIB_NEWLIB_XTENSA bool "xtensa" depends on ADK_TARGET_LIB_NEWLIB && ADK_TARGET_ARCH_XTENSA -config ADK_TARGET_LIB_NEWLIB_FROSTED - bool "frosted-git" - depends on ADK_TARGET_LIB_NEWLIB && ADK_TARGET_OS_FROSTED - config ADK_TARGET_LIB_NEWLIB_GIT bool "git" - depends on ADK_TARGET_LIB_NEWLIB && !ADK_TARGET_OS_FROSTED && ADK_EXPERIMENTAL + depends on ADK_TARGET_LIB_NEWLIB && ADK_EXPERIMENTAL endchoice diff --git a/target/config/Config.in.libs b/target/config/Config.in.libs index 55af79b68..f4feebc11 100644 --- a/target/config/Config.in.libs +++ b/target/config/Config.in.libs @@ -2,7 +2,7 @@ # material, please see the LICENCE file in the top-level directory. choice -depends on ADK_TARGET_OS_LINUX || ADK_TARGET_OS_WALDUX +depends on ADK_TARGET_OS_LINUX bool "Library support" config ADK_TARGET_USE_SHARED_LIBS_ONLY diff --git a/target/config/Config.in.mmu b/target/config/Config.in.mmu index 1d5cd52e1..eb885ebe3 100644 --- a/target/config/Config.in.mmu +++ b/target/config/Config.in.mmu @@ -12,5 +12,4 @@ config ADK_TARGET_WITH_MMU && !ADK_TARGET_ARCH_LM32 \ && !ADK_TARGET_CPU_SH_SH2 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.os b/target/config/Config.in.os index 797567ce1..6f6e96494 100644 --- a/target/config/Config.in.os +++ b/target/config/Config.in.os @@ -9,37 +9,13 @@ config ADK_TARGET_OS_LINUX help Create a Linux system or toolchain. -config ADK_TARGET_OS_WALDUX - bool "Waldux" - help - Create a Waldux system or toolchain. - config ADK_TARGET_OS_BAREMETAL bool "Bare metal" help Create a bare metal appliance or toolchain. -config ADK_TARGET_OS_RTEMS - bool "RTEMS" - help - Create a RTEMS appliance or toolchain. - -config ADK_TARGET_OS_FROSTED - bool "Frosted" - help - Create a frosted appliance or toolchain. - -config ADK_TARGET_OS_ZEPHYR - bool "Zephyr" - help - Create a zephyr appliance or toolchain. - endchoice config ADK_TARGET_OS string default "linux" if ADK_TARGET_OS_LINUX - default "waldux" if ADK_TARGET_OS_WALDUX - default "frosted" if ADK_TARGET_OS_FROSTED - default "rtems5.0.0" if ADK_TARGET_OS_RTEMS - default "zephyr" if ADK_TARGET_OS_ZEPHYR diff --git a/target/config/Config.in.qemuopts b/target/config/Config.in.qemuopts index 012e93efe..3a708885a 100644 --- a/target/config/Config.in.qemuopts +++ b/target/config/Config.in.qemuopts @@ -33,24 +33,6 @@ config ADK_TARGET_QEMU_WITH_BLOCK || ADK_TARGET_SYSTEM_QEMU_ARM_TERRIER select ADK_LINUX_KERNEL_MMC_ARMMMCI if ADK_TARGET_SYSTEM_QEMU_ARM_VEXPRESS_A9 select ADK_LINUX_KERNEL_BLK_DEV_CMD64X if ADK_TARGET_SYSTEM_QEMU_ALPHA - select ADK_WALDUX_KERNEL_SCSI_SYM53C8XX_2 if ADK_TARGET_SYSTEM_QEMU_ARM_VERSATILEPB - select ADK_WALDUX_KERNEL_MTD_M25P80 if ADK_TARGET_SYSTEM_QEMU_MICROBLAZE_ML605 \ - || ADK_TARGET_SYSTEM_QEMU_MICROBLAZE_S3ADSP1800 - select ADK_WALDUX_KERNEL_ATA_PIIX if ADK_TARGET_SYSTEM_QEMU_MIPS \ - || ADK_TARGET_SYSTEM_QEMU_MIPS64 \ - || ADK_TARGET_SYSTEM_QEMU_X86 \ - || ADK_TARGET_SYSTEM_QEMU_X86_64 - select ADK_WALDUX_KERNEL_PATA_MACIO if ADK_TARGET_SYSTEM_QEMU_PPC_BAMBOO \ - || ADK_TARGET_SYSTEM_QEMU_PPC_MACPPC - select ADK_WALDUX_KERNEL_SCSI_IBMVSCSI if ADK_TARGET_SYSTEM_QEMU_PPC64 - select ADK_WALDUX_KERNEL_SCSI_MAC_ESP if ADK_TARGET_SYSTEM_QEMU_M68K_Q800 - select ADK_WALDUX_KERNEL_SCSI_SUNESP if ADK_TARGET_SYSTEM_QEMU_SPARC - select ADK_WALDUX_KERNEL_PATA_CMD64X if ADK_TARGET_SYSTEM_QEMU_SPARC64 - select ADK_WALDUX_KERNEL_PATA_PLATFORM if ADK_TARGET_SYSTEM_QEMU_SH - select ADK_WALDUX_KERNEL_PATA_PXA if ADK_TARGET_QEMU_ARM_SPITZ \ - || ADK_TARGET_SYSTEM_QEMU_ARM_TERRIER - select ADK_WALDUX_KERNEL_MMC_ARMMMCI if ADK_TARGET_SYSTEM_QEMU_ARM_VEXPRESS_A9 - select ADK_WALDUX_KERNEL_BLK_DEV_CMD64X if ADK_TARGET_SYSTEM_QEMU_ALPHA menu "Qemu system configuration" depends on ADK_TARGET_QEMU && (ADK_TARGET_SYSTEM_QEMU_X86_64 \ @@ -107,23 +89,6 @@ config ADK_TARGET_QEMU_WITH_GRAPHIC select ADK_LINUX_KERNEL_MOUSE_PS2 if ADK_TARGET_SYSTEM_QEMU_X86 || ADK_TARGET_SYSTEM_QEMU_X86_64 select ADK_LINUX_KERNEL_USB_HID if ADK_TARGET_SYSTEM_QEMU_SH select ADK_LINUX_KERNEL_USB_OHCI_HCD_PLATFORM if ADK_TARGET_SYSTEM_QEMU_SH - select ADK_WALDUX_KERNEL_VT - select ADK_WALDUX_KERNEL_VT_CONSOLE - select ADK_WALDUX_KERNEL_FONTS - select ADK_WALDUX_KERNEL_FONT_8x16 - select ADK_WALDUX_KERNEL_FB - select ADK_WALDUX_KERNEL_FRAMEBUFFER_CONSOLE - select ADK_WALDUX_KERNEL_INPUT - select ADK_WALDUX_KERNEL_INPUT_KEYBOARD - select ADK_WALDUX_KERNEL_INPUT_MOUSE - select ADK_WALDUX_KERNEL_INPUT_MOUSEDEV - select ADK_WALDUX_KERNEL_PLAT_VERSATILE_CLCD if ADK_TARGET_SYSTEM_QEMU_ARM_VEXPRESS_A9 - select ADK_WALDUX_KERNEL_FB_SM501 if ADK_TARGET_SYSTEM_QEMU_SH - select ADK_WALDUX_KERNEL_DRM_BOCHS if ADK_TARGET_SYSTEM_QEMU_X86 || ADK_TARGET_SYSTEM_QEMU_X86_64 - select ADK_WALDUX_KERNEL_KEYBOARD_ATKBD if ADK_TARGET_SYSTEM_QEMU_X86 || ADK_TARGET_SYSTEM_QEMU_X86_64 - select ADK_WALDUX_KERNEL_MOUSE_PS2 if ADK_TARGET_SYSTEM_QEMU_X86 || ADK_TARGET_SYSTEM_QEMU_X86_64 - select ADK_WALDUX_KERNEL_USB_HID if ADK_TARGET_SYSTEM_QEMU_SH - select ADK_WALDUX_KERNEL_USB_OHCI_HCD_PLATFORM if ADK_TARGET_SYSTEM_QEMU_SH endchoice @@ -156,11 +121,6 @@ config ADK_TARGET_QEMU_WITH_VIRTIO select ADK_LINUX_KERNEL_VIRTIO_NET select ADK_LINUX_KERNEL_VIRTIO_BLK select ADK_LINUX_KERNEL_VIRTIO_CONSOLE - select ADK_WALDUX_KERNEL_VIRTIO - select ADK_WALDUX_KERNEL_VIRTIO_PCI - select ADK_WALDUX_KERNEL_VIRTIO_NET - select ADK_WALDUX_KERNEL_VIRTIO_BLK - select ADK_WALDUX_KERNEL_VIRTIO_CONSOLE endchoice diff --git a/target/config/Config.in.rootfs b/target/config/Config.in.rootfs index d9a459455..3eb4d1154 100644 --- a/target/config/Config.in.rootfs +++ b/target/config/Config.in.rootfs @@ -54,7 +54,6 @@ config ADK_TARGET_ROOTFS_INITRAMFS depends on !ADK_TARGET_SYSTEM_QEMU_M68K_MCF5208 depends on !ADK_TARGET_SYSTEM_QEMU_METAG select ADK_LINUX_KERNEL_BLK_DEV_INITRD if ADK_TARGET_OS_LINUX - select ADK_WALDUX_KERNEL_BLK_DEV_INITRD if ADK_TARGET_OS_WALDUX help create an read-only initramfs system. @@ -73,7 +72,6 @@ config ADK_TARGET_ROOTFS_SQUASHFS config ADK_TARGET_ROOTFS_JFFS2 bool "Compressed read-write root filesystem (jffs2)" select ADK_LINUX_KERNEL_JFFS2_FS if ADK_TARGET_OS_LINUX - select ADK_WALDUX_KERNEL_JFFS2_FS if ADK_TARGET_OS_WALDUX select ADK_HOST_NEED_MTD_UTILS select ADK_TARGET_QEMU_WITH_BLOCK if ADK_TARGET_QEMU depends on ADK_TARGET_WITH_MTD \ @@ -85,7 +83,6 @@ config ADK_TARGET_ROOTFS_JFFS2 config ADK_TARGET_ROOTFS_UBIFS bool "UBIFS root filesystem (NAND)" select ADK_LINUX_KERNEL_UBIFS_FS if ADK_TARGET_OS_LINUX - select ADK_WALDUX_KERNEL_UBIFS_FS if ADK_TARGET_OS_WALDUX select ADK_HOST_NEED_MTD_UTILS select ADK_HOST_NEED_KERNEL2MINOR depends on ADK_TARGET_WITH_NAND @@ -102,14 +99,6 @@ config ADK_TARGET_ROOTFS_NFSROOT select ADK_LINUX_KERNEL_NFS_COMMON if ADK_TARGET_OS_LINUX select ADK_LINUX_KERNEL_IP_PNP if ADK_TARGET_OS_LINUX select ADK_LINUX_KERNEL_IP_PNP_DHCP if ADK_TARGET_OS_LINUX - select ADK_WALDUX_KERNEL_NETWORK_FILESYSTEMS if ADK_TARGET_OS_WALDUX - select ADK_WALDUX_KERNEL_SUNRPC if ADK_TARGET_OS_WALDUX - select ADK_WALDUX_KERNEL_NFS_FS if ADK_TARGET_OS_WALDUX - select ADK_WALDUX_KERNEL_NFS_V3 if ADK_TARGET_OS_WALDUX - select ADK_WALDUX_KERNEL_ROOT_NFS if ADK_TARGET_OS_WALDUX - select ADK_WALDUX_KERNEL_NFS_COMMON if ADK_TARGET_OS_WALDUX - select ADK_WALDUX_KERNEL_IP_PNP if ADK_TARGET_OS_WALDUX - select ADK_WALDUX_KERNEL_IP_PNP_DHCP if ADK_TARGET_OS_WALDUX depends on !ADK_TARGET_QEMU && \ !ADK_TARGET_SIM && \ !ADK_TARGET_VBOX && \ @@ -128,14 +117,6 @@ config ADK_TARGET_ROOTFS_USB select ADK_LINUX_KERNEL_USB_OHCI_HCD if ADK_TARGET_OS_LINUX select ADK_LINUX_KERNEL_USB_UHCI_HCD if ADK_TARGET_OS_LINUX select ADK_LINUX_KERNEL_USB_STORAGE if ADK_TARGET_OS_LINUX - select ADK_WALDUX_KERNEL_NLS if ADK_TARGET_OS_WALDUX - select ADK_WALDUX_KERNEL_SCSI if ADK_TARGET_OS_WALDUX - select ADK_WALDUX_KERNEL_BLK_DEV_SD if ADK_TARGET_OS_WALDUX - select ADK_WALDUX_KERNEL_USB if ADK_TARGET_OS_WALDUX - select ADK_WALDUX_KERNEL_USB_EHCI_HCD if ADK_TARGET_OS_WALDUX - select ADK_WALDUX_KERNEL_USB_OHCI_HCD if ADK_TARGET_OS_WALDUX - select ADK_WALDUX_KERNEL_USB_UHCI_HCD if ADK_TARGET_OS_WALDUX - select ADK_WALDUX_KERNEL_USB_STORAGE if ADK_TARGET_OS_WALDUX select ADK_PACKAGE_ADKINSTALL depends on ADK_TARGET_WITH_USB_BOOT \ || ADK_TARGET_GENERIC @@ -148,10 +129,6 @@ config ADK_TARGET_ROOTFS_ISO select ADK_LINUX_KERNEL_JOLIET if ADK_TARGET_OS_LINUX select ADK_LINUX_KERNEL_SCSI if ADK_TARGET_OS_LINUX select ADK_LINUX_KERNEL_BLK_DEV_SR if ADK_TARGET_OS_LINUX - select ADK_WALDUX_KERNEL_ISO9660_FS if ADK_TARGET_OS_WALDUX - select ADK_WALDUX_KERNEL_JOLIET if ADK_TARGET_OS_WALDUX - select ADK_WALDUX_KERNEL_SCSI if ADK_TARGET_OS_WALDUX - select ADK_WALDUX_KERNEL_BLK_DEV_SR if ADK_TARGET_OS_WALDUX select ADK_HOST_NEED_CDRTOOLS select ADK_HOST_NEED_SYSLINUX depends on ADK_TARGET_ARCH_X86 @@ -165,7 +142,6 @@ config ADK_TARGET_ROOTFS_INITRAMFSARCHIVE && !ADK_TARGET_SYSTEM_QEMU_METAG \ && !ADK_TARGET_SIM select ADK_LINUX_KERNEL_BLK_DEV_INITRD if ADK_TARGET_OS_LINUX - select ADK_WALDUX_KERNEL_BLK_DEV_INITRD if ADK_TARGET_OS_WALDUX help Use this option if your planning to create a initramfs. @@ -173,7 +149,6 @@ config ADK_TARGET_ROOTFS_ARCHIVE bool "Archive usable for ext4 filesystems" select ADK_HOST_NEED_GENEXT2FS if ADK_TARGET_QEMU || ADK_TARGET_VBOX select ADK_LINUX_KERNEL_EXT4_FS if ADK_TARGET_OS_LINUX - select ADK_WALDUX_KERNEL_EXT4_FS if ADK_TARGET_OS_WALDUX select ADK_TARGET_QEMU_WITH_BLOCK if ADK_TARGET_QEMU depends on !ADK_TARGET_SIM \ && !ADK_TARGET_ARCH_NDS32 \ @@ -188,8 +163,6 @@ config ADK_TARGET_ROOTFS_GENIMAGE bool "Create a disk image for the target" select ADK_LINUX_KERNEL_EXT4_FS if ADK_TARGET_OS_LINUX select ADK_LINUX_KERNEL_VFAT_FS if ADK_TARGET_OS_LINUX - select ADK_WALDUX_KERNEL_EXT4_FS if ADK_TARGET_OS_WALDUX - select ADK_WALDUX_KERNEL_VFAT_FS if ADK_TARGET_OS_WALDUX select ADK_TARGET_QEMU_WITH_BLOCK if ADK_TARGET_QEMU select ADK_TARGET_QEMU_WITH_BOOTLOADER if ADK_TARGET_QEMU select ADK_HOST