tools: kwboot: Correctly set configuration of UART for BootROM messages

For kwbimage v1, tell BootROM to send BootROM messages to UART port number
0 (used also for UART booting) with default baudrate (which should be
115200) and do not touch UART MPP configuration.

Signed-off-by: Pali Rohár <pali@kernel.org>
Reviewed-by: Marek Behún <marek.behun@nic.cz>
Reviewed-by: Stefan Roese <sr@denx.de>

diff --git a/tools/kwboot.c b/tools/kwboot.c
index 1131c2eb1c46d37b28b7ce9f1c00556cc54e6a72..62288382289f27b82ade33d22c1f189809a9a721 100644 (file)
--- a/tools/kwboot.c
+++ b/tools/kwboot.c
@@ -1507,6 +1507,17 @@ kwboot_img_patch(void *img, size_t *size, int baudrate)
        }
 
        if (!is_secure) {
+               if (image_ver == 1) {
+                       /*
+                        * Tell BootROM to send BootROM messages to UART port
+                        * number 0 (used also for UART booting) with default
+                        * baudrate (which should be 115200) and do not touch
+                        * UART MPP configuration.
+                        */
+                       hdr->options &= ~0x1F;
+                       hdr->options |= MAIN_HDR_V1_OPT_BAUD_DEFAULT;
+                       hdr->options |= 0 << 3;
+               }
                if (image_ver == 0)
                        ((struct main_hdr_v0 *)img)->nandeccmode = IBR_HDR_ECC_DISABLED;
                hdr->nandpagesize = 0;