| Message ID | 1516356168-16697-2-git-send-email-faiz_abbas@ti.com |
|---|---|
| State | Accepted |
| Commit | ded509b44ced045cc949be9f474a660a93030cea |
| Delegated to: | Tom Rini |
| Headers | show |
| Series | Fix QSPI boot on am43xx_idk | expand |
On Fri, Jan 19, 2018 at 03:32:47PM +0530, Faiz Abbas wrote: > Since 7e0ed13 ("Convert ARCH_OMAP2PLUS boards' CONFIG_SYS_TEXT_BASE to > Kconfig"), a default SYS_TEXT_BASE was set for all ARCH_OMAP2PLUS devices. > CONFIG_ISW_ENTRY_ADDR is used to set SYS_TEXT_BASE in qspi boot. > > Simplify this by directly assigning SYS_TEXT_BASE in the defconfig. > > Signed-off-by: Faiz Abbas <faiz_abbas@ti.com> Applied to u-boot/master, thanks!
diff --git a/configs/am43xx_evm_qspiboot_defconfig b/configs/am43xx_evm_qspiboot_defconfig index d6a5263..0e6833e 100644 --- a/configs/am43xx_evm_qspiboot_defconfig +++ b/configs/am43xx_evm_qspiboot_defconfig @@ -2,7 +2,7 @@ CONFIG_ARM=y # CONFIG_SYS_THUMB_BUILD is not set CONFIG_ARCH_OMAP2PLUS=y CONFIG_AM43XX=y -CONFIG_ISW_ENTRY_ADDR=0x30000000 +CONFIG_SYS_TEXT_BASE=0x30000000 CONFIG_SYS_EXTRA_OPTIONS="SERIAL1,CONS_INDEX=1,QSPI,QSPI_BOOT" CONFIG_QSPI_BOOT=y CONFIG_SYS_CONSOLE_INFO_QUIET=y diff --git a/include/configs/am43xx_evm.h b/include/configs/am43xx_evm.h index 302181b..6e2cf7b 100644 --- a/include/configs/am43xx_evm.h +++ b/include/configs/am43xx_evm.h @@ -116,9 +116,6 @@ #endif #ifdef CONFIG_QSPI_BOOT -#ifndef CONFIG_SYS_TEXT_BASE -#define CONFIG_SYS_TEXT_BASE CONFIG_ISW_ENTRY_ADDR -#endif #define CONFIG_SYS_REDUNDAND_ENVIRONMENT #define CONFIG_ENV_SPI_MAX_HZ CONFIG_SF_DEFAULT_SPEED #define CONFIG_ENV_SECT_SIZE (64 << 10) /* 64 KB sectors */
Since 7e0ed13 ("Convert ARCH_OMAP2PLUS boards' CONFIG_SYS_TEXT_BASE to Kconfig"), a default SYS_TEXT_BASE was set for all ARCH_OMAP2PLUS devices. CONFIG_ISW_ENTRY_ADDR is used to set SYS_TEXT_BASE in qspi boot. Simplify this by directly assigning SYS_TEXT_BASE in the defconfig. Signed-off-by: Faiz Abbas <faiz_abbas@ti.com> --- configs/am43xx_evm_qspiboot_defconfig | 2 +- include/configs/am43xx_evm.h | 3 --- 2 files changed, 1 insertion(+), 4 deletions(-)