From f9ba44344aa6c9150322c3def3bbea21c26d0b5a Mon Sep 17 00:00:00 2001 From: Vaishnav Achath Date: Wed, 6 Jul 2022 18:41:07 +0000 Subject: [PATCH] configs: am6*_evm/j721e_evm: Fix earlycon uart MMIO address The earlycon UART address was unintentionally modifed to uart8 from uart0 by Commit be0386826c62 ("configs: am6*_evm/j721e_evm: prevent optargs from getting overwritten") this change caused boot to break in multiple platforms, only J7AEP is configured to have the earlycon on uart8. This commit reverts the earlycon MMIO address for AM62x, AM64x, AM65x and J721E to original expected value 0x02800000 (main_uart0), this fixes the broken boot for the above platforms. Fixes: be0386826c62 ("configs: am6*_evm/j721e_evm: prevent optargs from getting overwritten") Signed-off-by: Vaishnav Achath --- include/configs/am62x_evm.h | 2 +- include/configs/am64x_evm.h | 2 +- include/configs/am65x_evm.h | 2 +- include/configs/j721e_evm.h | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/include/configs/am62x_evm.h b/include/configs/am62x_evm.h index 40a12e26dd..406eba40e0 100644 --- a/include/configs/am62x_evm.h +++ b/include/configs/am62x_evm.h @@ -173,7 +173,7 @@ "name_kern=Image\0" \ "console=ttyS2,115200n8\0" \ "args_all=setenv optargs ${optargs} " \ - "earlycon=ns16550a,mmio32,0x02880000 ${mtdparts}\0" \ + "earlycon=ns16550a,mmio32,0x02800000 ${mtdparts}\0" \ "run_kern=booti ${loadaddr} ${rd_spec} ${fdtaddr}\0" /* U-Boot MMC-specific configuration */ diff --git a/include/configs/am64x_evm.h b/include/configs/am64x_evm.h index 1f4078c596..33ba5da31f 100644 --- a/include/configs/am64x_evm.h +++ b/include/configs/am64x_evm.h @@ -115,7 +115,7 @@ "name_kern=Image\0" \ "console=ttyS2,115200n8\0" \ "args_all=setenv optargs ${optargs} " \ - "earlycon=ns16550a,mmio32,0x02880000 ${mtdparts}\0" \ + "earlycon=ns16550a,mmio32,0x02800000 ${mtdparts}\0" \ "run_kern=booti ${loadaddr} ${rd_spec} ${fdtaddr}\0" /* U-Boot MMC-specific configuration */ diff --git a/include/configs/am65x_evm.h b/include/configs/am65x_evm.h index e454511208..c78e4c4493 100644 --- a/include/configs/am65x_evm.h +++ b/include/configs/am65x_evm.h @@ -70,7 +70,7 @@ "console=ttyS2,115200n8\0" \ "stdin=serial,usbkbd\0" \ "args_all=setenv optargs ${optargs} " \ - "earlycon=ns16550a,mmio32,0x02880000 ${mtdparts}\0" \ + "earlycon=ns16550a,mmio32,0x02800000 ${mtdparts}\0" \ "run_kern=booti ${loadaddr} ${rd_spec} ${fdtaddr}\0" \ /* U-Boot MMC-specific configuration */ diff --git a/include/configs/j721e_evm.h b/include/configs/j721e_evm.h index 145109da29..50b018b6ed 100644 --- a/include/configs/j721e_evm.h +++ b/include/configs/j721e_evm.h @@ -88,7 +88,7 @@ "name_kern=Image\0" \ "console=ttyS2,115200n8\0" \ "args_all=setenv optargs ${optargs} " \ - "earlycon=ns16550a,mmio32,0x02880000 ${mtdparts}\0" \ + "earlycon=ns16550a,mmio32,0x02800000 ${mtdparts}\0" \ "run_kern=booti ${loadaddr} ${rd_spec} ${fdtaddr}\0" #define PARTS_DEFAULT \