| Message ID | 1487857181-8938-2-git-send-email-uri.mashiach@compulab.co.il |
|---|---|
| State | Accepted |
| Delegated to: | Tom Rini |
| Headers | show |
On Thu, Feb 23, 2017 at 03:39:35PM +0200, Uri Mashiach wrote: > The symbol CONFIG_DRA7XX is needed for Kconfig conditions. > > Cc: Lokesh Vutla <lokeshvutla@ti.com> > Signed-off-by: Uri Mashiach <uri.mashiach@compulab.co.il> Reviewed-by: Tom Rini <trini@konsulko.com>
On Thu, Feb 23, 2017 at 03:39:35PM +0200, Uri Mashiach wrote: > The symbol CONFIG_DRA7XX is needed for Kconfig conditions. > > Cc: Lokesh Vutla <lokeshvutla@ti.com> > Signed-off-by: Uri Mashiach <uri.mashiach@compulab.co.il> > Reviewed-by: Tom Rini <trini@konsulko.com> Applied to u-boot/master, thanks!
diff --git a/arch/arm/mach-omap2/omap5/Kconfig b/arch/arm/mach-omap2/omap5/Kconfig index c5edc7c..179e2b7 100644 --- a/arch/arm/mach-omap2/omap5/Kconfig +++ b/arch/arm/mach-omap2/omap5/Kconfig @@ -36,12 +36,18 @@ config SPL_SERIAL_SUPPORT config SPL_DISPLAY_PRINT default y +config DRA7XX + bool + help + DRA7xx is an OMAP based SOC with Dual Core A-15s. + choice prompt "OMAP5 board select" optional config TARGET_CL_SOM_AM57X bool "CompuLab CL-SOM-AM57x" + select DRA7XX config TARGET_CM_T54 bool "CompuLab CM-T54" @@ -54,11 +60,13 @@ config TARGET_DRA7XX_EVM select BOARD_LATE_INIT select TI_I2C_BOARD_DETECT select PHYS_64BIT + select DRA7XX config TARGET_AM57XX_EVM bool "AM57XX" select BOARD_LATE_INIT select TI_I2C_BOARD_DETECT + select DRA7XX endchoice diff --git a/include/configs/am57xx_evm.h b/include/configs/am57xx_evm.h index 3d8b996..42cd434 100644 --- a/include/configs/am57xx_evm.h +++ b/include/configs/am57xx_evm.h @@ -14,8 +14,6 @@ #include <environment/ti/dfu.h> -#define CONFIG_DRA7XX - #ifdef CONFIG_SPL_BUILD #define CONFIG_IODELAY_RECALIBRATION #endif diff --git a/include/configs/cl-som-am57x.h b/include/configs/cl-som-am57x.h index e1f724b..c5f39ff 100644 --- a/include/configs/cl-som-am57x.h +++ b/include/configs/cl-som-am57x.h @@ -11,8 +11,6 @@ #ifndef __CONFIG_CL_SOM_AM57X_H #define __CONFIG_CL_SOM_AM57X_H -#define CONFIG_DRA7XX - #define CONFIG_NR_DRAM_BANKS 2 #define CONSOLEDEV "ttyO2" diff --git a/include/configs/dra7xx_evm.h b/include/configs/dra7xx_evm.h index 549439e..beba851 100644 --- a/include/configs/dra7xx_evm.h +++ b/include/configs/dra7xx_evm.h @@ -14,8 +14,6 @@ #include <environment/ti/dfu.h> -#define CONFIG_DRA7XX - #ifdef CONFIG_SPL_BUILD #define CONFIG_IODELAY_RECALIBRATION #endif diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt index f6c9101..bbcdc41 100644 --- a/scripts/config_whitelist.txt +++ b/scripts/config_whitelist.txt @@ -805,7 +805,6 @@ CONFIG_DNP5370_EXT_WD_DISABLE CONFIG_DP_DDR_CTRL CONFIG_DP_DDR_DIMM_SLOTS_PER_CTLR CONFIG_DP_DDR_NUM_CTRLS -CONFIG_DRA7XX CONFIG_DRAM_2G CONFIG_DRAM_TIMINGS_ CONFIG_DRIVER_AT91EMAC
The symbol CONFIG_DRA7XX is needed for Kconfig conditions. Cc: Lokesh Vutla <lokeshvutla@ti.com> Signed-off-by: Uri Mashiach <uri.mashiach@compulab.co.il> --- V2 -> V3: new commit V3 -> V4: move the DRA7XX symbol introduction to arch/arm/mach-omap2/omap5/Kconfig arch/arm/mach-omap2/omap5/Kconfig | 8 ++++++++ include/configs/am57xx_evm.h | 2 -- include/configs/cl-som-am57x.h | 2 -- include/configs/dra7xx_evm.h | 2 -- scripts/config_whitelist.txt | 1 - 5 files changed, 8 insertions(+), 7 deletions(-)