fix environment-box and build

diff --git a/make/environment-box.mk b/make/environment-box.mk
index bd916f68f0d2c5980b00123851f8c6f1229ee9d0..dba20f0211453bbeab4c5ece2b3744825a0bb592 100644 (file)
--- a/make/environment-box.mk
+++ b/make/environment-box.mk
@@ -152,10 +152,14 @@ else ifneq ($(BOXMODEL),)
   # mapping boxmodel alternate model names
   ifeq ($(BOXMODEL),$(filter $(BOXMODEL),hd1 bse neo zee))
     BOXMODEL = nevis
-  else ifeq ($(BOXMODEL),$(filter $(BOXMODEL),tank trinity))
+  else ifeq ($(BOXMODEL),$(filter $(BOXMODEL),tank))
     BOXMODEL = apollo
-  else ifeq ($(BOXMODEL),$(filter $(BOXMODEL),link zee2))
+  else ifeq ($(BOXMODEL),$(filter $(BOXMODEL),trinity))
+    BOXMODEL = shiner
+  else ifeq ($(BOXMODEL),$(filter $(BOXMODEL),zee2))
     BOXMODEL = kronos
+  else ifeq ($(BOXMODEL),$(filter $(BOXMODEL),link))
+    BOXMODEL = kronos_v2
   endif
 # ---------------------------------------------------------------
   ifeq ($(BOXMODEL),$(filter $(BOXMODEL),nevis))

diff --git a/make/environment-build.mk b/make/environment-build.mk
index 9e320df78e13b272d322fa004c6c7f2e9d6cd123..c23a632995f4ce5dfb26874aa2f4b2782ab4b50a 100755 (executable)
--- a/make/environment-build.mk
+++ b/make/environment-build.mk
@@ -65,21 +65,21 @@ endif
 ifeq ($(BOXFAMILY), kronos) # Zee2 Link
   CROSSTOOL_NG_VER       = $(CT_NG_VER_HD2)
   DRIVER_DIR             = $(BOXFAMILY)-3.x
-  CST_KERNEL_VERSION     = 3.10.70
+  CST_KERNEL_VERSION    ?= 3.10.93
   KVERSION_FULL          = $(CST_KERNEL_VERSION)
-  KBRANCH                = cst_3.10
+  KBRANCH               ?= cst_3.10
 else ifeq ($(BOXFAMILY), apollo) # Tank Trinity V1
   CROSSTOOL_NG_VER       = $(CT_NG_VER_HD2)
   DRIVER_DIR             = $(BOXFAMILY)-3.x
-  CST_KERNEL_VERSION     = 3.10.70
+  CST_KERNEL_VERSION    ?= 3.10.93
   KVERSION_FULL          = $(CST_KERNEL_VERSION)
-  KBRANCH                = cst_3.10
+  KBRANCH               ?= cst_3.10
 else ifeq ($(BOXFAMILY), nevis) #HD1, BSE, Neo, Neo Twin, Zee
   CROSSTOOL_NG_VER       = $(CT_NG_VER_HD1)
   DRIVER_DIR             = $(BOXFAMILY)
-  CST_KERNEL_VERSION     = 2.6.34.13
+  CST_KERNEL_VERSION    ?= 2.6.34.13
   KVERSION_FULL          = $(CST_KERNEL_VERSION)-nevis
-  KBRANCH                = $(CST_KERNEL_VERSION)-cnxt
+  KBRANCH               ?= $(CST_KERNEL_VERSION)-cnxt
 else ifeq ($(BOXSERIES),$(filter $(BOXSERIES), hd5x hd6x))
   CROSSTOOL_NG_VER       = $(CT_NG_VER_ARM)
   DRIVER_DIR             = $(BOXFAMILY)

diff --git a/make/kernel.mk b/make/kernel.mk
index 3d44f57fa524b46113e301977c28456be9e282f1..5cd9d3baef0bbd1f3f6fbaf41652356a780a76d8 100644 (file)
--- a/make/kernel.mk
+++ b/make/kernel.mk
@@ -8,7 +8,6 @@
 ###################################################################
 ifeq ($(BOXTYPE), coolstream)
 
-K_DEP = $(D)/kernel-coolstream
 
 SOURCE_MODULE = $(TARGETPREFIX)/mymodules/lib/modules/$(KVERSION_FULL)
 TARGET_MODULE = $(TARGETPREFIX)/lib/modules/$(KVERSION_FULL)
@@ -37,9 +36,12 @@ $(K_OBJ)/.config: $(PATCHES)/kernel-config/kernel-$(CST_KERNEL_VERSION)-$(BOXFAM
                git checkout $(KBRANCH)
        cp $(PATCHES)/kernel-config/kernel-$(CST_KERNEL_VERSION)-$(BOXFAMILY).config $@
 
+$(D)/kernel:
+       # for hd1 max gcc-4.9.4 and hd2 gcc-8.5.0
+       #make $(D)/kernel-cool
+       $(TOUCH)
 
-
-$(D)/kernel: $(K_SRCDIR) $(K_OBJ)/.config
+$(D)/kernel-cool: $(K_SRCDIR) $(K_OBJ)/.config
        $(START_BUILD)
 ifeq ($(K_SRCDIR), $(SOURCE_DIR)/linux)
        # we need this to build out of tree - kbuild complains otherwise
@@ -53,8 +55,6 @@ endif
                make ARCH=arm CROSS_COMPILE=$(TARGET)- silentoldconfig O=$(K_OBJ)/; \
                $(MAKE) ARCH=arm LOCALVERSION= CROSS_COMPILE=$(TARGET)- O=$(K_OBJ)/; \
                make ARCH=arm CROSS_COMPILE=$(TARGET)- INSTALL_MOD_PATH=$(TARGETPREFIX)/mymodules modules_install O=$(K_OBJ)/
-       $(TOUCH)
-
 
 
 ifeq ($(BOXFAMILY), nevis)
@@ -87,7 +87,7 @@ kernel-image: $(D)/kernel-$(BOXTYPE) | $(HOSTPREFIX)/bin/mkimage
 
 # rule for the autofs4 module - needed by the automounter
 # installs the already built module into the "proper" path
-$(TARGET_MODULE)/kernel/fs/autofs4/autofs4.ko: $(K_DEP)
+$(TARGET_MODULE)/kernel/fs/autofs4/autofs4.ko: $(D)/kernel-cool
        install -m 644 -D $(SOURCE_MODULE)/kernel/fs/autofs4/autofs4.ko $@
        make depmod