From b62abb9bc56c58ff03eab739e94f12f0246efbb4 Mon Sep 17 00:00:00 2001
From: Robert Nelson <robertcnelson@gmail.com>
Date: Mon, 14 Aug 2023 22:07:02 -0500
Subject: [PATCH] close: missing environment variable: kernel_addr_r

Signed-off-by: Robert Nelson <robertcnelson@gmail.com>
---
 .gitlab-ci.yml                  |  2 +-
 04_build_linux.sh               |  7 +++++--
 05_generate_payload.bin.sh      |  6 ------
 deploy/genimage.cfg             |  9 +++++----
 generate_debian_console_root.sh | 15 +++++++++++++--
 5 files changed, 24 insertions(+), 15 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 7338fc2..c1636e0 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -16,4 +16,4 @@ build:
     - ./03_build_u-boot.sh
     - ./04_build_linux.sh
     - ./05_generate_payload.bin.sh
-    - tree ./deploy/
+    - tree -s ./deploy/
diff --git a/04_build_linux.sh b/04_build_linux.sh
index 25cc702..152225a 100755
--- a/04_build_linux.sh
+++ b/04_build_linux.sh
@@ -44,8 +44,11 @@ cd "${wdir}/linux/" || exit
 rm -rf "${wdir}/deploy/tmp" || true
 
 cp -v ./.config ../patches/linux/mpfs_defconfig
-cp -v ./arch/riscv/boot/Image ../deploy/
-cp -v ./arch/riscv/boot/dts/microchip/mpfs-beaglev-fire.dtb ../deploy/
+if [ ! -d ../deploy/input/ ] ; then
+	mkdir -p ../deploy/input/ || true
+fi
+cp -v ./arch/riscv/boot/Image ../deploy/input/
+cp -v ./arch/riscv/boot/dts/microchip/mpfs-beaglev-fire.dtb ../deploy/input/
 
 cd ../
 
diff --git a/05_generate_payload.bin.sh b/05_generate_payload.bin.sh
index 9ebb76f..f9bfb83 100755
--- a/05_generate_payload.bin.sh
+++ b/05_generate_payload.bin.sh
@@ -4,14 +4,10 @@ cd ./deploy/
 
 if [ -f ./src.bin ] ; then
 	mkdir ./input/
-	tree -s ./
-
 	if [ -f ./input/payload.bin ] ; then
 		rm -rf ./input/payload.bin || true
 	fi
 
-	tree -s ./input/
-
 	./hss-payload-generator -vv -c config.yaml ./input/payload.bin
 
 	date
@@ -32,8 +28,6 @@ if [ -f ./src.bin ] ; then
 	if [ ! "x${test_var}" = "x" ] ; then
 		echo "[payload.bin:${test_var}]"
 	fi
-
-	tree -s ./input/
 fi
 
 #
diff --git a/deploy/genimage.cfg b/deploy/genimage.cfg
index 95a2f38..093e13c 100644
--- a/deploy/genimage.cfg
+++ b/deploy/genimage.cfg
@@ -3,13 +3,14 @@
 image boot.vfat {
 	vfat {
 		files = {
-			 "beaglev_fire.itb",
+			"mpfs-beaglev-fire.dtb",
+			"Image"
 		}
-
-		file boot.scr {
-			image = "boot.scr"
+		file extlinux/extlinux.conf {
+			image = extlinux.conf
 		}
 	}
+
 	size = 60M
 }
 
diff --git a/generate_debian_console_root.sh b/generate_debian_console_root.sh
index 55eff67..4a42f12 100755
--- a/generate_debian_console_root.sh
+++ b/generate_debian_console_root.sh
@@ -35,10 +35,21 @@ mkdir -p ./ignore/.root
 tar xfp ./deploy/debian-sid-console-riscv64-${datestamp}/riscv64-rootfs-*.tar -C ./ignore/.root
 sync
 
+mkdir -p ./deploy/input/ || true
+echo "label Linux eMMC" > ./deploy/input/extlinux.conf
+echo "    kernel /Image" >> ./deploy/input/extlinux.conf
+echo "    append root=/dev/mmcblk1p3 ro rootfstype=ext4 rootwait console=ttyS0,115200 net.ifnames=0" >> ./deploy/input/extlinux.conf
+echo "    fdtdir /" >> ./deploy/input/extlinux.conf
+echo "    fdt /mpfs-beaglev-fire.dtb" >> ./deploy/input/extlinux.conf
+echo "    #fdtoverlays /overlays/<file>.dtbo" >> ./deploy/input/extlinux.conf
+
+echo "extlinux/extlinux.conf"
+cat ./deploy/input/extlinux.conf
+
 mkdir -p ./ignore/.root/boot/firmware/ || true
 
-echo '/dev/mmcblk0p2  /boot/firmware/ auto  defaults  0  2' >> ./ignore/.root/etc/fstab
-echo '/dev/mmcblk0p3  /  auto  errors=remount-ro  0  1' >> ./ignore/.root/etc/fstab
+echo '/dev/mmcblk1p2  /boot/firmware/ auto  defaults  0  2' >> ./ignore/.root/etc/fstab
+echo '/dev/mmcblk1p3  /  auto  errors=remount-ro  0  1' >> ./ignore/.root/etc/fstab
 echo 'debugfs  /sys/kernel/debug  debugfs  mode=755,uid=root,gid=gpio,defaults  0  0' >> ./ignore/.root/etc/fstab
 
 rm -rf ./ignore/.root/usr/lib/systemd/system/bb-usb-gadgets.service || true