- align some variables to tango's names

archive-server/get-image.php

@@ -34,10 +34,10 @@ if ($boxtype == "coolstream" || $boxtype == "cst")
 	# CST
 	$boxtype_sc = "cst";
 }
-elseif ($boxtype == "axtech" || $boxtype == "axt")
+elseif ($boxtype == "armbox" || $boxtype == "arm")
 {
 	# AX Tech
-	$boxtype_sc = "axt";
+	$boxtype_sc = "arm";
 }
 
 # release/ni320-YYYYMMDDHHMM-cst-kronos.img

archive-server/get-kernel.php

@@ -33,10 +33,10 @@ if ($boxtype == "coolstream" || $boxtype == "cst")
 		$kernel_name = "vmlinux.ub.gz";
 	}
 }
-elseif ($boxtype == "axtech" || $boxtype == "axt")
+elseif ($boxtype == "armbox" || $boxtype == "arm")
 {
 	# AX Tech
-	$boxtype_sc = "axt";
+	$boxtype_sc = "arm";
 }
 
 # release/kernel-cst-kronos-vmlinux.ub.gz

make/bootstrap.mk

@@ -3,7 +3,7 @@
 BOOTSTRAP  = targetprefix $(D) $(BUILD_TMP) $(CROSS_DIR) $(STAGING_DIR) $(IMAGE_DIR) $(UPDATE_DIR) $(HOSTPREFIX)/bin includes-and-libs modules host-preqs
 BOOTSTRAP += $(TARGETLIB)/libc.so.6
 
-ifeq ($(BOXSERIES), $(filter $(BOXSERIES), hd2 ax))
+ifeq ($(BOXSERIES), $(filter $(BOXSERIES), hd2 hd51))
   BOOTSTRAP += static blobs
 endif
 

make/crosstool.mk

@@ -5,15 +5,15 @@ crosstool: crosstool-$(BOXARCH)-$(BOXSERIES)
 crosstools:
 	make crosstool-arm-hd1 BOXSERIES=hd1
 	make crosstool-arm-hd2 BOXSERIES=hd2
-	make crosstool-arm-ax BOXSERIES=ax
+	make crosstool-arm-hd51 BOXSERIES=hd51
 
 crosstools-renew:
 	make ccache-clean BOXSERIES=hd1
 	rm -rf $(BASE_DIR)/cross/$(BOXARCH)/hd1
 	make ccache-clean BOXSERIES=hd2
 	rm -rf $(BASE_DIR)/cross/$(BOXARCH)/hd2
-	make ccache-clean BOXSERIES=ax
-	rm -rf $(BASE_DIR)/cross/$(BOXARCH)/ax
+	make ccache-clean BOXSERIES=hd51
+	rm -rf $(BASE_DIR)/cross/$(BOXARCH)/hd51
 	rm -rf $(HOSTPREFIX)/bin/arm-*
 	rm -rf $(HOSTPREFIX)/bin/pkg-config
 	rm -rf $(BASE_DIR)/static
@@ -86,7 +86,7 @@ crosstool-arm-hd2: CROSS_DIR-check $(ARCHIVE)/gcc-linaro-$(GCC_VER).tar.xz $(SOU
 	rm -f $(CROSS_DIR)/$(TARGET)/sys-root/lib/libstdc++.so.6.0.20-gdb.py
 	$(REMOVE)/crosstool-ng
 
-crosstool-arm-ax: CROSS_DIR-check
+crosstool-arm-hd51: CROSS_DIR-check
 	make $(BUILD_TMP)
 	$(REMOVE)/crosstool-ng
 	cd $(BUILD_TMP) && \
@@ -95,7 +95,7 @@ crosstool-arm-ax: CROSS_DIR-check
 	git checkout 1dbb06f2 && \
 	unset CONFIG_SITE LIBRARY_PATH CPATH C_INCLUDE_PATH PKG_CONFIG_PATH CPLUS_INCLUDE_PATH INCLUDE && \
 	cd $(BUILD_TMP)/crosstool-ng && \
-		cp -a $(CONFIGS)/ct-ng-axtech_ax.config .config && \
+		cp -a $(CONFIGS)/ct-ng-armbox_hd51.config .config && \
 		sed -i "s@^CT_PARALLEL_JOBS=.*@CT_PARALLEL_JOBS=$(NUM_CPUS)@" .config && \
 		export NI_BASE_DIR=$(BASE_DIR) && \
 		export CT_BASE_DIR=$(CROSS_BASE); \

make/environment.mk

@@ -24,15 +24,15 @@ BASE_DIR    := $(shell pwd)
 #                      /        /     | |     \
 # BOXMODEL          nevis apollo shiner kronos kronos_v2
 
-# - AX Technologies -----------------------------------------------------------
+# - AX Technologies / Mutant --------------------------------------------------
 
-# BOXTYPE                     axtech
+# BOXTYPE                     armbox
 #                               |
-# BOXSERIES                    ax
+# BOXSERIES                    hd51
 #                               |
-# BOXFAMILY                    ax
+# BOXFAMILY                  bcm7251s
 #                               |
-# BOXMODEL                    hd51
+# BOXMODEL                     hd51
 
 # -----------------------------------------------------------------------------
 
@@ -46,9 +46,9 @@ ifneq ($(BOXSERIES),)
     BOXTYPE = coolstream
     BOXFAMILY = apollo
     BOXMODEL = apollo
-  else ifeq ($(BOXSERIES), ax)
-    BOXTYPE = axtech
-    BOXFAMILY = ax
+  else ifeq ($(BOXSERIES), hd51)
+    BOXTYPE = armbox
+    BOXFAMILY = bcm7251s
     BOXMODEL = hd51
   else
     $(error $(BOXTYPE) BOXSERIES $(BOXSERIES) not supported)
@@ -68,9 +68,9 @@ else ifneq ($(BOXFAMILY),)
     BOXTYPE = coolstream
     BOXSERIES = hd2
     BOXMODEL = kronos
-  else ifeq ($(BOXFAMILY), ax)
-    BOXTYPE = axtech
-    BOXSERIES = ax
+  else ifeq ($(BOXFAMILY), bcm7251s)
+    BOXTYPE = armbox
+    BOXSERIES = hd51
     BOXMODEL = hd51
   else
     $(error $(BOXTYPE) BOXFAMILY $(BOXFAMILY) not supported)
@@ -91,9 +91,9 @@ else ifneq ($(BOXMODEL),)
     BOXSERIES = hd2
     BOXFAMILY = kronos
   else ifeq ($(BOXMODEL), hd51)
-    BOXTYPE = axtech
-    BOXSERIES = ax
-    BOXFAMILY = ax
+    BOXTYPE = armbox
+    BOXSERIES = hd51
+    BOXFAMILY = bcm7251s
   else
     $(error $(BOXTYPE) BOXMODEL $(BOXMODEL) not supported)
   endif
@@ -103,8 +103,8 @@ endif
 ifeq ($(BOXTYPE), coolstream)
   BOXTYPE_SC = cst
   BOXARCH = arm
-else ifeq ($(BOXTYPE), axtech)
-  BOXTYPE_SC = axt
+else ifeq ($(BOXTYPE), armbox)
+  BOXTYPE_SC = arm
   BOXARCH = arm
 endif
 
@@ -205,7 +205,7 @@ ifeq ($(BOXSERIES), hd2)
   endif
 endif
 
-ifeq ($(BOXSERIES), ax)
+ifeq ($(BOXSERIES), hd51)
   KERNEL_VERSION         = 4.10.12
   KERNEL_VERSION_FULL    = $(KERNEL_VERSION)
   KERNEL_BRANCH          = ni/4.10.x

make/images.mk

@@ -82,29 +82,29 @@ devtable-remove:
 
 images:
 ifeq ($(BOXMODEL), nevis)
-	make flash-image ERASE_SIZE=0x20000 BOXNAME="HD1, BSE, Neo, Neo², Zee"
+	make flash-image-cst ERASE_SIZE=0x20000 BOXNAME="HD1, BSE, Neo, Neo², Zee"
 endif
 ifeq ($(BOXFAMILY), apollo)
-	make flash-image ERASE_SIZE=0x40000 BOXNAME="Tank"    IMAGE_SUFFIX=$(BOXTYPE_SC)-apollo
-	make flash-image ERASE_SIZE=0x20000 BOXNAME="Trinity" IMAGE_SUFFIX=$(BOXTYPE_SC)-shiner
+	make flash-image-cst ERASE_SIZE=0x40000 BOXNAME="Tank"    IMAGE_SUFFIX=$(BOXTYPE_SC)-apollo
+	make flash-image-cst ERASE_SIZE=0x20000 BOXNAME="Trinity" IMAGE_SUFFIX=$(BOXTYPE_SC)-shiner
 endif
 ifeq ($(BOXMODEL), kronos)
-	make flash-image ERASE_SIZE=0x20000 BOXNAME="Zee², Trinity V2"
+	make flash-image-cst ERASE_SIZE=0x20000 BOXNAME="Zee², Trinity V2"
 endif
 ifeq ($(BOXMODEL), kronos_v2)
-	make flash-image ERASE_SIZE=0x20000 BOXNAME="Link, Trinity Duo"
+	make flash-image-cst ERASE_SIZE=0x20000 BOXNAME="Link, Trinity Duo"
 endif
 ifeq ($(BOXMODEL), hd51)
-	#make flash-image-axt-single
-	make flash-image-axt-multi
-	make flash-image-axt-minimal
+	make flash-image-arm
+	#make flash-image-arm-single
+	make flash-image-arm-multi
 endif
 
-flash-image: IMAGE_NAME=$(IMAGE_PREFIX)-$(IMAGE_SUFFIX)
-flash-image: IMAGE_DESC="$(BOXNAME) [$(IMAGE_SUFFIX)][$(BOXSERIES)] $(shell echo $(IMAGE_TYPE_STRING) | sed 's/.*/\u&/')"
-flash-image: IMAGE_MD5FILE=$(IMAGE_TYPE_STRING)-$(IMAGE_SUFFIX).txt
-flash-image: IMAGE_DATE=$(shell cat $(BOX)/.version | grep "^version=" | cut -d= -f2 | cut -c 5-)
-flash-image:
+flash-image-cst: IMAGE_NAME=$(IMAGE_PREFIX)-$(IMAGE_SUFFIX)
+flash-image-cst: IMAGE_DESC="$(BOXNAME) [$(IMAGE_SUFFIX)][$(BOXSERIES)] $(shell echo $(IMAGE_TYPE_STRING) | sed 's/.*/\u&/')"
+flash-image-cst: IMAGE_MD5FILE=$(IMAGE_TYPE_STRING)-$(IMAGE_SUFFIX).txt
+flash-image-cst: IMAGE_DATE=$(shell cat $(BOX)/.version | grep "^version=" | cut -d= -f2 | cut -c 5-)
+flash-image-cst:
 	make devtable
 	mkfs.jffs2 -e $(ERASE_SIZE) $(MKFSFLAGS) -o $(IMAGE_DIR)/$(IMAGE_NAME).img
 	make devtable-remove
@@ -137,18 +137,18 @@ ifdef IMAGE_TO_CHECK
 	fi
 endif
 
-### AX-TECH
+### armbox hd51
 
 # general
-AX_IMAGE_NAME = disk
-AX_BOOT_IMAGE = boot.img
-AX_IMAGE_LINK = $(AX_IMAGE_NAME).ext4
-AX_IMAGE_ROOTFS_SIZE = 294912
-AX_BUILD_TMP = $(BUILD_TMP)/tmp
+HD51_IMAGE_NAME = disk
+HD51_BOOT_IMAGE = boot.img
+HD51_IMAGE_LINK = $(HD51_IMAGE_NAME).ext4
+HD51_IMAGE_ROOTFS_SIZE = 294912
+HD51_BUILD_TMP = $(BUILD_TMP)/tmp
 
 # emmc image
 EMMC_IMAGE_SIZE = 3817472
-EMMC_IMAGE = $(AX_BUILD_TMP)/$(AX_IMAGE_NAME).img
+EMMC_IMAGE = $(HD51_BUILD_TMP)/$(HD51_IMAGE_NAME).img
 
 # partition sizes
 BLOCK_SIZE = 512
@@ -174,28 +174,28 @@ FOURTH_KERNEL_PARTITION_OFFSET = $(shell expr $(THRID_ROOTFS_PARTITION_OFFSET) \
 FOURTH_ROOTFS_PARTITION_OFFSET = $(shell expr $(FOURTH_KERNEL_PARTITION_OFFSET) \+ $(KERNEL_PARTITION_SIZE))
 SWAP_PARTITION_OFFSET = $(shell expr $(FOURTH_ROOTFS_PARTITION_OFFSET) \+ $(ROOTFS_PARTITION_SIZE_MULTI))
 
-flash-image-axt-single:
-	mkdir -p $(AX_BUILD_TMP)
+flash-image-arm-single:
+	mkdir -p $(HD51_BUILD_TMP)
 	# Create a sparse image block
-	dd if=/dev/zero of=$(AX_BUILD_TMP)/$(AX_IMAGE_LINK) seek=$(shell expr $(AX_IMAGE_ROOTFS_SIZE) \* $(BLOCK_SECTOR)) count=0 bs=$(BLOCK_SIZE)
-	mkfs.ext4 -F $(AX_BUILD_TMP)/$(AX_IMAGE_LINK) -d $(BOX)
+	dd if=/dev/zero of=$(HD51_BUILD_TMP)/$(HD51_IMAGE_LINK) seek=$(shell expr $(HD51_IMAGE_ROOTFS_SIZE) \* $(BLOCK_SECTOR)) count=0 bs=$(BLOCK_SIZE)
+	mkfs.ext4 -F $(HD51_BUILD_TMP)/$(HD51_IMAGE_LINK) -d $(BOX)
 	# Error codes 0-3 indicate successfull operation of fsck (no errors or errors corrected)
-	fsck.ext4 -pvfD $(AX_BUILD_TMP)/$(AX_IMAGE_LINK) || [ $? -le 3 ]
+	fsck.ext4 -pvfD $(HD51_BUILD_TMP)/$(HD51_IMAGE_LINK) || [ $? -le 3 ]
 	dd if=/dev/zero of=$(EMMC_IMAGE) bs=$(BLOCK_SIZE) count=0 seek=$(shell expr $(EMMC_IMAGE_SIZE) \* $(BLOCK_SECTOR))
 	parted -s $(EMMC_IMAGE) mklabel gpt
 	parted -s $(EMMC_IMAGE) unit KiB mkpart boot fat16 $(IMAGE_ROOTFS_ALIGNMENT) $(shell expr $(IMAGE_ROOTFS_ALIGNMENT) \+ $(BOOT_PARTITION_SIZE))
 	parted -s $(EMMC_IMAGE) unit KiB mkpart kernel1 $(KERNEL_PARTITION_OFFSET) $(shell expr $(KERNEL_PARTITION_OFFSET) \+ $(KERNEL_PARTITION_SIZE))
 	parted -s $(EMMC_IMAGE) unit KiB mkpart rootfs1 ext4 $(ROOTFS_PARTITION_OFFSET) $(shell expr $(ROOTFS_PARTITION_OFFSET) \+ $(ROOTFS_PARTITION_SIZE_SINGLE))
 	parted -s $(EMMC_IMAGE) unit KiB mkpart storage ext4 $(STORAGE_PARTITION_OFFSET_SINGLE) $(shell expr $(EMMC_IMAGE_SIZE) \- 1024)
-	dd if=/dev/zero of=$(AX_BUILD_TMP)/$(AX_BOOT_IMAGE) bs=$(BLOCK_SIZE) count=$(shell expr $(BOOT_PARTITION_SIZE) \* $(BLOCK_SECTOR))
-	mkfs.msdos -S 512 $(AX_BUILD_TMP)/$(AX_BOOT_IMAGE)
-	echo "boot emmcflash0.kernel1 'root=/dev/mmcblk0p2 rw rootwait $(BOXMODEL)_4.boxmode=12'" > $(AX_BUILD_TMP)/STARTUP_1
-	mcopy -i $(AX_BUILD_TMP)/$(AX_BOOT_IMAGE) -v $(AX_BUILD_TMP)/STARTUP_1 ::
-	dd conv=notrunc if=$(AX_BUILD_TMP)/$(AX_BOOT_IMAGE) of=$(EMMC_IMAGE) bs=$(BLOCK_SIZE) seek=$(shell expr $(IMAGE_ROOTFS_ALIGNMENT) \* $(BLOCK_SECTOR))
+	dd if=/dev/zero of=$(HD51_BUILD_TMP)/$(HD51_BOOT_IMAGE) bs=$(BLOCK_SIZE) count=$(shell expr $(BOOT_PARTITION_SIZE) \* $(BLOCK_SECTOR))
+	mkfs.msdos -S 512 $(HD51_BUILD_TMP)/$(HD51_BOOT_IMAGE)
+	echo "boot emmcflash0.kernel1 'root=/dev/mmcblk0p2 rw rootwait $(BOXMODEL)_4.boxmode=12'" > $(HD51_BUILD_TMP)/STARTUP_1
+	mcopy -i $(HD51_BUILD_TMP)/$(HD51_BOOT_IMAGE) -v $(HD51_BUILD_TMP)/STARTUP_1 ::
+	dd conv=notrunc if=$(HD51_BUILD_TMP)/$(HD51_BOOT_IMAGE) of=$(EMMC_IMAGE) bs=$(BLOCK_SIZE) seek=$(shell expr $(IMAGE_ROOTFS_ALIGNMENT) \* $(BLOCK_SECTOR))
 	dd conv=notrunc if=$(ZIMAGE_DTB) of=$(EMMC_IMAGE) bs=$(BLOCK_SIZE) seek=$(shell expr $(KERNEL_PARTITION_OFFSET) \* $(BLOCK_SECTOR))
-	resize2fs $(AX_BUILD_TMP)/$(AX_IMAGE_LINK) $(ROOTFS_PARTITION_SIZE_SINGLE)k
+	resize2fs $(HD51_BUILD_TMP)/$(HD51_IMAGE_LINK) $(ROOTFS_PARTITION_SIZE_SINGLE)k
 	# Truncate on purpose
-	dd if=$(AX_BUILD_TMP)/$(AX_IMAGE_LINK) of=$(EMMC_IMAGE) bs=$(BLOCK_SIZE) seek=$(shell expr $(ROOTFS_PARTITION_OFFSET) \* $(BLOCK_SECTOR)) count=$(shell expr $(AX_IMAGE_ROOTFS_SIZE) \* $(BLOCK_SECTOR))
+	dd if=$(HD51_BUILD_TMP)/$(HD51_IMAGE_LINK) of=$(EMMC_IMAGE) bs=$(BLOCK_SIZE) seek=$(shell expr $(ROOTFS_PARTITION_OFFSET) \* $(BLOCK_SECTOR)) count=$(shell expr $(HD51_IMAGE_ROOTFS_SIZE) \* $(BLOCK_SECTOR))
 	# Create final USB-image
 	mkdir -p $(IMAGE_DIR)/$(BOXMODEL)
 	cp $(ZIMAGE_DTB) $(IMAGE_DIR)/$(BOXMODEL)/kernel.bin
@@ -208,15 +208,15 @@ flash-image-axt-single:
 	zip -r $(IMAGE_PREFIX)-$(IMAGE_SUFFIX)_single_usb.zip $(BOXMODEL)/*
 	# cleanup
 	rm -rf $(IMAGE_DIR)/$(BOXMODEL)
-	rm -rf $(AX_BUILD_TMP)
+	rm -rf $(HD51_BUILD_TMP)
 
-flash-image-axt-multi:
-	mkdir -p $(AX_BUILD_TMP)
+flash-image-arm-multi:
+	mkdir -p $(HD51_BUILD_TMP)
 	# Create a sparse image block
-	dd if=/dev/zero of=$(AX_BUILD_TMP)/$(AX_IMAGE_LINK) seek=$(shell expr $(AX_IMAGE_ROOTFS_SIZE) \* $(BLOCK_SECTOR)) count=0 bs=$(BLOCK_SIZE)
-	mkfs.ext4 -F $(AX_BUILD_TMP)/$(AX_IMAGE_LINK) -d $(BOX)
+	dd if=/dev/zero of=$(HD51_BUILD_TMP)/$(HD51_IMAGE_LINK) seek=$(shell expr $(HD51_IMAGE_ROOTFS_SIZE) \* $(BLOCK_SECTOR)) count=0 bs=$(BLOCK_SIZE)
+	mkfs.ext4 -F $(HD51_BUILD_TMP)/$(HD51_IMAGE_LINK) -d $(BOX)
 	# Error codes 0-3 indicate successfull operation of fsck (no errors or errors corrected)
-	fsck.ext4 -pvfD $(AX_BUILD_TMP)/$(AX_IMAGE_LINK) || [ $? -le 3 ]
+	fsck.ext4 -pvfD $(HD51_BUILD_TMP)/$(HD51_IMAGE_LINK) || [ $? -le 3 ]
 	dd if=/dev/zero of=$(EMMC_IMAGE) bs=$(BLOCK_SIZE) count=0 seek=$(shell expr $(EMMC_IMAGE_SIZE) \* $(BLOCK_SECTOR))
 	parted -s $(EMMC_IMAGE) mklabel gpt
 	parted -s $(EMMC_IMAGE) unit KiB mkpart boot fat16 $(IMAGE_ROOTFS_ALIGNMENT) $(shell expr $(IMAGE_ROOTFS_ALIGNMENT) \+ $(BOOT_PARTITION_SIZE))
@@ -229,23 +229,23 @@ flash-image-axt-multi:
 	parted -s $(EMMC_IMAGE) unit KiB mkpart kernel4 $(FOURTH_KERNEL_PARTITION_OFFSET) $(shell expr $(FOURTH_KERNEL_PARTITION_OFFSET) \+ $(KERNEL_PARTITION_SIZE))
 	parted -s $(EMMC_IMAGE) unit KiB mkpart rootfs4 ext4 $(FOURTH_ROOTFS_PARTITION_OFFSET) $(shell expr $(FOURTH_ROOTFS_PARTITION_OFFSET) \+ $(ROOTFS_PARTITION_SIZE_MULTI))
 	parted -s $(EMMC_IMAGE) unit KiB mkpart swap linux-swap $(SWAP_PARTITION_OFFSET) $(shell expr $(EMMC_IMAGE_SIZE) \- 1024)
-	dd if=/dev/zero of=$(AX_BUILD_TMP)/$(AX_BOOT_IMAGE) bs=$(BLOCK_SIZE) count=$(shell expr $(BOOT_PARTITION_SIZE) \* $(BLOCK_SECTOR))
-	mkfs.msdos -S 512 $(AX_BUILD_TMP)/$(AX_BOOT_IMAGE)
-	echo "boot emmcflash0.kernel1 'brcm_cma=440M@328M brcm_cma=192M@768M root=/dev/mmcblk0p3 rw rootwait $(BOXMODEL)_4.boxmode=1'" > $(AX_BUILD_TMP)/STARTUP
-	echo "boot emmcflash0.kernel1 'brcm_cma=440M@328M brcm_cma=192M@768M root=/dev/mmcblk0p3 rw rootwait $(BOXMODEL)_4.boxmode=1'" > $(AX_BUILD_TMP)/STARTUP_1
-	echo "boot emmcflash0.kernel2 'brcm_cma=440M@328M brcm_cma=192M@768M root=/dev/mmcblk0p5 rw rootwait $(BOXMODEL)_4.boxmode=1'" > $(AX_BUILD_TMP)/STARTUP_2
-	echo "boot emmcflash0.kernel3 'brcm_cma=440M@328M brcm_cma=192M@768M root=/dev/mmcblk0p7 rw rootwait $(BOXMODEL)_4.boxmode=1'" > $(AX_BUILD_TMP)/STARTUP_3
-	echo "boot emmcflash0.kernel4 'brcm_cma=440M@328M brcm_cma=192M@768M root=/dev/mmcblk0p9 rw rootwait $(BOXMODEL)_4.boxmode=1'" > $(AX_BUILD_TMP)/STARTUP_4
-	mcopy -i $(AX_BUILD_TMP)/$(AX_BOOT_IMAGE) -v $(AX_BUILD_TMP)/STARTUP ::
-	mcopy -i $(AX_BUILD_TMP)/$(AX_BOOT_IMAGE) -v $(AX_BUILD_TMP)/STARTUP_1 ::
-	mcopy -i $(AX_BUILD_TMP)/$(AX_BOOT_IMAGE) -v $(AX_BUILD_TMP)/STARTUP_2 ::
-	mcopy -i $(AX_BUILD_TMP)/$(AX_BOOT_IMAGE) -v $(AX_BUILD_TMP)/STARTUP_3 ::
-	mcopy -i $(AX_BUILD_TMP)/$(AX_BOOT_IMAGE) -v $(AX_BUILD_TMP)/STARTUP_4 ::
-	dd conv=notrunc if=$(AX_BUILD_TMP)/$(AX_BOOT_IMAGE) of=$(EMMC_IMAGE) bs=$(BLOCK_SIZE) seek=$(shell expr $(IMAGE_ROOTFS_ALIGNMENT) \* $(BLOCK_SECTOR))
+	dd if=/dev/zero of=$(HD51_BUILD_TMP)/$(HD51_BOOT_IMAGE) bs=$(BLOCK_SIZE) count=$(shell expr $(BOOT_PARTITION_SIZE) \* $(BLOCK_SECTOR))
+	mkfs.msdos -S 512 $(HD51_BUILD_TMP)/$(HD51_BOOT_IMAGE)
+	echo "boot emmcflash0.kernel1 'brcm_cma=440M@328M brcm_cma=192M@768M root=/dev/mmcblk0p3 rw rootwait $(BOXMODEL)_4.boxmode=1'" > $(HD51_BUILD_TMP)/STARTUP
+	echo "boot emmcflash0.kernel1 'brcm_cma=440M@328M brcm_cma=192M@768M root=/dev/mmcblk0p3 rw rootwait $(BOXMODEL)_4.boxmode=1'" > $(HD51_BUILD_TMP)/STARTUP_1
+	echo "boot emmcflash0.kernel2 'brcm_cma=440M@328M brcm_cma=192M@768M root=/dev/mmcblk0p5 rw rootwait $(BOXMODEL)_4.boxmode=1'" > $(HD51_BUILD_TMP)/STARTUP_2
+	echo "boot emmcflash0.kernel3 'brcm_cma=440M@328M brcm_cma=192M@768M root=/dev/mmcblk0p7 rw rootwait $(BOXMODEL)_4.boxmode=1'" > $(HD51_BUILD_TMP)/STARTUP_3
+	echo "boot emmcflash0.kernel4 'brcm_cma=440M@328M brcm_cma=192M@768M root=/dev/mmcblk0p9 rw rootwait $(BOXMODEL)_4.boxmode=1'" > $(HD51_BUILD_TMP)/STARTUP_4
+	mcopy -i $(HD51_BUILD_TMP)/$(HD51_BOOT_IMAGE) -v $(HD51_BUILD_TMP)/STARTUP ::
+	mcopy -i $(HD51_BUILD_TMP)/$(HD51_BOOT_IMAGE) -v $(HD51_BUILD_TMP)/STARTUP_1 ::
+	mcopy -i $(HD51_BUILD_TMP)/$(HD51_BOOT_IMAGE) -v $(HD51_BUILD_TMP)/STARTUP_2 ::
+	mcopy -i $(HD51_BUILD_TMP)/$(HD51_BOOT_IMAGE) -v $(HD51_BUILD_TMP)/STARTUP_3 ::
+	mcopy -i $(HD51_BUILD_TMP)/$(HD51_BOOT_IMAGE) -v $(HD51_BUILD_TMP)/STARTUP_4 ::
+	dd conv=notrunc if=$(HD51_BUILD_TMP)/$(HD51_BOOT_IMAGE) of=$(EMMC_IMAGE) bs=$(BLOCK_SIZE) seek=$(shell expr $(IMAGE_ROOTFS_ALIGNMENT) \* $(BLOCK_SECTOR))
 	dd conv=notrunc if=$(ZIMAGE_DTB) of=$(EMMC_IMAGE) bs=$(BLOCK_SIZE) seek=$(shell expr $(KERNEL_PARTITION_OFFSET) \* $(BLOCK_SECTOR))
-	resize2fs $(AX_BUILD_TMP)/$(AX_IMAGE_LINK) $(ROOTFS_PARTITION_SIZE_MULTI)k
+	resize2fs $(HD51_BUILD_TMP)/$(HD51_IMAGE_LINK) $(ROOTFS_PARTITION_SIZE_MULTI)k
 	# Truncate on purpose
-	dd if=$(AX_BUILD_TMP)/$(AX_IMAGE_LINK) of=$(EMMC_IMAGE) bs=$(BLOCK_SIZE) seek=$(shell expr $(ROOTFS_PARTITION_OFFSET) \* $(BLOCK_SECTOR)) count=$(shell expr $(AX_IMAGE_ROOTFS_SIZE) \* $(BLOCK_SECTOR))
+	dd if=$(HD51_BUILD_TMP)/$(HD51_IMAGE_LINK) of=$(EMMC_IMAGE) bs=$(BLOCK_SIZE) seek=$(shell expr $(ROOTFS_PARTITION_OFFSET) \* $(BLOCK_SECTOR)) count=$(shell expr $(HD51_IMAGE_ROOTFS_SIZE) \* $(BLOCK_SECTOR))
 	# Create final USB-image
 	mkdir -p $(IMAGE_DIR)/$(BOXMODEL)
 	cp $(ZIMAGE_DTB) $(IMAGE_DIR)/$(BOXMODEL)/kernel.bin
@@ -258,9 +258,14 @@ flash-image-axt-multi:
 	zip -r $(IMAGE_PREFIX)-$(IMAGE_SUFFIX)_multi_usb.zip $(BOXMODEL)/*
 	# cleanup
 	rm -rf $(IMAGE_DIR)/$(BOXMODEL)
-	rm -rf $(AX_BUILD_TMP)
+	rm -rf $(HD51_BUILD_TMP)
 
-flash-image-axt-minimal:
+flash-image-arm: BOXNAME="AX/Mut@nt"
+flash-image-arm: IMAGE_NAME=$(IMAGE_PREFIX)-$(IMAGE_SUFFIX)
+flash-image-arm: IMAGE_DESC="$(BOXNAME) [$(IMAGE_SUFFIX)][$(BOXSERIES)] $(shell echo $(IMAGE_TYPE_STRING) | sed 's/.*/\u&/')"
+flash-image-arm: IMAGE_MD5FILE=$(IMAGE_TYPE_STRING)-$(IMAGE_SUFFIX).txt
+flash-image-arm: IMAGE_DATE=$(shell cat $(BOX)/.version | grep "^version=" | cut -d= -f2 | cut -c 5-)
+flash-image-arm:
 	mkdir -p $(IMAGE_DIR)/$(BOXMODEL)
 	cp $(ZIMAGE_DTB) $(IMAGE_DIR)/$(BOXMODEL)/kernel.bin
 	cd $(BOX); \
@@ -268,5 +273,6 @@ flash-image-axt-minimal:
 	bzip2 $(IMAGE_DIR)/$(BOXMODEL)/rootfs.tar
 	# Create minimal image
 	cd $(IMAGE_DIR)/$(BOXMODEL); \
-	tar -czf $(IMAGE_DIR)/$(IMAGE_PREFIX)-$(IMAGE_SUFFIX).tgz kernel.bin rootfs.tar.bz2
+	tar -czf $(IMAGE_DIR)/$(IMAGE_NAME).tgz kernel.bin rootfs.tar.bz2
 	rm -rf $(IMAGE_DIR)/$(BOXMODEL)
+	echo $(IMAGE_URL)/$(IMAGE_NAME).tgz $(IMAGE_TYPE)$(IMAGE_VERSION)$(IMAGE_DATE) `md5sum $(IMAGE_DIR)/$(IMAGE_NAME).tgz | cut -c1-32` $(IMAGE_DESC) $(IMAGE_VERSION_STRING) >> $(IMAGE_DIR)/$(IMAGE_MD5FILE)

make/kernel-axt.mk → make/kernel-arm.mk

@@ -1,4 +1,4 @@
-# makefile to build axtech kernel
+# makefile to build armbox kernel
 
 DTB		= $(BUILD_TMP)/linux-$(KERNEL_VERSION)/arch/arm/boot/dts/$(KERNEL_DTB).dtb
 ZIMAGE		= $(BUILD_TMP)/linux-$(KERNEL_VERSION)/arch/arm/boot/zImage
@@ -7,7 +7,7 @@ MODULES_DIR	= $(BUILD_TMP)/linux-$(KERNEL_VERSION)-modules/lib/modules/$(KERNEL_
 
 TARGETMODULES	= $(TARGETLIB)/modules/$(KERNEL_VERSION_FULL)
 
-$(D)/kernel-axt: $(SOURCE_DIR)/$(NI_LINUX-KERNEL) | $(TARGETPREFIX)
+$(D)/kernel-arm: $(SOURCE_DIR)/$(NI_LINUX-KERNEL) | $(TARGETPREFIX)
 	cd $(SOURCE_DIR)/$(NI_LINUX-KERNEL) && \
 		git checkout $(KERNEL_BRANCH) && \
 	tar -C $(SOURCE_DIR) -cp $(NI_LINUX-KERNEL) --exclude-vcs | tar -C $(BUILD_TMP) -x
@@ -25,11 +25,11 @@ $(D)/kernel-axt: $(SOURCE_DIR)/$(NI_LINUX-KERNEL) | $(TARGETPREFIX)
 		$(MAKE) ARCH=arm CROSS_COMPILE=$(TARGET)- INSTALL_MOD_PATH=$(BUILD_TMP)/linux-$(KERNEL_VERSION)-modules modules_install && \
 	touch $@
 
-kernel-axt-modules: $(D)/kernel-axt
+kernel-arm-modules: $(D)/kernel-arm
 	cp -a $(MODULES_DIR)/kernel $(TARGETMODULES)
 	cp -a $(MODULES_DIR)/modules.builtin $(TARGETMODULES)
 	cp -a $(MODULES_DIR)/modules.order $(TARGETMODULES)
-	make depmod-axt
+	make depmod-arm
 
-depmod-axt:
+depmod-arm:
 	PATH=$(PATH):/sbin:/usr/sbin depmod -b $(TARGETPREFIX) $(KERNEL_VERSION_FULL)

make/neutrino.mk

@@ -9,7 +9,7 @@ ifeq ($(USE_LIBSTB-HAL), yes)
 	NEUTRINO_DEPS += libstb-hal
 endif
 
-ifeq ($(BOXSERIES), ax)
+ifeq ($(BOXSERIES), hd51)
 	NEUTRINO_DEPS += $(D)/gst_plugins_dvbmediasink
 endif
 
@@ -23,7 +23,7 @@ endif
 ifeq ($(BOXSERIES), hd2)
 	N_CFLAGS += -DFB_HW_ACCELERATION
 endif
-ifeq ($(BOXSERIES), ax)
+ifeq ($(BOXSERIES), hd51)
 	N_CFLAGS += $(shell $(PKG_CONFIG) --cflags --libs gstreamer-1.0)
 	N_CFLAGS += $(shell $(PKG_CONFIG) --cflags --libs gstreamer-audio-1.0)
 	N_CFLAGS += $(shell $(PKG_CONFIG) --cflags --libs gstreamer-video-1.0)
@@ -60,7 +60,7 @@ ifeq ($(USE_LIBSTB-HAL), yes)
 endif
 
 N_CONFIGURE_ADDITIONS =
-ifeq ($(BOXSERIES), ax)
+ifeq ($(BOXSERIES), hd51)
 	N_CONFIGURE_ADDITIONS += \
 		--enable-reschange
 endif

make/ni.mk

@@ -5,7 +5,7 @@ init: preqs crosstools bootstrap
 
 # -- wrapper-targets for Neutrino-Updates -------------------------------------
 
-BOXSERIES_UPDATE = hd2 ax
+BOXSERIES_UPDATE = hd2 hd51
 ifneq ($(DEBUG), yes)
 	BOXSERIES_UPDATE += hd1
 endif
@@ -77,7 +77,7 @@ ni-image:
 	make -j$(NUM_CPUS) wget
 	make -j$(NUM_CPUS) iconv
 	make -j$(NUM_CPUS) streamripper
-ifeq ($(BOXSERIES), $(filter $(BOXSERIES), hd2 ax))
+ifeq ($(BOXSERIES), $(filter $(BOXSERIES), hd2 hd51))
 	make channellogos
 	make -j$(NUM_CPUS) less
 	make -j$(NUM_CPUS) parted
@@ -89,7 +89,7 @@ ifeq ($(BOXSERIES), $(filter $(BOXSERIES), hd2 ax))
 	make -j$(NUM_CPUS) minicom
 	make -j$(NUM_CPUS) mc
   endif
-  ifeq ($(BOXSERIES), ax)
+  ifeq ($(BOXSERIES), hd51)
 	make -j$(NUM_CPUS) ofgwrite
 	make -j$(NUM_CPUS) aio-grab
 	make stb-startup

make/plugins.mk

@@ -76,7 +76,7 @@ plugins-all: $(D)/neutrino \
 plugins-hd1: # nothing to do
 plugins-hd2: # nothing to do
 
-plugins-ax: \
+plugins-hd51: \
 	showiframe
 
 ################

make/static.mk

@@ -3,7 +3,7 @@
 static: cortex-strings
 
 CORTEX-STRINGS_CONF =
-ifneq ($(BOXSERIES), ax)
+ifneq ($(BOXSERIES), hd51)
 	CORTEX-STRINGS_CONF = --without-neon
 endif
 

make/system-libs.mk

@@ -133,7 +133,7 @@ $(D)/libcurl: $(D)/zlib $(D)/openssl $(ARCHIVE)/curl-$(LIBCURL_VER).tar.bz2 | $(
 	touch $@
 
 LIBPNG_CONF =
-ifneq ($(BOXSERIES), ax)
+ifneq ($(BOXSERIES), hd51)
 	LIBPNG_CONF = --disable-arm-neon
 endif
 
@@ -385,7 +385,7 @@ ifeq ($(BOXSERIES), hd1)
 			--extra-cflags="-Wno-deprecated-declarations -I$(TARGETINCLUDE)"
 endif
 
-ifeq ($(BOXSERIES), ax)
+ifeq ($(BOXSERIES), hd51)
   FFMPEG_CONFIGURE = \
 			--enable-encoder=mpeg2video \
 			--enable-muxer=mpeg2video \

make/system-tools.mk

@@ -549,7 +549,7 @@ $(D)/samba-hd1: $(D)/zlib $(ARCHIVE)/samba-$(SAMBA33_VER).tar.gz | $(TARGETPREFI
 	$(REMOVE)/samba-$(SAMBA33_VER)
 	touch $@
 
-$(D)/samba-ax \
+$(D)/samba-hd51 \
 $(D)/samba-hd2: $(D)/zlib $(ARCHIVE)/samba-$(SAMBA36_VER).tar.gz | $(TARGETPREFIX)
 	$(UNTAR)/samba-$(SAMBA36_VER).tar.gz
 	cd $(BUILD_TMP)/samba-$(SAMBA36_VER) && \