switch ct-ng from BOXTYPE to BOXCPU, so one toolchain can be used for…

… multiple boxes
Duckbox-Developers · Jan 8, 2019 · aaf96f5 · aaf96f5
1 parent 25aa2da
commit aaf96f5
Show file tree

Hide file tree

Showing 5 changed files with 19 additions and 6 deletions.
diff --git a/...-ng/crosstool-ng-872341e3-arm-hd51.config → ...sstool-ng-872341e3-arm-Hi3798Mv200.config b/...-ng/crosstool-ng-872341e3-arm-hd51.config → ...sstool-ng-872341e3-arm-Hi3798Mv200.config
diff --git a/...-ng/crosstool-ng-872341e3-arm-hd60.config → ...crosstool-ng-872341e3-arm-bcm7251s.config b/...-ng/crosstool-ng-872341e3-arm-hd60.config → ...crosstool-ng-872341e3-arm-bcm7251s.config
diff --git a/...crosstool-ng-872341e3-arm-vusolo4k.config → .../crosstool-ng-872341e3-arm-bcm7376.config b/...crosstool-ng-872341e3-arm-vusolo4k.config → .../crosstool-ng-872341e3-arm-bcm7376.config
diff --git a/make/buildenv.mk b/make/buildenv.mk
@@ -37,6 +37,19 @@ GIT_NAME_FLASH       ?= Duckbox-Developers
 
 TUFSBOX_DIR           = $(BASE_DIR)/tufsbox
 CROSS_BASE            = $(BASE_DIR)/cross/$(BOXARCH)/$(BOXTYPE)
+ifeq ($(BOXTYPE), $(filter $(BOXTYPE), vusolo4k))
+BOXCPU                = bcm7376
+CROSS_BASE            = $(BASE_DIR)/cross/$(BOXARCH)/$(BOXCPU)
+endif
+ifeq ($(BOXTYPE), $(filter $(BOXTYPE), hd60))
+BOXCPU                = Hi3798Mv200
+CROSS_BASE            = $(BASE_DIR)/cross/$(BOXARCH)/$(BOXCPU)
+endif
+ifeq ($(BOXTYPE), $(filter $(BOXTYPE), hd51))
+BOXCPU                = bcm7251s
+CROSS_BASE            = $(BASE_DIR)/cross/$(BOXARCH)/$(BOXCPU)
+endif
+
 TARGET_DIR            = $(TUFSBOX_DIR)/cdkroot
 BOOT_DIR              = $(TUFSBOX_DIR)/cdkroot-tftpboot
 CROSS_DIR             = $(TUFSBOX_DIR)/cross

diff --git a/make/crosstool-arm.mk b/make/crosstool-arm.mk
@@ -27,10 +27,10 @@ $(ARCHIVE)/$(CROSSTOOL_NG_SOURCE):
 	$(SCRIPTS_DIR)/get-git-archive.sh $(CROSSTOOL_NG_URL) $(CROSSTOOL_NG_VER) $(notdir $@) $(ARCHIVE)
 
 CUSTOM_KERNEL = $(ARCHIVE)/$(KERNEL_SRC)
-ifeq ($(BOXTYPE), hd51)
+ifeq ($(BOXTYPE), $(filter $(BOXTYPE), hd51))
 CUSTOM_KERNEL_VER = $(KERNEL_VER)-arm
 endif
-ifeq ($(BOXTYPE), hd60)
+ifeq ($(BOXTYPE), $(filter $(BOXTYPE), hd60))
 CUSTOM_KERNEL_VER = $(KERNEL_VER)-$(KERNEL_DATE)-arm
 endif
 ifeq ($(BOXTYPE), vusolo4k)
@@ -52,7 +52,7 @@ crosstool-ng: $(D)/directories $(ARCHIVE)/$(KERNEL_SRC) $(ARCHIVE)/$(CROSSTOOL_N
 	$(UNTAR)/$(CROSSTOOL_NG_SOURCE)
 	unset CONFIG_SITE LIBRARY_PATH CPATH C_INCLUDE_PATH PKG_CONFIG_PATH CPLUS_INCLUDE_PATH INCLUDE; \
 	$(CHDIR)/crosstool-ng-git-$(CROSSTOOL_NG_VER); \
-		cp -a $(PATCHES)/ct-ng/crosstool-ng-$(CROSSTOOL_NG_VER)-$(BOXARCH)-$(BOXTYPE).config .config; \
+		cp -a $(PATCHES)/ct-ng/crosstool-ng-$(CROSSTOOL_NG_VER)-$(BOXARCH)-$(BOXCPU).config .config; \
 		NUM_CPUS=$$(expr `getconf _NPROCESSORS_ONLN` \* 2); \
 		MEM_512M=$$(awk '/MemTotal/ {M=int($$2/1024/512); print M==0?1:M}' /proc/meminfo); \
 		test $$NUM_CPUS -gt $$MEM_512M && NUM_CPUS=$$MEM_512M; \
@@ -80,14 +80,14 @@ endif
 
 crosstool-backup:
 	cd $(CROSS_BASE); \
-	tar czvf $(ARCHIVE)/crosstool-ng-git-$(BOXARCH)-$(BOXTYPE)-$(CROSSTOOL_NG_VER)-backup.tar.gz *
+	tar czvf $(ARCHIVE)/crosstool-ng-git-$(BOXARCH)-$(BOXCPU)-$(CROSSTOOL_NG_VER)-backup.tar.gz *
 
-crosstool-restore: $(ARCHIVE)/crosstool-ng-git-$(BOXARCH)-$(BOXTYPE)-$(CROSSTOOL_NG_VER)-backup.tar.gz
+crosstool-restore: $(ARCHIVE)/crosstool-ng-git-$(BOXARCH)-$(BOXCPU)-$(CROSSTOOL_NG_VER)-backup.tar.gz
 	rm -rf $(CROSS_BASE) ; \
 	if [ ! -e $(CROSS_BASE) ]; then \
 		mkdir -p $(CROSS_BASE); \
 	fi;
-	tar xzvf $(ARCHIVE)/crosstool-ng-git-$(BOXARCH)-$(BOXTYPE)-$(CROSSTOOL_NG_VER)-backup.tar.gz -C $(CROSS_BASE)
+	tar xzvf $(ARCHIVE)/crosstool-ng-git-$(BOXARCH)-$(BOXCPU)-$(CROSSTOOL_NG_VER)-backup.tar.gz -C $(CROSS_BASE)
 
 crossmenuconfig: $(D)/directories $(ARCHIVE)/$(CROSSTOOL_NG_SOURCE)
 	$(REMOVE)/crosstool-ng-git-$(CROSSTOOL_NG_VER)