bs: enable pip for ARM

diff --git a/make/flashimage.mk b/make/flashimage.mk
index a067561d31884b838bcb19d530fab03fad5dfa58..8ee9ade7ff5e4fb59f1dce908c83e9936ff8cdc8 100755 (executable)
--- a/make/flashimage.mk
+++ b/make/flashimage.mk
@@ -5,12 +5,20 @@ DATE := $(shell date +%Y-%m-%d)
 ###############################################################################
 # armbox hd51
 #
+PIP=1
+
 ifeq ($(BOXTYPE), armbox)
 NEWLAYOUT=1
 else
 NEWLAYOUT=0
 endif
 
+ifeq ($(PIP), 1)
+BOX_MODE="12"
+else
+BOX_MODE="1"
+endif
+
 # general
 HD51_IMAGE_NAME = disk
 HD51_BOOT_IMAGE = boot.img
@@ -67,6 +75,9 @@ MULTI_ROOTFS_PARTITION_OFFSET_NL = "$(shell expr ${FOURTH_KERNEL_PARTITION_OFFSE
 flash-image-hd51-multi-disk: IMAGE_NAME=$(shell cat $(RELEASE_DIR)/.version | grep "^imagename=" | cut -d= -f2)
 flash-image-hd51-multi-disk: IMG_DATE=$(shell cat $(RELEASE_DIR)/.version | grep "^version" | cut -d= -f2 | cut -c5-)
 flash-image-hd51-multi-disk:
+ifeq ($(PIP), 1)
+       touch $(RELEASE_DIR)/etc/.pip
+endif
        mkdir -p $(IMAGE_BUILD_TMP)
        rm -rf $(IMAGE_DIR)/$(BOXMODEL) || true
        # Create a sparse image block
@@ -90,11 +101,11 @@ ifeq ($(NEWLAYOUT), 1)
        parted -s $(EMMC_IMAGE) unit KiB mkpart userdata ext4 ${MULTI_ROOTFS_PARTITION_OFFSET_NL} 100%
        dd if=/dev/zero of=$(IMAGE_BUILD_TMP)/$(HD51_BOOT_IMAGE) bs=$(BLOCK_SIZE) count=$(shell expr $(BOOT_PARTITION_SIZE) \* $(BLOCK_SECTOR))
        mkfs.msdos -S 512 $(IMAGE_BUILD_TMP)/$(HD51_BOOT_IMAGE)
-       echo "boot emmcflash0.linuxkernel 'root=/dev/mmcblk0p3 rootsubdir=linuxrootfs1 kernel=/dev/mmcblk0p2 rw rootwait $(BOXMODEL)_4.boxmode=1'" > $(IMAGE_BUILD_TMP)/STARTUP
-       echo "boot emmcflash0.linuxkernel 'root=/dev/mmcblk0p3 rootsubdir=linuxrootfs1 kernel=/dev/mmcblk0p2 rw rootwait $(BOXMODEL)_4.boxmode=1'" > $(IMAGE_BUILD_TMP)/STARTUP_1
-       echo "boot emmcflash0.linuxkernel2 'root=/dev/mmcblk0p7 rootsubdir=linuxrootfs2 kernel=/dev/mmcblk0p4 rw rootwait $(BOXMODEL)_4.boxmode=1'" > $(IMAGE_BUILD_TMP)/STARTUP_2
-       echo "boot emmcflash0.linuxkernel3 'root=/dev/mmcblk0p7 rootsubdir=linuxrootfs3 kernel=/dev/mmcblk0p5 rw rootwait $(BOXMODEL)_4.boxmode=1'" > $(IMAGE_BUILD_TMP)/STARTUP_3
-       echo "boot emmcflash0.linuxkernel4 'root=/dev/mmcblk0p7 rootsubdir=linuxrootfs4 kernel=/dev/mmcblk0p6 rw rootwait $(BOXMODEL)_4.boxmode=1'" > $(IMAGE_BUILD_TMP)/STARTUP_4
+       echo "boot emmcflash0.linuxkernel 'root=/dev/mmcblk0p3 rootsubdir=linuxrootfs1 kernel=/dev/mmcblk0p2 rw rootwait $(BOXMODEL)_4.boxmode=$(BOX_MODE)'" > $(IMAGE_BUILD_TMP)/STARTUP
+       echo "boot emmcflash0.linuxkernel 'root=/dev/mmcblk0p3 rootsubdir=linuxrootfs1 kernel=/dev/mmcblk0p2 rw rootwait $(BOXMODEL)_4.boxmode=$(BOX_MODE)'" > $(IMAGE_BUILD_TMP)/STARTUP_1
+       echo "boot emmcflash0.linuxkernel2 'root=/dev/mmcblk0p7 rootsubdir=linuxrootfs2 kernel=/dev/mmcblk0p4 rw rootwait $(BOXMODEL)_4.boxmode=$(BOX_MODE)'" > $(IMAGE_BUILD_TMP)/STARTUP_2
+       echo "boot emmcflash0.linuxkernel3 'root=/dev/mmcblk0p7 rootsubdir=linuxrootfs3 kernel=/dev/mmcblk0p5 rw rootwait $(BOXMODEL)_4.boxmode=$(BOX_MODE)'" > $(IMAGE_BUILD_TMP)/STARTUP_3
+       echo "boot emmcflash0.linuxkernel4 'root=/dev/mmcblk0p7 rootsubdir=linuxrootfs4 kernel=/dev/mmcblk0p6 rw rootwait $(BOXMODEL)_4.boxmode=$(BOX_MODE)'" > $(IMAGE_BUILD_TMP)/STARTUP_4
 else
        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_MULTI))
@@ -108,11 +119,11 @@ else
        parted -s $(EMMC_IMAGE) unit KiB mkpart swap linux-swap $(SWAP_PARTITION_OFFSET) $(shell expr $(EMMC_IMAGE_SIZE) \- 1024)
        dd if=/dev/zero of=$(IMAGE_BUILD_TMP)/$(HD51_BOOT_IMAGE) bs=$(BLOCK_SIZE) count=$(shell expr $(BOOT_PARTITION_SIZE) \* $(BLOCK_SECTOR))
        mkfs.msdos -S 512 $(IMAGE_BUILD_TMP)/$(HD51_BOOT_IMAGE)
-       echo "boot emmcflash0.kernel1 'root=/dev/mmcblk0p3 rw rootwait $(BOXMODEL)_4.boxmode=1'" > $(IMAGE_BUILD_TMP)/STARTUP
-       echo "boot emmcflash0.kernel1 'root=/dev/mmcblk0p3 rw rootwait $(BOXMODEL)_4.boxmode=1'" > $(IMAGE_BUILD_TMP)/STARTUP_1
-       echo "boot emmcflash0.kernel2 'root=/dev/mmcblk0p5 rw rootwait $(BOXMODEL)_4.boxmode=1'" > $(IMAGE_BUILD_TMP)/STARTUP_2
-       echo "boot emmcflash0.kernel3 'root=/dev/mmcblk0p7 rw rootwait $(BOXMODEL)_4.boxmode=1'" > $(IMAGE_BUILD_TMP)/STARTUP_3
-       echo "boot emmcflash0.kernel4 'root=/dev/mmcblk0p9 rw rootwait $(BOXMODEL)_4.boxmode=1'" > $(IMAGE_BUILD_TMP)/STARTUP_4
+       echo "boot emmcflash0.kernel1 'root=/dev/mmcblk0p3 rw rootwait $(BOXMODEL)_4.boxmode=$(BOX_MODE)'" > $(IMAGE_BUILD_TMP)/STARTUP
+       echo "boot emmcflash0.kernel1 'root=/dev/mmcblk0p3 rw rootwait $(BOXMODEL)_4.boxmode=$(BOX_MODE)'" > $(IMAGE_BUILD_TMP)/STARTUP_1
+       echo "boot emmcflash0.kernel2 'root=/dev/mmcblk0p5 rw rootwait $(BOXMODEL)_4.boxmode=$(BOX_MODE)'" > $(IMAGE_BUILD_TMP)/STARTUP_2
+       echo "boot emmcflash0.kernel3 'root=/dev/mmcblk0p7 rw rootwait $(BOXMODEL)_4.boxmode=$(BOX_MODE)'" > $(IMAGE_BUILD_TMP)/STARTUP_3
+       echo "boot emmcflash0.kernel4 'root=/dev/mmcblk0p9 rw rootwait $(BOXMODEL)_4.boxmode=$(BOX_MODE)'" > $(IMAGE_BUILD_TMP)/STARTUP_4
 endif
        mcopy -i $(IMAGE_BUILD_TMP)/$(HD51_BOOT_IMAGE) -v $(IMAGE_BUILD_TMP)/STARTUP ::
        mcopy -i $(IMAGE_BUILD_TMP)/$(HD51_BOOT_IMAGE) -v $(IMAGE_BUILD_TMP)/STARTUP_1 ::
@@ -149,6 +160,9 @@ endif
 flash-image-hd51-multi-rootfs: IMAGE_NAME=$(shell cat $(RELEASE_DIR)/.version | grep "^imagename=" | cut -d= -f2)
 flash-image-hd51-multi-rootfs: IMG_DATE=$(shell cat $(RELEASE_DIR)/.version | grep "^version" | cut -d= -f2 | cut -c5-)
 flash-image-hd51-multi-rootfs:
+ifeq ($(PIP), 1)
+       touch $(RELEASE_DIR)/etc/.pip
+endif
        mkdir -p $(IMAGE_DIR)/$(BOXMODEL)
        rm -rf $(IMAGE_DIR)/$(BOXMODEL)/*
        cp $(ZIMAGE_DTB) $(IMAGE_DIR)/$(BOXMODEL)/kernel.bin
@@ -158,10 +172,9 @@ flash-image-hd51-multi-rootfs:
        echo $(BOXMODEL)_$(IMAGE_NAME)_ofg_$(IMG_DATE) > $(IMAGE_DIR)/$(BOXMODEL)/imageversion
        # Create minimal image
        cd $(IMAGE_DIR)/$(BOXMODEL); \
-       tar -czf $(BUILD_TMP)/$(BOXMODEL)_multi_ofg_$(IMG_DATE).tgz --owner=0 --group=0 rootfs.tar.bz2 kernel.bin imageversion
+       tar -czf $(BUILD_TMP)/$(BOXMODEL)_multi_ofg_$(IMG_DATE).tgz --exclude=zImage* --owner=0 --group=0 rootfs.tar.bz2 kernel.bin imageversion
        rm -rf $(IMAGE_DIR)/$(BOXMODEL)
 
-
 ### end hd51
 
 flash-customize: $(BASE_DIR)/customize/flash-customize.sh

diff --git a/make/neutrino.mk b/make/neutrino.mk
index 70f16dce04a75f86f480840d88e2543285fd63ec..84c1cef61f8cd2e427321d2ac88d370ff218e0d0 100755 (executable)
--- a/make/neutrino.mk
+++ b/make/neutrino.mk
@@ -83,9 +83,12 @@ else
        N_CONFIG_OPTS += --enable-flac
        NEUTRINO_DEPS += libflac
 endif
-ifeq ($(BOXSERIES), $(filter $(BOXSERIES), hd1 hd2))
+ifeq ($(BOXSERIES), $(filter $(BOXSERIES), hd1 hd2 h7 hd51 bre2ze4k))
        N_CONFIG_OPTS += --enable-pip
 endif
+ifeq  ($(BOXSERIES), $(filter $(BOXSERIES), h7 hd51 bre2ze4k))
+       N_CONFIG_OPTS += --enable-dynamicdemux
+endif
 ifeq ($(PLATFORM), $(filter $(PLATFORM), apollo kronos))
        NEUTRINO_DEPS += libiconv cortex-strings
 endif