Browse Source

add support for waldux

Waldemar Brodkorb 1 year ago
parent
commit
9bb871a0bb
100 changed files with 2743 additions and 2590 deletions
  1. 23 11
      Config.in
  2. 9 6
      mk/build.mk
  3. 9 9
      mk/image.mk
  4. 23 13
      mk/kernel-build.mk
  5. 1 1
      mk/kernel-vars.mk
  6. 13 13
      mk/kernel-ver.mk
  7. 4 4
      mk/linux.mk
  8. 1 2
      mk/vars.mk
  9. 16 0
      mk/waldux-ver.mk
  10. 10 0
      mk/waldux.mk
  11. 1 1
      package/uclibc-ng/Makefile
  12. 4 0
      rules.mk
  13. 1 1
      scripts/create-menu
  14. 17 11
      target/Makefile
  15. 1 1
      target/arm/systems/banana-pro
  16. 1 1
      target/arm/systems/beaglebone-black
  17. 1 1
      target/arm/systems/kinetis-k70
  18. 1 1
      target/arm/systems/linksys-nslu2
  19. 1 1
      target/arm/systems/orange-pi0
  20. 1 1
      target/arm/systems/phytec-wega
  21. 1 1
      target/arm/systems/qemu-arm-realview-eb-mpcore
  22. 1 1
      target/arm/systems/qemu-arm-spitz
  23. 1 1
      target/arm/systems/qemu-arm-terrier
  24. 1 1
      target/arm/systems/qemu-arm-versatilepb
  25. 1 1
      target/arm/systems/qemu-arm-versatilepb-nommu
  26. 1 1
      target/arm/systems/qemu-arm-vexpress-a9
  27. 1 1
      target/arm/systems/qemu-arm-xilinx-zynq
  28. 1 1
      target/arm/systems/raspberry-pi
  29. 1 1
      target/arm/systems/raspberry-pi0
  30. 1 1
      target/arm/systems/raspberry-pi2
  31. 1 1
      target/arm/systems/raspberry-pi3
  32. 1 1
      target/arm/systems/sharp-zaurus
  33. 1 1
      target/arm/systems/solidrun-clearfog
  34. 1 1
      target/arm/systems/solidrun-imx6
  35. 1 1
      target/arm/systems/st-stm32f429
  36. 1 1
      target/arm/systems/st-stm32f769
  37. 1 1
      target/config/Config.in.adk
  38. 1 1
      target/config/Config.in.binfmt
  39. 0 0
      target/config/Config.in.cmdline
  40. 24 12
      target/config/Config.in.cpu
  41. 2 1
      target/config/Config.in.hardware
  42. 3 3
      target/config/Config.in.libc
  43. 6 0
      target/config/Config.in.os
  44. 74 34
      target/config/Config.in.qemuopts
  45. 54 27
      target/config/Config.in.rootfs
  46. 13 6
      target/config/Config.in.runtime
  47. 2 2
      target/config/Config.in.toolchain
  48. 6 6
      target/config/Config.in.tools
  49. 11 11
      target/config/Config.in.kernelcfg
  50. 45 45
      target/config/Config.in.kernelversion
  51. 3 3
      target/linux/config/Config.in.arm
  52. 125 125
      target/linux/config/Config.in.audio
  53. 311 311
      target/linux/config/Config.in.block
  54. 48 48
      target/linux/config/Config.in.bluetooth
  55. 5 5
      target/linux/config/Config.in.bus
  56. 50 50
      target/linux/config/Config.in.compression
  57. 33 33
      target/linux/config/Config.in.cpu
  58. 148 148
      target/linux/config/Config.in.crypto
  59. 35 35
      target/linux/config/Config.in.debug
  60. 38 38
      target/linux/config/Config.in.dma
  61. 158 158
      target/linux/config/Config.in.ethernet
  62. 80 80
      target/linux/config/Config.in.flash
  63. 67 67
      target/linux/config/Config.in.fs
  64. 53 53
      target/linux/config/Config.in.fsnet
  65. 2 2
      target/linux/config/Config.in.fsopts
  66. 19 19
      target/linux/config/Config.in.gpio
  67. 132 132
      target/linux/config/Config.in.graphics
  68. 33 33
      target/linux/config/Config.in.i2c
  69. 54 54
      target/linux/config/Config.in.input
  70. 14 14
      target/linux/config/Config.in.ipsec
  71. 24 24
      target/linux/config/Config.in.ipvs
  72. 70 70
      target/linux/config/Config.in.kernel
  73. 7 7
      target/linux/config/Config.in.kvm
  74. 33 33
      target/linux/config/Config.in.leds
  75. 9 9
      target/linux/config/Config.in.lib
  76. 7 7
      target/linux/config/Config.in.mips
  77. 43 43
      target/linux/config/Config.in.misc
  78. 45 45
      target/linux/config/Config.in.multimedia
  79. 38 38
      target/linux/config/Config.in.netfilter
  80. 41 41
      target/linux/config/Config.in.netfilter.core
  81. 44 44
      target/linux/config/Config.in.netfilter.ebt
  82. 28 28
      target/linux/config/Config.in.netfilter.ip4
  83. 20 20
      target/linux/config/Config.in.netfilter.ip6
  84. 65 65
      target/linux/config/Config.in.network
  85. 13 13
      target/linux/config/Config.in.nfc
  86. 39 39
      target/linux/config/Config.in.nls
  87. 2 2
      target/linux/config/Config.in.part
  88. 18 18
      target/linux/config/Config.in.pcmcia
  89. 25 25
      target/linux/config/Config.in.pm
  90. 7 7
      target/linux/config/Config.in.regmap
  91. 17 17
      target/linux/config/Config.in.regulator
  92. 21 21
      target/linux/config/Config.in.rtc
  93. 63 63
      target/linux/config/Config.in.sched
  94. 75 75
      target/linux/config/Config.in.serial
  95. 38 38
      target/linux/config/Config.in.spi
  96. 9 9
      target/linux/config/Config.in.thermal
  97. 96 96
      target/linux/config/Config.in.usb
  98. 16 16
      target/linux/config/Config.in.virtio
  99. 26 26
      target/linux/config/Config.in.watchdog
  100. 0 0
      target/linux/config/Config.in.wireless

+ 23 - 11
Config.in

@@ -13,6 +13,7 @@ config ADK_HAVE_DOT_CONFIG
 	bool
 	default y
 
+source "target/config/Config.in"
 source "target/config/Config.in.os"
 source "target/config/Config.in.hardware"
 source "target/config/Config.in.boards"
@@ -27,19 +28,17 @@ source "target/config/Config.in.cpu"
 source "target/config/Config.in.addons"
 
 comment "After you saved your configuration once, you shouldn't change anything above"
-	depends on ADK_TARGET_OS_LINUX && !ADK_APPLIANCE_TOOLCHAIN && !ADK_TARGET_CHOOSE_ARCH
+	depends on (ADK_TARGET_OS_LINUX || ADK_TARGET_OS_WALDUX) && !ADK_APPLIANCE_TOOLCHAIN && !ADK_TARGET_CHOOSE_ARCH
 
 source "target/config/Config.in.tasks"
 
 menu "Firmware configuration"
-	visible if ADK_TARGET_OS_LINUX && !ADK_APPLIANCE_TOOLCHAIN && !ADK_TARGET_CHOOSE_ARCH
+	visible if (ADK_TARGET_OS_LINUX || ADK_TARGET_OS_WALDUX) && !ADK_APPLIANCE_TOOLCHAIN && !ADK_TARGET_CHOOSE_ARCH
 source "target/config/Config.in.rootfs"
 endmenu
 
-source "target/config/Config.in"
-
 menu "Package selection"
-	visible if ADK_TARGET_OS_LINUX && !ADK_APPLIANCE_TOOLCHAIN && !ADK_TARGET_CHOOSE_ARCH
+	visible if (ADK_TARGET_OS_LINUX || ADK_TARGET_OS_WALDUX) && !ADK_APPLIANCE_TOOLCHAIN && !ADK_TARGET_CHOOSE_ARCH
 source "package/Config.in.auto.global"
 source "package/Config.in"
 menu "Package options"
@@ -48,23 +47,36 @@ endmenu
 endmenu
 
 menu "Runtime configuration"
-	visible if ADK_TARGET_OS_LINUX && !ADK_APPLIANCE_TOOLCHAIN && !ADK_TARGET_CHOOSE_ARCH
+	visible if (ADK_TARGET_OS_LINUX || ADK_TARGET_OS_WALDUX) && !ADK_APPLIANCE_TOOLCHAIN && !ADK_TARGET_CHOOSE_ARCH
 source "target/config/Config.in.runtime"
 endmenu
 
 menu "Linux Kernel configuration"
 	visible if ADK_TARGET_OS_LINUX && !ADK_TARGET_CHOOSE_ARCH
-source "target/config/Config.in.kernelversion"
-source "target/config/Config.in.kernelcfg"
-source "target/config/Config.in.kernelcmd"
+source "target/linux/Config.in.kernelversion"
+source "target/linux/Config.in.kernelcfg"
 source "target/linux/config/Config.in.compression"
+source "target/config/Config.in.cmdline"
 
-menu "Advanced Kernel configuration"
-	visible if ADK_TARGET_OS_LINUX && ADK_TARGET_KERNEL_CUSTOMISING && !ADK_APPLIANCE_TOOLCHAIN && !ADK_TARGET_CHOOSE_ARCH && !ADK_TARGET_KERNEL_USE_DEFCONFIG && !ADK_TARGET_KERNEL_USE_CUSTOMCONFIG
+menu "Advanced Linux Kernel configuration"
+	visible if ADK_TARGET_OS_LINUX && ADK_TARGET_KERNEL_CUSTOMISING && !ADK_APPLIANCE_TOOLCHAIN && !ADK_TARGET_CHOOSE_ARCH && !ADK_TARGET_LINUX_KERNEL_USE_DEFCONFIG && !ADK_TARGET_LINUX_KERNEL_USE_CUSTOMCONFIG
 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"

+ 9 - 6
mk/build.mk

@@ -17,7 +17,6 @@ DEFCONFIG=		ADK_DEBUG=n \
 			ADK_PACKAGE_BUSYBOX_HIDE=n \
 			ADK_DISABLE_KERNEL_PATCHES=n \
 			ADK_DISABLE_TARGET_KERNEL_PATCHES=n \
-			ADK_KERNEL_FB_CON_DECOR=n \
 			ADK_MAKE_PARALLEL=y \
 			ADK_MAKE_JOBS=4 \
 			ADK_LEAVE_ETC_ALONE=n \
@@ -78,10 +77,11 @@ DEFCONFIG=		ADK_DEBUG=n \
 			BUSYBOX_FEATURE_INETD_RPC=n \
 			BUSYBOX_FEATURE_MOUNT_NFS=n \
 			BUSYBOX_FEATURE_VI_REGEX_SEARCH=n \
-			ADK_KERNEL_RT2X00_DEBUG=n \
-			ADK_KERNEL_ATH5K_DEBUG=n \
-			ADK_KERNEL_BUG=n \
-			ADK_KERNEL_DEBUG_WITH_KGDB=n
+			ADK_LINUX_KERNEL_FB_CON_DECOR=n \
+			ADK_LINUX_KERNEL_RT2X00_DEBUG=n \
+			ADK_LINUX_KERNEL_ATH5K_DEBUG=n \
+			ADK_LINUX_KERNEL_BUG=n \
+			ADK_LINUX_KERNEL_DEBUG_WITH_KGDB=n
 
 noconfig_targets:=	menuconfig \
 			_config \
@@ -104,7 +104,7 @@ POSTCONFIG=		-@\
 				rebuild=1;\
 			fi; \
 		done; \
-		for i in ADK_TARGET_GPU_MEM ADK_KERNEL_SND_BCM2708;do \
+		for i in ADK_TARGET_GPU_MEM ADK_LINUX_KERNEL_SND_BCM2708;do \
 			if [ "$$(grep ^$$i .config|md5sum)" != "$$(grep ^$$i .config.old|md5sum)" ];then \
 				touch .rebuild.bcm28xx-bootloader;\
 				rebuild=1;\
@@ -188,6 +188,9 @@ 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

+ 9 - 9
mk/image.mk

@@ -7,7 +7,7 @@ else
 FAKEROOT:=
 endif
 
-ifeq ($(ADK_TARGET_OS_LINUX),y)
+ifeq ($(ADK_TARGET_OS_LINUX)$(ADK_TARGET_OS_WALDUX),y)
 # relative paths, like 'mksh' or '../usr/bin/foosh'
 ifeq (${ADK_BINSH_ASH},y)
 BINSH:=ash
@@ -143,7 +143,7 @@ else
 	cp $(BUILD_DIR)/$(TARGET_KERNEL) $(KERNEL_PKGDIR)/boot/kernel
 endif
 	@${BASH} ${SCRIPT_DIR}/make-ipkg-dir.sh ${KERNEL_PKGDIR} \
-	    ../linux/kernel.control ${KERNEL_VERSION} ${ADK_TARGET_CPU_ARCH}
+	    ../$(ADK_TARGET_OS)/kernel.control ${KERNEL_VERSION} ${ADK_TARGET_CPU_ARCH}
 	PATH='$(HOST_PATH)' $(PKG_BUILD) $(KERNEL_PKGDIR) $(PACKAGE_DIR) $(MAKE_TRACE)
 	$(PKG_INSTALL) $(KERNEL_PKG) $(MAKE_TRACE)
 	$(CMD_TRACE) " done"
@@ -235,7 +235,7 @@ createinitramfs: ${STAGING_TARGET_DIR}/${INITRAMFS}_list
 		echo 'CONFIG_INITRAMFS_ROOT_GID=0'; \
 		echo 'CONFIG_INITRAMFS_IS_LARGE=n'; \
 	) >> ${LINUX_DIR}/.config
-ifeq ($(ADK_KERNEL_COMP_XZ),y)
+ifeq ($(ADK_LINUX_KERNEL_COMP_XZ)$(ADK_WALDUX_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
@@ -251,7 +251,7 @@ ifeq ($(ADK_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_KERNEL_COMP_LZ4),y)
+ifeq ($(ADK_LINUX_KERNEL_COMP_LZ4)$(ADK_WALDUX_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
@@ -260,7 +260,7 @@ ifeq ($(ADK_KERNEL_COMP_LZ4),y)
 		echo "CONFIG_RD_LZMA=n" >> ${LINUX_DIR}/.config
 		echo "CONFIG_INITRAMFS_COMPRESSION_LZ4=y" >> ${LINUX_DIR}/.config
 endif
-ifeq ($(ADK_KERNEL_COMP_LZMA),y)
+ifeq ($(ADK_LINUX_KERNEL_COMP_LZMA)$(ADK_WALDUX_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
@@ -269,7 +269,7 @@ ifeq ($(ADK_KERNEL_COMP_LZMA),y)
 		echo "CONFIG_RD_LZMA=y" >> ${LINUX_DIR}/.config
 		echo "CONFIG_INITRAMFS_COMPRESSION_LZMA=y" >> ${LINUX_DIR}/.config
 endif
-ifeq ($(ADK_KERNEL_COMP_LZO),y)
+ifeq ($(ADK_LINUX_KERNEL_COMP_LZO)$(ADK_WALDUX_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
@@ -278,7 +278,7 @@ ifeq ($(ADK_KERNEL_COMP_LZO),y)
 		echo "CONFIG_RD_LZO=y" >> ${LINUX_DIR}/.config
 		echo "CONFIG_INITRAMFS_COMPRESSION_LZO=y" >> ${LINUX_DIR}/.config
 endif
-ifeq ($(ADK_KERNEL_COMP_GZIP),y)
+ifeq ($(ADK_LINUX_KERNEL_COMP_GZIP)$(ADK_WALDUX_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
@@ -287,7 +287,7 @@ ifeq ($(ADK_KERNEL_COMP_GZIP),y)
 		echo "CONFIG_RD_GZIP=y" >> ${LINUX_DIR}/.config
 		echo "CONFIG_INITRAMFS_COMPRESSION_GZIP=y" >> ${LINUX_DIR}/.config
 endif
-ifeq ($(ADK_KERNEL_COMP_BZIP2),y)
+ifeq ($(ADK_LINUX_KERNEL_COMP_BZIP2)$(ADK_WALDUX_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
@@ -296,7 +296,7 @@ ifeq ($(ADK_KERNEL_COMP_BZIP2),y)
 		echo "CONFIG_RD_BZIP2=y" >> ${LINUX_DIR}/.config
 		echo "CONFIG_INITRAMFS_COMPRESSION_BZIP2=y" >> ${LINUX_DIR}/.config
 endif
-ifeq ($(ADK_KERNEL_COMPRESS_NONE),y)
+ifeq ($(ADK_LINUX_KERNEL_COMPRESS_NONE)$(ADK_WALDUX_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

+ 23 - 13
mk/kernel-build.mk

@@ -2,14 +2,14 @@
 # material, please see the LICENCE file in the top-level directory.
 
 include $(ADK_TOPDIR)/rules.mk
-include $(ADK_TOPDIR)/mk/kernel-ver.mk
-include $(ADK_TOPDIR)/mk/linux.mk
+include $(ADK_TOPDIR)/mk/$(ADK_TARGET_OS)-ver.mk
+include $(ADK_TOPDIR)/mk/$(ADK_TARGET_OS).mk
 include $(ADK_TOPDIR)/mk/kernel-vars.mk
 
 ifeq ($(ADK_TARGET_KERNEL_USE_CUSTOMCONFIG),y)
 KERNEL_MODULES_USED:=$(shell grep -s =m $(ADK_TOPDIR)/$(ADK_TARGET_KERNEL_CUSTOMCONFIG_PATH))
 else
-KERNEL_MODULES_USED:=$(shell grep ^ADK_KERNEL $(ADK_TOPDIR)/.config|grep =m)
+KERNEL_MODULES_USED:=$(shell grep ^ADK_$(ADK_TARGET_OS)_KERNEL $(ADK_TOPDIR)/.config|grep =m)
 endif
 
 KERNEL_FILE:=$(ADK_TARGET_KERNEL)
@@ -49,31 +49,41 @@ else
 ADK_DEPMOD:=true
 endif
 
-$(LINUX_DIR)/.prepared: $(TOOLCHAIN_BUILD_DIR)/w-$(PKG_NAME)-$(PKG_VERSION)-$(PKG_RELEASE)/linux-$(KERNEL_FILE_VER)/.patched
-	ln -sf $(TOOLCHAIN_BUILD_DIR)/w-$(PKG_NAME)-$(PKG_VERSION)-$(PKG_RELEASE)/linux-$(KERNEL_FILE_VER) $(LINUX_DIR)
+$(LINUX_DIR)/.prepared: $(TOOLCHAIN_BUILD_DIR)/w-$(PKG_NAME)-$(PKG_VERSION)-$(PKG_RELEASE)/$(ADK_TARGET_OS)-$(KERNEL_FILE_VER)/.patched
+	ln -sf $(TOOLCHAIN_BUILD_DIR)/w-$(PKG_NAME)-$(PKG_VERSION)-$(PKG_RELEASE)/$(ADK_TARGET_OS)-$(KERNEL_FILE_VER) $(LINUX_DIR)
 	mkdir -p $(LINUX_BUILD_DIR)/kmod-control
 	touch $@
 
-ifeq ($(ADK_TARGET_KERNEL_USE_MINICONFIG),y)
+ifeq ($(ADK_TARGET_LINUX_KERNEL_USE_MINICONFIG)$(ADK_TARGET_WALDUX_KERNEL_USE_MINICONFIG),y)
 $(LINUX_DIR)/.config: $(BUILD_DIR)/.kernelconfig
 endif
 
-ifeq ($(ADK_TARGET_KERNEL_USE_CUSTOMCONFIG),y)
-$(ADK_TOPDIR)/$(ADK_TARGET_KERNEL_CUSTOMCONFIG_PATH):
-$(LINUX_DIR)/.config: $(ADK_TOPDIR)/$(ADK_TARGET_KERNEL_CUSTOMCONFIG_PATH)
+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_KERNEL_USE_DEFCONFIG),y)
+ifeq ($(ADK_TARGET_LINUX_KERNEL_USE_DEFCONFIG)$(ADK_TARGET_WALDUX_KERNEL_USE_DEFCONFIG),y)
 	${KERNEL_MAKE_ENV} $(MAKE) -C "${LINUX_DIR}" ${KERNEL_MAKE_OPTS} $(ADK_TARGET_KERNEL_DEFCONFIG) $(MAKE_TRACE)
-else ifeq ($(ADK_TARGET_KERNEL_USE_CUSTOMCONFIG),y)
+else ifeq ($(ADK_TARGET_LINUX_KERNEL_USE_CUSTOMCONFIG),y)
 	@if [ ! -f $(ADK_TOPDIR)/$(ADK_TARGET_KERNEL_CUSTOMCONFIG_PATH) ];then \
-		echo "no kernel configuration found in $(ADK_TOPDIR)/$(ADK_TARGET_KERNEL_CUSTOMCONFIG_PATH)"; \
+		echo "no kernel configuration found in $(ADK_TOPDIR)/$(ADK_TARGET_LINUX_KERNEL_CUSTOMCONFIG_PATH)"; \
+		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_KERNEL_CUSTOMCONFIG_PATH) allnoconfig $(MAKE_TRACE)
+	${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)

+ 1 - 1
mk/kernel-vars.mk

@@ -28,4 +28,4 @@ KERNEL_MAKE_OPTS+=	LOADADDR=0x40008000
 endif
 
 KERNEL_MAKE_ENV:=	PATH="${TOOLCHAIN_DIR}/usr/bin:${STAGING_HOST_DIR}/usr/bin:$$PATH"
-LINUX_BUILD_DIR:=	$(BUILD_DIR)/linux-$(ADK_TARGET_ARCH)
+LINUX_BUILD_DIR:=	$(BUILD_DIR)/$(ADK_TARGET_OS)-$(ADK_TARGET_ARCH)

+ 13 - 13
mk/kernel-ver.mk

@@ -10,66 +10,66 @@
 # KERNEL_RELEASE:  OpenADK internal versioning
 # KERNEL_VERSION:  final kernel version how we want to identify a specific kernel
 
-ifeq ($(ADK_TARGET_KERNEL_VERSION_GIT),y)
-KERNEL_FILE_VER:=	$(ADK_TARGET_KERNEL_GIT)
+ifeq ($(ADK_TARGET_LINUX_KERNEL_VERSION_GIT),y)
+KERNEL_FILE_VER:=	$(ADK_TARGET_LINUX_KERNEL_GIT)
 KERNEL_RELEASE:=	1
-KERNEL_VERSION:=	$(ADK_TARGET_KERNEL_GIT_VER)-$(KERNEL_RELEASE)
+KERNEL_VERSION:=	$(ADK_TARGET_LINUX_KERNEL_GIT_VER)-$(KERNEL_RELEASE)
 endif
-ifeq ($(ADK_TARGET_KERNEL_VERSION_4_15),y)
+ifeq ($(ADK_TARGET_LINUX_KERNEL_VERSION_4_15),y)
 KERNEL_FILE_VER:=	4.15.4
 KERNEL_RELEASE:=	1
 KERNEL_VERSION:=	$(KERNEL_FILE_VER)-$(KERNEL_RELEASE)
 KERNEL_HASH:=		a23d7e1a9c1f72528531d9933e59e4cc4556752a2ea029fdc66a1b0fd24c8a3a
 endif
-ifeq ($(ADK_TARGET_KERNEL_VERSION_4_14),y)
+ifeq ($(ADK_TARGET_LINUX_KERNEL_VERSION_4_14),y)
 KERNEL_FILE_VER:=	4.14.8
 KERNEL_RELEASE:=	1
 KERNEL_VERSION:=	$(KERNEL_FILE_VER)-$(KERNEL_RELEASE)
 KERNEL_HASH:=		6ebcc57ba31d714af872347184d1de32f4ab0b7096ef4e062d1ca6b3234d9333
 endif
-ifeq ($(ADK_TARGET_KERNEL_VERSION_4_9),y)
+ifeq ($(ADK_TARGET_LINUX_KERNEL_VERSION_4_9),y)
 KERNEL_FILE_VER:=	4.9.77
 KERNEL_RELEASE:=	1
 KERNEL_VERSION:=	$(KERNEL_FILE_VER)-$(KERNEL_RELEASE)
 KERNEL_HASH:=		7c29bc3fb96f1e23d98f664e786dddd53a1599f56431b9b7fdfba402a4b3705c
 endif
-ifeq ($(ADK_TARGET_KERNEL_VERSION_4_4),y)
+ifeq ($(ADK_TARGET_LINUX_KERNEL_VERSION_4_4),y)
 KERNEL_FILE_VER:=	4.4.112
 KERNEL_RELEASE:=	1
 KERNEL_VERSION:=	$(KERNEL_FILE_VER)-$(KERNEL_RELEASE)
 KERNEL_HASH:=		544b42cbeed022896115c76a18fc97b4507d5b41d7ac0ce1dce9afd6ffd11ecd
 endif
-ifeq ($(ADK_TARGET_KERNEL_VERSION_4_1),y)
+ifeq ($(ADK_TARGET_LINUX_KERNEL_VERSION_4_1),y)
 KERNEL_FILE_VER:=	4.1.45
 KERNEL_RELEASE:=	1
 KERNEL_VERSION:=	$(KERNEL_FILE_VER)-$(KERNEL_RELEASE)
 KERNEL_HASH:=		76700a6a788c5750e3421eba004190cdc5b63f62726fce3b5fa27bd1c2cd5912
 endif
-ifeq ($(ADK_TARGET_KERNEL_VERSION_3_16),y)
+ifeq ($(ADK_TARGET_LINUX_KERNEL_VERSION_3_16),y)
 KERNEL_FILE_VER:=	3.16.49
 KERNEL_RELEASE:=	1
 KERNEL_VERSION:=	$(KERNEL_FILE_VER)-$(KERNEL_RELEASE)
 KERNEL_HASH:=		7ab9ab2efb584b36685bae83f8005a699186ad0d70e6b659de58c89d0ec55f96
 endif
-ifeq ($(ADK_TARGET_KERNEL_VERSION_3_10),y)
+ifeq ($(ADK_TARGET_LINUX_KERNEL_VERSION_3_10),y)
 KERNEL_FILE_VER:=	3.10.107
 KERNEL_RELEASE:=	1
 KERNEL_VERSION:=	$(KERNEL_FILE_VER)-$(KERNEL_RELEASE)
 KERNEL_HASH:=		948ae756ba90b3b981fb8245789ea1426d43c351921df566dd5463171883edc3
 endif
-ifeq ($(ADK_TARGET_KERNEL_VERSION_3_2),y)
+ifeq ($(ADK_TARGET_LINUX_KERNEL_VERSION_3_2),y)
 KERNEL_FILE_VER:=	3.2.94
 KERNEL_RELEASE:=	1
 KERNEL_VERSION:=	$(KERNEL_FILE_VER)-$(KERNEL_RELEASE)
 KERNEL_HASH:=		0bc5856e6de4ad1a941c6d2b0014493c31800dcd51db3e561c38a19b99621f60
 endif
-ifeq ($(ADK_TARGET_KERNEL_VERSION_2_6_32),y)
+ifeq ($(ADK_TARGET_LINUX_KERNEL_VERSION_2_6_32),y)
 KERNEL_FILE_VER:=	2.6.32.70
 KERNEL_RELEASE:=	1
 KERNEL_VERSION:=	$(KERNEL_FILE_VER)-$(KERNEL_RELEASE)
 KERNEL_HASH:=		d7d0ee4588711d4f85ed67b65d447b4bbbe215e600a771fb87a62524b6341c43
 endif
-ifeq ($(ADK_TARGET_KERNEL_VERSION_3_10_NDS32),y)
+ifeq ($(ADK_TARGET_LINUX_KERNEL_VERSION_3_10_NDS32),y)
 KERNEL_FILE_VER:=	3.10-nds32
 KERNEL_RELEASE:=	1
 KERNEL_VERSION:=	$(KERNEL_FILE_VER)-$(KERNEL_RELEASE)

+ 4 - 4
mk/linux.mk

@@ -3,10 +3,10 @@
 
 PKG_NAME:=	linux
 PKG_RELEASE:=	$(KERNEL_RELEASE)
-ifeq ($(ADK_TARGET_KERNEL_VERSION_GIT),y)
-PKG_VERSION:=	$(ADK_TARGET_KERNEL_GIT)
-PKG_GIT:=	$(ADK_TARGET_KERNEL_GIT_TYPE)
-PKG_SITES:=	$(ADK_TARGET_KERNEL_GIT_REPO)
+ifeq ($(ADK_TARGET_LINUX_KERNEL_VERSION_GIT),y)
+PKG_VERSION:=	$(ADK_TARGET_LINUX_KERNEL_GIT)
+PKG_GIT:=	$(ADK_TARGET_LINUX_KERNEL_GIT_TYPE)
+PKG_SITES:=	$(ADK_TARGET_LINUX_KERNEL_GIT_REPO)
 else
 PKG_VERSION:=	$(KERNEL_FILE_VER)
 PKG_SITES:=  	${MASTER_SITE_KERNEL:=kernel/v4.x/} \

+ 1 - 2
mk/vars.mk

@@ -326,12 +326,11 @@ endif
 SED:=			PATH='${HOST_PATH}' sed -i -e
 XZ:=			PATH='${HOST_PATH}' xz
 CPIO:=			PATH='${HOST_PATH}' cpio
-LINUX_DIR:=		$(BUILD_DIR)/linux
+LINUX_DIR:=		$(BUILD_DIR)/$(ADK_TARGET_OS)
 KERNEL_MODULE_FLAGS:=	ARCH=${ADK_TARGET_KARCH} \
 			PREFIX=/usr \
 			KERNEL_PATH=${LINUX_DIR} \
 			KERNELDIR=${LINUX_DIR} \
-			KERNEL_DIR=${LINUX_DIR} \
 			CROSS_COMPILE="${TARGET_CROSS}" \
 			V=1
 

+ 16 - 0
mk/waldux-ver.mk

@@ -0,0 +1,16 @@
+# 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

+ 10 - 0
mk/waldux.mk

@@ -0,0 +1,10 @@
+# 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

+ 1 - 1
package/uclibc-ng/Makefile

@@ -2,7 +2,7 @@
 # material, please see the LICENCE file in the top-level directory.
 
 include $(ADK_TOPDIR)/rules.mk
-include $(ADK_TOPDIR)/mk/kernel-ver.mk
+include $(ADK_TOPDIR)/mk/$(ADK_TARGET_OS)-ver.mk
 include $(ADK_TOPDIR)/mk/kernel-vars.mk
 include $(ADK_TOPDIR)/toolchain/uclibc-ng/Makefile.inc
 

+ 4 - 0
rules.mk

@@ -27,6 +27,7 @@ SET_DASHX:=		:
 endif
 
 # Strip off the annoying quoting
+ADK_TARGET_OS:=				$(strip $(subst ",, $(ADK_TARGET_OS)))
 ADK_TARGET_ARCH:=			$(strip $(subst ",, $(ADK_TARGET_ARCH)))
 ADK_TARGET_SYSTEM:=			$(strip $(subst ",, $(ADK_TARGET_SYSTEM)))
 ADK_TARGET_BOARD:=			$(strip $(subst ",, $(ADK_TARGET_BOARD)))
@@ -74,6 +75,9 @@ ADK_TARGET_KERNEL_GIT_REPO_NAME:=	$(strip $(subst ",, $(ADK_TARGET_KERNEL_GIT_RE
 ADK_TARGET_KERNEL_GIT:=			$(strip $(subst ",, $(ADK_TARGET_KERNEL_GIT)))
 ADK_TARGET_KERNEL_GIT_VER:=		$(strip $(subst ",, $(ADK_TARGET_KERNEL_GIT_VER)))
 ADK_TARGET_KERNEL_GIT_TYPE:=		$(strip $(subst ",, $(ADK_TARGET_KERNEL_GIT_TYPE)))
+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_KERNEL_DEFCONFIG:=		$(strip $(subst ",, $(ADK_TARGET_KERNEL_DEFCONFIG)))
 ADK_TARGET_GENIMAGE_FILENAME:=		$(strip $(subst ",, $(ADK_TARGET_GENIMAGE_FILENAME)))
 ADK_TARGET_ROOTDEV:=			$(strip $(subst ",, $(ADK_TARGET_ROOTDEV)))

+ 1 - 1
scripts/create-menu

@@ -98,7 +98,7 @@ config ADK_TARGET_CHOOSE_ARCH
 	bool "choose architecture"
 
 EOD
-for os in linux frosted rtems zephyr baremetal; do
+for os in linux waldux frosted rtems zephyr baremetal; do
   for arch in $(cat $topdir/target/$os/arch.lst);do
     OS=$(echo $os | tr '[:lower:]' '[:upper:]')
     ARCH=$(echo $arch | tr '[:lower:]' '[:upper:]')

+ 17 - 11
target/Makefile

@@ -7,7 +7,7 @@ include $(ADK_TOPDIR)/mk/rootfs.mk
 ifeq ($(ADK_TARGET_KERNEL_USE_CUSTOMCONFIG),y)
 KERNEL_MODULES_USED:=$(shell grep -s =m $(ADK_TOPDIR)/$(ADK_TARGET_KERNEL_CUSTOMCONFIG_PATH))
 else
-KERNEL_MODULES_USED:=$(shell grep ^ADK_KERNEL $(ADK_TOPDIR)/.config|grep =m)
+KERNEL_MODULES_USED:=$(shell grep ^ADK_$(ADK_TARGET_OS)_KERNEL $(ADK_TOPDIR)/.config|grep =m)
 endif
 
 all: install
@@ -16,7 +16,7 @@ all: install
 # The following target combines all kernel-related variables and
 # config files into a single one to be used as the final kernel
 # configuration when building. This is how it's done:
-# 1) fetch all enabled ADK_KERNEL_* vars into
+# 1) fetch all enabled ADK_OS_KERNEL_* vars into
 #    .kernelconfig.kernel
 # 2) get the global and device-specific static kernel config and place it into
 #    .kernelconfig.board
@@ -31,14 +31,20 @@ 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),y)
-ifeq ($(ADK_TARGET_KERNEL_USE_MINICONFIG),y)
+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_KERNEL_CUSTOMISING),y)
 config-prepare: $(ADK_TOPDIR)/.config
-	@PATH='$(HOST_PATH)' sed -n '/^ADK_KERNEL/s//CONFIG/p' $(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/linux/kernel.config \
+		cat $(ADK_TOPDIR)/target/$(ADK_TARGET_OS)/kernel.config \
 		    $(ADK_TARGET_ARCH)/kernel/$(ADK_TARGET_SYSTEM) > $(BUILD_DIR)/.kernelconfig.board; \
 	else \
 		echo "no miniconfig found for target system"; \
@@ -100,11 +106,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_KERNEL_DEBUG_WITH_KGDB),y)
+ifeq ($(ADK_LINUX_KERNEL_DEBUG_WITH_KGDB)$(ADK_WALDUX_KERNEL_DEBUG_WITH_KGDB),y)
 	@$(SED) 's#^\(CONFIG_.*CMDLINE="\)\(.*\)"#\1\2 kgdbwait kgdboc=ttyS0,115200"#' \
 		$(BUILD_DIR)/.kernelconfig.board
 endif
-ifeq ($(ADK_KERNEL_NETCONSOLE),y)
+ifeq ($(ADK_LINUX_KERNEL_NETCONSOLE)$(ADK_WALDUX_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
@@ -117,7 +123,7 @@ endif
 else
 config-prepare: $(ADK_TOPDIR)/.config
 	@if [ -f $(ADK_TARGET_ARCH)/kernel/$(ADK_TARGET_SYSTEM) ];then \
-		cat $(ADK_TOPDIR)/target/linux/kernel.config \
+		cat $(ADK_TOPDIR)/target/$(ADK_TARGET_OS)/kernel.config \
 		    $(ADK_TARGET_ARCH)/kernel/$(ADK_TARGET_SYSTEM) > $(BUILD_DIR)/.kernelconfig.board; \
 	else \
 		echo "no miniconfig found for target system"; \
@@ -161,7 +167,7 @@ install: zephyr-install
 targethelp: zephyr-targethelp
 endif
 
-ifeq ($(ADK_TARGET_OS_LINUX),y)
+ifeq ($(ADK_TARGET_OS_LINUX)$(ADK_TARGET_OS_WALDUX),y)
 prepare: $(ADK_TARGET_ARCH)-prepare
 compile: $(ADK_TARGET_ARCH)-compile
 image: $(ADK_TARGET_ARCH)-imageclean $(ADK_TARGET_ARCH)-imageinstall
@@ -193,7 +199,7 @@ endif
 ifeq ($(ADK_RUNTIME_DEV_UDEV),y)
 ifneq ($(KERNEL_MODULES_USED),)
 	# This should be made a package instead
-	$(CP) $(BUILD_DIR)/linux-$(ADK_TARGET_ARCH)/modules/lib $(TARGET_DIR)
+	$(CP) $(BUILD_DIR)/$(ADK_TARGET_OS)-$(ADK_TARGET_ARCH)/modules/lib $(TARGET_DIR)
 	rm -f "$(TARGET_DIR)"/lib/modules/*/build \
 	      "$(TARGET_DIR)"/lib/modules/*/source
 endif

+ 1 - 1
target/arm/systems/banana-pro

@@ -1,6 +1,6 @@
 config ADK_TARGET_SYSTEM_BANANA_PRO
 	bool "Banana Pro"
-	depends on ADK_TARGET_OS_LINUX
+	depends on ADK_TARGET_OS_LINUX || ADK_TARGET_OS_WALDUX
 	depends on ADK_TARGET_LITTLE_ENDIAN
 	select ADK_TARGET_CPU_ARM_CORTEX_A7
 	select ADK_TARGET_CPU_WITH_NEON

+ 1 - 1
target/arm/systems/beaglebone-black

@@ -1,6 +1,6 @@
 config ADK_TARGET_SYSTEM_BEAGLEBONE_BLACK
 	bool "BeagleBone Black"
-	depends on ADK_TARGET_OS_LINUX
+	depends on ADK_TARGET_OS_LINUX || ADK_TARGET_OS_WALDUX
 	depends on ADK_TARGET_LITTLE_ENDIAN
 	select ADK_TARGET_CPU_ARM_CORTEX_A8
 	select ADK_TARGET_CPU_WITH_NEON

+ 1 - 1
target/arm/systems/kinetis-k70

@@ -1,6 +1,6 @@
 config ADK_TARGET_SYSTEM_KINETIS_K70
 	bool "Kinetis K70"
-	depends on ADK_TARGET_OS_LINUX
+	depends on ADK_TARGET_OS_LINUX || ADK_TARGET_OS_WALDUX
 	depends on ADK_TARGET_LITTLE_ENDIAN
 	select ADK_TARGET_CPU_ARM_CORTEX_M3
 	select ADK_TARGET_ARCH_ARM_WITH_THUMB

+ 1 - 1
target/arm/systems/linksys-nslu2

@@ -1,6 +1,6 @@
 config ADK_TARGET_SYSTEM_LINKSYS_NSLU2
 	bool "Linksys NSLU2"
-	depends on ADK_TARGET_OS_LINUX
+	depends on ADK_TARGET_OS_LINUX || ADK_TARGET_OS_WALDUX
 	depends on ADK_TARGET_BIG_ENDIAN
 	select ADK_TARGET_CPU_ARM_XSCALE
 	select ADK_TARGET_WITH_USB

+ 1 - 1
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
+	depends on ADK_TARGET_OS_LINUX || ADK_TARGET_OS_WALDUX
 	depends on ADK_TARGET_LITTLE_ENDIAN
 	select ADK_TARGET_CPU_ARM_CORTEX_A7
 	select ADK_TARGET_CPU_WITH_NEON

+ 1 - 1
target/arm/systems/phytec-wega

@@ -1,6 +1,6 @@
 config ADK_TARGET_SYSTEM_PHYTEC_WEGA
 	bool "Phytec Wega"
-	depends on ADK_TARGET_OS_LINUX
+	depends on ADK_TARGET_OS_LINUX || ADK_TARGET_OS_WALDUX
 	depends on ADK_TARGET_LITTLE_ENDIAN
 	select ADK_TARGET_CPU_ARM_CORTEX_A8
 	select ADK_TARGET_WITH_VGA

+ 1 - 1
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
+	depends on ADK_TARGET_OS_LINUX || ADK_TARGET_OS_WALDUX
 	depends on ADK_TARGET_LITTLE_ENDIAN
 	select ADK_TARGET_CPU_ARM_ARM11MPCORE
 	select ADK_TARGET_QEMU

+ 1 - 1
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
+	depends on ADK_TARGET_OS_LINUX || ADK_TARGET_OS_WALDUX
 	depends on ADK_TARGET_LITTLE_ENDIAN
 	select ADK_TARGET_CPU_ARM_XSCALE
 	select ADK_TARGET_QEMU

+ 1 - 1
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
+	depends on ADK_TARGET_OS_LINUX || ADK_TARGET_OS_WALDUX
 	depends on ADK_TARGET_LITTLE_ENDIAN
 	select ADK_TARGET_CPU_ARM_XSCALE
 	select ADK_TARGET_QEMU

+ 1 - 1
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
+	depends on ADK_TARGET_OS_LINUX || ADK_TARGET_OS_WALDUX
 	depends on ADK_TARGET_LITTLE_ENDIAN
 	select ADK_TARGET_CPU_ARM_ARM926EJ_S
 	select ADK_TARGET_QEMU

+ 1 - 1
target/arm/systems/qemu-arm-versatilepb-nommu

@@ -1,6 +1,6 @@
 config ADK_TARGET_SYSTEM_QEMU_ARM_VERSATILEPB_NOMMU
 	bool "Qemu Emulator (Versatile/PB) no MMU"
-	depends on ADK_TARGET_OS_LINUX
+	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

+ 1 - 1
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
+	depends on ADK_TARGET_OS_LINUX || ADK_TARGET_OS_WALDUX
 	depends on ADK_TARGET_LITTLE_ENDIAN
 	select ADK_TARGET_CPU_ARM_CORTEX_A9
 	select ADK_TARGET_QEMU

+ 1 - 1
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
+	depends on ADK_TARGET_OS_LINUX || ADK_TARGET_OS_WALDUX
 	select ADK_TARGET_CPU_ARM_CORTEX_A9
 	select ADK_TARGET_QEMU
 	select ADK_TARGET_KERNEL_ZIMAGE

+ 1 - 1
target/arm/systems/raspberry-pi

@@ -1,6 +1,6 @@
 config ADK_TARGET_SYSTEM_RASPBERRY_PI
 	bool "Raspberry PI"
-	depends on ADK_TARGET_OS_LINUX
+	depends on ADK_TARGET_OS_LINUX || ADK_TARGET_OS_WALDUX
 	depends on ADK_TARGET_LITTLE_ENDIAN
 	select ADK_TARGET_CPU_ARM_ARM1176JZF_S
 	select ADK_TARGET_BOARD_BCM28XX

+ 1 - 1
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
+	depends on ADK_TARGET_OS_LINUX || ADK_TARGET_OS_WALDUX
 	depends on ADK_TARGET_LITTLE_ENDIAN
 	select ADK_TARGET_CPU_ARM_ARM1176JZF_S
 	select ADK_TARGET_BOARD_BCM28XX

+ 1 - 1
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
+	depends on ADK_TARGET_OS_LINUX || ADK_TARGET_OS_WALDUX
 	depends on ADK_TARGET_LITTLE_ENDIAN
 	select ADK_TARGET_CPU_ARM_CORTEX_A7
 	select ADK_TARGET_BOARD_BCM28XX

+ 1 - 1
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
+	depends on ADK_TARGET_OS_LINUX || ADK_TARGET_OS_WALDUX
 	depends on ADK_TARGET_LITTLE_ENDIAN
 	select ADK_TARGET_CPU_ARM_CORTEX_A53
 	select ADK_TARGET_BOARD_BCM28XX

+ 1 - 1
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
+	depends on ADK_TARGET_OS_LINUX || ADK_TARGET_OS_WALDUX
 	depends on ADK_TARGET_LITTLE_ENDIAN
 	select ADK_TARGET_CPU_ARM_XSCALE
 	select ADK_TARGET_CPU_WITH_IWMMXT

+ 1 - 1
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
+	depends on ADK_TARGET_OS_LINUX || ADK_TARGET_OS_WALDUX
 	depends on ADK_EXPERIMENTAL
 	depends on ADK_TARGET_LITTLE_ENDIAN
 	select ADK_TARGET_CPU_ARM_CORTEX_A9

+ 1 - 1
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
+	depends on ADK_TARGET_OS_LINUX || ADK_TARGET_OS_WALDUX
 	depends on ADK_TARGET_LITTLE_ENDIAN
 	select ADK_TARGET_CPU_ARM_CORTEX_A9
 	select ADK_TARGET_WITH_VGA

+ 1 - 1
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
+	depends on ADK_TARGET_OS_LINUX || ADK_TARGET_OS_WALDUX
 	select ADK_TARGET_CPU_ARM_CORTEX_M4
 	select ADK_TARGET_ARCH_ARM_WITH_THUMB
 	select ADK_TARGET_WITH_SERIAL

+ 1 - 1
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
+	depends on ADK_TARGET_OS_LINUX || ADK_TARGET_OS_WALDUX
 	select ADK_TARGET_CPU_ARM_CORTEX_M7
 	select ADK_TARGET_HARD_FLOAT_DP
 	select ADK_TARGET_ARCH_ARM_WITH_THUMB

+ 1 - 1
target/config/Config.in.adk

@@ -39,7 +39,7 @@ config ADK_BUILD_WITH_DEBUG
 	default n
 	help
 	  If you want to create debug packages, you should enable this option.
-	  WARNING: It will use a lot of additional disk space on you build system!
+	  WARNING: It will use a lot of additional disk space on your build system!
 
 config ADK_DISABLE_CHECKSUM
 	bool "Disable checksum check for downloads globally"

+ 1 - 1
target/config/Config.in.binfmt

@@ -3,7 +3,7 @@
 
 choice
 prompt "Binary Format"
-depends on ADK_TARGET_OS_LINUX
+depends on ADK_TARGET_OS_LINUX || ADK_TARGET_OS_WALDUX
 
 config ADK_TARGET_BINFMT_ELF
 	bool "ELF"

target/config/Config.in.kernelcmd → target/config/Config.in.cmdline


+ 24 - 12
target/config/Config.in.cpu

@@ -860,8 +860,9 @@ config ADK_TARGET_CPU_MIPS_MIPS32
 	select ADK_TARGET_SUPPORTS_NPTL
 	select ADK_TARGET_WITH_MMU
 	select ADK_TARGET_CPU_WITH_FPU
-	select ADK_KERNEL_CPU_MIPS32_R1
 	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
@@ -871,8 +872,9 @@ config ADK_TARGET_CPU_MIPS_MIPS32R2
 	select ADK_TARGET_SUPPORTS_NPTL
 	select ADK_TARGET_WITH_MMU
 	select ADK_TARGET_CPU_WITH_FPU
-	select ADK_KERNEL_CPU_MIPS32_R2
 	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
@@ -882,8 +884,9 @@ config ADK_TARGET_CPU_MIPS_MIPS32R6
 	select ADK_TARGET_SUPPORTS_NPTL
 	select ADK_TARGET_WITH_MMU
 	select ADK_TARGET_CPU_WITH_FPU
-	select ADK_KERNEL_CPU_MIPS32_R6
 	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
@@ -955,7 +958,8 @@ config ADK_TARGET_CPU_MIPS64_MIPS64
 	select ADK_TARGET_SUPPORTS_NPTL
 	select ADK_TARGET_WITH_MMU
 	select ADK_TARGET_ARCH_MIPS_WITH_NAN_LEGACY
-	select ADK_KERNEL_CPU_MIPS64_R1
+	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
@@ -966,7 +970,8 @@ config ADK_TARGET_CPU_MIPS64_MIPS64R2
 	select ADK_TARGET_SUPPORTS_NPTL
 	select ADK_TARGET_WITH_MMU
 	select ADK_TARGET_ARCH_MIPS_WITH_NAN_LEGACY
-	select ADK_KERNEL_CPU_MIPS64_R2
+	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
@@ -977,7 +982,8 @@ config ADK_TARGET_CPU_MIPS64_MIPS64R6
 	select ADK_TARGET_SUPPORTS_NPTL
 	select ADK_TARGET_WITH_MMU
 	select ADK_TARGET_ARCH_MIPS_WITH_NAN_2008
-	select ADK_KERNEL_CPU_MIPS64_R6
+	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
@@ -1795,9 +1801,11 @@ config ADK_TARGET_CPU_XTENSA_DC233C
 	select ADK_TARGET_SUPPORTS_NPTL
 	select ADK_TARGET_SUPPORTS_LT
 	select ADK_TARGET_WITH_MMU
-	select ADK_KERNEL_XTENSA_VARIANT_DC233C
 	select ADK_TARGET_KERNEL_ZIMAGE
-	select ADK_KERNEL_INITIALIZE_XTENSA_MMU_INSIDE_VMLINUX
+	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
@@ -1807,8 +1815,9 @@ config ADK_TARGET_CPU_XTENSA_DC232B
 	select ADK_TARGET_SUPPORTS_NPTL
 	select ADK_TARGET_SUPPORTS_LT
 	select ADK_TARGET_WITH_MMU
-	select ADK_KERNEL_XTENSA_VARIANT_DC232B
 	select ADK_TARGET_KERNEL_ZIMAGE
+	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
@@ -1818,8 +1827,9 @@ config ADK_TARGET_CPU_XTENSA_DE212
 	select ADK_TARGET_SUPPORTS_LT
 	select ADK_TARGET_WITHOUT_MMU
 	select ADK_TARGET_UCLINUX
-	select ADK_KERNEL_XTENSA_VARIANT_CUSTOM
 	select ADK_TARGET_KERNEL_ZIMAGE
+	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
@@ -1829,8 +1839,9 @@ config ADK_TARGET_CPU_XTENSA_KC705_BE
 	select ADK_TARGET_SUPPORTS_NPTL
 	select ADK_TARGET_SUPPORTS_LT
 	select ADK_TARGET_WITH_MMU
-	select ADK_KERNEL_XTENSA_VARIANT_DC233C
 	select ADK_TARGET_KERNEL_ZIMAGE
+	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
@@ -1840,8 +1851,9 @@ config ADK_TARGET_CPU_XTENSA_FSF
 	select ADK_TARGET_SUPPORTS_NPTL
 	select ADK_TARGET_SUPPORTS_LT
 	select ADK_TARGET_WITH_MMU
-	select ADK_KERNEL_XTENSA_VARIANT_FSF
 	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

+ 2 - 1
target/config/Config.in.hardware

@@ -112,7 +112,8 @@ config ADK_TARGET_WITH_SMP
 
 config ADK_TARGET_WITH_MMU
 	bool
-	select ADK_KERNEL_MMU
+	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

+ 3 - 3
target/config/Config.in.libc

@@ -3,7 +3,7 @@
 
 choice
 prompt "C library"
-default ADK_TARGET_LIB_UCLIBC_NG if ADK_TARGET_OS_LINUX
+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"
@@ -37,9 +37,9 @@ config ADK_TARGET_LIB_UCLIBC_NG
 		ADK_TARGET_ARCH_SPARC64 || \
 		ADK_TARGET_ARCH_X86 || \
 		ADK_TARGET_ARCH_X86_64 || \
-		ADK_TARGET_ARCH_XTENSA) && ADK_TARGET_OS_LINUX
+		ADK_TARGET_ARCH_XTENSA) && ADK_TARGET_OS_LINUX || ADK_TARGET_OS_WALDUX
 	help
-	  http://uclibc-ng.org
+	  https://uclibc-ng.org
 
 config ADK_TARGET_LIB_MUSL
 	bool "musl C library"

+ 6 - 0
target/config/Config.in.os

@@ -9,6 +9,11 @@ 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
@@ -34,6 +39,7 @@ 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

+ 74 - 34
target/config/Config.in.qemuopts

@@ -15,24 +15,42 @@ config ADK_TARGET_QEMU_WITH_GRAPHIC_ONLY
 config ADK_TARGET_QEMU_WITH_BLOCK
 	bool
 	select ADK_TARGET_WITH_BLOCK
-	select ADK_KERNEL_SCSI_SYM53C8XX_2 if ADK_TARGET_SYSTEM_QEMU_ARM_VERSATILEPB
-	select ADK_KERNEL_MTD_M25P80 if ADK_TARGET_SYSTEM_QEMU_MICROBLAZE_ML605 \
+	select ADK_LINUX_KERNEL_SCSI_SYM53C8XX_2 if ADK_TARGET_SYSTEM_QEMU_ARM_VERSATILEPB
+	select ADK_LINUX_KERNEL_MTD_M25P80 if ADK_TARGET_SYSTEM_QEMU_MICROBLAZE_ML605 \
 					|| ADK_TARGET_SYSTEM_QEMU_MICROBLAZE_S3ADSP1800
-	select ADK_KERNEL_ATA_PIIX if ADK_TARGET_SYSTEM_QEMU_MIPS \
+	select ADK_LINUX_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_KERNEL_PATA_MACIO if ADK_TARGET_SYSTEM_QEMU_PPC_BAMBOO \
+	select ADK_LINUX_KERNEL_PATA_MACIO if ADK_TARGET_SYSTEM_QEMU_PPC_BAMBOO \
 					|| ADK_TARGET_SYSTEM_QEMU_PPC_MACPPC
-	select ADK_KERNEL_SCSI_IBMVSCSI if ADK_TARGET_SYSTEM_QEMU_PPC64
-	select ADK_KERNEL_SCSI_MAC_ESP if ADK_TARGET_SYSTEM_QEMU_M68K_Q800
-	select ADK_KERNEL_SCSI_SUNESP if ADK_TARGET_SYSTEM_QEMU_SPARC
-	select ADK_KERNEL_PATA_CMD64X if ADK_TARGET_SYSTEM_QEMU_SPARC64
-	select ADK_KERNEL_PATA_PLATFORM if ADK_TARGET_SYSTEM_QEMU_SH
-	select ADK_KERNEL_PATA_PXA if ADK_TARGET_QEMU_ARM_SPITZ \
+	select ADK_LINUX_KERNEL_SCSI_IBMVSCSI if ADK_TARGET_SYSTEM_QEMU_PPC64
+	select ADK_LINUX_KERNEL_SCSI_MAC_ESP if ADK_TARGET_SYSTEM_QEMU_M68K_Q800
+	select ADK_LINUX_KERNEL_SCSI_SUNESP if ADK_TARGET_SYSTEM_QEMU_SPARC
+	select ADK_LINUX_KERNEL_PATA_CMD64X if ADK_TARGET_SYSTEM_QEMU_SPARC64
+	select ADK_LINUX_KERNEL_PATA_PLATFORM if ADK_TARGET_SYSTEM_QEMU_SH
+	select ADK_LINUX_KERNEL_PATA_PXA if ADK_TARGET_QEMU_ARM_SPITZ \
 					|| ADK_TARGET_SYSTEM_QEMU_ARM_TERRIER
-	select ADK_KERNEL_MMC_ARMMMCI if ADK_TARGET_SYSTEM_QEMU_ARM_VEXPRESS_A9
-	select ADK_KERNEL_BLK_DEV_CMD64X if ADK_TARGET_SYSTEM_QEMU_ALPHA
+	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 \
@@ -72,23 +90,40 @@ config ADK_TARGET_QEMU_WITHOUT_GRAPHIC
 config ADK_TARGET_QEMU_WITH_GRAPHIC
 	bool "enabled"
 	select ADK_TARGET_WITH_VGA
-	select ADK_KERNEL_VT
-	select ADK_KERNEL_VT_CONSOLE
-	select ADK_KERNEL_FONTS
-	select ADK_KERNEL_FONT_8x16
-	select ADK_KERNEL_FB
-	select ADK_KERNEL_FRAMEBUFFER_CONSOLE
-	select ADK_KERNEL_INPUT
-	select ADK_KERNEL_INPUT_KEYBOARD
-	select ADK_KERNEL_INPUT_MOUSE
-	select ADK_KERNEL_INPUT_MOUSEDEV
-	select ADK_KERNEL_PLAT_VERSATILE_CLCD if ADK_TARGET_SYSTEM_QEMU_ARM_VEXPRESS_A9
-	select ADK_KERNEL_FB_SM501 if ADK_TARGET_SYSTEM_QEMU_SH
-	select ADK_KERNEL_DRM_BOCHS if ADK_TARGET_SYSTEM_QEMU_X86 || ADK_TARGET_SYSTEM_QEMU_X86_64
-	select ADK_KERNEL_KEYBOARD_ATKBD if ADK_TARGET_SYSTEM_QEMU_X86 || ADK_TARGET_SYSTEM_QEMU_X86_64
-	select ADK_KERNEL_MOUSE_PS2 if ADK_TARGET_SYSTEM_QEMU_X86 || ADK_TARGET_SYSTEM_QEMU_X86_64
-	select ADK_KERNEL_USB_HID if ADK_TARGET_SYSTEM_QEMU_SH
-	select ADK_KERNEL_USB_OHCI_HCD_PLATFORM if ADK_TARGET_SYSTEM_QEMU_SH
+	select ADK_LINUX_KERNEL_VT
+	select ADK_LINUX_KERNEL_VT_CONSOLE
+	select ADK_LINUX_KERNEL_FONTS
+	select ADK_LINUX_KERNEL_FONT_8x16
+	select ADK_LINUX_KERNEL_FB
+	select ADK_LINUX_KERNEL_FRAMEBUFFER_CONSOLE
+	select ADK_LINUX_KERNEL_INPUT
+	select ADK_LINUX_KERNEL_INPUT_KEYBOARD
+	select ADK_LINUX_KERNEL_INPUT_MOUSE
+	select ADK_LINUX_KERNEL_INPUT_MOUSEDEV
+	select ADK_LINUX_KERNEL_PLAT_VERSATILE_CLCD if ADK_TARGET_SYSTEM_QEMU_ARM_VEXPRESS_A9
+	select ADK_LINUX_KERNEL_FB_SM501 if ADK_TARGET_SYSTEM_QEMU_SH
+	select ADK_LINUX_KERNEL_DRM_BOCHS if ADK_TARGET_SYSTEM_QEMU_X86 || ADK_TARGET_SYSTEM_QEMU_X86_64
+	select ADK_LINUX_KERNEL_KEYBOARD_ATKBD if ADK_TARGET_SYSTEM_QEMU_X86 || ADK_TARGET_SYSTEM_QEMU_X86_64
+	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
 
@@ -115,11 +150,16 @@ config ADK_TARGET_QEMU_WITHOUT_VIRTIO
 
 config ADK_TARGET_QEMU_WITH_VIRTIO
 	bool "enabled"
-	select ADK_KERNEL_VIRTIO
-	select ADK_KERNEL_VIRTIO_PCI
-	select ADK_KERNEL_VIRTIO_NET
-	select ADK_KERNEL_VIRTIO_BLK
-	select ADK_KERNEL_VIRTIO_CONSOLE
+	select ADK_LINUX_KERNEL_VIRTIO
+	select ADK_LINUX_KERNEL_VIRTIO_PCI
+	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
 

+ 54 - 27
target/config/Config.in.rootfs

@@ -52,7 +52,8 @@ config ADK_TARGET_ROOTFS_INITRAMFS
 	depends on !ADK_TARGET_SYSTEM_MIKROTIK_RB532
 	depends on !ADK_TARGET_SYSTEM_QEMU_M68K_MCF5208
 	depends on !ADK_TARGET_SYSTEM_QEMU_METAG
-	select ADK_KERNEL_BLK_DEV_INITRD
+	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.
 
@@ -70,7 +71,8 @@ config ADK_TARGET_ROOTFS_SQUASHFS
 
 config ADK_TARGET_ROOTFS_JFFS2
 	bool "Compressed read-write root filesystem (jffs2)"
-	select ADK_KERNEL_JFFS2_FS
+	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 \
@@ -81,7 +83,8 @@ config ADK_TARGET_ROOTFS_JFFS2
 
 config ADK_TARGET_ROOTFS_UBIFS
 	bool "UBIFS root filesystem (NAND)"
-	select ADK_KERNEL_UBIFS_FS
+	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
@@ -90,14 +93,22 @@ config ADK_TARGET_ROOTFS_UBIFS
 
 config ADK_TARGET_ROOTFS_NFSROOT
 	bool "NFS root"
-	select ADK_KERNEL_NETWORK_FILESYSTEMS
-	select ADK_KERNEL_SUNRPC
-	select ADK_KERNEL_NFS_FS
-	select ADK_KERNEL_NFS_V3
-	select ADK_KERNEL_ROOT_NFS
-	select ADK_KERNEL_NFS_COMMON
-	select ADK_KERNEL_IP_PNP
-	select ADK_KERNEL_IP_PNP_DHCP
+	select ADK_LINUX_KERNEL_NETWORK_FILESYSTEMS if ADK_TARGET_OS_LINUX
+	select ADK_LINUX_KERNEL_SUNRPC if ADK_TARGET_OS_LINUX
+	select ADK_LINUX_KERNEL_NFS_FS if ADK_TARGET_OS_LINUX
+	select ADK_LINUX_KERNEL_NFS_V3 if ADK_TARGET_OS_LINUX
+	select ADK_LINUX_KERNEL_ROOT_NFS if ADK_TARGET_OS_LINUX
+	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 && \
@@ -109,14 +120,22 @@ config ADK_TARGET_ROOTFS_NFSROOT
 
 config ADK_TARGET_ROOTFS_USB
 	bool "Boot from USB stick"
-	select ADK_KERNEL_NLS
-	select ADK_KERNEL_SCSI
-	select ADK_KERNEL_BLK_DEV_SD
-	select ADK_KERNEL_USB
-	select ADK_KERNEL_USB_EHCI_HCD
-	select ADK_KERNEL_USB_OHCI_HCD
-	select ADK_KERNEL_USB_UHCI_HCD
-	select ADK_KERNEL_USB_STORAGE
+	select ADK_LINUX_KERNEL_NLS if ADK_TARGET_OS_LINUX
+	select ADK_LINUX_KERNEL_SCSI if ADK_TARGET_OS_LINUX
+	select ADK_LINUX_KERNEL_BLK_DEV_SD if ADK_TARGET_OS_LINUX
+	select ADK_LINUX_KERNEL_USB if ADK_TARGET_OS_LINUX
+	select ADK_LINUX_KERNEL_USB_EHCI_HCD if ADK_TARGET_OS_LINUX
+	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
@@ -125,10 +144,14 @@ config ADK_TARGET_ROOTFS_USB
 
 config ADK_TARGET_ROOTFS_ISO
 	bool "ISO image"
-	select ADK_KERNEL_ISO9660_FS
-	select ADK_KERNEL_JOLIET
-	select ADK_KERNEL_SCSI
-	select ADK_KERNEL_BLK_DEV_SR
+	select ADK_LINUX_KERNEL_ISO9660_FS if ADK_TARGET_OS_LINUX
+	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
@@ -141,14 +164,16 @@ config ADK_TARGET_ROOTFS_INITRAMFSARCHIVE
 		&& !ADK_TARGET_SYSTEM_QEMU_M68K_MCF5208 \
 		&& !ADK_TARGET_SYSTEM_QEMU_METAG \
 		&& !ADK_TARGET_SIM
-	select ADK_KERNEL_BLK_DEV_INITRD
+	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.
 
 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_KERNEL_EXT4_FS
+	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 \
@@ -161,8 +186,10 @@ config ADK_TARGET_ROOTFS_ARCHIVE
 
 config ADK_TARGET_ROOTFS_GENIMAGE
 	bool "Create a disk image for the target"
-	select ADK_KERNEL_EXT4_FS
-	select ADK_KERNEL_VFAT_FS
+	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

+ 13 - 6
target/config/Config.in.runtime

@@ -56,8 +56,10 @@ default ADK_RUNTIME_DEV_MDEV
 
 config ADK_RUNTIME_DEV_MDEV
 	bool "Use mdev"
-	select ADK_KERNEL_DEVTMPFS
-	select ADK_KERNEL_DEVTMPFS_MOUNT
+	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
 
@@ -66,14 +68,18 @@ config ADK_RUNTIME_DEV_UDEV
 	select ADK_PACKAGE_UDEV
 	# needs depmod for module dependency generation on host
 	select ADK_HOST_BUILD_KMOD
-	select ADK_KERNEL_DEVTMPFS
-	select ADK_KERNEL_DEVTMPFS_MOUNT
+	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_KERNEL_DEVTMPFS
-	select ADK_KERNEL_DEVTMPFS_MOUNT
+	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
@@ -220,6 +226,7 @@ config ADK_RUNTIME_DEFAULT_LOCALE
 
 choice
 prompt "bootup messages from kernel"
+default ADK_RUNTIME_VERBOSE_KERNEL_SERIAL_ONLY if ADK_TARGET_QEMU
 
 config ADK_RUNTIME_VERBOSE_KERNEL_VGA_ONLY
 	bool "output via VGA only"

+ 2 - 2
target/config/Config.in.toolchain

@@ -2,7 +2,7 @@
 # material, please see the LICENCE file in the top-level directory.
 
 choice
-depends on ADK_TARGET_OS_LINUX
+depends on ADK_TARGET_OS_LINUX || ADK_TARGET_OS_WALDUX
 bool "Library support"
 
 config ADK_TARGET_USE_SHARED_LIBS_ONLY
@@ -160,7 +160,7 @@ config ADK_STATIC_TOOLCHAIN
 
 config ADK_PRELINK
 	bool "Prelink binaries and libraries in Image"
-	depends on ADK_TARGET_OS_LINUX
+	depends on ADK_TARGET_OS_LINUX || ADK_TARGET_OS_WALDUX
 	help
 	  Do prelinking for faster loading of binaries.
 

+ 6 - 6
target/config/Config.in.tools

@@ -304,11 +304,11 @@ source "target/config/Config.in.prereq"
 
 config ADK_COMPRESSION_TOOL
 	string
-	default "gzip -n9" if ADK_KERNEL_INITRAMFS_COMPRESSION_GZIP
-	default "bzip2" if ADK_KERNEL_INITRAMFS_COMPRESSION_BZIP2
-	default "xz -v --check=crc32 --lzma2=dict=1MiB" if ADK_KERNEL_INITRAMFS_COMPRESSION_XZ
-	default "lz4c -l" if ADK_KERNEL_INITRAMFS_COMPRESSION_LZ4
-	default "lzma -9" if ADK_KERNEL_INITRAMFS_COMPRESSION_LZMA
-	default "lzop" if ADK_KERNEL_INITRAMFS_COMPRESSION_LZO
+	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"
 	help

+ 11 - 11
target/config/Config.in.kernelcfg

@@ -4,31 +4,31 @@
 choice 
 prompt "Kernel configuration" if !ADK_TARGET_CHOOSE_ARCH
 depends on ADK_TARGET_OS_LINUX
-default ADK_TARGET_KERNEL_USE_DEFCONFIG if ADK_TARGET_SYSTEM_BEAGLEBONE_BLACK && ADK_TARGET_KERNEL_VERSION_GIT
-default ADK_TARGET_KERNEL_USE_DEFCONFIG if ADK_TARGET_SYSTEM_PHYTEC_WEGA && ADK_TARGET_KERNEL_VERSION_GIT
-default ADK_TARGET_KERNEL_USE_DEFCONFIG if ADK_TARGET_SYSTEM_SOLIDRUN_CLEARFOG && ADK_TARGET_KERNEL_VERSION_GIT
+default ADK_TARGET_LINUX_KERNEL_USE_DEFCONFIG if ADK_TARGET_SYSTEM_BEAGLEBONE_BLACK && ADK_TARGET_LINUX_KERNEL_VERSION_GIT
+default ADK_TARGET_LINUX_KERNEL_USE_DEFCONFIG if ADK_TARGET_SYSTEM_PHYTEC_WEGA && ADK_TARGET_LINUX_KERNEL_VERSION_GIT
+default ADK_TARGET_LINUX_KERNEL_USE_DEFCONFIG if ADK_TARGET_SYSTEM_SOLIDRUN_CLEARFOG && ADK_TARGET_LINUX_KERNEL_VERSION_GIT
 
-config ADK_TARGET_KERNEL_USE_MINICONFIG
+config ADK_TARGET_LINUX_KERNEL_USE_MINICONFIG
 	bool "Use mini.config from OpenADK"
 
-config ADK_TARGET_KERNEL_USE_DEFCONFIG
+config ADK_TARGET_LINUX_KERNEL_USE_DEFCONFIG
 	bool "Use defconfig from Linux kernel"
 
-config ADK_TARGET_KERNEL_USE_CUSTOMCONFIG
+config ADK_TARGET_LINUX_KERNEL_USE_CUSTOMCONFIG
 	bool "Use custom Linux kernel configuration file"
 
 endchoice
 
-config ADK_TARGET_KERNEL_DEFCONFIG
+config ADK_TARGET_LINUX_KERNEL_DEFCONFIG
 	string "Defconfig name"
-	depends on ADK_TARGET_KERNEL_USE_DEFCONFIG
+	depends on ADK_TARGET_LINUX_KERNEL_USE_DEFCONFIG
 	default "bcmrpi_defconfig" if ADK_TARGET_SYSTEM_RASPBERRY_PI
 	default "bcmrpi_defconfig" if ADK_TARGET_SYSTEM_RASPBERRY_PI0
 	default "bcm2709_defconfig" if ADK_TARGET_SYSTEM_RASPBERRY_PI2
 	default "bcm2709_defconfig" if ADK_TARGET_SYSTEM_RASPBERRY_PI3
 	default "bcmrpi3_defconfig" if ADK_TARGET_SYSTEM_RASPBERRY_PI3_64
 	default "twr-k70f120m_defconfig" if ADK_TARGET_SYSTEM_KINETIS_K70
-	default "imx_v7_cbi_hb_defconfig" if ADK_TARGET_SYSTEM_SOLIDRUN_IMX6 && ADK_TARGET_KERNEL_VERSION_GIT
+	default "imx_v7_cbi_hb_defconfig" if ADK_TARGET_SYSTEM_SOLIDRUN_IMX6 && ADK_TARGET_LINUX_KERNEL_VERSION_GIT
 	default "imx_v6_v7_defconfig" if ADK_TARGET_SYSTEM_SOLIDRUN_IMX6
 	default "mvebu_defconfig" if ADK_TARGET_SYSTEM_SOLIDRUN_CLEARFOG
 	default "nsim_700_defconfig" if ADK_TARGET_SYSTEM_NSIM_ARCV1
@@ -44,8 +44,8 @@ config ADK_TARGET_KERNEL_DEFCONFIG
 	default "i386_defconfig" if ADK_TARGET_SYSTEM_GENERIC_X86
 	default ""
 
-config ADK_TARGET_KERNEL_CUSTOMCONFIG_PATH
+config ADK_TARGET_LINUX_KERNEL_CUSTOMCONFIG_PATH
 	string "Kernel configuration file location"
-	depends on ADK_TARGET_KERNEL_USE_CUSTOMCONFIG
+	depends on ADK_TARGET_LINUX_KERNEL_USE_CUSTOMCONFIG
 	default ".kernelconfig"
 

+ 45 - 45
target/config/Config.in.kernelversion

@@ -2,38 +2,38 @@
 # material, please see the LICENCE file in the top-level directory.
 
 choice
-prompt "Kernel version" if !ADK_TARGET_CHOOSE_ARCH
+prompt "Linux Kernel version" if !ADK_TARGET_CHOOSE_ARCH
 depends on ADK_TARGET_OS_LINUX
-default ADK_TARGET_KERNEL_VERSION_GIT if ADK_TARGET_BOARD_BCM28XX
-default ADK_TARGET_KERNEL_VERSION_GIT if ADK_TARGET_SYSTEM_SOLIDRUN_CLEARFOG
-default ADK_TARGET_KERNEL_VERSION_GIT if ADK_TARGET_SYSTEM_BEAGLEBONE_BLACK
-default ADK_TARGET_KERNEL_VERSION_GIT if ADK_TARGET_SYSTEM_KINETIS_K70
-default ADK_TARGET_KERNEL_VERSION_GIT if ADK_TARGET_SYSTEM_ADSP_BF537
-default ADK_TARGET_KERNEL_VERSION_GIT if ADK_TARGET_SYSTEM_PHYTEC_WEGA
-default ADK_TARGET_KERNEL_VERSION_GIT if ADK_TARGET_ARCH_CSKY
-default ADK_TARGET_KERNEL_VERSION_GIT if ADK_TARGET_ARCH_LM32
-default ADK_TARGET_KERNEL_VERSION_4_4 if ADK_TARGET_ARCH_CRIS
-default ADK_TARGET_KERNEL_VERSION_4_4 if ADK_TARGET_ARCH_H8300
-default ADK_TARGET_KERNEL_VERSION_4_4 if ADK_TARGET_ARCH_METAG
-default ADK_TARGET_KERNEL_VERSION_4_4 if ADK_TARGET_SYSTEM_QEMU_ARM_VERSATILEPB_NOMMU
-default ADK_TARGET_KERNEL_VERSION_4_4 if ADK_TARGET_SYSTEM_QEMU_ARM_REALVIEW_EB_MPCORE
-default ADK_TARGET_KERNEL_VERSION_4_14 if ADK_TARGET_SYSTEM_ORANGE_PI0
-default ADK_TARGET_KERNEL_VERSION_4_14 if ADK_TARGET_ARCH_OR1K
-default ADK_TARGET_KERNEL_VERSION_4_15 if ADK_TARGET_ARCH_RISCV32
-default ADK_TARGET_KERNEL_VERSION_4_15 if ADK_TARGET_ARCH_RISCV64
-default ADK_TARGET_KERNEL_VERSION_4_9
+default ADK_TARGET_LINUX_KERNEL_VERSION_GIT if ADK_TARGET_BOARD_BCM28XX
+default ADK_TARGET_LINUX_KERNEL_VERSION_GIT if ADK_TARGET_SYSTEM_SOLIDRUN_CLEARFOG
+default ADK_TARGET_LINUX_KERNEL_VERSION_GIT if ADK_TARGET_SYSTEM_BEAGLEBONE_BLACK
+default ADK_TARGET_LINUX_KERNEL_VERSION_GIT if ADK_TARGET_SYSTEM_KINETIS_K70
+default ADK_TARGET_LINUX_KERNEL_VERSION_GIT if ADK_TARGET_SYSTEM_ADSP_BF537
+default ADK_TARGET_LINUX_KERNEL_VERSION_GIT if ADK_TARGET_SYSTEM_PHYTEC_WEGA
+default ADK_TARGET_LINUX_KERNEL_VERSION_GIT if ADK_TARGET_ARCH_CSKY
+default ADK_TARGET_LINUX_KERNEL_VERSION_GIT if ADK_TARGET_ARCH_LM32
+default ADK_TARGET_LINUX_KERNEL_VERSION_4_4 if ADK_TARGET_ARCH_CRIS
+default ADK_TARGET_LINUX_KERNEL_VERSION_4_4 if ADK_TARGET_ARCH_H8300
+default ADK_TARGET_LINUX_KERNEL_VERSION_4_4 if ADK_TARGET_ARCH_METAG
+default ADK_TARGET_LINUX_KERNEL_VERSION_4_4 if ADK_TARGET_SYSTEM_QEMU_ARM_VERSATILEPB_NOMMU
+default ADK_TARGET_LINUX_KERNEL_VERSION_4_4 if ADK_TARGET_SYSTEM_QEMU_ARM_REALVIEW_EB_MPCORE
+default ADK_TARGET_LINUX_KERNEL_VERSION_4_14 if ADK_TARGET_SYSTEM_ORANGE_PI0
+default ADK_TARGET_LINUX_KERNEL_VERSION_4_14 if ADK_TARGET_ARCH_OR1K
+default ADK_TARGET_LINUX_KERNEL_VERSION_4_15 if ADK_TARGET_ARCH_RISCV32
+default ADK_TARGET_LINUX_KERNEL_VERSION_4_15 if ADK_TARGET_ARCH_RISCV64
+default ADK_TARGET_LINUX_KERNEL_VERSION_4_9
 
-config ADK_TARGET_KERNEL_VERSION_GIT
+config ADK_TARGET_LINUX_KERNEL_VERSION_GIT
 	bool "git"
 	depends on !ADK_TARGET_ARCH_AVR32
 	depends on !ADK_TARGET_ARCH_NDS32
 	select ADK_HOST_NEED_LZOP if ADK_TARGET_SYSTEM_SOLIDRUN_IMX6
 	select ADK_HOST_NEED_LZOP if ADK_TARGET_SYSTEM_BEAGLEBONE_BLACK
-	select ADK_HOST_NEED_LZ4 if ADK_TARGET_SYSTEM_PHYTEC_WEGA && ADK_TARGET_KERNEL_VERSION_GIT
-	select ADK_TARGET_KERNEL_IMAGE if ADK_TARGET_SYSTEM_SOLIDRUN_IMX6
-	select ADK_TARGET_KERNEL_IMAGE if ADK_TARGET_SYSTEM_BEAGLEBONE_BLACK
+	select ADK_HOST_NEED_LZ4 if ADK_TARGET_SYSTEM_PHYTEC_WEGA && ADK_TARGET_LINUX_KERNEL_VERSION_GIT
+	select ADK_TARGET_LINUX_KERNEL_IMAGE if ADK_TARGET_SYSTEM_SOLIDRUN_IMX6
+	select ADK_TARGET_LINUX_KERNEL_IMAGE if ADK_TARGET_SYSTEM_BEAGLEBONE_BLACK
 
-config ADK_TARGET_KERNEL_VERSION_4_15
+config ADK_TARGET_LINUX_KERNEL_VERSION_4_15
 	bool "4.15.4"
 	depends on !ADK_TARGET_ARCH_AVR32
 	depends on !ADK_TARGET_ARCH_CRIS
@@ -43,7 +43,7 @@ config ADK_TARGET_KERNEL_VERSION_4_15
 	depends on !ADK_TARGET_SYSTEM_QEMU_ARM_VERSATILEPB_NOMMU
 	depends on !ADK_TARGET_SYSTEM_QEMU_ARM_REALVIEW_EB_MPCORE
 
-config ADK_TARGET_KERNEL_VERSION_4_14
+config ADK_TARGET_LINUX_KERNEL_VERSION_4_14
 	bool "4.14.8"
 	depends on !ADK_TARGET_ARCH_AVR32
 	depends on !ADK_TARGET_ARCH_CRIS
@@ -55,7 +55,7 @@ config ADK_TARGET_KERNEL_VERSION_4_14
 	depends on !ADK_TARGET_SYSTEM_QEMU_ARM_VERSATILEPB_NOMMU
 	depends on !ADK_TARGET_SYSTEM_QEMU_ARM_REALVIEW_EB_MPCORE
 
-config ADK_TARGET_KERNEL_VERSION_4_9
+config ADK_TARGET_LINUX_KERNEL_VERSION_4_9
 	bool "4.9.77"
 	depends on !ADK_TARGET_ARCH_CRIS
 	depends on !ADK_TARGET_ARCH_CSKY
@@ -68,7 +68,7 @@ config ADK_TARGET_KERNEL_VERSION_4_9
 	depends on !ADK_TARGET_SYSTEM_QEMU_ARM_REALVIEW_EB_MPCORE
 	depends on !ADK_TARGET_SYSTEM_ORANGE_PI0
 
-config ADK_TARGET_KERNEL_VERSION_4_4
+config ADK_TARGET_LINUX_KERNEL_VERSION_4_4
 	bool "4.4.112"
 	depends on !ADK_TARGET_ARCH_CSKY
 	depends on !ADK_TARGET_ARCH_NDS32
@@ -81,7 +81,7 @@ config ADK_TARGET_KERNEL_VERSION_4_4
 	depends on !ADK_TARGET_SYSTEM_NUMATO_MIMASV2
 	depends on !ADK_TARGET_SYSTEM_ORANGE_PI0
 
-config ADK_TARGET_KERNEL_VERSION_4_1
+config ADK_TARGET_LINUX_KERNEL_VERSION_4_1
 	bool "4.1.45"
 	depends on !ADK_TARGET_ARCH_ARC
 	depends on !ADK_TARGET_ARCH_BFIN
@@ -100,7 +100,7 @@ config ADK_TARGET_KERNEL_VERSION_4_1
 	depends on !ADK_TARGET_CPU_MIPS64_MIPS64R6
 	depends on !ADK_TARGET_SYSTEM_ORANGE_PI0
 
-config ADK_TARGET_KERNEL_VERSION_3_16
+config ADK_TARGET_LINUX_KERNEL_VERSION_3_16
 	bool "3.16.49"
 	depends on !ADK_TARGET_ARCH_ARC
 	depends on !ADK_TARGET_ARCH_BFIN
@@ -124,7 +124,7 @@ config ADK_TARGET_KERNEL_VERSION_3_16
 	depends on !ADK_TARGET_CPU_MIPS64_MIPS64R6
 	depends on !ADK_TARGET_SYSTEM_ORANGE_PI0
 
-config ADK_TARGET_KERNEL_VERSION_3_10
+config ADK_TARGET_LINUX_KERNEL_VERSION_3_10
 	bool "3.10.107"
 	depends on !ADK_TARGET_ARCH_ARC
 	depends on !ADK_TARGET_ARCH_BFIN
@@ -149,12 +149,12 @@ config ADK_TARGET_KERNEL_VERSION_3_10
 	depends on !ADK_TARGET_CPU_MIPS64_MIPS64R6
 	depends on !ADK_TARGET_SYSTEM_ORANGE_PI0
 
-config ADK_TARGET_KERNEL_VERSION_3_10_NDS32
+config ADK_TARGET_LINUX_KERNEL_VERSION_3_10_NDS32
 	bool "3.10-nds32"
 	depends on ADK_TARGET_ARCH_NDS32
-	select ADK_TARGET_KERNEL_NO_MIRROR
+	select ADK_TARGET_LINUX_KERNEL_NO_MIRROR
 
-config ADK_TARGET_KERNEL_VERSION_3_2
+config ADK_TARGET_LINUX_KERNEL_VERSION_3_2
 	bool "3.2.94"
 	depends on !ADK_TARGET_ARCH_ARC
 	depends on !ADK_TARGET_ARCH_BFIN
@@ -178,7 +178,7 @@ config ADK_TARGET_KERNEL_VERSION_3_2
 	depends on !ADK_TARGET_CPU_MIPS64_MIPS64R6
 	depends on !ADK_TARGET_SYSTEM_ORANGE_PI0
 
-config ADK_TARGET_KERNEL_VERSION_2_6_32
+config ADK_TARGET_LINUX_KERNEL_VERSION_2_6_32
 	bool "2.6.32.70"
 	depends on !ADK_TARGET_ARCH_ARC
 	depends on !ADK_TARGET_ARCH_BFIN
@@ -203,9 +203,9 @@ config ADK_TARGET_KERNEL_VERSION_2_6_32
 
 endchoice
 
-config ADK_TARGET_KERNEL_GIT_REPO
+config ADK_TARGET_LINUX_KERNEL_GIT_REPO
 	string "git repository"
-	depends on ADK_TARGET_KERNEL_VERSION_GIT
+	depends on ADK_TARGET_LINUX_KERNEL_VERSION_GIT
 	default "https://github.com/raspberrypi/linux.git" if ADK_TARGET_BOARD_BCM28XX
 	default "git://git.code.sf.net/p/adi-linux/code" if ADK_TARGET_SYSTEM_ADSP_BF537
 	default "https://github.com/EmcraftSystems/linux-emcraft.git" if ADK_TARGET_SYSTEM_KINETIS_K70
@@ -219,9 +219,9 @@ config ADK_TARGET_KERNEL_GIT_REPO
 	help
 	  GIT repository to use.
 
-config ADK_TARGET_KERNEL_GIT_REPO_NAME
+config ADK_TARGET_LINUX_KERNEL_GIT_REPO_NAME
 	string
-	depends on ADK_TARGET_KERNEL_VERSION_GIT
+	depends on ADK_TARGET_LINUX_KERNEL_VERSION_GIT
 	default "csky" if ADK_TARGET_ARCH_CSKY
 	default "lm32" if ADK_TARGET_ARCH_LM32
 	default "rpi" if ADK_TARGET_BOARD_BCM28XX
@@ -233,9 +233,9 @@ config ADK_TARGET_KERNEL_GIT_REPO_NAME
 	default "fslc" if ADK_TARGET_SYSTEM_SOLIDRUN_IMX6
 	default "linus"
 
-config ADK_TARGET_KERNEL_GIT
+config ADK_TARGET_LINUX_KERNEL_GIT
 	string "git version"
-	depends on ADK_TARGET_KERNEL_VERSION_GIT
+	depends on ADK_TARGET_LINUX_KERNEL_VERSION_GIT
 	default "6064a9bdf48cefbccc4f6472dd04251f0dec1931" if ADK_TARGET_ARCH_CSKY
 	default "6a2f2e4198eaff63ee75f6085ce9f966c47b4441" if ADK_TARGET_ARCH_LM32
 	default "31a8651c138253007c66e1be176cdc839b416842" if ADK_TARGET_BOARD_BCM28XX
@@ -246,9 +246,9 @@ config ADK_TARGET_KERNEL_GIT
 	default "8624998967676862843aed1f8ee2141e98987f81" if ADK_TARGET_SYSTEM_BEAGLEBONE_BLACK
 	default "v4.4.52-phy" if ADK_TARGET_SYSTEM_PHYTEC_WEGA
 
-config ADK_TARGET_KERNEL_GIT_VER
+config ADK_TARGET_LINUX_KERNEL_GIT_VER
 	string "kernel version"
-	depends on ADK_TARGET_KERNEL_VERSION_GIT
+	depends on ADK_TARGET_LINUX_KERNEL_VERSION_GIT
 	default "4.9.56" if ADK_TARGET_ARCH_CSKY
 	default "4.9.70" if ADK_TARGET_BOARD_BCM28XX
 	default "4.4.37" if ADK_TARGET_SYSTEM_BEAGLEBONE_BLACK
@@ -256,13 +256,13 @@ config ADK_TARGET_KERNEL_GIT_VER
 	default "2.6.33" if ADK_TARGET_SYSTEM_KINETIS_K70
 	default "3.14.79" if ADK_TARGET_SYSTEM_SOLIDRUN_IMX6
 
-config ADK_TARGET_KERNEL_GIT_TYPE
+config ADK_TARGET_LINUX_KERNEL_GIT_TYPE
 	string
-	depends on ADK_TARGET_KERNEL_VERSION_GIT
+	depends on ADK_TARGET_LINUX_KERNEL_VERSION_GIT
 	default "branch" if ADK_TARGET_SYSTEM_PHYTEC_WEGA
 	default "hash"
 
-config ADK_TARGET_KERNEL_NO_MIRROR
+config ADK_TARGET_LINUX_KERNEL_NO_MIRROR
 	bool
 	help
 	  Select this if the kernel source is only available

+ 3 - 3
target/linux/config/Config.in.arm

@@ -1,13 +1,13 @@
 # This file is part of the OpenADK project. OpenADK is copyrighted
 # material, please see the LICENCE file in the top-level directory.
 
-config ADK_KERNEL_ARM_PATCH_PHYS_VIRT
+config ADK_LINUX_KERNEL_ARM_PATCH_PHYS_VIRT
 	bool
 	depends on ADK_TARGET_ARCH_ARM
 
-config ADK_KERNEL_ARCH_VERSATILE_PB
+config ADK_LINUX_KERNEL_ARCH_VERSATILE_PB
 	bool
-	select ADK_KERNEL_ARM_PATCH_PHYS_VIRT
+	select ADK_LINUX_KERNEL_ARM_PATCH_PHYS_VIRT
 	default y if !ADK_TARGET_WITH_DEVICETREE
 	depends on ADK_TARGET_ARCH_ARM
 

+ 125 - 125
target/linux/config/Config.in.audio

@@ -8,130 +8,130 @@ depends on ADK_TARGET_WITH_PCI \
 	|| ADK_TARGET_QEMU \
 	|| ADK_TARGET_GENERIC
 
-config ADK_KERNEL_SOUND
+config ADK_LINUX_KERNEL_SOUND
 	tristate
 
-config ADK_KERNEL_SND_DRIVERS
+config ADK_LINUX_KERNEL_SND_DRIVERS
 	bool
 
-config ADK_KERNEL_SND_PCI
+config ADK_LINUX_KERNEL_SND_PCI
 	bool
 
-config ADK_KERNEL_SND_USB
+config ADK_LINUX_KERNEL_SND_USB
 	bool
 
-config ADK_KERNEL_SND_SOC
+config ADK_LINUX_KERNEL_SND_SOC
 	bool
 
-config ADK_KERNEL_SND_ARM
+config ADK_LINUX_KERNEL_SND_ARM
 	bool
 
-config ADK_KERNEL_SND_TIMER
+config ADK_LINUX_KERNEL_SND_TIMER
 	tristate
 
-config ADK_KERNEL_SND_PCM
+config ADK_LINUX_KERNEL_SND_PCM
 	tristate
 
-config ADK_KERNEL_SND_HWDEP
+config ADK_LINUX_KERNEL_SND_HWDEP
 	tristate
 
-config ADK_KERNEL_SND_RAWMIDI
+config ADK_LINUX_KERNEL_SND_RAWMIDI
 	tristate
 
-config ADK_KERNEL_SND_AC97_CODEC
+config ADK_LINUX_KERNEL_SND_AC97_CODEC
 	tristate
 
-config ADK_KERNEL_SND_SOC_GENERIC_DMAENGINE_PCM
+config ADK_LINUX_KERNEL_SND_SOC_GENERIC_DMAENGINE_PCM
 	bool
 
-config ADK_KERNEL_SND_SOC_SPDIF
+config ADK_LINUX_KERNEL_SND_SOC_SPDIF
 	tristate
 
-config ADK_KERNEL_SND_SOC_FSL_ASRC
+config ADK_LINUX_KERNEL_SND_SOC_FSL_ASRC
 	bool
 
-config ADK_KERNEL_SND_SOC_FSL_HDMI
+config ADK_LINUX_KERNEL_SND_SOC_FSL_HDMI
 	bool
 
-config ADK_KERNEL_SND_SOC_FSL_SPDIF
+config ADK_LINUX_KERNEL_SND_SOC_FSL_SPDIF
 	tristate
 
-config ADK_KERNEL_SND_SOC_IMX_SGTL5000
+config ADK_LINUX_KERNEL_SND_SOC_IMX_SGTL5000
 	tristate
 
-config ADK_KERNEL_SND_SOC_IMX_PCM_DMA
+config ADK_LINUX_KERNEL_SND_SOC_IMX_PCM_DMA
 	bool
 
-config ADK_KERNEL_SND_SOC_HDMI_CODEC
+config ADK_LINUX_KERNEL_SND_SOC_HDMI_CODEC
 	tristate
 
-config ADK_KERNEL_SND_SOC_IMX_HDMI_DMA
+config ADK_LINUX_KERNEL_SND_SOC_IMX_HDMI_DMA
 	bool
 
-config ADK_KERNEL_SND_SOC_IMX_SPDIF
+config ADK_LINUX_KERNEL_SND_SOC_IMX_SPDIF
 	tristate
 
-config ADK_KERNEL_SND_SOC_IMX_HDMI
+config ADK_LINUX_KERNEL_SND_SOC_IMX_HDMI
 	tristate
 
-config ADK_KERNEL_SND_PXA2XX_AC97
+config ADK_LINUX_KERNEL_SND_PXA2XX_AC97
 	tristate
 
-config ADK_KERNEL_SND_PXA2XX_SOC
+config ADK_LINUX_KERNEL_SND_PXA2XX_SOC
 	tristate
 
-config ADK_KERNEL_SND_SOC_I2C_AND_SPI
+config ADK_LINUX_KERNEL_SND_SOC_I2C_AND_SPI
 	tristate
 
-config ADK_KERNEL_SND_SOC_WM8731
+config ADK_LINUX_KERNEL_SND_SOC_WM8731
 	tristate
-	select ADK_KERNEL_SND_SOC_I2C_AND_SPI
+	select ADK_LINUX_KERNEL_SND_SOC_I2C_AND_SPI
 
-config ADK_KERNEL_SND_SOC_WM8804
+config ADK_LINUX_KERNEL_SND_SOC_WM8804
 	tristate
-	select ADK_KERNEL_SND_SOC_I2C_AND_SPI
+	select ADK_LINUX_KERNEL_SND_SOC_I2C_AND_SPI
 
-config ADK_KERNEL_SND_SOC_PCM5102A
+config ADK_LINUX_KERNEL_SND_SOC_PCM5102A
 	tristate
-	select ADK_KERNEL_SND_SOC_I2C_AND_SPI
+	select ADK_LINUX_KERNEL_SND_SOC_I2C_AND_SPI
 
-config ADK_KERNEL_SND_SOC_PCM512x
+config ADK_LINUX_KERNEL_SND_SOC_PCM512x
 	tristate
-	select ADK_KERNEL_SND_SOC_I2C_AND_SPI
+	select ADK_LINUX_KERNEL_SND_SOC_I2C_AND_SPI
 
-config ADK_KERNEL_SND_SOC_PCM512x_I2C
+config ADK_LINUX_KERNEL_SND_SOC_PCM512x_I2C
 	tristate
-	select ADK_KERNEL_SND_SOC_PCM512x
-	select ADK_KERNEL_SND_SOC_I2C_AND_SPI
+	select ADK_LINUX_KERNEL_SND_SOC_PCM512x
+	select ADK_LINUX_KERNEL_SND_SOC_I2C_AND_SPI
 
-config ADK_KERNEL_SND_SOC_PCM512x_SPI
+config ADK_LINUX_KERNEL_SND_SOC_PCM512x_SPI
 	tristate
-	select ADK_KERNEL_SND_SOC_PCM512x
-	select ADK_KERNEL_SND_SOC_I2C_AND_SPI
+	select ADK_LINUX_KERNEL_SND_SOC_PCM512x
+	select ADK_LINUX_KERNEL_SND_SOC_I2C_AND_SPI
 
-config ADK_KERNEL_SND
+config ADK_LINUX_KERNEL_SND
 	tristate
-	select ADK_KERNEL_SOUND
-	select ADK_KERNEL_SND_PCM
-	select ADK_KERNEL_SND_HWDEP
-	select ADK_KERNEL_SND_TIMER
+	select ADK_LINUX_KERNEL_SOUND
+	select ADK_LINUX_KERNEL_SND_PCM
+	select ADK_LINUX_KERNEL_SND_HWDEP
+	select ADK_LINUX_KERNEL_SND_TIMER
 
-config ADK_KERNEL_SND_TIMER
+config ADK_LINUX_KERNEL_SND_TIMER
        tristate
 
-config ADK_KERNEL_SND_RAWMIDI
+config ADK_LINUX_KERNEL_SND_RAWMIDI
        tristate
 
-config ADK_KERNEL_SND_SEQUENCER
+config ADK_LINUX_KERNEL_SND_SEQUENCER
        tristate "Sequencer support"
-       select ADK_KERNEL_SND_TIMER
-       select ADK_KERNEL_SND_RAWMIDI
+       select ADK_LINUX_KERNEL_SND_TIMER
+       select ADK_LINUX_KERNEL_SND_RAWMIDI
 
-config ADK_KERNEL_SND_INTEL8X0
+config ADK_LINUX_KERNEL_SND_INTEL8X0
 	tristate "Intel AC97 driver"
-	select ADK_KERNEL_SND
-	select ADK_KERNEL_SND_PCI
-	select ADK_KERNEL_SND_AC97_CODEC
+	select ADK_LINUX_KERNEL_SND
+	select ADK_LINUX_KERNEL_SND_PCI
+	select ADK_LINUX_KERNEL_SND_AC97_CODEC
 	default m if ADK_TARGET_SYSTEM_IBM_X40
 	default m if ADK_TARGET_QEMU_WITH_AUDIO
 	default n
@@ -141,143 +141,143 @@ config ADK_KERNEL_SND_INTEL8X0
 	help
 	  Driver for intel chipsets.
 
-config ADK_KERNEL_SND_VIA82XX
+config ADK_LINUX_KERNEL_SND_VIA82XX
 	tristate "VIA82XX driver"
-	select ADK_KERNEL_SND
+	select ADK_LINUX_KERNEL_SND
 	depends on ADK_TARGET_WITH_PCI || ADK_TARGET_GENERIC
 	help
 	 ALSA VIA82XX driver
 
-config ADK_KERNEL_SND_ENS1370
+config ADK_LINUX_KERNEL_SND_ENS1370
 	tristate "Ensoniq 1370 driver"
-	select ADK_KERNEL_SND
+	select ADK_LINUX_KERNEL_SND
 	depends on ADK_TARGET_WITH_PCI || ADK_TARGET_GENERIC
 	help
 	 ALSA Ensonique 1370 driver
 
-config ADK_KERNEL_SND_CS5535AUDIO
+config ADK_LINUX_KERNEL_SND_CS5535AUDIO
 	tristate "AMD CS5535 driver"
-	select ADK_KERNEL_SND_PCI
-	select ADK_KERNEL_SND_AC97_CODEC
-	select ADK_KERNEL_SND
+	select ADK_LINUX_KERNEL_SND_PCI
+	select ADK_LINUX_KERNEL_SND_AC97_CODEC
+	select ADK_LINUX_KERNEL_SND
 	default m if ADK_TARGET_SYSTEM_LEMOTE_YEELONG
 	default m if ADK_TARGET_MODEL_PCENGINES_ALIX1C
 	depends on ADK_TARGET_WITH_PCI || ADK_TARGET_GENERIC
 	help
 	 ALSA AMD CS5535 driver
 
-config ADK_KERNEL_SND_HDSP
+config ADK_LINUX_KERNEL_SND_HDSP
 	tristate "RME Hammerfall DSP Audio"
-	select ADK_KERNEL_SND
-	select ADK_KERNEL_SND_PCI
-	select ADK_KERNEL_FW_LOADER
-	select ADK_KERNEL_SND_HWDEP
-	select ADK_KERNEL_SND_RAWMIDI
-	select ADK_KERNEL_SND_PCM
+	select ADK_LINUX_KERNEL_SND
+	select ADK_LINUX_KERNEL_SND_PCI
+	select ADK_LINUX_KERNEL_FW_LOADER
+	select ADK_LINUX_KERNEL_SND_HWDEP
+	select ADK_LINUX_KERNEL_SND_RAWMIDI
+	select ADK_LINUX_KERNEL_SND_PCM
 	default y if ADK_TARGET_SYSTEM_ASUS_P5BVM
 	default n
 	depends on ADK_TARGET_WITH_PCI || ADK_TARGET_GENERIC
 	help
 	  ALSA driver for RME HDSP cards.
 
-config ADK_KERNEL_SND_PXA2XX_SOC_SPITZ
+config ADK_LINUX_KERNEL_SND_PXA2XX_SOC_SPITZ
 	tristate "Sharp Zaurus SoC"
-	select ADK_KERNEL_SND
-	select ADK_KERNEL_SND_ARM
-	select ADK_KERNEL_SND_PXA2XX_AC97
-	select ADK_KERNEL_SND_AC97_CODEC
-	select ADK_KERNEL_SND_SOC
-	select ADK_KERNEL_SND_PXA2XX_SOC
+	select ADK_LINUX_KERNEL_SND
+	select ADK_LINUX_KERNEL_SND_ARM
+	select ADK_LINUX_KERNEL_SND_PXA2XX_AC97
+	select ADK_LINUX_KERNEL_SND_AC97_CODEC
+	select ADK_LINUX_KERNEL_SND_SOC
+	select ADK_LINUX_KERNEL_SND_PXA2XX_SOC
 	depends on ADK_TARGET_SYSTEM_SHARP_ZAURUS
 	default m if ADK_TARGET_SYSTEM_SHARP_ZAURUS
 	default n
 
-config ADK_KERNEL_SND_BCM2835
+config ADK_LINUX_KERNEL_SND_BCM2835
 	tristate "BCM28XX onboard soundcard"
-	select ADK_KERNEL_SND
-	select ADK_KERNEL_SND_ARM
+	select ADK_LINUX_KERNEL_SND
+	select ADK_LINUX_KERNEL_SND_ARM
 	depends on ADK_TARGET_BOARD_BCM28XX
 	default m if ADK_TARGET_HARDWARE_NONE
 	default n
 
-config ADK_KERNEL_SND_BCM2835_SOC_I2S
+config ADK_LINUX_KERNEL_SND_BCM2835_SOC_I2S
 	tristate
-	select ADK_KERNEL_SND
-	select ADK_KERNEL_SND_ARM
-	select ADK_KERNEL_SND_SOC
-	select ADK_KERNEL_DMA_BCM2835
-	select ADK_KERNEL_REGMAP
-	select ADK_KERNEL_REGMAP_MMIO
+	select ADK_LINUX_KERNEL_SND
+	select ADK_LINUX_KERNEL_SND_ARM
+	select ADK_LINUX_KERNEL_SND_SOC
+	select ADK_LINUX_KERNEL_DMA_BCM2835
+	select ADK_LINUX_KERNEL_REGMAP
+	select ADK_LINUX_KERNEL_REGMAP_MMIO
 	depends on ADK_TARGET_BOARD_BCM28XX
 	default n
 
-config ADK_KERNEL_SND_BCM2708_SOC_HIFIBERRY_AMP
+config ADK_LINUX_KERNEL_SND_BCM2708_SOC_HIFIBERRY_AMP
 	tristate "Hifiberry AMP"
-	select ADK_KERNEL_SND_BCM2835_SOC_I2S
+	select ADK_LINUX_KERNEL_SND_BCM2835_SOC_I2S
 	depends on ADK_TARGET_BOARD_BCM28XX
 
-config ADK_KERNEL_SND_BCM2708_SOC_HIFIBERRY_DAC
+config ADK_LINUX_KERNEL_SND_BCM2708_SOC_HIFIBERRY_DAC
 	tristate "Hifiberry DAC"
-	select ADK_KERNEL_SND_BCM2835_SOC_I2S
-	select ADK_KERNEL_SND_SOC_PCM5102A
+	select ADK_LINUX_KERNEL_SND_BCM2835_SOC_I2S
+	select ADK_LINUX_KERNEL_SND_SOC_PCM5102A
 	depends on ADK_TARGET_BOARD_BCM28XX
 
-config ADK_KERNEL_SND_BCM2708_SOC_HIFIBERRY_DACPLUS
+config ADK_LINUX_KERNEL_SND_BCM2708_SOC_HIFIBERRY_DACPLUS
 	tristate "Hifiberry DACPLUS"
-	select ADK_KERNEL_SND_BCM2835_SOC_I2S
-	select ADK_KERNEL_SND_SOC_PCM512x_I2C
-	select ADK_KERNEL_SND_SOC_PCM512x
+	select ADK_LINUX_KERNEL_SND_BCM2835_SOC_I2S
+	select ADK_LINUX_KERNEL_SND_SOC_PCM512x_I2C
+	select ADK_LINUX_KERNEL_SND_SOC_PCM512x
 	depends on ADK_TARGET_BOARD_BCM28XX
 
-config ADK_KERNEL_SND_BCM2708_SOC_HIFIBERRY_DIGI
+config ADK_LINUX_KERNEL_SND_BCM2708_SOC_HIFIBERRY_DIGI
 	tristate "Hifiberry DIGI"
-	select ADK_KERNEL_SND_BCM2835_SOC_I2S
-	select ADK_KERNEL_SND_SOC_WM8804
+	select ADK_LINUX_KERNEL_SND_BCM2835_SOC_I2S
+	select ADK_LINUX_KERNEL_SND_SOC_WM8804
 	depends on ADK_TARGET_BOARD_BCM28XX
 
-config ADK_KERNEL_SND_BCM2708_SOC_RPI_DAC
+config ADK_LINUX_KERNEL_SND_BCM2708_SOC_RPI_DAC
 	tristate "RPI-DAC"
-	select ADK_KERNEL_SND_BCM2835_SOC_I2S
+	select ADK_LINUX_KERNEL_SND_BCM2835_SOC_I2S
 	depends on ADK_TARGET_BOARD_BCM28XX
 
-config ADK_KERNEL_SND_BCM2708_SOC_IQAUDIO_DAC
+config ADK_LINUX_KERNEL_SND_BCM2708_SOC_IQAUDIO_DAC
 	tristate "IQAudio-DAC"
-	select ADK_KERNEL_SND_BCM2835_SOC_I2S
-	select ADK_KERNEL_SND_SOC_PCM512x_I2C
+	select ADK_LINUX_KERNEL_SND_BCM2835_SOC_I2S
+	select ADK_LINUX_KERNEL_SND_SOC_PCM512x_I2C
 	depends on ADK_TARGET_BOARD_BCM28XX
 
-config ADK_KERNEL_SND_BCM2708_SOC_RPI_PROTO
+config ADK_LINUX_KERNEL_SND_BCM2708_SOC_RPI_PROTO
 	tristate "Rpi-Proto"
-	select ADK_KERNEL_SND_BCM2835_SOC_I2S
-	select ADK_KERNEL_SND_SOC_WM8731
+	select ADK_LINUX_KERNEL_SND_BCM2835_SOC_I2S
+	select ADK_LINUX_KERNEL_SND_SOC_WM8731
 	depends on ADK_TARGET_BOARD_BCM28XX
 
-config ADK_KERNEL_SND_IMX_SOC
+config ADK_LINUX_KERNEL_SND_IMX_SOC
 	tristate "IMX6 SoC sound chip"
-	select ADK_KERNEL_SND
-	select ADK_KERNEL_SND_SOC
-	select ADK_KERNEL_SND_SOC_GENERIC_DMAENGINE_PCM
-	select ADK_KERNEL_SND_SOC_HDMI_CODEC
-	select ADK_KERNEL_SND_SOC_IMX_PCM_DMA
-	select ADK_KERNEL_SND_SOC_IMX_HDMI_DMA
-	select ADK_KERNEL_SND_SOC_IMX_HDMI
-	select ADK_KERNEL_SND_SOC_IMX_SPDIF
-	select ADK_KERNEL_SND_SOC_IMX_SGTL5000 if ADK_TARGET_MODEL_HUMMINGBOARD_I2EX
-	select ADK_KERNEL_SND_SOC_FSL_ASRC
-	select ADK_KERNEL_SND_SOC_FSL_SPDIF
-	select ADK_KERNEL_SND_SOC_FSL_HDMI
-	select ADK_KERNEL_REGMAP
-	select ADK_KERNEL_REGMAP_SPI
-	select ADK_KERNEL_REGMAP_I2C
+	select ADK_LINUX_KERNEL_SND
+	select ADK_LINUX_KERNEL_SND_SOC
+	select ADK_LINUX_KERNEL_SND_SOC_GENERIC_DMAENGINE_PCM
+	select ADK_LINUX_KERNEL_SND_SOC_HDMI_CODEC
+	select ADK_LINUX_KERNEL_SND_SOC_IMX_PCM_DMA
+	select ADK_LINUX_KERNEL_SND_SOC_IMX_HDMI_DMA
+	select ADK_LINUX_KERNEL_SND_SOC_IMX_HDMI
+	select ADK_LINUX_KERNEL_SND_SOC_IMX_SPDIF
+	select ADK_LINUX_KERNEL_SND_SOC_IMX_SGTL5000 if ADK_TARGET_MODEL_HUMMINGBOARD_I2EX
+	select ADK_LINUX_KERNEL_SND_SOC_FSL_ASRC
+	select ADK_LINUX_KERNEL_SND_SOC_FSL_SPDIF
+	select ADK_LINUX_KERNEL_SND_SOC_FSL_HDMI
+	select ADK_LINUX_KERNEL_REGMAP
+	select ADK_LINUX_KERNEL_REGMAP_SPI
+	select ADK_LINUX_KERNEL_REGMAP_I2C
 	depends on ADK_TARGET_SYSTEM_SOLIDRUN_IMX6
 	default m if ADK_TARGET_SYSTEM_SOLIDRUN_IMX6
 	default n
 
-config ADK_KERNEL_SND_ALOOP
+config ADK_LINUX_KERNEL_SND_ALOOP
 	tristate "Generic loopback driver (PCM)"
-	select ADK_KERNEL_SND
-	select ADK_KERNEL_SND_DRIVERS
-	select ADK_KERNEL_SND_PCM
+	select ADK_LINUX_KERNEL_SND
+	select ADK_LINUX_KERNEL_SND_DRIVERS
+	select ADK_LINUX_KERNEL_SND_PCM
 	default n
 
 endmenu

+ 311 - 311
target/linux/config/Config.in.block

@@ -1,165 +1,165 @@
 # This file is part of the OpenADK project. OpenADK is copyrighted
 # material, please see the LICENCE file in the top-level directory.
 
-config ADK_KERNEL_BLOCK
+config ADK_LINUX_KERNEL_BLOCK
 	bool
-	select ADK_KERNEL_AIO
-	select ADK_KERNEL_INOTIFY_USER
+	select ADK_LINUX_KERNEL_AIO
+	select ADK_LINUX_KERNEL_INOTIFY_USER
 
-config ADK_KERNEL_AIO
+config ADK_LINUX_KERNEL_AIO
 	bool
 
 menu "Block devices support"
 depends on ADK_TARGET_WITH_BLOCK \
 	|| ADK_TARGET_GENERIC
 
-config ADK_KERNEL_IOSCHED_DEADLINE
+config ADK_LINUX_KERNEL_IOSCHED_DEADLINE
 	bool
 
-config ADK_KERNEL_IOSCHED_CFQ
+config ADK_LINUX_KERNEL_IOSCHED_CFQ
 	bool
 
-config ADK_KERNEL_IOSCHED_NOOP
+config ADK_LINUX_KERNEL_IOSCHED_NOOP
 	bool
 
 choice
 prompt "I/O scheduler"
 
-config ADK_KERNEL_DEFAULT_DEADLINE
+config ADK_LINUX_KERNEL_DEFAULT_DEADLINE
 	bool "deadline"
-	select ADK_KERNEL_IOSCHED_DEADLINE
+	select ADK_LINUX_KERNEL_IOSCHED_DEADLINE
 
-config ADK_KERNEL_DEFAULT_CFQ
+config ADK_LINUX_KERNEL_DEFAULT_CFQ
 	bool "cfq"
-	select ADK_KERNEL_IOSCHED_CFQ
+	select ADK_LINUX_KERNEL_IOSCHED_CFQ
 
-config ADK_KERNEL_DEFAULT_NOOP
+config ADK_LINUX_KERNEL_DEFAULT_NOOP
 	bool "noop"
-	select ADK_KERNEL_IOSCHED_NOOP
+	select ADK_LINUX_KERNEL_IOSCHED_NOOP
 
 endchoice
 
-config ADK_KERNEL_IDE
+config ADK_LINUX_KERNEL_IDE
 	bool
 
-config ADK_KERNEL_IDE_GD
+config ADK_LINUX_KERNEL_IDE_GD
 	bool
 
-config ADK_KERNEL_IDE_GD_ATA
+config ADK_LINUX_KERNEL_IDE_GD_ATA
 	bool
 
-config ADK_KERNEL_LBDAF
+config ADK_LINUX_KERNEL_LBDAF
 	bool
 
-config ADK_KERNEL_BLK_DEV_BSG
+config ADK_LINUX_KERNEL_BLK_DEV_BSG
 	bool
 
-config ADK_KERNEL_BLK_DEV_BSGLIB
+config ADK_LINUX_KERNEL_BLK_DEV_BSGLIB
 	bool
 
-config ADK_KERNEL_BLK_DEV_THROTTLING
+config ADK_LINUX_KERNEL_BLK_DEV_THROTTLING
 	bool
 
-config ADK_KERNEL_MD
+config ADK_LINUX_KERNEL_MD
 	bool
 
-config ADK_KERNEL_RAID6_PQ
+config ADK_LINUX_KERNEL_RAID6_PQ
 	tristate
 
-config ADK_KERNEL_BLK_DEV_IO_TRACE
+config ADK_LINUX_KERNEL_BLK_DEV_IO_TRACE
 	bool
 
-config ADK_KERNEL_IOSCHED_AS
+config ADK_LINUX_KERNEL_IOSCHED_AS
 	bool
 
-config ADK_KERNEL_IOSCHED_DEADLINE
+config ADK_LINUX_KERNEL_IOSCHED_DEADLINE
 	bool
 
-config ADK_KERNEL_IOSCHED_CFQ
+config ADK_LINUX_KERNEL_IOSCHED_CFQ
 	bool
 
-config ADK_KERNEL_SCSI_LOWLEVEL
+config ADK_LINUX_KERNEL_SCSI_LOWLEVEL
 	bool
 
-config ADK_KERNEL_SCSI_DMA
+config ADK_LINUX_KERNEL_SCSI_DMA
 	bool
 
-config ADK_KERNEL_SCSI_MULTI_LUN
+config ADK_LINUX_KERNEL_SCSI_MULTI_LUN
 	bool
 
-config ADK_KERNEL_SCSI_CONSTANTS
+config ADK_LINUX_KERNEL_SCSI_CONSTANTS
 	bool
 
-config ADK_KERNEL_SCSI_LOGGING
+config ADK_LINUX_KERNEL_SCSI_LOGGING
 	bool
 	
-config ADK_KERNEL_SCSI_SCAN_ASYNC
+config ADK_LINUX_KERNEL_SCSI_SCAN_ASYNC
 	bool
 
-config ADK_KERNEL_ISCSI_TCP
+config ADK_LINUX_KERNEL_ISCSI_TCP
 	bool
 
-config ADK_KERNEL_BLK_DEV
+config ADK_LINUX_KERNEL_BLK_DEV
 	bool
 
-config ADK_KERNEL_ATA
+config ADK_LINUX_KERNEL_ATA
 	bool
 
-config ADK_KERNEL_ATA_SFF
+config ADK_LINUX_KERNEL_ATA_SFF
 	bool
 
-config ADK_KERNEL_ATA_BMDMA
+config ADK_LINUX_KERNEL_ATA_BMDMA
 	bool
 
-config ADK_KERNEL_SATA_AHCI_PLATFORM
+config ADK_LINUX_KERNEL_SATA_AHCI_PLATFORM
 	bool
 
-config ADK_KERNEL_SATA_PMP
+config ADK_LINUX_KERNEL_SATA_PMP
 	bool
 
-config ADK_KERNEL_AHCI_IMX
+config ADK_LINUX_KERNEL_AHCI_IMX
 	bool
 
-config ADK_KERNEL_CONNECTOR
+config ADK_LINUX_KERNEL_CONNECTOR
 	bool
 
-config ADK_KERNEL_MMC
+config ADK_LINUX_KERNEL_MMC
 	bool
 
-config ADK_KERNEL_MMC_BLOCK
+config ADK_LINUX_KERNEL_MMC_BLOCK
 	bool
 
-config ADK_KERNEL_MMC_BLOCK_BOUNCE
+config ADK_LINUX_KERNEL_MMC_BLOCK_BOUNCE
 	bool
 
-config ADK_KERNEL_MMC_UNSAFE_RESUME
+config ADK_LINUX_KERNEL_MMC_UNSAFE_RESUME
 	bool
 
-config ADK_KERNEL_MMC_SDHCI
+config ADK_LINUX_KERNEL_MMC_SDHCI
 	bool
 
-config ADK_KERNEL_MMC_SDHCI_IO_ACCESSORS
+config ADK_LINUX_KERNEL_MMC_SDHCI_IO_ACCESSORS
 	bool
 
-config ADK_KERNEL_MMC_SDHCI_PLTFM
+config ADK_LINUX_KERNEL_MMC_SDHCI_PLTFM
 	bool
 
-config ADK_KERNEL_MMC_BCM2835_DMA
+config ADK_LINUX_KERNEL_MMC_BCM2835_DMA
 	bool
 
-config ADK_KERNEL_MMC_BCM2835_SDHOST
+config ADK_LINUX_KERNEL_MMC_BCM2835_SDHOST
 	bool
 
-config ADK_KERNEL_PWRSEQ_EMMC
+config ADK_LINUX_KERNEL_PWRSEQ_EMMC
 	bool
 
-config ADK_KERNEL_PWRSEQ_SIMPLE
+config ADK_LINUX_KERNEL_PWRSEQ_SIMPLE
 	bool
 
-config ADK_KERNEL_BOARD_GRASSHOPPER_MMC
+config ADK_LINUX_KERNEL_BOARD_GRASSHOPPER_MMC
 	bool
 
-config ADK_KERNEL_BOARD_GRASSHOPPER_MMCLED
+config ADK_LINUX_KERNEL_BOARD_GRASSHOPPER_MMCLED
 	bool
 
 menu "SATA/PATA devices support"
@@ -169,30 +169,30 @@ depends on ADK_TARGET_WITH_PATA \
 	|| ADK_TARGET_VBOX \
 	|| ADK_TARGET_GENERIC
 
-config ADK_KERNEL_PATA_RB532
+config ADK_LINUX_KERNEL_PATA_RB532
 	tristate "CF disk driver for Mikrotik RB532"
-	select ADK_KERNEL_BLOCK
-	select ADK_KERNEL_LBDAF
-	select ADK_KERNEL_SCSI
-	select ADK_KERNEL_ATA
-	select ADK_KERNEL_ATA_SFF
-	select ADK_KERNEL_ATA_BMDMA
-	select ADK_KERNEL_BLK_DEV
-	select ADK_KERNEL_BLK_DEV_SD
+	select ADK_LINUX_KERNEL_BLOCK
+	select ADK_LINUX_KERNEL_LBDAF
+	select ADK_LINUX_KERNEL_SCSI
+	select ADK_LINUX_KERNEL_ATA
+	select ADK_LINUX_KERNEL_ATA_SFF
+	select ADK_LINUX_KERNEL_ATA_BMDMA
+	select ADK_LINUX_KERNEL_BLK_DEV
+	select ADK_LINUX_KERNEL_BLK_DEV_SD
 	depends on ADK_TARGET_SYSTEM_MIKROTIK_RB532
 	default y if ADK_TARGET_SYSTEM_MIKROTIK_RB532
 	default n
 
-config ADK_KERNEL_PATA_AMD
+config ADK_LINUX_KERNEL_PATA_AMD
 	tristate "AMD PATA driver"
-	select ADK_KERNEL_BLOCK
-	select ADK_KERNEL_LBDAF
-	select ADK_KERNEL_SCSI
-	select ADK_KERNEL_ATA
-	select ADK_KERNEL_ATA_SFF
-	select ADK_KERNEL_ATA_BMDMA
-	select ADK_KERNEL_BLK_DEV
-	select ADK_KERNEL_BLK_DEV_SD
+	select ADK_LINUX_KERNEL_BLOCK
+	select ADK_LINUX_KERNEL_LBDAF
+	select ADK_LINUX_KERNEL_SCSI
+	select ADK_LINUX_KERNEL_ATA
+	select ADK_LINUX_KERNEL_ATA_SFF
+	select ADK_LINUX_KERNEL_ATA_BMDMA
+	select ADK_LINUX_KERNEL_BLK_DEV
+	select ADK_LINUX_KERNEL_BLK_DEV_SD
 	depends on ADK_TARGET_SYSTEM_PCENGINES_ALIX \
 		|| ADK_TARGET_SYSTEM_LEMOTE_YEELONG \
 		|| ADK_TARGET_GENERIC
@@ -200,28 +200,28 @@ config ADK_KERNEL_PATA_AMD
 	default y if ADK_TARGET_SYSTEM_LEMOTE_YEELONG
 	default n
 
-config ADK_KERNEL_PATA_SC1200
+config ADK_LINUX_KERNEL_PATA_SC1200
 	tristate
-	select ADK_KERNEL_BLOCK
-	select ADK_KERNEL_LBDAF
-	select ADK_KERNEL_SCSI
-	select ADK_KERNEL_ATA
-	select ADK_KERNEL_ATA_SFF
-	select ADK_KERNEL_ATA_BMDMA
-	select ADK_KERNEL_BLK_DEV
-	select ADK_KERNEL_BLK_DEV_SD
+	select ADK_LINUX_KERNEL_BLOCK
+	select ADK_LINUX_KERNEL_LBDAF
+	select ADK_LINUX_KERNEL_SCSI
+	select ADK_LINUX_KERNEL_ATA
+	select ADK_LINUX_KERNEL_ATA_SFF
+	select ADK_LINUX_KERNEL_ATA_BMDMA
+	select ADK_LINUX_KERNEL_BLK_DEV
+	select ADK_LINUX_KERNEL_BLK_DEV_SD
 	depends on ADK_TARGET_SYSTEM_PCENGINES_WRAP
 	default y if ADK_TARGET_SYSTEM_PCENGINES_WRAP
 	default n
 
-config ADK_KERNEL_SATA_AHCI
+config ADK_LINUX_KERNEL_SATA_AHCI
 	tristate "AHCI SATA driver"
-	select ADK_KERNEL_BLOCK
-	select ADK_KERNEL_LBDAF
-	select ADK_KERNEL_SCSI
-	select ADK_KERNEL_ATA
-	select ADK_KERNEL_BLK_DEV
-	select ADK_KERNEL_BLK_DEV_SD
+	select ADK_LINUX_KERNEL_BLOCK
+	select ADK_LINUX_KERNEL_LBDAF
+	select ADK_LINUX_KERNEL_SCSI
+	select ADK_LINUX_KERNEL_ATA
+	select ADK_LINUX_KERNEL_BLK_DEV
+	select ADK_LINUX_KERNEL_BLK_DEV_SD
 	depends on ADK_TARGET_SYSTEM_ASUS_P5BVM || \
 		   ADK_TARGET_SYSTEM_PCENGINES_APU || \
 		   ADK_TARGET_GENERIC || \
@@ -233,17 +233,17 @@ config ADK_KERNEL_SATA_AHCI
 	help
 	  Enables support for AHCI Serial ATA.
 
-config ADK_KERNEL_ATA_PIIX
+config ADK_LINUX_KERNEL_ATA_PIIX
 	tristate "ATA PIIX support"
-	select ADK_KERNEL_BLOCK
-	select ADK_KERNEL_LBDAF
-	select ADK_KERNEL_SCSI
-	select ADK_KERNEL_SCSI_DMA
-	select ADK_KERNEL_ATA
-	select ADK_KERNEL_ATA_SFF
-	select ADK_KERNEL_ATA_BMDMA
-	select ADK_KERNEL_BLK_DEV
-	select ADK_KERNEL_BLK_DEV_SD
+	select ADK_LINUX_KERNEL_BLOCK
+	select ADK_LINUX_KERNEL_LBDAF
+	select ADK_LINUX_KERNEL_SCSI
+	select ADK_LINUX_KERNEL_SCSI_DMA
+	select ADK_LINUX_KERNEL_ATA
+	select ADK_LINUX_KERNEL_ATA_SFF
+	select ADK_LINUX_KERNEL_ATA_BMDMA
+	select ADK_LINUX_KERNEL_BLK_DEV
+	select ADK_LINUX_KERNEL_BLK_DEV_SD
 	depends on ADK_TARGET_SYSTEM_IBM_X40 || \
 		   ADK_TARGET_GENERIC || \
 		   ADK_TARGET_SYSTEM_QEMU_MIPS || \
@@ -257,82 +257,82 @@ config ADK_KERNEL_ATA_PIIX
 	help
 	  ATA PIIX driver.
 
-config ADK_KERNEL_PATA_MACIO
+config ADK_LINUX_KERNEL_PATA_MACIO
 	tristate "MAC IO support"
-	select ADK_KERNEL_BLOCK
-	select ADK_KERNEL_LBDAF
-	select ADK_KERNEL_SCSI
-	select ADK_KERNEL_ATA
-	select ADK_KERNEL_ATA_SFF
-	select ADK_KERNEL_ATA_BMDMA
-	select ADK_KERNEL_BLK_DEV
-	select ADK_KERNEL_BLK_DEV_SD
+	select ADK_LINUX_KERNEL_BLOCK
+	select ADK_LINUX_KERNEL_LBDAF
+	select ADK_LINUX_KERNEL_SCSI
+	select ADK_LINUX_KERNEL_ATA
+	select ADK_LINUX_KERNEL_ATA_SFF
+	select ADK_LINUX_KERNEL_ATA_BMDMA
+	select ADK_LINUX_KERNEL_BLK_DEV
+	select ADK_LINUX_KERNEL_BLK_DEV_SD
 	depends on ADK_TARGET_SYSTEM_QEMU_PPC_MACPPC
 	
-config ADK_KERNEL_PATA_PLATFORM
+config ADK_LINUX_KERNEL_PATA_PLATFORM
 	tristate "PATA platform driver"
-	select ADK_KERNEL_BLOCK
-	select ADK_KERNEL_LBDAF
-	select ADK_KERNEL_SCSI
-	select ADK_KERNEL_ATA
-	select ADK_KERNEL_ATA_SFF
-	select ADK_KERNEL_ATA_BMDMA
-	select ADK_KERNEL_BLK_DEV
-	select ADK_KERNEL_BLK_DEV_SD
+	select ADK_LINUX_KERNEL_BLOCK
+	select ADK_LINUX_KERNEL_LBDAF
+	select ADK_LINUX_KERNEL_SCSI
+	select ADK_LINUX_KERNEL_ATA
+	select ADK_LINUX_KERNEL_ATA_SFF
+	select ADK_LINUX_KERNEL_ATA_BMDMA
+	select ADK_LINUX_KERNEL_BLK_DEV
+	select ADK_LINUX_KERNEL_BLK_DEV_SD
 	depends on ADK_TARGET_SYSTEM_QEMU_SH
 	default n
 
-config ADK_KERNEL_PATA_PCMCIA
+config ADK_LINUX_KERNEL_PATA_PCMCIA
 	tristate
-	select ADK_KERNEL_PCCARD
-	select ADK_KERNEL_PCMCIA
+	select ADK_LINUX_KERNEL_PCCARD
+	select ADK_LINUX_KERNEL_PCMCIA
 
-config ADK_KERNEL_PATA_IMX
+config ADK_LINUX_KERNEL_PATA_IMX
 	tristate "eSATA driver for IMX6 boards"
-	select ADK_KERNEL_BLOCK
-	select ADK_KERNEL_LBDAF
-	select ADK_KERNEL_SCSI
-	select ADK_KERNEL_ATA
-	select ADK_KERNEL_ATA_SFF
-	select ADK_KERNEL_ATA_BMDMA
-	select ADK_KERNEL_BLK_DEV
-	select ADK_KERNEL_BLK_DEV_SD
-	select ADK_KERNEL_ATA
-	select ADK_KERNEL_AHCI_IMX
-	select ADK_KERNEL_SATA_PMP
-	select ADK_KERNEL_SATA_AHCI_PLATFORM
+	select ADK_LINUX_KERNEL_BLOCK
+	select ADK_LINUX_KERNEL_LBDAF
+	select ADK_LINUX_KERNEL_SCSI
+	select ADK_LINUX_KERNEL_ATA
+	select ADK_LINUX_KERNEL_ATA_SFF
+	select ADK_LINUX_KERNEL_ATA_BMDMA
+	select ADK_LINUX_KERNEL_BLK_DEV
+	select ADK_LINUX_KERNEL_BLK_DEV_SD
+	select ADK_LINUX_KERNEL_ATA
+	select ADK_LINUX_KERNEL_AHCI_IMX
+	select ADK_LINUX_KERNEL_SATA_PMP
+	select ADK_LINUX_KERNEL_SATA_AHCI_PLATFORM
 	depends on ADK_TARGET_SYSTEM_SOLIDRUN_IMX6
 	default y if ADK_TARGET_SYSTEM_SOLIDRUN_IMX6
 	default n
 	help
 	  eSATA driver for IMX6 boards.
 
-config ADK_KERNEL_PATA_CMD64X
+config ADK_LINUX_KERNEL_PATA_CMD64X
 	tristate "CMD64x PATA driver"
-	select ADK_KERNEL_BLOCK
-	select ADK_KERNEL_LBDAF
-	select ADK_KERNEL_SCSI
-	select ADK_KERNEL_ATA
-	select ADK_KERNEL_ATA_SFF
-	select ADK_KERNEL_ATA_BMDMA
-	select ADK_KERNEL_BLK_DEV
-	select ADK_KERNEL_BLK_DEV_SD
+	select ADK_LINUX_KERNEL_BLOCK
+	select ADK_LINUX_KERNEL_LBDAF
+	select ADK_LINUX_KERNEL_SCSI
+	select ADK_LINUX_KERNEL_ATA
+	select ADK_LINUX_KERNEL_ATA_SFF
+	select ADK_LINUX_KERNEL_ATA_BMDMA
+	select ADK_LINUX_KERNEL_BLK_DEV
+	select ADK_LINUX_KERNEL_BLK_DEV_SD
 	depends on ADK_TARGET_SYSTEM_QEMU_SPARC64
 	help
 	  Driver for CMD64x chipsets.
 
-config ADK_KERNEL_PATA_PXA
+config ADK_LINUX_KERNEL_PATA_PXA
 	tristate "PATA driver for Sharp Zaurus"
-	select ADK_KERNEL_BLOCK
-	select ADK_KERNEL_LBDAF
-	select ADK_KERNEL_SCSI
-	select ADK_KERNEL_ATA
-	select ADK_KERNEL_ATA_SFF
-	select ADK_KERNEL_ATA_BMDMA
-	select ADK_KERNEL_BLK_DEV
-	select ADK_KERNEL_BLK_DEV_SD
-	select ADK_KERNEL_PATA_PCMCIA
-	select ADK_KERNEL_PCMCIA_PXA2XX
+	select ADK_LINUX_KERNEL_BLOCK
+	select ADK_LINUX_KERNEL_LBDAF
+	select ADK_LINUX_KERNEL_SCSI
+	select ADK_LINUX_KERNEL_ATA
+	select ADK_LINUX_KERNEL_ATA_SFF
+	select ADK_LINUX_KERNEL_ATA_BMDMA
+	select ADK_LINUX_KERNEL_BLK_DEV
+	select ADK_LINUX_KERNEL_BLK_DEV_SD
+	select ADK_LINUX_KERNEL_PATA_PCMCIA
+	select ADK_LINUX_KERNEL_PCMCIA_PXA2XX
 	depends on ADK_TARGET_SYSTEM_SHARP_ZAURUS \
 		|| ADK_TARGET_SYSTEM_QEMU_ARM_TERRIER \
 		|| ADK_TARGET_SYSTEM_QEMU_ARM_SPITZ
@@ -346,12 +346,12 @@ endmenu
 menu "IDE driver support"
 depends on ADK_TARGET_SYSTEM_QEMU_ALPHA
 
-config ADK_KERNEL_BLK_DEV_CMD64X
+config ADK_LINUX_KERNEL_BLK_DEV_CMD64X
 	tristate "CMD64x support"
-	select ADK_KERNEL_BLOCK
-	select ADK_KERNEL_IDE
-	select ADK_KERNEL_IDE_GD
-	select ADK_KERNEL_IDE_GD_ATA
+	select ADK_LINUX_KERNEL_BLOCK
+	select ADK_LINUX_KERNEL_IDE
+	select ADK_LINUX_KERNEL_IDE_GD
+	select ADK_LINUX_KERNEL_IDE_GD_ATA
 	depends on ADK_TARGET_SYSTEM_QEMU_ALPHA
 	help
 	  CMD64x IDE driver.
@@ -365,56 +365,56 @@ depends on ADK_TARGET_WITH_SCSI || \
 	ADK_TARGET_SYSTEM_QEMU_PPC64 || \
 	ADK_TARGET_SYSTEM_QEMU_SPARC