Adds initial support for multiboot OGU and Max 3.

linaro/build_linaro

@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 # SPDX-License-Identifier: Apache-2.0
 # Copyright (C) 2023-present Fewtarius
 
@@ -8,20 +8,27 @@
 ###
 
 ###
-### Export PROJECTS="kernel uboot" or the default will
+### Export SCRIPTS="mkkernel mkuboot" or the default will
 ### only build u-boot.
 ###
 
-PROJECTS="${PROJECTS:-uboot}"
+SCRIPTS="${SCRIPTS:-mkuboot}"
 CONTAINER="linaro:latest"
 
 echo "Provisioning container..."
 docker build -t "${CONTAINER}" .
 
-for BUILD in ${PROJECTS}
+for SCRIPT in ${SCRIPTS}
 do
-  echo "Building ${BUILD}..."
+  echo "Executing ${SCRIPT}..."
-  docker run -it --rm --user $(id -u):$(id -g) -v $(pwd):/work -w /work ${CONTAINER} /work/${BUILD}
+  docker run -it --rm --user $(id -u):$(id -g) -v $(pwd):/work -w /work ${CONTAINER} /work/${SCRIPT}
+
+  if [[ "${SCRIPT}" =~ mkuboot ]] && \
+     [ -e "u-boot/sd_fuse/u-boot.bin" ]
+  then
+    echo "Copying u-boot binary..."
+    cp u-boot/sd_fuse/u-boot.bin ../projects/Amlogic/packages/u-boot/bin/S922X/u-boot.bin
+  fi
 done
 
 

projects/Amlogic/bootloader/install

@@ -11,7 +11,7 @@ case "${DEVICE}" in
   ;;
   *)
     echo "uboot: encrypting u-boot.bin with fip..."
-    cp -av u-boot.bin ${FIP_DIR}/
+    cp -av build/u-boot.bin ${FIP_DIR}/
     cd ${FIP_DIR}
     ./build-fip.sh ${BOOT_FIP} u-boot.bin ${INSTALL}/usr/share/bootloader/
   ;;
@@ -36,7 +36,7 @@ setenv loadaddr "0x1B00000"
 setenv bootargs "boot=UUID=@BOOT_UUID@ disk=UUID=@DISK_UUID@ ${EXTRA_CMDLINE}"
 
 load mmc \${devno}:1 \${loadaddr} KERNEL
-load mmc \${devno}:1 \${dtb_loadaddr} ${DEVICE_DTB[0]}.dtb
+load mmc \${devno}:1 \${dtb_loadaddr} \${fdtfile}
 
 fdt addr \${dtb_loadaddr}
 

projects/Amlogic/packages/linux/patches/000-ogu-linux.patch

@@ -1226,7 +1226,7 @@ diff -rupN linux.orig/arch/arm64/boot/dts/amlogic/meson-g12b-powkiddy-rgb10-max-
 +#include <dt-bindings/sound/meson-g12a-tohdmitx.h>
 +
 +/ {
-+	compatible = "hardkernel,odroid-go-ultra", "amlogic,s922x", "amlogic,g12b";
++	compatible = "powkiddy,rgb10-max-3", "amlogic,s922x", "amlogic,g12b";
 +	model = "Powkiddy RGB10 MAX 3";
 +
 +	aliases {