- more clearness in our KERNEL-variables

8 years ago · 8aefa6477d
9 changed files with 82 additions and 81 deletions
--- a/archive-configs/ct-ng-coolstream_hd1.config
+++ b/archive-configs/ct-ng-coolstream_hd1.config
@ -227,12 +227,12 @@ CT_BUILD_SUFFIX=""
 #
 CT_KERNEL_SUPPORTS_SHARED_LIBS=y
 CT_KERNEL="linux"
-CT_KERNEL_VERSION="${NI_CUSTOM_KERNEL_VER}"
+CT_KERNEL_VERSION="${NI_CUSTOM_KERNEL_VERSION}"
 # CT_KERNEL_bare_metal is not set
 CT_KERNEL_linux=y
 CT_KERNEL_LINUX_CUSTOM=y
 CT_KERNEL_LINUX_CUSTOM_LOCATION="${NI_CUSTOM_KERNEL}"
-CT_KERNEL_LINUX_CUSTOM_VERSION="${NI_CUSTOM_KERNEL_VER}"
+CT_KERNEL_LINUX_CUSTOM_VERSION="${NI_CUSTOM_KERNEL_VERSION}"

 #
 # Common kernel options
@ -351,7 +351,7 @@ CT_LIBC_ADDONS_LIST=""
 # CT_LIBC_GLIBC_KERNEL_VERSION_NONE is not set
 CT_LIBC_GLIBC_KERNEL_VERSION_AS_HEADERS=y
 # CT_LIBC_GLIBC_KERNEL_VERSION_CHOSEN is not set
-CT_LIBC_GLIBC_MIN_KERNEL="${NI_CUSTOM_KERNEL_VER}"
+CT_LIBC_GLIBC_MIN_KERNEL="${NI_CUSTOM_KERNEL_VERSION}"

 #
 # C compiler
--- a/archive-configs/ct-ng-coolstream_hd2.config
+++ b/archive-configs/ct-ng-coolstream_hd2.config
@ -225,12 +225,12 @@ CT_TOOLCHAIN_ENABLE_NLS=y
 #
 CT_KERNEL_SUPPORTS_SHARED_LIBS=y
 CT_KERNEL="linux"
-CT_KERNEL_VERSION="${NI_CUSTOM_KERNEL_VER}"
+CT_KERNEL_VERSION="${NI_CUSTOM_KERNEL_VERSION}"
 # CT_KERNEL_bare_metal is not set
 CT_KERNEL_linux=y
 CT_KERNEL_LINUX_CUSTOM=y
 CT_KERNEL_LINUX_CUSTOM_LOCATION="${NI_CUSTOM_KERNEL}"
-CT_KERNEL_LINUX_CUSTOM_VERSION="${NI_CUSTOM_KERNEL_VER}"
+CT_KERNEL_LINUX_CUSTOM_VERSION="${NI_CUSTOM_KERNEL_VERSION}"

 #
 # Common kernel options
--- a/make/bootstrap.mk
+++ b/make/bootstrap.mk
@ -63,7 +63,7 @@ $(TARGETLIB): | $(TARGETPREFIX)

 $(TARGETLIB)/modules: | $(TARGETPREFIX)
 	mkdir -p $@
-	cp -a $(SOURCE_DIR)/$(NI_DRIVERS-BIN)/$(DRIVERS_DIR)/drivers/$(KVERSION_FULL) $@/
+	cp -a $(SOURCE_DIR)/$(NI_DRIVERS-BIN)/$(DRIVERS_DIR)/drivers/$(KERNEL_VERSION_FULL) $@/

 $(TARGETLIB)/libc.so.6: | $(TARGETPREFIX)
 	if test -e $(CROSS_DIR)/$(TARGET)/sys-root/lib; then \
--- a/make/crosstool.mk
+++ b/make/crosstool.mk
@ -32,15 +32,15 @@ crosstool-arm-hd1: CROSS_DIR-check $(SOURCE_DIR)/$(NI_LINUX-KERNEL)
 	cd $(BUILD_TMP)/crosstool-ng && \
 		mkdir -p $(BUILD_TMP)/crosstool-ng/targets/src/ && \
 			pushd $(SOURCE_DIR)/$(NI_LINUX-KERNEL) && \
-				git checkout $(KBRANCH) && \
+				git checkout $(KERNEL_BRANCH) && \
 			popd && \
-		tar cf linux-$(KVERSION).tar --exclude-vcs -C $(SOURCE_DIR)/$(NI_LINUX-KERNEL) . && \
-		mv linux-$(KVERSION).tar $(BUILD_TMP)/crosstool-ng/targets/src/ && \
+		tar cf linux-$(KERNEL_VERSION).tar --exclude-vcs -C $(SOURCE_DIR)/$(NI_LINUX-KERNEL) . && \
+		mv linux-$(KERNEL_VERSION).tar $(BUILD_TMP)/crosstool-ng/targets/src/ && \
 		cp -a $(CONFIGS)/ct-ng-coolstream_hd1.config .config && \
 		sed -i "s@^CT_PARALLEL_JOBS=.*@CT_PARALLEL_JOBS=$(NUM_CPUS)@" .config && \
 		export NI_BASE_DIR=$(BASE_DIR) && \
-		export NI_CUSTOM_KERNEL=$(BUILD_TMP)/crosstool-ng/targets/src/linux-$(KVERSION).tar && \
-		export NI_CUSTOM_KERNEL_VER=$(KVERSION) && \
+		export NI_CUSTOM_KERNEL=$(BUILD_TMP)/crosstool-ng/targets/src/linux-$(KERNEL_VERSION).tar && \
+		export NI_CUSTOM_KERNEL_VERSION=$(KERNEL_VERSION) && \
 		export LD_LIBRARY_PATH= && \
 		test -f ./configure || ./bootstrap && \
 		./configure --enable-local; MAKELEVEL=0 make; chmod 0755 ct-ng && \
@ -65,15 +65,15 @@ crosstool-arm-hd2: CROSS_DIR-check $(ARCHIVE)/gcc-linaro-$(GCC_VER).tar.xz $(SOU
 	cd $(BUILD_TMP)/crosstool-ng && \
 		mkdir -p $(BUILD_TMP)/crosstool-ng/targets/src/ && \
 			pushd $(SOURCE_DIR)/$(NI_LINUX-KERNEL) && \
-				git checkout $(KBRANCH) && \
+				git checkout $(KERNEL_BRANCH) && \
 			popd && \
-		tar cf linux-$(KVERSION).tar --exclude-vcs -C $(SOURCE_DIR)/$(NI_LINUX-KERNEL) . && \
-		mv linux-$(KVERSION).tar $(BUILD_TMP)/crosstool-ng/targets/src/ && \
+		tar cf linux-$(KERNEL_VERSION).tar --exclude-vcs -C $(SOURCE_DIR)/$(NI_LINUX-KERNEL) . && \
+		mv linux-$(KERNEL_VERSION).tar $(BUILD_TMP)/crosstool-ng/targets/src/ && \
 		cp -a $(CONFIGS)/ct-ng-coolstream_hd2.config .config && \
 		sed -i "s@^CT_PARALLEL_JOBS=.*@CT_PARALLEL_JOBS=$(NUM_CPUS)@" .config && \
 		export NI_BASE_DIR=$(BASE_DIR) && \
-		export NI_CUSTOM_KERNEL=$(BUILD_TMP)/crosstool-ng/targets/src/linux-$(KVERSION).tar && \
-		export NI_CUSTOM_KERNEL_VER=$(KVERSION) && \
+		export NI_CUSTOM_KERNEL=$(BUILD_TMP)/crosstool-ng/targets/src/linux-$(KERNEL_VERSION).tar && \
+		export NI_CUSTOM_KERNEL_VERSION=$(KERNEL_VERSION) && \
 		export NI_UCLIBC_CONFIG=$(CONFIGS)/ct-ng-uClibc-$(UCLIBC_VER).config && \
 		export LD_LIBRARY_PATH= && \
 		test -f ./configure || ./bootstrap && \
--- a/make/environment.mk
+++ b/make/environment.mk
@ -131,7 +131,6 @@ MAKEFLAGS += --no-print-directory

 MAINTAINER   ?= NI-Team
 FLAVOUR      ?= ni-neutrino-hd
-KSTRING       = NI $(shell echo $(BOXMODEL) | sed 's/.*/\u&/') Kernel
 WHOAMI       := $(shell id -un)
 ARCHIVE       = $(BASE_DIR)/download
 BUILD_TMP     = $(BASE_DIR)/build_tmp
@ -165,12 +164,14 @@ export CCACHE_DIR
 # create debug image
 DEBUG ?= no

+KERNEL_NAME = NI $(shell echo $(BOXMODEL) | sed 's/.*/\u&/') Kernel
+
 ifeq ($(BOXSERIES), hd1)
-  KVERSION               = 2.6.34.13
-  KVERSION_FULL          = $(KVERSION)-$(BOXMODEL)
-  KBRANCH                = ni/2.6.34.x
+  KERNEL_VERSION         = 2.6.34.13
+  KERNEL_VERSION_FULL    = $(KERNEL_VERSION)-$(BOXMODEL)
+  KERNEL_BRANCH          = ni/2.6.34.x
+  KERNEL_DTB             =
  DRIVERS_DIR            = nevis
-  KTECHSTR               =
  CORTEX-STRINGS         =
  TARGET                 = arm-cx2450x-linux-gnueabi
  TARGET_O_CFLAGS        = -Os
@ -180,16 +181,16 @@ ifeq ($(BOXSERIES), hd1)
 endif

 ifeq ($(BOXSERIES), hd2)
-  KVERSION               = 3.10.93
-  KVERSION_FULL          = $(KVERSION)
-  KBRANCH                = ni/3.10.x
+  KERNEL_VERSION         = 3.10.93
+  KERNEL_VERSION_FULL    = $(KERNEL_VERSION)
+  KERNEL_BRANCH          = ni/3.10.x
  ifeq ($(BOXFAMILY), apollo)
+    KERNEL_DTB           = hd849x
    DRIVERS_DIR          = apollo-3.x
-    KTECHSTR             = hd849x
  endif
  ifeq ($(BOXFAMILY), kronos)
+    KERNEL_DTB           = en75x1
    DRIVERS_DIR          = kronos-3.x
-    KTECHSTR             = en75x1
  endif
  CORTEX-STRINGS         = -lcortex-strings
  TARGET                 = arm-cortex-linux-uclibcgnueabi
@ -205,9 +206,10 @@ ifeq ($(BOXSERIES), hd2)
 endif

 ifeq ($(BOXSERIES), ax)
-  KVERSION               = 4.10.12
-  KVERSION_FULL          = $(KVERSION)
-  KBRANCH                = ni/4.10.x
+  KERNEL_VERSION         = 4.10.12
+  KERNEL_VERSION_FULL    = $(KERNEL_VERSION)
+  KERNEL_BRANCH          = ni/4.10.x
+  KERNEL_DTB             = bcm7445-bcm97445svmb
  DRIVERS_DIR            = hd51
  CORTEX-STRINGS         = -lcortex-strings
  TARGET                 = arm-cortex-linux-gnueabihf
--- a/make/kernel-axt.mk
+++ b/make/kernel-axt.mk
@ -1,30 +1,28 @@
 # makefile to build axtech kernel

-DTB_VER		= bcm7445-bcm97445svmb.dtb
+DTB		= $(BUILD_TMP)/linux-$(KERNEL_VERSION)/arch/arm/boot/dts/$(KERNEL_DTB).dtb
+ZIMAGE		= $(BUILD_TMP)/linux-$(KERNEL_VERSION)/arch/arm/boot/zImage
+ZIMAGE_DTB	= $(BUILD_TMP)/linux-$(KERNEL_VERSION)/arch/arm/boot/zImage_DTB
+MODULES_DIR	= $(BUILD_TMP)/linux-$(KERNEL_VERSION)-modules/lib/modules/$(KERNEL_VERSION_FULL)

-DTB		= $(BUILD_TMP)/linux-$(KVERSION)/arch/arm/boot/dts/$(DTB_VER)
-ZIMAGE		= $(BUILD_TMP)/linux-$(KVERSION)/arch/arm/boot/zImage
-ZIMAGE_DTB	= $(BUILD_TMP)/linux-$(KVERSION)/arch/arm/boot/zImage_DTB
-MODULES_DIR	= $(BUILD_TMP)/linux-$(KVERSION)-modules/lib/modules/$(KVERSION_FULL)
-
-TARGETMODULES	= $(TARGETLIB)/modules/$(KVERSION_FULL)
+TARGETMODULES	= $(TARGETLIB)/modules/$(KERNEL_VERSION_FULL)

 $(D)/kernel-axt: $(SOURCE_DIR)/$(NI_LINUX-KERNEL) | $(TARGETPREFIX)
 	cd $(SOURCE_DIR)/$(NI_LINUX-KERNEL) && \
-		git checkout $(KBRANCH) && \
+		git checkout $(KERNEL_BRANCH) && \
 	tar -C $(SOURCE_DIR) -cp $(NI_LINUX-KERNEL) --exclude-vcs | tar -C $(BUILD_TMP) -x
 	cd $(BUILD_TMP) && \
-	mv $(NI_LINUX-KERNEL) linux-$(KVERSION) && \
-	cd $(BUILD_TMP)/linux-$(KVERSION) && \
+	mv $(NI_LINUX-KERNEL) linux-$(KERNEL_VERSION) && \
+	cd $(BUILD_TMP)/linux-$(KERNEL_VERSION) && \
 	touch .scmversion && \
-	cp $(CONFIGS)/kernel-4.10-$(BOXFAMILY).config $(BUILD_TMP)/linux-$(KVERSION)/.config && \
-	mkdir -p $(BUILD_TMP)/linux-$(KVERSION)-modules && \
-		$(MAKE) ARCH=arm CROSS_COMPILE=$(TARGET)- INSTALL_MOD_PATH=$(BUILD_TMP)/linux-$(KVERSION)-modules silentoldconfig && \
-		$(MAKE) ARCH=arm CROSS_COMPILE=$(TARGET)- INSTALL_MOD_PATH=$(BUILD_TMP)/linux-$(KVERSION)-modules $(DTB_VER) && \
-		$(MAKE) ARCH=arm CROSS_COMPILE=$(TARGET)- INSTALL_MOD_PATH=$(BUILD_TMP)/linux-$(KVERSION)-modules zImage && \
+	cp $(CONFIGS)/kernel-4.10-$(BOXFAMILY).config $(BUILD_TMP)/linux-$(KERNEL_VERSION)/.config && \
+	mkdir -p $(BUILD_TMP)/linux-$(KERNEL_VERSION)-modules && \
+		$(MAKE) ARCH=arm CROSS_COMPILE=$(TARGET)- INSTALL_MOD_PATH=$(BUILD_TMP)/linux-$(KERNEL_VERSION)-modules silentoldconfig && \
+		$(MAKE) ARCH=arm CROSS_COMPILE=$(TARGET)- INSTALL_MOD_PATH=$(BUILD_TMP)/linux-$(KERNEL_VERSION)-modules $(DTB_VER) && \
+		$(MAKE) ARCH=arm CROSS_COMPILE=$(TARGET)- INSTALL_MOD_PATH=$(BUILD_TMP)/linux-$(KERNEL_VERSION)-modules zImage && \
 		cat $(ZIMAGE) $(DTB) > $(ZIMAGE_DTB) && \
-		$(MAKE) ARCH=arm CROSS_COMPILE=$(TARGET)- INSTALL_MOD_PATH=$(BUILD_TMP)/linux-$(KVERSION)-modules modules && \
-		$(MAKE) ARCH=arm CROSS_COMPILE=$(TARGET)- INSTALL_MOD_PATH=$(BUILD_TMP)/linux-$(KVERSION)-modules modules_install && \
+		$(MAKE) ARCH=arm CROSS_COMPILE=$(TARGET)- INSTALL_MOD_PATH=$(BUILD_TMP)/linux-$(KERNEL_VERSION)-modules modules && \
+		$(MAKE) ARCH=arm CROSS_COMPILE=$(TARGET)- INSTALL_MOD_PATH=$(BUILD_TMP)/linux-$(KERNEL_VERSION)-modules modules_install && \
 	touch $@

 kernel-axt-modules: $(D)/kernel-axt
@ -34,4 +32,4 @@ kernel-axt-modules: $(D)/kernel-axt
 	make depmod-axt

 depmod-axt:
-	PATH=$(PATH):/sbin:/usr/sbin depmod -b $(TARGETPREFIX) $(KVERSION_FULL)
+	PATH=$(PATH):/sbin:/usr/sbin depmod -b $(TARGETPREFIX) $(KERNEL_VERSION_FULL)
--- a/make/kernel-cst.mk
+++ b/make/kernel-cst.mk
@ -1,15 +1,16 @@
 # makefile to build coolstream kernel

-DTB		= $(SOURCE_DIR)/$(NI_DRIVERS-BIN)/$(DRIVERS_DIR)/device-tree-overlay/$(KTECHSTR).dtb
-IMAGE		= $(BUILD_TMP)/linux-$(KVERSION)/arch/arm/boot/Image
-ZIMAGE		= $(BUILD_TMP)/linux-$(KVERSION)/arch/arm/boot/zImage
-MODULES_DIR	= $(BUILD_TMP)/linux-$(KVERSION)-modules/lib/modules/$(KVERSION_FULL)
-TARGETMODULES	= $(TARGETLIB)/modules/$(KVERSION_FULL)
+DTB		= $(SOURCE_DIR)/$(NI_DRIVERS-BIN)/$(DRIVERS_DIR)/device-tree-overlay/$(KERNEL_DTB).dtb
+IMAGE		= $(BUILD_TMP)/linux-$(KERNEL_VERSION)/arch/arm/boot/Image
+ZIMAGE		= $(BUILD_TMP)/linux-$(KERNEL_VERSION)/arch/arm/boot/zImage
+MODULES_DIR	= $(BUILD_TMP)/linux-$(KERNEL_VERSION)-modules/lib/modules/$(KERNEL_VERSION_FULL)
+
+TARGETMODULES	= $(TARGETLIB)/modules/$(KERNEL_VERSION_FULL)

 ifneq ($(wildcard $(SKEL_ROOT)-$(BOXFAMILY)),)
-  KDESTDIR	= $(SKEL_ROOT)-$(BOXFAMILY)/var/update
+  KERNEL_DESTDIR = $(SKEL_ROOT)-$(BOXFAMILY)/var/update
 else
-  KDESTDIR	= $(SKEL_ROOT)/var/update
+  KERNEL_DESTDIR = $(SKEL_ROOT)/var/update
 endif

 kernel-cst: kernel-cst-$(BOXSERIES)
@ -41,21 +42,21 @@ kernel-cst-install-all:

 $(D)/kernel-cst-hd2: $(SOURCE_DIR)/$(NI_LINUX-KERNEL) $(SOURCE_DIR)/$(NI_DRIVERS-BIN) | $(TARGETPREFIX)
 	cd $(SOURCE_DIR)/$(NI_LINUX-KERNEL) && \
-		git checkout $(KBRANCH) && \
+		git checkout $(KERNEL_BRANCH) && \
 	tar -C $(SOURCE_DIR) -cp $(NI_LINUX-KERNEL) --exclude-vcs | tar -C $(BUILD_TMP) -x
 	cd $(BUILD_TMP) && \
-	mv $(NI_LINUX-KERNEL) linux-$(KVERSION) && \
-	cd $(BUILD_TMP)/linux-$(KVERSION) && \
+	mv $(NI_LINUX-KERNEL) linux-$(KERNEL_VERSION) && \
+	cd $(BUILD_TMP)/linux-$(KERNEL_VERSION) && \
 	touch .scmversion && \
-	cp $(CONFIGS)/kernel-3.10-$(BOXFAMILY).config $(BUILD_TMP)/linux-$(KVERSION)/.config && \
+	cp $(CONFIGS)/kernel-3.10-$(BOXFAMILY).config $(BUILD_TMP)/linux-$(KERNEL_VERSION)/.config && \
 	sed -i -e 's/SUBLEVEL = 107/SUBLEVEL = 93/g' Makefile && \
-	mkdir -p $(BUILD_TMP)/linux-$(KVERSION)-modules && \
-		$(MAKE) ARCH=arm CROSS_COMPILE=$(TARGET)- INSTALL_MOD_PATH=$(BUILD_TMP)/linux-$(KVERSION)-modules silentoldconfig && \
-		$(MAKE) ARCH=arm CROSS_COMPILE=$(TARGET)- INSTALL_MOD_PATH=$(BUILD_TMP)/linux-$(KVERSION)-modules zImage && \
-		$(MAKE) ARCH=arm CROSS_COMPILE=$(TARGET)- INSTALL_MOD_PATH=$(BUILD_TMP)/linux-$(KVERSION)-modules modules && \
-		$(MAKE) ARCH=arm CROSS_COMPILE=$(TARGET)- INSTALL_MOD_PATH=$(BUILD_TMP)/linux-$(KVERSION)-modules modules_install && \
+	mkdir -p $(BUILD_TMP)/linux-$(KERNEL_VERSION)-modules && \
+		$(MAKE) ARCH=arm CROSS_COMPILE=$(TARGET)- INSTALL_MOD_PATH=$(BUILD_TMP)/linux-$(KERNEL_VERSION)-modules silentoldconfig && \
+		$(MAKE) ARCH=arm CROSS_COMPILE=$(TARGET)- INSTALL_MOD_PATH=$(BUILD_TMP)/linux-$(KERNEL_VERSION)-modules zImage && \
+		$(MAKE) ARCH=arm CROSS_COMPILE=$(TARGET)- INSTALL_MOD_PATH=$(BUILD_TMP)/linux-$(KERNEL_VERSION)-modules modules && \
+		$(MAKE) ARCH=arm CROSS_COMPILE=$(TARGET)- INSTALL_MOD_PATH=$(BUILD_TMP)/linux-$(KERNEL_VERSION)-modules modules_install && \
 		cat $(ZIMAGE) $(DTB) > zImage_DTB && \
-		mkimage -A ARM -O linux -T kernel -C none -a 0x8000 -e 0x8000 -n "$(KSTRING)" -d zImage_DTB $(IMAGE_DIR)/kernel-$(BOXTYPE_SC)-$(BOXMODEL)-vmlinux.ub.gz
+		mkimage -A ARM -O linux -T kernel -C none -a 0x8000 -e 0x8000 -n "$(KERNEL_NAME)" -d zImage_DTB $(IMAGE_DIR)/kernel-$(BOXTYPE_SC)-$(BOXMODEL)-vmlinux.ub.gz
 ifeq ($(BOXFAMILY), apollo)
  ifeq ($(BOXMODEL), apollo)
 		cp -a $(IMAGE_DIR)/kernel-$(BOXTYPE_SC)-$(BOXMODEL)-vmlinux.ub.gz $(IMAGE_DIR)/kernel-$(BOXTYPE_SC)-shiner-vmlinux.ub.gz
@ -66,29 +67,29 @@ endif
 	touch $@

 kernel-cst-install-hd2: $(D)/kernel-cst-hd2
-	cp -af $(IMAGE_DIR)/kernel-$(BOXTYPE_SC)-$(BOXMODEL)-vmlinux.ub.gz $(KDESTDIR)/vmlinux.ub.gz
+	cp -af $(IMAGE_DIR)/kernel-$(BOXTYPE_SC)-$(BOXMODEL)-vmlinux.ub.gz $(KERNEL_DESTDIR)/vmlinux.ub.gz

 $(D)/kernel-cst-hd1: $(SOURCE_DIR)/$(NI_LINUX-KERNEL) | $(TARGETPREFIX)
 	cd $(SOURCE_DIR)/$(NI_LINUX-KERNEL) && \
-		git checkout $(KBRANCH) && \
+		git checkout $(KERNEL_BRANCH) && \
 	tar -C $(SOURCE_DIR) -cp $(NI_LINUX-KERNEL) --exclude-vcs | tar -C $(BUILD_TMP) -x
 	cd $(BUILD_TMP) && \
-	mv $(NI_LINUX-KERNEL) linux-$(KVERSION) && \
-	cd $(BUILD_TMP)/linux-$(KVERSION) && \
+	mv $(NI_LINUX-KERNEL) linux-$(KERNEL_VERSION) && \
+	cd $(BUILD_TMP)/linux-$(KERNEL_VERSION) && \
 	touch .scmversion && \
-	cp $(CONFIGS)/kernel-$(KVERSION).config $(BUILD_TMP)/linux-$(KVERSION)/.config && \
+	cp $(CONFIGS)/kernel-$(KERNEL_VERSION).config $(BUILD_TMP)/linux-$(KERNEL_VERSION)/.config && \
 	sed -i -e 's/EXTRAVERSION = .15/EXTRAVERSION = .13/g' Makefile && \
-	mkdir -p $(BUILD_TMP)/linux-$(KVERSION)-modules && \
-		$(MAKE) ARCH=arm CROSS_COMPILE=$(TARGET)- INSTALL_MOD_PATH=$(BUILD_TMP)/linux-$(KVERSION)-modules silentoldconfig && \
-		$(MAKE) ARCH=arm CROSS_COMPILE=$(TARGET)- INSTALL_MOD_PATH=$(BUILD_TMP)/linux-$(KVERSION)-modules zImage && \
-		$(MAKE) ARCH=arm CROSS_COMPILE=$(TARGET)- INSTALL_MOD_PATH=$(BUILD_TMP)/linux-$(KVERSION)-modules modules && \
-		$(MAKE) ARCH=arm CROSS_COMPILE=$(TARGET)- INSTALL_MOD_PATH=$(BUILD_TMP)/linux-$(KVERSION)-modules modules_install && \
-		mkimage -A arm -O linux -T kernel -C none -a 0x48000 -e 0x48000 -n "$(KSTRING)" -d $(IMAGE) $(IMAGE_DIR)/kernel-$(BOXTYPE_SC)-$(BOXMODEL)-uImage.img && \
-		mkimage -A arm -O linux -T kernel -C none -a 0x48000 -e 0x48000 -n "$(KSTRING)" -d $(ZIMAGE) $(IMAGE_DIR)/kernel-$(BOXTYPE_SC)-$(BOXMODEL)-zImage.img
+	mkdir -p $(BUILD_TMP)/linux-$(KERNEL_VERSION)-modules && \
+		$(MAKE) ARCH=arm CROSS_COMPILE=$(TARGET)- INSTALL_MOD_PATH=$(BUILD_TMP)/linux-$(KERNEL_VERSION)-modules silentoldconfig && \
+		$(MAKE) ARCH=arm CROSS_COMPILE=$(TARGET)- INSTALL_MOD_PATH=$(BUILD_TMP)/linux-$(KERNEL_VERSION)-modules zImage && \
+		$(MAKE) ARCH=arm CROSS_COMPILE=$(TARGET)- INSTALL_MOD_PATH=$(BUILD_TMP)/linux-$(KERNEL_VERSION)-modules modules && \
+		$(MAKE) ARCH=arm CROSS_COMPILE=$(TARGET)- INSTALL_MOD_PATH=$(BUILD_TMP)/linux-$(KERNEL_VERSION)-modules modules_install && \
+		mkimage -A arm -O linux -T kernel -C none -a 0x48000 -e 0x48000 -n "$(KERNEL_NAME)" -d $(IMAGE) $(IMAGE_DIR)/kernel-$(BOXTYPE_SC)-$(BOXMODEL)-uImage.img && \
+		mkimage -A arm -O linux -T kernel -C none -a 0x48000 -e 0x48000 -n "$(KERNEL_NAME)" -d $(ZIMAGE) $(IMAGE_DIR)/kernel-$(BOXTYPE_SC)-$(BOXMODEL)-zImage.img
 	touch $@

 kernel-cst-install-hd1: $(D)/kernel-cst-hd1
-	cp -af $(IMAGE_DIR)/kernel-$(BOXTYPE_SC)-$(BOXMODEL)-zImage.img $(KDESTDIR)/zImage
+	cp -af $(IMAGE_DIR)/kernel-$(BOXTYPE_SC)-$(BOXMODEL)-zImage.img $(KERNEL_DESTDIR)/zImage

 kernel-cst-modules: kernel-cst-modules-$(BOXSERIES)

@ -124,10 +125,10 @@ kernel-cst-modules-hd2: kernel-cst
 	make depmod-hd2

 depmod-hd1:
-	PATH=$(PATH):/sbin:/usr/sbin depmod -b $(TARGETPREFIX) $(KVERSION_FULL)
+	PATH=$(PATH):/sbin:/usr/sbin depmod -b $(TARGETPREFIX) $(KERNEL_VERSION_FULL)
 	mv $(TARGETMODULES)/modules.dep $(TARGETMODULES)/.modules.dep
 	rm $(TARGETMODULES)/modules.*
 	mv $(TARGETMODULES)/.modules.dep $(TARGETMODULES)/modules.dep

 depmod-hd2:
-	PATH=$(PATH):/sbin:/usr/sbin depmod -b $(TARGETPREFIX) $(KVERSION_FULL)
+	PATH=$(PATH):/sbin:/usr/sbin depmod -b $(TARGETPREFIX) $(KERNEL_VERSION_FULL)
--- a/make/rootfs.mk
+++ b/make/rootfs.mk
@ -68,7 +68,7 @@ ifeq ($(DEBUG), no)
 			-path $(BOX)/lib/modules \) -prune -o \
 	-type f -print0 | xargs -0 $(TARGET)-strip || true
 ifeq ($(BOXSERIES), hd2)
-	find $(BOX)/lib/modules/$(KVERSION_FULL)/kernel -type f -name '*.ko' | xargs -n 1 $(TARGET)-objcopy --strip-unneeded
+	find $(BOX)/lib/modules/$(KERNEL_VERSION_FULL)/kernel -type f -name '*.ko' | xargs -n 1 $(TARGET)-objcopy --strip-unneeded
 endif
 	@echo -e "$(TERM_YELLOW)"
 	@du -sh $(BOX)
--- a/make/update.mk
+++ b/make/update.mk
@ -49,7 +49,7 @@ ifeq ($(HAS_LIBCS), yes)
 	cd $(SOURCE_DIR)/$(NI_LIBCOOLSTREAM) && git pull --all && git checkout $(NI_LIBCOOLSTREAM_BRANCH)
 endif
 	cd $(SOURCE_DIR)/$(NI_LIBSTB-HAL) && git pull
-	cd $(SOURCE_DIR)/$(NI_LINUX-KERNEL) && git pull --all && git checkout $(KBRANCH)
+	cd $(SOURCE_DIR)/$(NI_LINUX-KERNEL) && git pull --all && git checkout $(KERNEL_BRANCH)
 	cd $(SOURCE_DIR)/$(NI_LOGO-STUFF) && git pull
 	cd $(SOURCE_DIR)/$(NI_NEUTRINO-PLUGINS) && git pull
 	cd $(SOURCE_DIR)/$(NI_OFGWRITE) && git pull