From 9134d2b25c4dc50bf56655cd5cee6b22f95cecf1 Mon Sep 17 00:00:00 2001
From: Takumi Sueda <puhitaku@gmail.com>
Date: Thu, 22 Sep 2022 22:42:17 +0900
Subject: [PATCH] Update

---
 image/build_image.sh | 40 ++++++++++++++++++++++++----------------
 1 file changed, 24 insertions(+), 16 deletions(-)

diff --git a/image/build_image.sh b/image/build_image.sh
index 832b137..d1080b2 100755
--- a/image/build_image.sh
+++ b/image/build_image.sh
@@ -11,20 +11,21 @@ export CROSS_COMPILE=arm-linux-gnueabi-
 mkdir -p ${WORK}
 mkdir -p ${WORK}/lilobin
 
-for i in "g5300" "sh1" "sh2" "sh3" "sh4" "sh5" "sh6" "sh7"; do
+# for i in "g5300" "sh1" "sh2" "sh3" "sh4" "sh5" "sh6" "sh7"; do
+for i in "sh1"; do
     NUM=$(echo $i | sed -E 's/sh//g')
 
     make -C ${REPO}/u-boot-brain distclean pw${i}_defconfig
-    make -j${JOBS} -C ${REPO}/u-boot-brain u-boot.bin
-    ${REPO}/nkbin_maker/bsd-ce ${REPO}/u-boot-brain/u-boot.bin
+    make -j${JOBS} -C ${REPO}/u-boot-brain u-boot.sb
+    #${REPO}/nkbin_maker/bsd-ce ${REPO}/u-boot-brain/u-boot.bin
 
     case $i in
         "g5300")
             mv ${REPO}/nk.bin ${WORK}/edna3exe.bin
             mv ${REPO}/u-boot-brain/u-boot.bin ${WORK}/lilobin/gen2.bin;;
         "sh1" | "sh2" | "sh3")
-            mv ${REPO}/nk.bin ${WORK}/edsa${NUM}exe.bin
-            mv ${REPO}/u-boot-brain/u-boot.bin ${WORK}/lilobin/gen3_${NUM}.bin;;
+        #    mv ${REPO}/nk.bin ${WORK}/edsa${NUM}exe.bin
+            mv ${REPO}/u-boot-brain/u-boot.sb ${WORK}/lilobin/gen3_${NUM}.sb;;
         "sh4" | "sh5" | "sh6" | "sh7")
             mv ${REPO}/nk.bin ${WORK}/edsh${NUM}exe.bin
             mv ${REPO}/u-boot-brain/u-boot.bin ${WORK}/lilobin/gen3_${NUM}.bin;;
@@ -34,15 +35,18 @@ for i in "g5300" "sh1" "sh2" "sh3" "sh4" "sh5" "sh6" "sh7"; do
     esac
 done
 
-dd if=/dev/zero of=${IMG} bs=1M count=3072
+dd if=/dev/zero of=${IMG} bs=1M count=2048
 
 START1=2048
 SECTORS1=$((1024 * 1024 * 64 / 512))
 START2=$((2048 + ${SECTORS1}))
+SECTORS1=$((1024 * 1024 * 8 / 512))
+START2=$((2048 + ${SECTORS1} + ${SECTORS2}))
 
 cat <<EOF > ${WORK}/part.sfdisk
 ${IMG}1 : start=${START1}, size=${SECTORS1}, type=b
-${IMG}2 : start=${START2}, type=83
+${IMG}2 : start=${START2}, size=${SECTORS2}, type=53
+${IMG}3 : start=${START3}, type=83
 EOF
 
 sfdisk ${IMG} < ${WORK}/part.sfdisk
@@ -51,17 +55,21 @@ sudo kpartx -av ${IMG}
 
 LOOPDEV=$(losetup -l | grep sd.img | grep -o 'loop.' | tail -n 1)
 
-sudo mkfs.fat -n boot -F32 -v -I /dev/mapper/${LOOPDEV}p1
-sudo mkfs.ext4 -L rootfs /dev/mapper/${LOOPDEV}p2
+${REPO}/image/mk_hdr.sh `fdisk -lu /dev/${LOOPDEV} | awk '$6==53 {print $2}'` 1 > ${WORK}/header.bin
+dd if=${WORK}/header.bin of=/dev/${LOOPDEV}p2 ibs=512 conv=sync
+dd if=${WORK}/lilobin/gen3_1.sb of=/dev/${LOOPDEV}p2 ibs=512 obs=512 seek=1 conv=sync
 
-mkdir -p ${WORK}/p1 ${WORK}/p2
+sudo mkfs.fat -n boot -F32 -v -I /dev/mapper/${LOOPDEV}p1
+sudo mkfs.ext4 -L rootfs /dev/mapper/${LOOPDEV}p3
+
+mkdir -p ${WORK}/p1 ${WORK}/p3
 sudo mount -o utf8=true /dev/mapper/${LOOPDEV}p1 ${WORK}/p1
-sudo mount /dev/mapper/${LOOPDEV}p2 ${WORK}/p2
+sudo mount /dev/mapper/${LOOPDEV}p3 ${WORK}/p3
 
 sudo cp ${LINUX}/arch/arm/boot/zImage ${WORK}/p1/
 sudo cp ${LINUX}/arch/arm/boot/dts/imx28-pw*.dtb ${WORK}/p1/
-sudo mkdir -p ${WORK}/p1/nk
-sudo cp ${WORK}/*.bin ${WORK}/p1/nk/
+# sudo mkdir -p ${WORK}/p1/nk
+# sudo cp ${WORK}/*.bin ${WORK}/p1/nk/
 
 make -C ${REPO}/brainlilo
 
@@ -77,10 +85,10 @@ sudo cp ${REPO}/image/exeopener.exe "${LILO}/AppMain.exe"
 sudo mkdir -p ${WORK}/p1/loader
 sudo cp ${WORK}/lilobin/*.bin ${WORK}/p1/loader/
 
-sudo cp -ra ${REPO}/brainux/* ${WORK}/p2/
+sudo cp -ra ${REPO}/brainux/* ${WORK}/p3/
 
-sudo umount ${WORK}/p1 ${WORK}/p2
+sudo umount ${WORK}/p1 ${WORK}/p3
 sudo kpartx -d ${IMG}
 
-rmdir ${WORK}/p1 ${WORK}/p2
+rmdir ${WORK}/p1 ${WORK}/p3