- rename DRIVERS_DIR => DRIVERS-BIN_DIR

make/bootstrap.mk

@@ -104,10 +104,10 @@ firmware: $(TARGET_LIB_DIR)/firmware
 $(TARGET_LIB_DIR)/firmware: | $(TARGET_DIR)
 	mkdir -p $(@)
 ifeq ($(BOXTYPE), coolstream)
-	$(INSTALL_COPY) $(SOURCE_DIR)/$(NI-DRIVERS-BIN)/$(BOXTYPE)/$(DRIVERS_DIR)/lib-firmware/. $(@)
-	$(INSTALL_COPY) $(SOURCE_DIR)/$(NI-DRIVERS-BIN)/$(BOXTYPE)/$(DRIVERS_DIR)/lib-firmware-dvb/. $(@)
+	$(INSTALL_COPY) $(SOURCE_DIR)/$(NI-DRIVERS-BIN)/$(DRIVERS-BIN_DIR)/lib-firmware/. $(@)
+	$(INSTALL_COPY) $(SOURCE_DIR)/$(NI-DRIVERS-BIN)/$(DRIVERS-BIN_DIR)/lib-firmware-dvb/. $(@)
 endif
-	$(INSTALL_COPY) $(SOURCE_DIR)/$(NI-DRIVERS-BIN)/$(BOXTYPE)/$(DRIVERS_DIR)/lib-firmware-rt/. $(@)
+	$(INSTALL_COPY) $(SOURCE_DIR)/$(NI-DRIVERS-BIN)/$(DRIVERS-BIN_DIR)/lib-firmware-rt/. $(@)
 
 # -----------------------------------------------------------------------------
 
@@ -139,11 +139,11 @@ var-update: $(TARGET_DIR)/var/update
 $(TARGET_DIR)/var/update: | $(TARGET_DIR)
 	mkdir -p $(@)
 ifeq ($(BOXSERIES), $(filter $(BOXSERIES), hd2))
-	$(INSTALL_COPY) $(SOURCE_DIR)/$(NI-DRIVERS-BIN)/$(BOXTYPE)/$(DRIVERS_DIR)/uldr.bin $(@)
+	$(INSTALL_COPY) $(SOURCE_DIR)/$(NI-DRIVERS-BIN)/$(DRIVERS-BIN_DIR)/uldr.bin $(@)
   ifeq ($(BOXMODEL), kronos_v2)
-	$(INSTALL_COPY) $(SOURCE_DIR)/$(NI-DRIVERS-BIN)/$(BOXTYPE)/$(DRIVERS_DIR)/u-boot.bin.kronos_v2 $(@)/u-boot.bin
+	$(INSTALL_COPY) $(SOURCE_DIR)/$(NI-DRIVERS-BIN)/$(DRIVERS-BIN_DIR)/u-boot.bin.kronos_v2 $(@)/u-boot.bin
   else
-	$(INSTALL_COPY) $(SOURCE_DIR)/$(NI-DRIVERS-BIN)/$(BOXTYPE)/$(DRIVERS_DIR)/u-boot.bin $(@)
+	$(INSTALL_COPY) $(SOURCE_DIR)/$(NI-DRIVERS-BIN)/$(DRIVERS-BIN_DIR)/u-boot.bin $(@)
   endif
 endif
 

make/environment-build.mk

@@ -73,7 +73,7 @@ DEBUG ?= no
 # -----------------------------------------------------------------------------
 
 ifeq ($(BOXSERIES), hd1)
-  DRIVERS_DIR            = $(BOXFAMILY)
+  DRIVERS-BIN_DIR        = $(BOXTYPE)/$(BOXFAMILY)
   CORTEX-STRINGS_LDFLAG  =
   TARGET                 = arm-cx2450x-linux-gnueabi
   TARGET_OPTIMIZATION    = -Os
@@ -84,7 +84,7 @@ ifeq ($(BOXSERIES), hd1)
   CXX11_ABI              =
 
 else ifeq ($(BOXSERIES), hd2)
-  DRIVERS_DIR            = $(BOXFAMILY)
+  DRIVERS-BIN_DIR        = $(BOXTYPE)/$(BOXFAMILY)
   CORTEX-STRINGS_LDFLAG  = -lcortex-strings
   TARGET                 = arm-cortex-linux-uclibcgnueabi
   TARGET_OPTIMIZATION    = -O2
@@ -100,7 +100,7 @@ else ifeq ($(BOXSERIES), hd2)
   CXX11_ABI              = -D_GLIBCXX_USE_CXX11_ABI=0
 
 else ifeq ($(BOXSERIES), $(filter $(BOXSERIES), hd51 vusolo4k vuduo4k vuultimo4k vuzero4k vuuno4k vuuno4kse))
-  DRIVERS_DIR            = $(BOXMODEL)
+  DRIVERS-BIN_DIR        = $(BOXTYPE)/$(BOXMODEL)
   CORTEX-STRINGS_LDFLAG  = -lcortex-strings
   TARGET                 = arm-cortex-linux-gnueabihf
   TARGET_OPTIMIZATION    = -O2
@@ -111,7 +111,7 @@ else ifeq ($(BOXSERIES), $(filter $(BOXSERIES), hd51 vusolo4k vuduo4k vuultimo4k
   CXX11_ABI              =
 
 else ifeq ($(BOXSERIES), $(filter $(BOXSERIES), vuduo))
-  DRIVERS_DIR            = $(BOXMODEL)
+  DRIVERS-BIN_DIR        = $(BOXTYPE)/$(BOXMODEL)
   CORTEX-STRINGS_LDFLAG  =
   TARGET                 = mipsel-unknown-linux-gnu
   TARGET_OPTIMIZATION    = -O2

make/environment-linux.mk

@@ -20,10 +20,10 @@ else ifeq ($(BOXMODEL), $(filter $(BOXMODEL), apollo shiner kronos kronos_v2))
 
   KERNEL_BRANCH = ni/linux-3.10.108
   ifeq ($(BOXMODEL), $(filter $(BOXMODEL), apollo shiner))
-    KERNEL_DTB    = $(SOURCE_DIR)/$(NI-DRIVERS-BIN)/$(BOXTYPE)/$(DRIVERS_DIR)/kernel-dtb/hd849x.dtb
+    KERNEL_DTB    = $(SOURCE_DIR)/$(NI-DRIVERS-BIN)/$(DRIVERS-BIN_DIR)/kernel-dtb/hd849x.dtb
     KERNEL_CONFIG = $(CONFIGS)/kernel-apollo.config
   else
-    KERNEL_DTB    = $(SOURCE_DIR)/$(NI-DRIVERS-BIN)/$(BOXTYPE)/$(DRIVERS_DIR)/kernel-dtb/en75x1.dtb
+    KERNEL_DTB    = $(SOURCE_DIR)/$(NI-DRIVERS-BIN)/$(DRIVERS-BIN_DIR)/kernel-dtb/en75x1.dtb
     KERNEL_CONFIG = $(CONFIGS)/kernel-kronos.config
   endif
 

make/target-blobs.mk

@@ -74,13 +74,13 @@ kronos-drivers \
 kronos_v2-drivers \
 coolstream-drivers: | $(TARGET_DIR)
 	mkdir -p $(TARGET_LIB_DIR)
-	$(INSTALL_COPY) $(SOURCE_DIR)/$(NI-DRIVERS-BIN)/$(BOXTYPE)/$(DRIVERS_DIR)/lib/. $(TARGET_LIB_DIR)
-	$(INSTALL_COPY) $(SOURCE_DIR)/$(NI-DRIVERS-BIN)/$(BOXTYPE)/$(DRIVERS_DIR)/libcoolstream/$(shell echo -n $(NI-FFMPEG_BRANCH) | sed 's,/,-,g')/. $(TARGET_LIB_DIR)
+	$(INSTALL_COPY) $(SOURCE_DIR)/$(NI-DRIVERS-BIN)/$(DRIVERS-BIN_DIR)/lib/. $(TARGET_LIB_DIR)
+	$(INSTALL_COPY) $(SOURCE_DIR)/$(NI-DRIVERS-BIN)/$(DRIVERS-BIN_DIR)/libcoolstream/$(shell echo -n $(NI-FFMPEG_BRANCH) | sed 's,/,-,g')/. $(TARGET_LIB_DIR)
 ifeq ($(BOXMODEL), nevis)
 	ln -sf libnxp.so $(TARGET_LIB_DIR)/libconexant.so
 endif
 	mkdir -p $(TARGET_MODULES_DIR)
-	$(INSTALL_COPY) $(SOURCE_DIR)/$(NI-DRIVERS-BIN)/$(BOXTYPE)/$(DRIVERS_DIR)/lib-modules/$(KERNEL_VER)/. $(TARGET_MODULES_DIR)
+	$(INSTALL_COPY) $(SOURCE_DIR)/$(NI-DRIVERS-BIN)/$(DRIVERS-BIN_DIR)/lib-modules/$(KERNEL_VER)/. $(TARGET_MODULES_DIR)
 ifeq ($(BOXMODEL), nevis)
 	ln -sf $(KERNEL_VER) $(TARGET_MODULES_DIR)-$(BOXMODEL)
 endif

make/target-rootfs.mk

@@ -157,7 +157,7 @@ get-update-info-hd2:
 	$(call draw_line);
 	@echo "Get update info for model $(shell echo $(BOXMODEL) | sed 's/.*/\u&/')"
 	@echo
-	@$(CD) $(SOURCE_DIR)/$(NI-DRIVERS-BIN)/$(BOXTYPE)/$(DRIVERS_DIR); \
+	@$(CD) $(SOURCE_DIR)/$(NI-DRIVERS-BIN)/$(DRIVERS-BIN_DIR); \
 	test -e ./u-boot.bin && ( \
 		strings u-boot.bin | grep -m1 "U-Boot "; \
 	); \