From: Markham <markham001@gmx.de>
Date: Sat, 13 Mar 2021 20:44:21 +0000 (+0100)
Subject: flashimage.mk: revert pip changings
X-Git-Url: https://git.webhop.me/?a=commitdiff_plain;h=aceeacf4aa46fa518600cbd85d52d08940d3ceaa;p=bs-cst-neutrino-hd.git

flashimage.mk: revert pip changings
---

diff --git a/make/flashimage.mk b/make/flashimage.mk
index 8ee9ade..60779a7 100755
--- a/make/flashimage.mk
+++ b/make/flashimage.mk
@@ -13,12 +13,6 @@ 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
@@ -75,9 +69,6 @@ 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
@@ -101,11 +92,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=$(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
+	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
 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))
@@ -119,11 +110,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=$(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
+	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
 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 ::
@@ -160,9 +151,6 @@ 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