From 5a2e6a2f63a63468dd13e8e1b5e7bd070ecac686 Mon Sep 17 00:00:00 2001 From: Igor Date: Fri, 18 Aug 2023 15:50:51 +0200 Subject: [PATCH] Add support for most recent memory chips on BPi M5 / M2PRO Signed-off-by: Igor --- config/boards/bananapim2pro.csc | 8 ++++++++ config/boards/bananapim5.conf | 8 ++++++++ config/sources/families/meson-sm1.conf | 6 ++++-- 3 files changed, 20 insertions(+), 2 deletions(-) diff --git a/config/boards/bananapim2pro.csc b/config/boards/bananapim2pro.csc index 48cab3dec2..911a0c3467 100644 --- a/config/boards/bananapim2pro.csc +++ b/config/boards/bananapim2pro.csc @@ -10,3 +10,11 @@ SERIALCON="ttyAML0" BOOT_LOGO="desktop" BOOTBRANCH_BOARD="tag:v2023.07.02" BOOTPATCHDIR="v2023.07.02" + +function fetch_sources_tools__libreelec_amlogic_fip_pre_m2-pro_blob_update() { + fetch_from_repo "https://github.com/Dangku/amlogic-boot-fip" "amlogic-boot-fip" "branch:master" +} + +function post_uboot_custom_postprocess__bpi-m2-pro() { + uboot_g12_postprocess "$SRC"/cache/sources/amlogic-boot-fip/bananapi-m2-pro g12a +} diff --git a/config/boards/bananapim5.conf b/config/boards/bananapim5.conf index 839e44357a..8a5a4ac151 100644 --- a/config/boards/bananapim5.conf +++ b/config/boards/bananapim5.conf @@ -11,6 +11,14 @@ BOOT_LOGO="desktop" BOOTBRANCH_BOARD="tag:v2023.07.02" BOOTPATCHDIR="v2023.07.02" +function fetch_sources_tools__libreelec_amlogic_fip_pre_m5_blob_update() { + fetch_from_repo "https://github.com/Dangku/amlogic-boot-fip" "amlogic-boot-fip" "branch:master" +} + +function post_uboot_custom_postprocess__bpi-m5() { + uboot_g12_postprocess "$SRC"/cache/sources/amlogic-boot-fip/bananapi-m5 g12a +} + function post_family_tweaks_bsp__bananapi_rtl_bt() { if [[ -d "$SRC/packages/bsp/bananapi/rtl_bt" ]]; then mkdir -p "${destination}"/lib/firmware/updates/rtl_bt diff --git a/config/sources/families/meson-sm1.conf b/config/sources/families/meson-sm1.conf index c5b2ece3fe..d59d9984e1 100644 --- a/config/sources/families/meson-sm1.conf +++ b/config/sources/families/meson-sm1.conf @@ -26,9 +26,11 @@ uboot_custom_postprocess() { # do nothing. VIM3L has its own post_uboot_custom_postprocess hook, directly in the board file. : elif [[ $BOARD == bananapim5 ]]; then - uboot_g12_postprocess $SRC/cache/sources/amlogic-boot-fip/bananapi-m5 g12a + # do nothing. Banana M5 has its own post_uboot_custom_postprocess hook, directly in the board file. + : elif [[ $BOARD == bananapim2pro ]]; then - uboot_g12_postprocess $SRC/cache/sources/amlogic-boot-fip/bananapi-m5 g12a # Attention: bananapim2pro uses the same blobs as bananapim5 + # do nothing. Banana M2Pro has its own post_uboot_custom_postprocess hook, directly in the board file. + : else display_alert "uboot_custom_postprocess meson-sm1" "Unknown BOARD: $BOARD - not using FIP trees" "wrn" fi