crosstool.mk: fix crossmenuconfig

diff --git a/make/crosstool-arm.mk b/make/crosstool-arm.mk
index 0ec78d4dffd19334648ebc8849b904829eea526f..65453e27a12a25cbaaa7563369e7b38ef27c2e2b 100644 (file)
--- a/make/crosstool-arm.mk
+++ b/make/crosstool-arm.mk
@@ -4,11 +4,10 @@
 # crosstool-ng
 #
 ifeq ($(BOXTYPE), armbox)
-CROSSTOOL_NG_VER = $(CT_NG_VER_ARM)
-CROSSTOOL_NG_SOURCE = crosstool-ng-git-$(CROSSTOOL_NG_VER).tar.gz
-
+CROSSTOOL_NG_SOURCE = crosstool-ng-git-$(CT_NG_VER_ARM).tar.gz
 
 CUSTOM_KERNEL = $(ARCHIVE)/$(KERNEL_SRC)
+
 ifeq ($(BOXSERIES), hd51)
 CUSTOM_KERNEL_VER = $(KERNEL_VER)-arm
 endif
@@ -53,11 +52,10 @@ crosstool-ng: $(ARCHIVE)/$(KERNEL_SRC) $(ARCHIVE)/$(CROSSTOOL_NG_SOURCE)
        $(REMOVE)/crosstool-ng-git-$(CROSSTOOL_NG_VER)
 endif
 
-crossmenuconfig: directories $(ARCHIVE)/$(CROSSTOOL_NG_SOURCE)
-       $(REMOVE)/crosstool-ng-$(CROSSTOOL_NG_VER)
+crossmenuconfig: $(ARCHIVE)/$(CROSSTOOL_NG_SOURCE)
+       $(REMOVE)/crosstool-ng-git-$(CROSSTOOL_NG_VER)
        $(UNTAR)/$(CROSSTOOL_NG_SOURCE)
-       set -e; unset CONFIG_SITE; cd $(BUILD_TMP)/crosstool-ng-$(CROSSTOOL_NG_VER); \
-               cp -a $(PATCHES)/ct-ng/ct-ng-git-$(CROSSTOOL_NG_VER)-arm-$(BOXSERIES).config .config; \
+       set -e; unset CONFIG_SITE; cd $(BUILD_TMP)/crosstool-ng-git-$(CROSSTOOL_NG_VER); \
                test -f ./configure || ./bootstrap && \
                ./configure --enable-local; \
                MAKELEVEL=0 make; \

diff --git a/make/crosstool.mk b/make/crosstool.mk
index 545985f248a2476533191d811dec70dcd8cf2771..ddf446452147e2909aba87202b1b6f6442e527b4 100755 (executable)
--- a/make/crosstool.mk
+++ b/make/crosstool.mk
@@ -1,16 +1,5 @@
 # makefile to build crosstool
 
-ifeq ($(BOXSERIES), hd1)
-CROSSTOOL_NG_VER = $(CT_NG_VER_HD1)
-#LINARO_GCC_VER   = $(GCC_VER_HD1)
-endif
-
-ifeq ($(BOXSERIES), hd2)
-CROSSTOOL_NG_VER = $(CT_NG_VER_HD2)
-#LINARO_GCC_VER   = $(GCC_VER_HD2)
-endif
-
-
 ifeq ($(BOXSERIES), hd1) ## Platform nevis
 CT_NG_CONFIG = $(PATCHES)/ct-ng/ct-ng-coolstream_hd1.config
 

diff --git a/make/environment.mk b/make/environment.mk
index 251127189d5037165823c0614eb824f3091268cd..4db83586836122c1f45e81dabb550aece664da6a 100755 (executable)
--- a/make/environment.mk
+++ b/make/environment.mk
@@ -65,6 +65,7 @@ endif
 ifeq ($(BOXMODEL), $(filter $(BOXMODEL), zee2 link))
   BOXTYPE                = coolstream
   BOXSERIES              = hd2
+  CROSSTOOL_NG_VER       = $(CT_NG_VER_HD2)
   TARGET                ?= arm-cortex-linux-uclibcgnueabi
   PLATFORM               = kronos
   DRIVER_DIR            ?= $(PLATFORM)-3.x
@@ -74,6 +75,7 @@ ifeq ($(BOXMODEL), $(filter $(BOXMODEL), zee2 link))
 else ifeq ($(BOXMODEL), $(filter $(BOXMODEL), tank trinity))
   BOXTYPE                = coolstream
   BOXSERIES              = hd2
+  CROSSTOOL_NG_VER       = $(CT_NG_VER_HD2)
   TARGET                ?= arm-cortex-linux-uclibcgnueabi
   PLATFORM               = apollo
   DRIVER_DIR            ?= $(PLATFORM)-3.x
@@ -83,6 +85,7 @@ else ifeq ($(BOXMODEL), $(filter $(BOXMODEL), tank trinity))
 else ifeq ($(BOXMODEL), $(filter $(BOXMODEL), neo zee))
   BOXTYPE                = coolstream
   BOXSERIES              = hd1
+  CROSSTOOL_NG_VER       = $(CT_NG_VER_HD1)
   TARGET                ?= arm-cx2450x-linux-gnueabi
   PLATFORM               = nevis
   DRIVER_DIR            ?= $(PLATFORM)
@@ -92,6 +95,7 @@ else ifeq ($(BOXMODEL), $(filter $(BOXMODEL), neo zee))
 else ifeq ($(BOXMODEL), hd51)
   BOXTYPE                = armbox
   BOXSERIES              = hd51
+  CROSSTOOL_NG_VER       = $(CT_NG_VER_ARM)
   TARGET                ?= arm-cortex-linux-gnueabihf
   PLATFORM               = bcm7251s
   DRIVER_DIR            ?= $(PLATFORM)