JDM170/build
1
0
Fork 0
mirror of https://github.com/armbian/build synced 2025-09-24 19:47:06 +07:00
Code Issues Packages Projects Releases Wiki Activity

ODROID C4, HC4: fix u-boot map and FIP trees handling (#3068)

Browse Source 
- We really want the u-boot.bin.sd.bin for HC4
- During VIM3L-adding commit, "odroid*c4" was replaced with "odroid-c4" and "odroid-hc4"
  - Which is cool but it's actually "odroidc4" and "odroidhc4"
  - Add a warning to save future time if no FIP tree decided by SM1 family

Signed-off-by: Ricardo Pardini <ricardo@pardini.net>
This commit is contained in:
Ricardo Pardini
2021-07-28 14:12:53 +02:00
committed by GitHub
parent 9beffe4b86
commit 5005806f6e
2 changed files with 8 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
config/sources/families/include/meson64_common.inc
View File

@@ -11,8 +11,8 @@ OVERLAY_PREFIX='meson'
# this family does not need it # this family does not need it
ATF_COMPILE="no" ATF_COMPILE="no"
if [[ $BOARD == lafrite || $BOARD == odroid*c4 ]]; then if [[ $BOARD == lafrite ]]; then
UBOOT_TARGET_MAP="u-boot-dtb.img;;u-boot.bin:u-boot.bin u-boot-dtb.img" UBOOT_TARGET_MAP="u-boot-dtb.img;;u-boot.bin:u-boot.bin u-boot-dtb.img"
fi fi
# Set CPUMIN et al if not already set in the board config. # Set CPUMIN et al if not already set in the board config.

13
config/sources/families/meson-sm1.conf
View File

@@ -11,16 +11,15 @@ family_tweaks()
: :
} }
uboot_custom_postprocess() uboot_custom_postprocess() {
{
# FIP trees for C4 and HC4 are identical as of 30/06/2021 # FIP trees for C4 and HC4 are identical as of 30/06/2021
if [[ $BOARD == odroid-c4 ]]; then if [[ $BOARD == odroidc4 ]]; then
uboot_g12_postprocess $SRC/cache/sources/amlogic-boot-fip/odroid-c4 g12a uboot_g12_postprocess $SRC/cache/sources/amlogic-boot-fip/odroid-c4 g12a
fi elif [[ $BOARD == odroidhc4 ]]; then
if [[ $BOARD == odroid-hc4 ]]; then
uboot_g12_postprocess $SRC/cache/sources/amlogic-boot-fip/odroid-hc4 g12a uboot_g12_postprocess $SRC/cache/sources/amlogic-boot-fip/odroid-hc4 g12a
fi elif [[ $BOARD == khadas-vim3l ]]; then
if [[ $BOARD == khadas-vim3l ]]; then
uboot_g12_postprocess $SRC/cache/sources/amlogic-boot-fip/khadas-vim3l g12a uboot_g12_postprocess $SRC/cache/sources/amlogic-boot-fip/khadas-vim3l g12a
else
display_alert "uboot_custom_postprocess meson-sm1" "Unknown BOARD: $BOARD - not using FIP trees" "wrn"
fi fi
} }