adapted to neutrino master 3.6.0

diff --git a/make/environment.mk b/make/environment.mk
index c4bc4da496f51a38b0def59c4dff7f2330551cc2..ed2230154b75d257b9e5a7de3ff91e0c4e042dcd 100755 (executable)
--- a/make/environment.mk
+++ b/make/environment.mk
@@ -30,23 +30,10 @@ BUILD       ?= $(shell /usr/share/libtool/config.guess 2>/dev/null || /usr/share
 
 GCC = $(shell gcc -dumpversion | cut -c 1-3)
 
-#GCC_4_7_1 = 4_7_1
-#GCC_4_8_1 = 4_8_1
-#GCC_4_9_1 = 4_9_1
-
-#ifeq ($(GCC), 4.7)
-#      G_C_C = $(GCC_4_7_1)
-#endif
-#ifeq ($(GCC), 4.8)
-#      G_C_C = $(GCC_4_8_1)
-#endif
-#ifeq ($(GCC), 4.9)
-#      G_C_C = $(GCC_4_9_1)
-#endif
-
-BOXARCH = arm
 
 ifeq ($(BOXMODEL), $(filter $(BOXMODEL), zee2 link))
+  BOXTYPE             = coolstream
+  BOXSERIES           = hd2
   TARGET             ?= arm-cortex-linux-uclibcgnueabi
   PLATFORM            = kronos
   DRIVER_DIR         ?= $(PLATFORM)-3.x
@@ -54,6 +41,8 @@ ifeq ($(BOXMODEL), $(filter $(BOXMODEL), zee2 link))
   KVERSION_FULL       = $(CST_KERNEL_VERSION)
   KBRANCH            ?= cst_3.10 
 else ifeq ($(BOXMODEL), $(filter $(BOXMODEL), tank trinity))
+  BOXTYPE             = coolstream
+  BOXSERIES           = hd2
   TARGET             ?= arm-cortex-linux-uclibcgnueabi
   PLATFORM            = apollo
   DRIVER_DIR         ?= $(PLATFORM)-3.x
@@ -61,6 +50,8 @@ else ifeq ($(BOXMODEL), $(filter $(BOXMODEL), tank trinity))
   KVERSION_FULL       = $(CST_KERNEL_VERSION)
   KBRANCH            ?= cst_3.10
 else ifeq ($(BOXMODEL), $(filter $(BOXMODEL), neo zee))
+  BOXTYPE             = coolstream
+  BOXSERIES           = hd1
   TARGET             ?= arm-cx2450x-linux-gnueabi
   PLATFORM            = nevis
   DRIVER_DIR         ?= $(PLATFORM)
@@ -68,13 +59,11 @@ else ifeq ($(BOXMODEL), $(filter $(BOXMODEL), neo zee))
   KVERSION_FULL       = $(CST_KERNEL_VERSION)-nevis
   KBRANCH            ?= $(CST_KERNEL_VERSION)-cnxt
 else
-  BOXMODEL            = neo
-  TARGET             ?= arm-cx2450x-linux-gnueabi
-  PLATFORM            = nevis
-  DRIVER_DIR         ?= $(PLATFORM)
-  CST_KERNEL_VERSION ?= 2.6.34.13
-  KVERSION_FULL       = $(CST_KERNEL_VERSION)-nevis
-  KBRANCH            ?= $(CST_KERNEL_VERSION)-cnxt
+  $(error $(BOXTYPE) BOXMODEL $(BOXMODEL) not supported)
+endif
+
+ifeq ($(BOXTYPE), coolstream)
+  BOXARCH = arm
 endif
 
 TARGETLIB        = $(TARGETPREFIX)/lib

diff --git a/make/neutrino.mk b/make/neutrino.mk
index 6893948a800c83f274924baccb6638d9031452a0..b01808beefb883bd1806ec7b1b9085cd5ca6f893 100755 (executable)
--- a/make/neutrino.mk
+++ b/make/neutrino.mk
@@ -88,7 +88,8 @@ $(NEUTRINO_OBJDIR)/config.status: $(NEUTRINO_DEPS) $(D)/neutrino-hd-libs
                LDFLAGS="$(N_LDFLAGS)" \
                $(SOURCE_DIR)/neutrino-hd/configure --host=$(TARGET) --build=$(BUILD) --prefix= \
                        --enable-maintainer-mode --with-target=cdk --with-targetprefix="" \
-                       --with-boxtype=coolstream \
+                       --with-boxtype=$(BOXTYPE) \
+                       --with-boxmodel=$(BOXSERIES) \
                        --enable-freesatepg \
                        --enable-mdev \
                        --enable-pip \
@@ -96,7 +97,6 @@ $(NEUTRINO_OBJDIR)/config.status: $(NEUTRINO_DEPS) $(D)/neutrino-hd-libs
                        --enable-giflib \
                        --enable-pugixml \
                        --enable-fribidi \
-                       $(HW_TYPE) \
                        $(N_CONFIG_OPTS)
 
 neutrino-version: $(TARGETPREFIX)/bin/neutrino