From 7d8a375a0fd07d3e33be30104f1d82df38477d4d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Igor=20Pe=C4=8Dovnik?= Date: Tue, 2 Feb 2021 02:06:37 +0100 Subject: [PATCH] Bump meson64 u-boot to 2021.01 (#2601) Solves at least this problem https://forum.armbian.com/topic/16940-odroid-c2-does-not-boot-from-orange-64gb-emmc-module/ but needs to be tested on all affected boards --- .../families/include/meson64_common.inc | 2 +- .../le-potato-general-vendor.patch | 4 +- .../odroidc4_TFLASH_VDD_EN_pin.patch | 37 ------------------- 3 files changed, 3 insertions(+), 40 deletions(-) delete mode 100644 patch/u-boot/u-boot-meson64/odroidc4_TFLASH_VDD_EN_pin.patch diff --git a/config/sources/families/include/meson64_common.inc b/config/sources/families/include/meson64_common.inc index 4487bce236..164dc6b8fa 100644 --- a/config/sources/families/include/meson64_common.inc +++ b/config/sources/families/include/meson64_common.inc @@ -5,7 +5,7 @@ LINUXFAMILY=meson64 ARCH=arm64 SERIALCON=ttyAML0 SRC_LOADADDR='LOADADDR=0x1080000' -BOOTBRANCH="tag:v2020.10" +BOOTBRANCH="tag:v2021.01" OVERLAY_PREFIX='meson' # this family does not need it diff --git a/patch/u-boot/u-boot-meson64/le-potato-general-vendor.patch b/patch/u-boot/u-boot-meson64/le-potato-general-vendor.patch index fc9bb3cdb6..6b3876b46d 100644 --- a/patch/u-boot/u-boot-meson64/le-potato-general-vendor.patch +++ b/patch/u-boot/u-boot-meson64/le-potato-general-vendor.patch @@ -37,7 +37,7 @@ index a23252ef..c92b67a6 100644 @@ -54,16 +54,18 @@ compatible = "gpio-leds"; - system { + led-system { - label = "librecomputer:system-status"; + label = "librecomputer:green:disk"; gpios = <&gpio GPIODV_24 GPIO_ACTIVE_HIGH>; @@ -46,7 +46,7 @@ index a23252ef..c92b67a6 100644 panic-indicator; }; - blue { + led-blue { - label = "librecomputer:blue"; + label = "librecomputer:blue:cpu"; gpios = <&gpio_ao GPIOAO_2 GPIO_ACTIVE_HIGH>; diff --git a/patch/u-boot/u-boot-meson64/odroidc4_TFLASH_VDD_EN_pin.patch b/patch/u-boot/u-boot-meson64/odroidc4_TFLASH_VDD_EN_pin.patch deleted file mode 100644 index ba462509ba..0000000000 --- a/patch/u-boot/u-boot-meson64/odroidc4_TFLASH_VDD_EN_pin.patch +++ /dev/null @@ -1,37 +0,0 @@ -From 21a1bc6a900c33efe4da4cc1b33efcfa543fd9d0 Mon Sep 17 00:00:00 2001 -From: Marek Szyprowski -Date: Fri, 18 Dec 2020 11:43:45 +0100 -Subject: [PATCH] ARM: dts: meson: switch TFLASH_VDD_EN pin to open drain on - Odroid-C4 - -For the proper reboot Odroid-C4 board requires to switch TFLASH_VDD_EN -pin to the high impedance mode, otherwise the board is stuck in the -middle of loading early stages of the bootloader from SD card. - -This can be achieved by using the OPEN_DRAIN flag instead if the -ACTIVE_HIGH, what will leave the pin in input to achieve high state (pin -has the pull-up) and solve the issue. - -Suggested-by: Neil Armstrong -Signed-off-by: Marek Szyprowski -Acked-by: Neil Armstrong -Signed-off-by: Neil Armstrong ---- - arch/arm/dts/meson-sm1-odroid-c4-u-boot.dtsi | 4 ++++ - 1 file changed, 4 insertions(+) - -diff --git a/arch/arm/dts/meson-sm1-odroid-c4-u-boot.dtsi b/arch/arm/dts/meson-sm1-odroid-c4-u-boot.dtsi -index c431988075..fbcc8287c5 100644 ---- a/arch/arm/dts/meson-sm1-odroid-c4-u-boot.dtsi -+++ b/arch/arm/dts/meson-sm1-odroid-c4-u-boot.dtsi -@@ -11,3 +11,7 @@ - snps,reset-delays-us = <0 10000 1000000>; - snps,reset-active-low; - }; -+ -+&tflash_vdd { -+ gpio = <&gpio_ao GPIOAO_3 GPIO_OPEN_DRAIN>; -+}; --- -GitLab -