rcS: hd51/h7/bre2ze4k fix boxmode 12

Duckbox-Developers · Mar 12, 2021 · 833f18d · 833f18d
1 parent ef3115a
commit 833f18d
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 5 deletions.
diff --git a/make/flashimage.mk b/make/flashimage.mk
@@ -159,7 +159,7 @@ endif
 	mcopy -i $(IMAGE_BUILD_DIR)/$($(BOXTYPE)_BOOT_IMAGE) -v $(IMAGE_BUILD_DIR)/STARTUP_2 ::
 	mcopy -i $(IMAGE_BUILD_DIR)/$($(BOXTYPE)_BOOT_IMAGE) -v $(IMAGE_BUILD_DIR)/STARTUP_3 ::
 	mcopy -i $(IMAGE_BUILD_DIR)/$($(BOXTYPE)_BOOT_IMAGE) -v $(IMAGE_BUILD_DIR)/STARTUP_4 ::
-	@if [ "$(BOXTYPE)" == "hd51" ]; then \
+	@ifeq ($(BOXTYPE), $(filter $(BOXTYPE), bre2ze4k hd51 h7))
 		echo "boot emmcflash0.kernel1 'brcm_cma=520M@248M brcm_cma=200M@768M root=/dev/mmcblk0p3 rw rootwait $(BOXTYPE)_4.boxmode=12'" > $(IMAGE_BUILD_DIR)/STARTUP_1_12; \
 		echo "boot emmcflash0.kernel2 'brcm_cma=520M@248M brcm_cma=200M@768M root=/dev/mmcblk0p5 rw rootwait $(BOXTYPE)_4.boxmode=12'" > $(IMAGE_BUILD_DIR)/STARTUP_2_12; \
 		echo "boot emmcflash0.kernel3 'brcm_cma=520M@248M brcm_cma=200M@768M root=/dev/mmcblk0p7 rw rootwait $(BOXTYPE)_4.boxmode=12'" > $(IMAGE_BUILD_DIR)/STARTUP_3_12; \
@@ -168,7 +168,7 @@ endif
 		mcopy -i $(IMAGE_BUILD_DIR)/$($(BOXTYPE)_BOOT_IMAGE) -v $(IMAGE_BUILD_DIR)/STARTUP_2_12 ::; \
 		mcopy -i $(IMAGE_BUILD_DIR)/$($(BOXTYPE)_BOOT_IMAGE) -v $(IMAGE_BUILD_DIR)/STARTUP_3_12 ::; \
 		mcopy -i $(IMAGE_BUILD_DIR)/$($(BOXTYPE)_BOOT_IMAGE) -v $(IMAGE_BUILD_DIR)/STARTUP_4_12 ::; \
-	fi
+	endif
 	dd conv=notrunc if=$(IMAGE_BUILD_DIR)/$($(BOXTYPE)_BOOT_IMAGE) of=$(EMMC_IMAGE) bs=$(BLOCK_SIZE) seek=$(shell expr $(IMAGE_ROOTFS_ALIGNMENT) \* $(BLOCK_SECTOR))
 	dd conv=notrunc if=$(RELEASE_DIR)/boot/zImage.dtb of=$(EMMC_IMAGE) bs=$(BLOCK_SIZE) seek=$(shell expr $(KERNEL_PARTITION_OFFSET) \* $(BLOCK_SECTOR))
 	$(HOST_DIR)/bin/resize2fs $(IMAGE_BUILD_DIR)/$($(BOXTYPE)_IMAGE_LINK) $(ROOTFS_PARTITION_SIZE_MULTI)k

diff --git a/root/release/rcS_neutrino_bre2ze4k b/root/release/rcS_neutrino_bre2ze4k
@@ -62,11 +62,16 @@ fi
 # rpc.statd for nfs
 /etc/init.d/nfs-common start
 
+echo "[rcS] check boxmode"
+cat /proc/cmdline | grep -q 'boxmode=12'
+[ "$?" == "0" ] && BOXMODE=12 || BOXMODE=1
+echo "[rcS] boxmode=$BOXMODE"
+
 echo "[rcS] `date +'%d.%m.%Y %H:%M:%S'` load modules"
 insmod /lib/modules/bre2ze4k_1.ko
 insmod /lib/modules/bre2ze4k_2.ko
 insmod /lib/modules/bre2ze4k_3.ko
-insmod /lib/modules/bre2ze4k_4.ko
+insmod /lib/modules/bre2ze4k_4.ko boxmode=$BOXMODE
 
 echo "Booting... DDT" > /dev/dbox/oled0
 

diff --git a/root/release/rcS_neutrino_h7 b/root/release/rcS_neutrino_h7
@@ -62,11 +62,16 @@ fi
 # rpc.statd for nfs
 /etc/init.d/nfs-common start
 
+echo "[rcS] check boxmode"
+cat /proc/cmdline | grep -q 'boxmode=12'
+[ "$?" == "0" ] && BOXMODE=12 || BOXMODE=1
+echo "[rcS] boxmode=$BOXMODE"
+
 echo "[rcS] `date +'%d.%m.%Y %H:%M:%S'` load modules"
 insmod /lib/modules/h7_1.ko
 insmod /lib/modules/h7_2.ko
 insmod /lib/modules/h7_3.ko
-insmod /lib/modules/h7_4.ko
+insmod /lib/modules/h7_4.ko boxmode=$BOXMODE
 
 echo "Booting... DDT" > /dev/dbox/oled0
 

diff --git a/root/release/rcS_neutrino_hd51 b/root/release/rcS_neutrino_hd51
@@ -62,11 +62,16 @@ fi
 # rpc.statd for nfs
 /etc/init.d/nfs-common start
 
+echo "[rcS] check boxmode"
+cat /proc/cmdline | grep -q 'boxmode=12'
+[ "$?" == "0" ] && BOXMODE=12 || BOXMODE=1
+echo "[rcS] boxmode=$BOXMODE"
+
 echo "[rcS] `date +'%d.%m.%Y %H:%M:%S'` load modules"
 insmod /lib/modules/hd51_1.ko
 insmod /lib/modules/hd51_2.ko
 insmod /lib/modules/hd51_3.ko
-insmod /lib/modules/hd51_4.ko
+insmod /lib/modules/hd51_4.ko boxmode=$BOXMODE
 
 echo "Booting... DDT" > /dev/dbox/oled0