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 --- 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 +++++------ 14 files changed, 19 insertions(+), 150 deletions(-) (limited to 'target/config') 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_BUILD_GENIMAGE diff --git a/target/config/Config.in.runtime b/target/config/Config.in.runtime index 9c9b9cd49..836d7aa14 100644 --- a/target/config/Config.in.runtime +++ b/target/config/Config.in.runtime @@ -59,8 +59,6 @@ config ADK_RUNTIME_DEV_MDEV bool "Use mdev" select ADK_LINUX_KERNEL_DEVTMPFS if ADK_TARGET_OS_LINUX select ADK_LINUX_KERNEL_DEVTMPFS_MOUNT if ADK_TARGET_OS_LINUX - select ADK_WALDUX_KERNEL_DEVTMPFS if ADK_TARGET_OS_WALDUX - select ADK_WALDUX_KERNEL_DEVTMPFS_MOUNT if ADK_TARGET_OS_WALDUX depends on ADK_PACKAGE_BUSYBOX depends on !ADK_RUNTIME_INIT_SYSTEMD @@ -75,16 +73,12 @@ config ADK_RUNTIME_DEV_UDEV select ADK_HOST_BUILD_KMOD select ADK_LINUX_KERNEL_DEVTMPFS if ADK_TARGET_OS_LINUX select ADK_LINUX_KERNEL_DEVTMPFS_MOUNT if ADK_TARGET_OS_LINUX - select ADK_WALDUX_KERNEL_DEVTMPFS if ADK_TARGET_OS_WALDUX - select ADK_WALDUX_KERNEL_DEVTMPFS_MOUNT if ADK_TARGET_OS_WALDUX depends on !ADK_RUNTIME_INIT_SYSTEMD config ADK_RUNTIME_DEV_SYSTEMD_UDEV bool "Use systemd udev" select ADK_LINUX_KERNEL_DEVTMPFS if ADK_TARGET_OS_LINUX select ADK_LINUX_KERNEL_DEVTMPFS_MOUNT if ADK_TARGET_OS_LINUX - select ADK_WALDUX_KERNEL_DEVTMPFS if ADK_TARGET_OS_WALDUX - select ADK_WALDUX_KERNEL_DEVTMPFS_MOUNT if ADK_TARGET_OS_WALDUX depends on ADK_RUNTIME_INIT_SYSTEMD config ADK_RUNTIME_DEV_STATIC diff --git a/target/config/Config.in.toolchain b/target/config/Config.in.toolchain index 0845490a1..184e4adfc 100644 --- a/target/config/Config.in.toolchain +++ b/target/config/Config.in.toolchain @@ -124,7 +124,7 @@ config ADK_STATIC_TOOLCHAIN config ADK_PRELINK bool "Prelink binaries and libraries in Image" - depends on ADK_TARGET_OS_LINUX || ADK_TARGET_OS_WALDUX + depends on ADK_TARGET_OS_LINUX help Do prelinking for faster loading of binaries. diff --git a/target/config/Config.in.tools b/target/config/Config.in.tools index a328b8684..b6c740525 100644 --- a/target/config/Config.in.tools +++ b/target/config/Config.in.tools @@ -309,11 +309,11 @@ source "target/config/Config.in.prereq" config ADK_COMPRESSION_TOOL string - default "gzip -n9" if ADK_LINUX_KERNEL_INITRAMFS_COMPRESSION_GZIP || ADK_WALDUX_KERNEL_INITRAMFS_COMPRESSION_GZIP - default "bzip2" if ADK_LINUX_KERNEL_INITRAMFS_COMPRESSION_BZIP2 || ADK_WALDUX_KERNEL_INITRAMFS_COMPRESSION_BZIP2 - default "xz -v --check=crc32 --lzma2=dict=1MiB" if ADK_LINUX_KERNEL_INITRAMFS_COMPRESSION_XZ || ADK_WALDUX_KERNEL_INITRAMFS_COMPRESSION_XZ - default "lz4c -l" if ADK_LINUX_KERNEL_INITRAMFS_COMPRESSION_LZ4 || ADK_WALDUX_KERNEL_INITRAMFS_COMPRESSION_LZ4 - default "lzma -9" if ADK_LINUX_KERNEL_INITRAMFS_COMPRESSION_LZMA || ADK_WALDUX_KERNEL_INITRAMFS_COMPRESSION_LZMA - default "lzop" if ADK_LINUX_KERNEL_INITRAMFS_COMPRESSION_LZO || ADK_WALDUX_KERNEL_INITRAMFS_COMPRESSION_LZO + default "gzip -n9" if ADK_LINUX_KERNEL_INITRAMFS_COMPRESSION_GZIP + default "bzip2" if ADK_LINUX_KERNEL_INITRAMFS_COMPRESSION_BZIP2 + default "xz -v --check=crc32 --lzma2=dict=1MiB" if ADK_LINUX_KERNEL_INITRAMFS_COMPRESSION_XZ + default "lz4c -l" if ADK_LINUX_KERNEL_INITRAMFS_COMPRESSION_LZ4 + default "lzma -9" if ADK_LINUX_KERNEL_INITRAMFS_COMPRESSION_LZMA + default "lzop" if ADK_LINUX_KERNEL_INITRAMFS_COMPRESSION_LZO default "gzip -n9" help -- cgit v1.2.3