From ded509b44ced045cc949be9f474a660a93030cea Mon Sep 17 00:00:00 2001 From: Faiz Abbas Date: Fri, 19 Jan 2018 15:32:47 +0530 Subject: [PATCH] configs: Replace CONFIG_ISW_ENTRY_ADDR with CONFIG_SYS_TEXT_BASE 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 --- configs/am43xx_evm_qspiboot_defconfig | 2 +- include/configs/am43xx_evm.h | 3 --- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/configs/am43xx_evm_qspiboot_defconfig b/configs/am43xx_evm_qspiboot_defconfig index a56abc929f..35a412ae3d 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 77f8e7689c..726dbba74d 100644 --- a/include/configs/am43xx_evm.h +++ b/include/configs/am43xx_evm.h @@ -115,9 +115,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 */ -- 2.39.5