- turn BOXSERIES bre2ze4k into hd51

.server-files/update.php

@@ -36,7 +36,7 @@ if ($revision == 1) // libstb-hal
 	{
 		# WWIO
 		$boxtype_sc = "arm";
-		$boxseries = "bre2ze4k";
+		$boxseries = "hd51";
 		$boxmodel = "bre2ze4k";
 	}
 }

make/bootstrap.mk

@@ -36,7 +36,7 @@ skeleton: | $(TARGET_DIR)
 
 target-dir:
 	mkdir -p $(TARGET_DIR)
-ifeq ($(BOXSERIES), $(filter $(BOXSERIES), hd51 bre2ze4k))
+ifeq ($(BOXSERIES), $(filter $(BOXSERIES), hd51))
 	mkdir -p $(TARGET_DIR)/boot
 endif
 	mkdir -p $(TARGET_DIR)/dev
@@ -143,7 +143,7 @@ ifeq ($(BOXSERIES), hd2)
 		ln -sf libuClibc-$(UCLIBC_VER).so libpthread.so.0; \
 		ln -sf libuClibc-$(UCLIBC_VER).so librt.so.0
 endif
-ifeq ($(BOXSERIES), $(filter $(BOXSERIES), hd51 bre2ze4k))
+ifeq ($(BOXSERIES), $(filter $(BOXSERIES), hd51))
 	$(CD) $(TARGET_LIB_DIR); \
 		ln -sf ld-2.23.so ld-linux.so.3
 endif

make/crosstool.mk

@@ -6,7 +6,7 @@
 crosstool: $(CROSS_BASE)/$(BOXARCH)/$(BOXSERIES)
 
 crosstools:
-	for boxseries in hd1 hd2 hd51 bre2ze4k; do \
+	for boxseries in hd1 hd2 hd51; do \
 		make BOXSERIES=$${boxseries} $(CROSS_BASE)/$(BOXARCH)/$${boxseries} || exit; \
 	done;
 
@@ -32,7 +32,7 @@ crosstool-restore: $(CROSSTOOL_BACKUP)
 # -----------------------------------------------------------------------------
 
 crosstools-renew:
-	for boxseries in hd1 hd2 hd51 bre2ze4k; do \
+	for boxseries in hd1 hd2 hd51; do \
 		make BOXSERIES=$${boxseries} ccache-clean || exit; \
 	done;
 	make host-clean
@@ -57,7 +57,6 @@ $(BUILD_TMP)/linux-$(KERNEL_VERSION).tar: | $(BUILD_TMP)
 crosstool-arm-hd1: $(CROSS_BASE)/arm/hd1
 crosstool-arm-hd2: $(CROSS_BASE)/arm/hd2
 crosstool-arm-hd51: $(CROSS_BASE)/arm/hd51
-crosstool-arm-bre2ze4k: $(CROSS_BASE)/arm/bre2ze4k
 
 # -----------------------------------------------------------------------------
 
@@ -94,7 +93,7 @@ $(CROSS_BASE)/arm/hd51: | $(BUILD_TMP)
 	$(CHDIR)/$(CROSSTOOL-NG_TMP); \
 		git checkout 1dbb06f2; \
 		$(call apply_patches, $(CROSSTOOL-NG_PATCH))
-ifeq ($(BOXSERIES), $(filter $(BOXSERIES), hd2 hd51 bre2ze4k))
+ifeq ($(BOXSERIES), $(filter $(BOXSERIES), hd2 hd51))
 	$(CHDIR)/$(CROSSTOOL-NG_TMP); \
 		cp -a $(PATCHES)/crosstool-ng/gcc/* patches/gcc/linaro-6.3-2017.02
 endif
@@ -123,13 +122,6 @@ endif
 
 # -----------------------------------------------------------------------------
 
-# bre2ze4k uses same crosstool as hd51; so let's just create a symlink
-$(CROSS_BASE)/arm/bre2ze4k:
-	make $(CROSS_BASE)/arm/hd51
-	ln -sf hd51 $(@)
-
-# -----------------------------------------------------------------------------
-
 get-gccversion:
 	@echo ""
 	@$(TARGET_CC) --version

make/environment-build.mk

@@ -51,10 +51,6 @@ ifneq ($(BOXSERIES),)
     BOXTYPE = armbox
     BOXFAMILY = bcm7251s
     BOXMODEL = hd51
-  else ifeq ($(BOXSERIES), bre2ze4k)
-    BOXTYPE = armbox
-    BOXFAMILY = bcm7251s
-    BOXMODEL = bre2ze4k
   else
     $(error $(BOXTYPE) BOXSERIES $(BOXSERIES) not supported)
   endif
@@ -101,7 +97,7 @@ else ifneq ($(BOXMODEL),)
     BOXFAMILY = bcm7251s
   else ifeq ($(BOXMODEL), bre2ze4k)
     BOXTYPE = armbox
-    BOXSERIES = bre2ze4k
+    BOXSERIES = hd51
     BOXFAMILY = bcm7251s
   else
     $(error $(BOXTYPE) BOXMODEL $(BOXMODEL) not supported)
@@ -228,7 +224,7 @@ else ifeq ($(BOXSERIES), hd2)
   endif
   CXX11_ABI              = -D_GLIBCXX_USE_CXX11_ABI=0
 
-else ifeq ($(BOXSERIES), $(filter $(BOXSERIES), hd51 bre2ze4k))
+else ifeq ($(BOXSERIES), $(filter $(BOXSERIES), hd51))
   KERNEL_VERSION_MAJOR   = 4.10
   KERNEL_VERSION         = 4.10.12
 

make/image-updates.mk

@@ -3,7 +3,7 @@
 #
 # -----------------------------------------------------------------------------
 
-BOXSERIES_UPDATE = hd2 hd51 bre2ze4k
+BOXSERIES_UPDATE = hd2 hd51
 ifneq ($(DEBUG), yes)
 	BOXSERIES_UPDATE += hd1
 endif

make/linux-kernel.mk

@@ -24,7 +24,7 @@ ifeq ($(BOXSERIES)-$(BOXFAMILY), hd2-apollo)
   KERNEL_DTB = $(SOURCE_DIR)/$(NI-DRIVERS-BIN)/$(BOXTYPE)/$(DRIVERS_DIR)/kernel-dtb/hd849x.dtb
 else ifeq ($(BOXSERIES)-$(BOXFAMILY), hd2-kronos)
   KERNEL_DTB = $(SOURCE_DIR)/$(NI-DRIVERS-BIN)/$(BOXTYPE)/$(DRIVERS_DIR)/kernel-dtb/en75x1.dtb
-else ifeq ($(BOXSERIES), $(filter $(BOXSERIES), hd51 bre2ze4k))
+else ifeq ($(BOXSERIES), $(filter $(BOXSERIES), hd51))
   KERNEL_DTB = $(BUILD_TMP)/$(KERNEL_OBJ)/arch/$(BOXARCH)/boot/dts/bcm7445-bcm97445svmb.dtb
 endif
 
@@ -45,7 +45,7 @@ KERNEL_MAKEVARS += \
 KERNEL_MAKEOPTS = $(EMPTY)
 ifeq ($(BOXSERIES), $(filter $(BOXSERIES), hd1 hd2))
   KERNEL_MAKEOPTS = zImage modules
-else ifeq ($(BOXSERIES), $(filter $(BOXSERIES), hd51 bre2ze4k))
+else ifeq ($(BOXSERIES), $(filter $(BOXSERIES), hd51))
   KERNEL_MAKEOPTS = zImage modules $(notdir $(KERNEL_DTB))
 endif
 

make/neutrino-plugins.mk

@@ -14,8 +14,7 @@ plugins-hd1:
 	# nothing to do
 
 plugins-hd2 \
-plugins-hd51 \
+plugins-hd51: \
-plugins-bre2ze4k: \
 	channellogos
 ifneq ($(BOXMODEL), kronos_v2)
 	make links
@@ -202,7 +201,6 @@ PHONY += plugins
 PHONY += plugins-hd1
 PHONY += plugins-hd2
 PHONY += plugins-hd51
-PHONY += plugins-bre2ze4k
 
 PHONY += neutrino-plugins-uninstall neutrino-plugins-distclean
 PHONY += neutrino-plugins-clean neutrino-plugins-clean-all

make/neutrino.mk

@@ -48,7 +48,7 @@ ifeq ($(BOXSERIES), hd2)
   N_CFLAGS += -DFB_HW_ACCELERATION
 endif
 
-ifeq ($(BOXSERIES), $(filter $(BOXSERIES), hd51 bre2ze4k))
+ifeq ($(BOXSERIES), $(filter $(BOXSERIES), hd51))
   ifeq ($(USE_GSTREAMER), yes)
     N_CFLAGS += $(shell $(PKG_CONFIG) --cflags --libs gstreamer-1.0)
     N_CFLAGS += $(shell $(PKG_CONFIG) --cflags --libs gstreamer-audio-1.0)
@@ -187,7 +187,7 @@ LH_DEPS += ffmpeg
 LH_DEPS += openthreads
 
 USE_GSTREAMER = no
-ifeq ($(BOXSERIES), $(filter $(BOXSERIES), hd51 bre2ze4k))
+ifeq ($(BOXSERIES), $(filter $(BOXSERIES), hd51))
   ifeq ($(USE_GSTREAMER), yes)
     LH_DEPS += gstreamer-all
   endif
@@ -196,7 +196,7 @@ endif
 # -----------------------------------------------------------------------------
 
 LH_CONFIGURE_GSTREAMER =
-ifeq ($(BOXSERIES), $(filter $(BOXSERIES), hd51 bre2ze4k))
+ifeq ($(BOXSERIES), $(filter $(BOXSERIES), hd51))
   ifeq ($(USE_GSTREAMER), yes)
     LH_CONFIGURE_GSTREAMER += \
 			--enable-gstreamer_10

make/ni.mk

@@ -53,7 +53,7 @@ ni-image:
 	$(MAKE) wget
 	$(MAKE) iconv
 	$(MAKE) streamripper
-ifeq ($(BOXSERIES), $(filter $(BOXSERIES), hd2 hd51 bre2ze4k))
+ifeq ($(BOXSERIES), $(filter $(BOXSERIES), hd2 hd51))
 	$(MAKE) less
 	$(MAKE) parted
 	$(MAKE) openvpn
@@ -65,7 +65,7 @@ ifeq ($(BOXSERIES), $(filter $(BOXSERIES), hd2 hd51 bre2ze4k))
 	$(MAKE) minicom
 	$(MAKE) mc
   endif
-  ifeq ($(BOXSERIES), $(filter $(BOXSERIES), hd51 bre2ze4k))
+  ifeq ($(BOXSERIES), $(filter $(BOXSERIES), hd51))
 	$(MAKE) rsync
 	$(MAKE) ofgwrite
 	$(MAKE) aio-grab

make/target-libs-static.mk

@@ -4,7 +4,7 @@
 # -----------------------------------------------------------------------------
 
 STATIC_LIBS =
-ifeq ($(BOXSERIES), $(filter $(BOXSERIES), hd2 hd51 bre2ze4k))
+ifeq ($(BOXSERIES), $(filter $(BOXSERIES), hd2 hd51))
   STATIC_LIBS += cortex-strings
 endif
 
@@ -20,7 +20,7 @@ CORTEX-STRINGS_URL    = http://git.linaro.org/git-ro/toolchain/cortex-strings.gi
 $(ARCHIVE)/$(CORTEX-STRINGS_SOURCE):
 	$(GET-GIT-ARCHIVE) $(CORTEX-STRINGS_URL) $(CORTEX-STRINGS_VER) $(@F) $(ARCHIVE)
 
-CORTEX-STRINGS_CONF   = $(if $(filter $(BOXSERIES), hd51 bre2ze4k), --with-neon, --without-neon)
+CORTEX-STRINGS_CONF   = $(if $(filter $(BOXSERIES), hd51), --with-neon, --without-neon)
 
 cortex-strings: $(STATIC_LIB_DIR)/libcortex-strings.la
 $(STATIC_LIB_DIR)/libcortex-strings.la: $(ARCHIVE)/$(CORTEX-STRINGS_SOURCE) | $(TARGET_DIR)

make/target-libs.mk

@@ -218,7 +218,7 @@ LIBPNG_PATCH  = libpng-Disable-pngfix-and-png-fix-itxt.patch
 
 LIBPNG_DEPS   = zlib
 
-LIBPNG_CONF   = $(if $(filter $(BOXSERIES), hd51 bre2ze4k), --enable-arm-neon, --disable-arm-neon)
+LIBPNG_CONF   = $(if $(filter $(BOXSERIES), hd51), --enable-arm-neon, --disable-arm-neon)
 
 libpng: $(LIBPNG_DEPS) $(ARCHIVE)/$(LIBPNG_SOURCE) | $(TARGET_DIR)
 	$(REMOVE)/$(LIBPNG_TMP)

make/target-rootfs.mk

@@ -39,7 +39,7 @@ $(TARGET_DIR)/var/etc/update.urls: | $(TARGET_DIR)
 symbolic-links: | $(TARGET_DIR)
 	$(CD) $(TARGET_DIR); \
 		ln -sf /var/root root
-ifeq ($(BOXSERIES), $(filter $(BOXSERIES), hd51 bre2ze4k))
+ifeq ($(BOXSERIES), $(filter $(BOXSERIES), hd51))
 	$(CD) $(TARGET_DIR); \
 		ln -sf /var/root home
 endif

make/target-scripts.mk

@@ -36,7 +36,7 @@ $(TARGET_DIR)/etc/init.d/camd_datefix:
 	$(INSTALL_EXEC) -D $(IMAGEFILES)/scripts/camd_datefix.init $(@)
 
 $(TARGET_DIR)/etc/init.d/coredump:
-ifeq ($(BOXSERIES), $(filter $(BOXSERIES), hd2 hd51 bre2ze4k))
+ifeq ($(BOXSERIES), $(filter $(BOXSERIES), hd2 hd51))
 	$(INSTALL_EXEC) -D $(IMAGEFILES)/scripts/coredump.init $(@)
 endif
 
@@ -68,17 +68,17 @@ $(TARGET_DIR)/etc/init.d/networking:
 	ln -sf networking $(TARGET_DIR)/etc/init.d/K99networking
 
 $(TARGET_DIR)/etc/init.d/partitions-by-name:
-ifeq ($(BOXSERIES), $(filter $(BOXSERIES), hd51 bre2ze4k))
+ifeq ($(BOXSERIES), $(filter $(BOXSERIES), hd51))
 	$(INSTALL_EXEC) -D $(IMAGEFILES)/scripts/partitions-by-name.init $(@)
 endif
 
 $(TARGET_DIR)/etc/init.d/resizerootfs:
-ifeq ($(BOXSERIES), $(filter $(BOXSERIES), hd51 bre2ze4k))
+ifeq ($(BOXSERIES), $(filter $(BOXSERIES), hd51))
 	$(INSTALL_EXEC) -D $(IMAGEFILES)/scripts/resizerootfs.init $(@)
 endif
 
 $(TARGET_DIR)/etc/init.d/swap:
-ifeq ($(BOXSERIES), $(filter $(BOXSERIES), hd51 bre2ze4k))
+ifeq ($(BOXSERIES), $(filter $(BOXSERIES), hd51))
 	$(INSTALL_EXEC) -D $(IMAGEFILES)/scripts/swap.init $(@)
 	ln -sf swap $(TARGET_DIR)/etc/init.d/K99swap
 endif

make/target-tools.mk

@@ -46,7 +46,7 @@ define BUSYBOX_INSTALL_CONFIG
 	$(call KCONFIG_SET_OPT,CONFIG_PREFIX,"$(TARGET_DIR)",$(BUSYBOX_BUILD_CONFIG))
 endef
 
-ifeq ($(BOXSERIES), $(filter $(BOXSERIES), hd2 hd51 bre2ze4k))
+ifeq ($(BOXSERIES), $(filter $(BOXSERIES), hd2 hd51))
 
   define BUSYBOX_SET_BLKDISCARD
 	$(call KCONFIG_ENABLE_OPT,CONFIG_BLKDISCARD,$(BUSYBOX_BUILD_CONFIG))
@@ -57,7 +57,7 @@ ifeq ($(BOXSERIES), $(filter $(BOXSERIES), hd2 hd51 bre2ze4k))
 	$(call KCONFIG_ENABLE_OPT,CONFIG_FEATURE_IFUPDOWN_IPV6,$(BUSYBOX_BUILD_CONFIG))
   endef
 
-  ifeq ($(BOXSERIES), $(filter $(BOXSERIES), hd51 bre2ze4k))
+  ifeq ($(BOXSERIES), $(filter $(BOXSERIES), hd51))
 
     define BUSYBOX_SET_SWAP
 	$(call KCONFIG_ENABLE_OPT,CONFIG_SWAPON,$(BUSYBOX_BUILD_CONFIG))