close: missing environment variable: kernel_addr_r

Signed-off-by: Robert Nelson <robertcnelson@gmail.com>

.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/

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/
+if [ ! -d ../deploy/input/ ] ; then
-cp -v ./arch/riscv/boot/dts/microchip/mpfs-beaglev-fire.dtb ../deploy/
+	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 ../
 

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
 
 #

deploy/genimage.cfg

@@ -3,13 +3,14 @@
 image boot.vfat {
 	vfat {
 		files = {
-			 "beaglev_fire.itb",
+			"mpfs-beaglev-fire.dtb",
+			"Image"
 		}
-
+		file extlinux/extlinux.conf {
-		file boot.scr {
+			image = extlinux.conf
-			image = "boot.scr"
 		}
 	}
+
 	size = 60M
 }
 

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/mmcblk1p2  /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/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