wbrawner/distribution
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Update 3326 boot.ini, clean up install and mkimage a bit.

Browse source
This commit is contained in:
fewtarius 2023-11-06 11:49:14 +00:00
commit c41a1c27db
No known key found for this signature in database
GPG key ID: F4AE55305D1B8C1A
4 changed files with 23 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
projects/Rockchip/bootloader/install
View file

@ -85,18 +85,15 @@ fi
;;
esac
#Create boot.scr
if [ "${BOOT_INI}" == true ]
then
echo "image: create boot.scr..."
if [ -e "${PROJECT_DIR}/${PROJECT}/devices/${DEVICE}/boot/boot.scr" ]
echo "boot: create boot.ini..."
if [ -e "${PROJECT_DIR}/${PROJECT}/devices/${DEVICE}/boot/boot.ini" ]
then
cp ${PROJECT_DIR}/${PROJECT}/devices/${DEVICE}/boot/boot.scr ${INSTALL}/usr/share/bootloader/boot.scr
sed -i "s~@EXTRA_CMDLINE@~${EXTRA_CMDLINE}~g" ${INSTALL}/usr/share/bootloader/boot.scr
sed -i "s~@PKG_LOAD_ADDR@~${PKG_LOAD_ADDR}~g" ${INSTALL}/usr/share/bootloader/boot.scr
sed -i "s~@DTB_LOAD_ADDR@~${DTB_LOAD_ADDR}~g" ${INSTALL}/usr/share/bootloader/boot.scr
cp -f ${PROJECT_DIR}/${PROJECT}/devices/${DEVICE}/boot/boot.ini ${INSTALL}/usr/share/bootloader/boot.ini
sed -i "s~@EXTRA_CMDLINE@~${EXTRA_CMDLINE}~g" ${INSTALL}/usr/share/bootloader/boot.ini
else
echo "ERROR: No boot.scr found in ${PROJECT_DIR}/${PROJECT}/devices/${DEVICE}/boot/."
echo "ERROR: No boot.ini found in ${PROJECT_DIR}/${PROJECT}/devices/${DEVICE}/boot/."
exit 1
fi
fi

19
projects/Rockchip/bootloader/mkimage
View file

@ -49,19 +49,16 @@ esac
#Create boot.scr
if [ "${BOOT_INI}" == true ]
then
<<<<<<< HEAD
echo "image: create boot.scr..."
if [ -e "${PROJECT_DIR}/${PROJECT}/devices/${DEVICE}/boot/boot.scr" ]
echo "boot: create boot.ini..."
if [ -e "${PROJECT_DIR}/${PROJECT}/devices/${DEVICE}/boot/boot.ini" ]
then
cp ${PROJECT_DIR}/${PROJECT}/devices/${DEVICE}/boot/boot.scr ${LE_TMP}/boot.scr
sed -i "s~@BOOT_UUID@~${BOOT_UUID}~g" ${LE_TMP}/boot.scr
sed -i "s~@DISK_UUID@~${DISK_UUID}~g" ${LE_TMP}/boot.scr
sed -i "s~@EXTRA_CMDLINE@~${EXTRA_CMDLINE}~g" ${LE_TMP}/boot.scr
sed -i "s~@PKG_LOAD_ADDR@~${PKG_LOAD_ADDR}~g" ${LE_TMP}/boot.scr
sed -i "s~@DTB_LOAD_ADDR@~${DTB_LOAD_ADDR}~g" ${LE_TMP}/boot.scr
mcopy -so "${LE_TMP}/boot.scr" ::
cp -f ${PROJECT_DIR}/${PROJECT}/devices/${DEVICE}/boot/boot.ini ${LE_TMP}/boot.ini
sed -i "s~@UUID_SYSTEM@~${UUID_SYSTEM}~g" ${INSTALL}/usr/share/bootloader/boot.ini
sed -i "s~@UUID_STORAGE@~${UUID_STORAGE}~g" ${INSTALL}/usr/share/bootloader/boot.ini
sed -i "s~@EXTRA_CMDLINE@~${EXTRA_CMDLINE}~g" ${INSTALL}/usr/share/bootloader/boot.ini
mcopy -so "${LE_TMP}/boot.ini" ::
else
echo "ERROR: No boot.scr found in ${PROJECT_DIR}/${PROJECT}/devices/${DEVICE}/boot/."
echo "ERROR: No boot.ini found in ${PROJECT_DIR}/${PROJECT}/devices/${DEVICE}/boot/."
exit 1
fi
fi

13
projects/Rockchip/devices/RK3326/boot/boot.scr → projects/Rockchip/devices/RK3326/boot/boot.ini
View file

@ -1,15 +1,19 @@
odroidgoa-uboot-config
setenv bootargs "boot=UUID=@BOOT_UUID@ disk=UUID=@DISK_UUID@ @EXTRA_CMDLINE@"
setenv bootargs "boot=UUID=@UUID_SYSTEM@ disk=UUID=@UUID_STORAGE@ @EXTRA_CMDLINE@"
setenv loadaddr "@PKG_LOAD_ADDR@"
setenv dtb_loadaddr "@DTB_LOAD_ADDR@"
setenv loadaddr "0x02000000"
setenv dtb_loadaddr "0x01f00000"
load mmc 1:1 ${loadaddr} KERNEL
if test ${hwrev} = 'v11'; then
if gpio input c22; then
load mmc 1:1 ${dtb_loadaddr} rk3326-odroid-go2-v11.dtb
if gpio input d9; then
load mmc 1:1 ${dtb_loadaddr} rk3326-powkiddy-rgb10.dtb
else
load mmc 1:1 ${dtb_loadaddr} rk3326-odroid-go2-v11.dtb
fi
else
load mmc 1:1 ${dtb_loadaddr} rk3326-anbernic-rg351m.dtb
fi
@ -24,3 +28,4 @@ elif test ${hwrev} = 'rg351mp'; then
fi
booti ${loadaddr} - ${dtb_loadaddr}

2
projects/Rockchip/devices/RK3566/boot/boot.scr → projects/Rockchip/devices/RK3566/boot/boot.ini
View file

@ -1,4 +1,4 @@
setenv bootargs "boot=UUID=@BOOT_UUID@ disk=UUID=@DISK_UUID@ @EXTRA_CMDLINE@"
setenv bootargs "boot=UUID=@UUID_SYSTEM@ disk=UUID=@UUID_STORAGE@ @EXTRA_CMDLINE@"
setenv kernel_comp_addr_r 0x03000000
setenv kernel_comp_size 0x04000000
load mmc 1 ${fdt_addr_r} ${fdtfile}