diff options
| author | Felipe Balbi <balbi@ti.com> | 2014-11-06 08:28:42 -0600 |
|---|---|---|
| committer | Tom Rini <trini@ti.com> | 2014-12-04 11:04:12 -0500 |
| commit | ba2e01c72be50b49e731ef3d06a0e5f55bb328b4 (patch) | |
| tree | 7ea12200f7363e8a8c9964b0e88a3944bfb2bea5 | |
| parent | f0c6e1c31b94f193047619b6adf67c2d792b659e (diff) | |
| download | u-boot-imx-ba2e01c72be50b49e731ef3d06a0e5f55bb328b4.zip u-boot-imx-ba2e01c72be50b49e731ef3d06a0e5f55bb328b4.tar.gz u-boot-imx-ba2e01c72be50b49e731ef3d06a0e5f55bb328b4.tar.bz2 | |
arm: omap5: don't enable misc_init_r by default
Out of all OMAP5-like boards, only one of them
needs CONFIG_MISC_INIT_R, so it's best to enable
that for that particular board only, instead of
enabling for all boards unconditionally.
Signed-off-by: Felipe Balbi <balbi@ti.com>
Reviewed-by: Tom Rini <trini@ti.com>
| -rw-r--r-- | board/ti/dra7xx/evm.c | 12 | ||||
| -rw-r--r-- | include/configs/cm_t54.h | 1 | ||||
| -rw-r--r-- | include/configs/omap5_uevm.h | 1 | ||||
| -rw-r--r-- | include/configs/ti_omap5_common.h | 1 |
4 files changed, 1 insertions, 14 deletions
diff --git a/board/ti/dra7xx/evm.c b/board/ti/dra7xx/evm.c index 37df7b2..6522241 100644 --- a/board/ti/dra7xx/evm.c +++ b/board/ti/dra7xx/evm.c @@ -96,18 +96,6 @@ int board_late_init(void) return 0; } -/** - * @brief misc_init_r - Configure EVM board specific configurations - * such as power configurations, ethernet initialization as phase2 of - * boot sequence - * - * @return 0 - */ -int misc_init_r(void) -{ - return 0; -} - static void do_set_mux32(u32 base, struct pad_conf_entry const *array, int size) { diff --git a/include/configs/cm_t54.h b/include/configs/cm_t54.h index 641ab48..92ce1e1 100644 --- a/include/configs/cm_t54.h +++ b/include/configs/cm_t54.h @@ -16,7 +16,6 @@ #include <configs/ti_omap5_common.h> -#undef CONFIG_MISC_INIT_R #undef CONFIG_SPL_OS_BOOT /* Enable Generic board */ diff --git a/include/configs/omap5_uevm.h b/include/configs/omap5_uevm.h index e8dc462..e07795f 100644 --- a/include/configs/omap5_uevm.h +++ b/include/configs/omap5_uevm.h @@ -23,6 +23,7 @@ #define CONFIG_SYS_NS16550_COM3 UART3_BASE #define CONFIG_BAUDRATE 115200 +#define CONFIG_MISC_INIT_R /* MMC ENV related defines */ #define CONFIG_ENV_IS_IN_MMC #define CONFIG_SYS_MMC_ENV_DEV 1 /* SLOT2: eMMC(1) */ diff --git a/include/configs/ti_omap5_common.h b/include/configs/ti_omap5_common.h index 3166392..5b03fb1 100644 --- a/include/configs/ti_omap5_common.h +++ b/include/configs/ti_omap5_common.h @@ -19,7 +19,6 @@ #define CONFIG_DISPLAY_CPUINFO #define CONFIG_DISPLAY_BOARDINFO -#define CONFIG_MISC_INIT_R #define CONFIG_ARCH_CPU_INIT #define CONFIG_SYS_CACHELINE_SIZE 64 |