From 7b5d606a9b13ede0c315899b5332f09edb01a64c Mon Sep 17 00:00:00 2001 From: Ricardo Pardini Date: Sun, 12 Feb 2023 00:46:58 +0100 Subject: [PATCH] split BOARD `bananapim2pro` from `bananapim5`, and force use of its new DTB; only for 6.2+, so edge only; use m5 FIP for m2pro --- config/boards/bananapim2pro.conf | 11 +++++++++++ config/boards/bananapim5.conf | 5 +++-- config/sources/families/meson-sm1.conf | 2 ++ 3 files changed, 16 insertions(+), 2 deletions(-) create mode 100644 config/boards/bananapim2pro.conf diff --git a/config/boards/bananapim2pro.conf b/config/boards/bananapim2pro.conf new file mode 100644 index 0000000000..725937bf24 --- /dev/null +++ b/config/boards/bananapim2pro.conf @@ -0,0 +1,11 @@ +# Amlogic S905X3 quad core 2-4GB RAM SoC eMMC GBE USB3 SPI Wifi +BOARD_NAME="Banana Pi M2Pro" +BOARDFAMILY="meson-sm1" +BOOTCONFIG="bananapi-m5_defconfig" # u-boot is still shared betwen m5 and m2pro +BOOT_FDT_FILE="amlogic/meson-sm1-bananapi-m2-pro.dtb" +KERNEL_TARGET="edge" # current does not carry the DTB yet; @TODO re-add when 6.2+ is current for meson64 +FULL_DESKTOP="yes" +SERIALCON="ttyAML0" +BOOT_LOGO="desktop" +BOOTBRANCH_BOARD="tag:v2022.10" +BOOTPATCHDIR="v2022.10" diff --git a/config/boards/bananapim5.conf b/config/boards/bananapim5.conf index f36a746ae2..61335ce94c 100644 --- a/config/boards/bananapim5.conf +++ b/config/boards/bananapim5.conf @@ -1,7 +1,8 @@ -# Amlogic S905X3 quad core 2-4GB RAM SoC eMMC GBE USB3 SPI (M2P has wifi) -BOARD_NAME="Banana Pi M5/M2P" +# Amlogic S905X3 quad core 2-4GB RAM SoC eMMC GBE USB3 SPI +BOARD_NAME="Banana Pi M5" BOARDFAMILY="meson-sm1" BOOTCONFIG="bananapi-m5_defconfig" +BOOT_FDT_FILE="amlogic/meson-sm1-bananapi-m5.dtb" KERNEL_TARGET="current,edge" FULL_DESKTOP="yes" SERIALCON="ttyAML0" diff --git a/config/sources/families/meson-sm1.conf b/config/sources/families/meson-sm1.conf index 589c739bd4..a8f9ebb9b3 100644 --- a/config/sources/families/meson-sm1.conf +++ b/config/sources/families/meson-sm1.conf @@ -18,6 +18,8 @@ uboot_custom_postprocess() { uboot_g12_postprocess $SRC/cache/sources/amlogic-boot-fip/khadas-vim3l g12a elif [[ $BOARD == bananapim5 ]]; then uboot_g12_postprocess $SRC/cache/sources/amlogic-boot-fip/bananapi-m5 g12a + elif [[ $BOARD == bananapim2pro ]]; then + uboot_g12_postprocess $SRC/cache/sources/amlogic-boot-fip/bananapi-m5 g12a # Attention: bananapim2pro uses the same blobs as bananapim5 else display_alert "uboot_custom_postprocess meson-sm1" "Unknown BOARD: $BOARD - not using FIP trees" "wrn" fi