Not all Rockchip boards have their console running at 1500000 baud in U-Boot and the kernel. Such is the case for puma-haikou RK3399-based SoM+Carrierboard.
In order to prepare for the addition of puma-haikou to meta-rockchip, let's replace the baudrate in TF-A by the one defined in the machine conf file in the RK_CONSOLE_BAUD variable. Cc: Quentin Schulz <[email protected]> Signed-off-by: Quentin Schulz <[email protected]> --- v2: use a less restrictive regular expression .../files/serial-console-baudrate.patch | 36 ------------------- .../trusted-firmware-a_%.bbappend | 6 +++- 2 files changed, 5 insertions(+), 37 deletions(-) delete mode 100644 recipes-bsp/trusted-firmware-a/files/serial-console-baudrate.patch diff --git a/recipes-bsp/trusted-firmware-a/files/serial-console-baudrate.patch b/recipes-bsp/trusted-firmware-a/files/serial-console-baudrate.patch deleted file mode 100644 index 2d6e9bf..0000000 --- a/recipes-bsp/trusted-firmware-a/files/serial-console-baudrate.patch +++ /dev/null @@ -1,36 +0,0 @@ -From 840d6b6420e1fd8cdf6e4de7fa58a6f8de151622 Mon Sep 17 00:00:00 2001 -From: Yann Dirson <[email protected]> -Date: Tue, 6 Apr 2021 17:28:45 +0200 -Subject: [PATCH] Set serial console baudrate back to 1500000. -Upstream-Status: Inappropriate[other] - -TF-A runs between two u-boot stages which both uses 1500000 baud, it -just makes no sense to use the same UART at a different rate. - -This effectively reverts part of 0c05748bdebfad9fa43a80962186438bb8fbce62. -Main reason for that change stated in https://developer.trustedfirmware.org/T762 -is ChromeOS compatibility. - -Looks like this patch may become unnecessary in the future, when -u-boot and TF-A get to communicate this value. - ---- - plat/rockchip/rk3399/rk3399_def.h | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/plat/rockchip/rk3399/rk3399_def.h b/plat/rockchip/rk3399/rk3399_def.h -index ba83242eb..8d6ecfbe6 100644 ---- a/plat/rockchip/rk3399/rk3399_def.h -+++ b/plat/rockchip/rk3399/rk3399_def.h -@@ -17,7 +17,7 @@ - /************************************************************************** - * UART related constants - **************************************************************************/ --#define RK3399_BAUDRATE 115200 -+#define RK3399_BAUDRATE 1500000 - #define RK3399_UART_CLOCK 24000000 - - /****************************************************************************** --- -2.30.2 - diff --git a/recipes-bsp/trusted-firmware-a/trusted-firmware-a_%.bbappend b/recipes-bsp/trusted-firmware-a/trusted-firmware-a_%.bbappend index 513cea1..07fae1e 100644 --- a/recipes-bsp/trusted-firmware-a/trusted-firmware-a_%.bbappend +++ b/recipes-bsp/trusted-firmware-a/trusted-firmware-a_%.bbappend @@ -7,7 +7,6 @@ COMPATIBLE_MACHINE:append:rk3328 = "|rk3328" FILESEXTRAPATHS:prepend := "${THISDIR}/files:" SRC_URI += "\ - file://serial-console-baudrate.patch \ file://0001-dram-Fix-build-with-gcc-11.patch \ file://0001-plat_macros.S-Use-compatible-.asciz-asm-directive.patch \ file://0001-pmu-Do-not-mark-already-defined-functions-as-weak.patch \ @@ -19,3 +18,8 @@ SRC_URI += "\ # this needs fixing until then use gcc TOOLCHAIN:rk3399 = "gcc" +fixup_rk3399_baudrate() { + sed -i "s/#define RK3399_BAUDRATE\s\+.*/#define RK3399_BAUDRATE ${RK_CONSOLE_BAUD}/" ${S}/plat/rockchip/rk3399/rk3399_def.h +} + +do_patch[postfuncs] += "fixup_rk3399_baudrate" -- 2.33.1
-=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#55577): https://lists.yoctoproject.org/g/yocto/message/55577 Mute This Topic: https://lists.yoctoproject.org/mt/87719028/21656 Group Owner: [email protected] Unsubscribe: https://lists.yoctoproject.org/g/yocto/unsub [[email protected]] -=-=-=-=-=-=-=-=-=-=-=-
