Skip to content

Commit

Permalink
Remove mislabeled kernel configs, they break scripts. Fix RK3326 u-boot.
Browse files Browse the repository at this point in the history
  • Loading branch information
fewtarius committed Mar 12, 2024
1 parent ea8d392 commit d2af132
Show file tree
Hide file tree
Showing 10 changed files with 14 additions and 18,435 deletions.
2 changes: 1 addition & 1 deletion documentation/PER_DEVICE_DOCUMENTATION/RK3326/SUPPORTED_EMULATORS_AND_CORES.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,7 @@ This document describes all available systems emulators and cores available for
|Sega|Dreamcast (dreamcast)|1998|`dreamcast`|.cdi .gdi .chd .m3u .cue|**retroarch:** flycast2021<br>**flycast:** flycast-sa<br>**retroarch:** flycast (default)<br>|
|Sega|Game Gear (gamegear)|1990|`gamegear`|.bin .gg .zip .7z|**retroarch:** gearsystem (default)<br>**retroarch:** genesis_plus_gx<br>**retroarch:** picodrive<br>**retroarch:** smsplus<br>**mednafen:** gg<br>|
|Sega|Game Gear (Hacks) (ggh)|1990|`gamegearh`|.bin .gg .zip .7z|**retroarch:** gearsystem (default)<br>**retroarch:** genesis_plus_gx<br>**retroarch:** picodrive<br>**retroarch:** smsplus<br>**mednafen:** gg<br>|
|Sega|Genesis (genesis)|1989|`genesis`|.bin .gen .md .sg .smd .zip .7z|**retroarch:** genesis_plus_gx (default)<br>**retroarch:** genesis_plus_gx_wide<br>**retroarch:** picodrive<br>|
|Sega|Genesis (genesis)|1989|`genesis`|.bin .gen .md .sg .smd .zip .7z|**retroarch:** genesis_plus_gx (default)<br>**retroarch:** genesis_plus_gx_wide<br>**retroarch:** picodrive<br>**mednafen:** md<br>|
|Sega|Genesis (Hacks) (genh)|1989|`genh`|.bin .gen .md .sg .smd .zip .7z|**retroarch:** genesis_plus_gx (default)<br>**retroarch:** genesis_plus_gx_wide<br>**retroarch:** picodrive<br>**mednafen:** md<br>|
|Sega|Master System (mastersystem)|1985|`mastersystem`|.bin .sms .zip .7z|**retroarch:** gearsystem (default)<br>**retroarch:** genesis_plus_gx<br>**retroarch:** picodrive<br>**retroarch:** smsplus<br>**mednafen:** sms<br>|
|Sega|Mega CD (megacd)|1991|`megacd`|.chd .cue .iso .m3u|**retroarch:** genesis_plus_gx (default)<br>**retroarch:** picodrive<br>|
Expand Down
2 changes: 1 addition & 1 deletion documentation/PER_DEVICE_DOCUMENTATION/RK3588/SUPPORTED_EMULATORS_AND_CORES.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,7 @@ This document describes all available systems emulators and cores available for
|Sega|Mega Drive (megadrive)|1990|`megadrive`|.bin .gen .md .sg .smd .zip .7z|**retroarch:** genesis_plus_gx (default)<br>**retroarch:** genesis_plus_gx_wide<br>**retroarch:** picodrive<br>**mednafen:** md<br>|
|Sega|Mega Drive (megadrive-japan)|1988|`megadrive-japan`|.bin .gen .md .sg .smd .zip .7z|**retroarch:** genesis_plus_gx (default)<br>**retroarch:** genesis_plus_gx_wide<br>**retroarch:** picodrive<br>**mednafen:** md<br>|
|Sega|Naomi (naomi)|1998|`naomi`|.lst .bin .dat .zip .7z|**retroarch:** flycast2021<br>**retroarch:** flycast<br>**flycast:** flycast-sa<br>|
|Sega|Saturn (saturn)|1994|`saturn`|.cue .chd .iso|**yabasanshiro:** yabasanshiro-sa (default)<br>**retroarch:** yabasanshiro<br>**retroarch:** beetle_saturn<br>**mednafen:** ss<br>|
|Sega|Saturn (saturn)|1994|`saturn`|.cue .chd .iso|**yabasanshiro:** yabasanshiro-sa (default)<br>**retroarch:** yabasanshiro<br>**retroarch:** beetle_saturn<br>|
|Sega|Sega 32X (sega32x)|1994|`sega32x`|.32x .smd .bin .md .zip .7z|**retroarch:** picodrive (default)<br>|
|Sega|Sega CD (segacd)|1991|`segacd`|.chd .cue .iso .m3u|**retroarch:** genesis_plus_gx (default)<br>**retroarch:** picodrive<br>|
|Sega|SG-1000 (sg-1000)|1983|`sg-1000`|.bin .sg .zip .7z|**retroarch:** gearsystem (default)<br>**retroarch:** genesis_plus_gx<br>**retroarch:** picodrive<br>|
Expand Down
12 changes: 6 additions & 6 deletions projects/Rockchip/bootloader/install
View file
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ fi

case "${PKG_SOC}" in
rk35*)
for BOOT_IMAGE in u-boot.itb u-boot.img uboot.img
for BOOT_IMAGE in u-boot.itb u-boot.img u-boot.img
do
if [ -f "${BOOT_IMAGE}" ]; then
echo "uboot: copy ${BOOT_IMAGE} image to ${INSTALL}/usr/share/bootloader..."
Expand All @@ -70,19 +70,19 @@ case "${PKG_SOC}" in
rk3399)
PKG_ATF_INI="${PKG_RKBIN}"/RKTRUST/"${DEVICE}"TRUST.ini
echo "uboot: building ${UBOOT_FIT_IMAGE}..."
${PKG_RKBIN}/tools/loaderimage --pack --uboot u-boot-dtb.bin uboot.img.rk "${PKG_LOAD_ADDR}" || exit 1
${PKG_RKBIN}/tools/loaderimage --pack --uboot u-boot-dtb.bin u-boot.img.rk "${PKG_LOAD_ADDR}" || exit 1
dd if=idbloader.img.rk of="${UBOOT_FIT_IMAGE}" seek=0 conv=fsync,notrunc > /dev/null 2>&1 || exit 1
dd if=uboot.img.rk of="${UBOOT_FIT_IMAGE}" seek=16320 conv=fsync,notrunc > /dev/null 2>&1 || exit 1
dd if=u-boot.img.rk of="${UBOOT_FIT_IMAGE}" seek=16320 conv=fsync,notrunc > /dev/null 2>&1 || exit 1
"${PKG_RKBIN}"/tools/trust_merger --ignore-bl32 --prepath "${PKG_RKBIN}"/ "${PKG_ATF_INI}" || exit 1
dd if=trust.img of="${UBOOT_FIT_IMAGE}" seek=24512 conv=fsync,notrunc > /dev/null 2>&1 || exit 1

echo "uboot: copy ${UBOOT_FIT_IMAGE} to ${INSTALL}/usr/share/bootloader..."
cp -av ${UBOOT_FIT_IMAGE} ${INSTALL}/usr/share/bootloader
;;
*)
echo "uboot: build loader image uboot.img at ${PKG_LOAD_ADDR}..."
${PKG_UBOOT}/tools/loaderimage --pack --uboot u-boot-dtb.bin uboot.img ${PKG_LOAD_ADDR} ||:
cp -av uboot.img ${INSTALL}/usr/share/bootloader
echo "uboot: build loader image u-boot.img at ${PKG_LOAD_ADDR}..."
${PKG_UBOOT}/tools/loaderimage --pack --uboot u-boot-dtb.bin u-boot.img ${PKG_LOAD_ADDR} ||:
cp -av u-boot.img ${INSTALL}/usr/share/bootloader
;;
esac

Expand Down
5 changes: 3 additions & 2 deletions projects/Rockchip/bootloader/mkimage
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ fi

case "${PKG_SOC}" in
rk35*)
for BOOT_IMAGE in u-boot.itb u-boot.img uboot.img
for BOOT_IMAGE in u-boot.itb u-boot.img
do
if [ -f "${RELEASE_DIR}/3rdparty/bootloader/${BOOT_IMAGE}" ]; then
echo "image: burn ${BOOT_IMAGE} to image..."
Expand All @@ -45,9 +45,10 @@ case "${PKG_SOC}" in
fi
;;
*)
for BOOT_IMAGE in u-boot.itb u-boot.img uboot.img
for BOOT_IMAGE in u-boot.itb u-boot.img
do
if [ -f "${RELEASE_DIR}/3rdparty/bootloader/${BOOT_IMAGE}" ]; then
echo "image: burn ${BOOT_IMAGE} to image..."
dd if="${RELEASE_DIR}/3rdparty/bootloader/${BOOT_IMAGE}" of="${DISK}" bs=512 seek=16384 conv=sync,noerror,notrunc >"${SAVE_ERROR}" 2>&1 || show_error
break
fi
Expand Down
4 changes: 2 additions & 2 deletions projects/Rockchip/bootloader/release
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ if [ -n "${UBOOT_CONFIG}" ]; then
fi
case "${PKG_SOC}" in
rk35*)
for BOOT_IMAGE in u-boot.itb u-boot.img uboot.img
for BOOT_IMAGE in u-boot.itb u-boot.img
do
if [ -f "${BOOTLOADER_DIR}/${BOOT_IMAGE}" ]; then
cp -a ${BOOTLOADER_DIR}/${BOOT_IMAGE} ${RELEASE_DIR}/3rdparty/bootloader
Expand All @@ -28,7 +28,7 @@ if [ -n "${UBOOT_CONFIG}" ]; then
fi
;;
*)
for BOOT_IMAGE in u-boot.itb u-boot.img uboot.img
for BOOT_IMAGE in u-boot.itb u-boot.img
do
if [ -f "${BOOTLOADER_DIR}/${BOOT_IMAGE}" ]; then
cp -a ${BOOTLOADER_DIR}/${BOOT_IMAGE} ${RELEASE_DIR}/3rdparty/bootloader
Expand Down
2 changes: 1 addition & 1 deletion projects/Rockchip/bootloader/update.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -144,7 +144,7 @@ if [ -f $SYSTEM_ROOT/usr/share/bootloader/idbloader.img ]; then
echo "done"
fi

for BOOT_IMAGE in u-boot.itb u-boot.img uboot.img rk3399-uboot.bin
for BOOT_IMAGE in u-boot.itb u-boot.img rk3399-uboot.bin
do
if [ -f "$SYSTEM_ROOT/usr/share/bootloader/${BOOT_IMAGE}" ]; then
echo "Updating ${BOOT_IMAGE}..."
Expand Down
Loading

0 comments on commit d2af132

Please sign in to comment.