diff --git a/config/boards/bananapim5.conf b/config/boards/bananapim5.conf index 34327a8a10..f36a746ae2 100644 --- a/config/boards/bananapim5.conf +++ b/config/boards/bananapim5.conf @@ -6,5 +6,5 @@ KERNEL_TARGET="current,edge" FULL_DESKTOP="yes" SERIALCON="ttyAML0" BOOT_LOGO="desktop" -BOOTBRANCH_BOARD="tag:v2022.04" -BOOTPATCHDIR="v2022.07" +BOOTBRANCH_BOARD="tag:v2022.10" +BOOTPATCHDIR="v2022.10" diff --git a/patch/u-boot/v2022.10/board_bananapim5/bananapi-m5-fix-wrong-GPIO-pin-labeling-for-CON1.patch b/patch/u-boot/v2022.10/board_bananapim5/bananapi-m5-fix-wrong-GPIO-pin-labeling-for-CON1.patch new file mode 100644 index 0000000000..94466821bf --- /dev/null +++ b/patch/u-boot/v2022.10/board_bananapim5/bananapi-m5-fix-wrong-GPIO-pin-labeling-for-CON1.patch @@ -0,0 +1,12 @@ +diff --git a/arch/arm/dts/meson-sm1-bananapi-m5.dts b/arch/arm/dts/meson-sm1-bananapi-m5.dts +index 5751c48620ed..cadba194b149 100644 +--- a/arch/arm/dts/meson-sm1-bananapi-m5.dts ++++ b/arch/arm/dts/meson-sm1-bananapi-m5.dts +@@ -437,6 +437,7 @@ &gpio { + "", + "eMMC_RST#", /* BOOT_12 */ + "eMMC_DS", /* BOOT_13 */ ++ "", "", + /* GPIOC */ + "SD_D0_B", /* GPIOC_0 */ + "SD_D1_B", /* GPIOC_1 */ diff --git a/patch/u-boot/v2022.10/board_bananapim5/u-boot-meson64-current.patch b/patch/u-boot/v2022.10/board_bananapim5/u-boot-meson64-current.patch new file mode 100644 index 0000000000..837135c162 --- /dev/null +++ b/patch/u-boot/v2022.10/board_bananapim5/u-boot-meson64-current.patch @@ -0,0 +1,23 @@ +From 1582929df286ae9f08c741d3f101b07062974448 Mon Sep 17 00:00:00 2001 +From: Igor Pecovnik +Date: Fri, 30 Sep 2022 18:22:30 +0200 +Subject: [PATCH] Change boot breaking method + +Signed-off-by: Igor Pecovnik +--- + configs/bananapi-m5_defconfig | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/configs/bananapi-m5_defconfig b/configs/bananapi-m5_defconfig +index 6ab2d8ef0..a328a1c51 100644 +--- a/configs/bananapi-m5_defconfig ++++ b/configs/bananapi-m5_defconfig +@@ -74,3 +74,5 @@ CONFIG_BMP_16BPP=y + CONFIG_BMP_24BPP=y + CONFIG_BMP_32BPP=y + CONFIG_OF_LIBFDT_OVERLAY=y ++CONFIG_AUTOBOOT_KEYED=y ++CONFIG_AUTOBOOT_KEYED_CTRLC=y +-- +Created with Armbian build tools https://github.com/armbian/build +