add support for waldux

9 files changed, 86 insertions, 48 deletions

diff --git a/mk/build.mk b/mk/build.mk
index 0564c69d1..4e6fb0cfa 100644
--- a/mk/build.mk
+++ b/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
diff --git a/mk/image.mk b/mk/image.mk
index 461c98125..5f4906d2b 100644
--- a/mk/image.mk
+++ b/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
diff --git a/mk/kernel-build.mk b/mk/kernel-build.mk
index f912e8c01..d53c5e8db 100644
--- a/mk/kernel-build.mk
+++ b/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)
diff --git a/mk/kernel-vars.mk b/mk/kernel-vars.mk
index 72fc56693..eeaffcf8f 100644
--- a/mk/kernel-vars.mk
+++ b/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)
diff --git a/mk/kernel-ver.mk b/mk/linux-ver.mk
index 316bfc06e..ec54a236f 100644
--- a/mk/kernel-ver.mk
+++ b/mk/linux-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)
diff --git a/mk/linux.mk b/mk/linux.mk
index c206906e3..037b48cbd 100644
--- a/mk/linux.mk
+++ b/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/} \
diff --git a/mk/vars.mk b/mk/vars.mk
index 09031dcf8..8224232ff 100644
--- a/mk/vars.mk
+++ b/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
 
diff --git a/mk/waldux-ver.mk b/mk/waldux-ver.mk
new file mode 100644
index 000000000..a88c4501b
--- /dev/null
+++ b/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
diff --git a/mk/waldux.mk b/mk/waldux.mk
new file mode 100644
index 000000000..15a021a3c
--- /dev/null
+++ b/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