diff options
Diffstat (limited to 'board')
-rw-r--r-- | board/BuR/common/common.c | 2 | ||||
-rw-r--r-- | board/amazon/kc1/kc1.c | 2 | ||||
-rw-r--r-- | board/compulab/cm_t35/cm_t35.c | 2 | ||||
-rw-r--r-- | board/compulab/cm_t3517/cm_t3517.c | 2 | ||||
-rw-r--r-- | board/compulab/cm_t54/cm_t54.c | 2 | ||||
-rw-r--r-- | board/corscience/tricorder/tricorder.c | 2 | ||||
-rw-r--r-- | board/gumstix/duovero/duovero.c | 4 | ||||
-rw-r--r-- | board/htkw/mcx/mcx.c | 2 | ||||
-rw-r--r-- | board/isee/igep00x0/igep00x0.c | 2 | ||||
-rw-r--r-- | board/lg/sniper/sniper.c | 2 | ||||
-rw-r--r-- | board/logicpd/am3517evm/am3517evm.c | 2 | ||||
-rw-r--r-- | board/logicpd/omap3som/omap3logic.c | 2 | ||||
-rw-r--r-- | board/quipos/cairo/cairo.c | 2 | ||||
-rw-r--r-- | board/technexion/tao3530/tao3530.c | 2 | ||||
-rw-r--r-- | board/ti/am3517crane/am3517crane.c | 2 | ||||
-rw-r--r-- | board/ti/am57xx/board.c | 2 | ||||
-rw-r--r-- | board/ti/beagle/beagle.c | 2 | ||||
-rw-r--r-- | board/ti/dra7xx/evm.c | 2 | ||||
-rw-r--r-- | board/ti/evm/evm.c | 2 | ||||
-rw-r--r-- | board/ti/ks2_evm/board_k2g.c | 2 | ||||
-rw-r--r-- | board/ti/omap5_uevm/evm.c | 2 | ||||
-rw-r--r-- | board/ti/panda/panda.c | 4 | ||||
-rw-r--r-- | board/ti/sdp4430/sdp.c | 4 | ||||
-rw-r--r-- | board/ti/ti814x/evm.c | 2 | ||||
-rw-r--r-- | board/timll/devkit8000/devkit8000.c | 2 |
25 files changed, 29 insertions, 27 deletions
diff --git a/board/BuR/common/common.c b/board/BuR/common/common.c index e947e54c39f..876150402c8 100644 --- a/board/BuR/common/common.c +++ b/board/BuR/common/common.c @@ -684,7 +684,7 @@ int board_eth_init(bd_t *bis) return rv; } #endif /* defined(CONFIG_DRIVER_TI_CPSW) && !defined(CONFIG_SPL_BUILD) */ -#if defined(CONFIG_GENERIC_MMC) && !defined(CONFIG_SPL_BUILD) +#if defined(CONFIG_GENERIC_MMC) int board_mmc_init(bd_t *bis) { return omap_mmc_init(1, 0, 0, -1, -1); diff --git a/board/amazon/kc1/kc1.c b/board/amazon/kc1/kc1.c index 469a83eeef3..b3fa7896c5f 100644 --- a/board/amazon/kc1/kc1.c +++ b/board/amazon/kc1/kc1.c @@ -166,12 +166,10 @@ int fb_set_reboot_flag(void) return omap_reboot_mode_store("b"); } -#ifndef CONFIG_SPL_BUILD int board_mmc_init(bd_t *bis) { return omap_mmc_init(1, 0, 0, -1, -1); } -#endif void board_mmc_power_init(void) { diff --git a/board/compulab/cm_t35/cm_t35.c b/board/compulab/cm_t35/cm_t35.c index ec21955b391..2d9dd9d808b 100644 --- a/board/compulab/cm_t35/cm_t35.c +++ b/board/compulab/cm_t35/cm_t35.c @@ -372,7 +372,7 @@ void set_muxconf_regs(void) cm_t3730_set_muxconf(); } -#if defined(CONFIG_GENERIC_MMC) && !defined(CONFIG_SPL_BUILD) +#if defined(CONFIG_GENERIC_MMC) #define SB_T35_WP_GPIO 59 int board_mmc_getcd(struct mmc *mmc) diff --git a/board/compulab/cm_t3517/cm_t3517.c b/board/compulab/cm_t3517/cm_t3517.c index 50312b126c2..b55ded054af 100644 --- a/board/compulab/cm_t3517/cm_t3517.c +++ b/board/compulab/cm_t3517/cm_t3517.c @@ -115,7 +115,7 @@ int misc_init_r(void) return 0; } -#if defined(CONFIG_GENERIC_MMC) && !defined(CONFIG_SPL_BUILD) +#if defined(CONFIG_GENERIC_MMC) #define SB_T35_CD_GPIO 144 #define SB_T35_WP_GPIO 59 diff --git a/board/compulab/cm_t54/cm_t54.c b/board/compulab/cm_t54/cm_t54.c index b4f5d406547..7b58fcd21f4 100644 --- a/board/compulab/cm_t54/cm_t54.c +++ b/board/compulab/cm_t54/cm_t54.c @@ -96,7 +96,7 @@ uint mmc_get_env_part(struct mmc *mmc) } #endif -#if defined(CONFIG_GENERIC_MMC) && !defined(CONFIG_SPL_BUILD) +#if defined(CONFIG_GENERIC_MMC) #define SB_T54_CD_GPIO 228 #define SB_T54_WP_GPIO 229 diff --git a/board/corscience/tricorder/tricorder.c b/board/corscience/tricorder/tricorder.c index e8260c63a08..48d65e8b4fb 100644 --- a/board/corscience/tricorder/tricorder.c +++ b/board/corscience/tricorder/tricorder.c @@ -140,7 +140,7 @@ void set_muxconf_regs(void) MUX_TRICORDER(); } -#if defined(CONFIG_GENERIC_MMC) && !(defined(CONFIG_SPL_BUILD)) +#if defined(CONFIG_GENERIC_MMC) int board_mmc_init(bd_t *bis) { return omap_mmc_init(0, 0, 0, -1, -1); diff --git a/board/gumstix/duovero/duovero.c b/board/gumstix/duovero/duovero.c index c9cd62e3344..11d2d7f45f1 100644 --- a/board/gumstix/duovero/duovero.c +++ b/board/gumstix/duovero/duovero.c @@ -110,17 +110,19 @@ void set_muxconf_regs(void) sizeof(struct pad_conf_entry)); } -#if !defined(CONFIG_SPL_BUILD) && defined(CONFIG_GENERIC_MMC) +#if defined(CONFIG_GENERIC_MMC) int board_mmc_init(bd_t *bis) { return omap_mmc_init(0, 0, 0, -1, -1); } +#if !defined(CONFIG_SPL_BUILD) void board_mmc_power_init(void) { twl6030_power_mmc_init(0); } #endif +#endif #if defined(CONFIG_CMD_NET) diff --git a/board/htkw/mcx/mcx.c b/board/htkw/mcx/mcx.c index 1ac9d663c8b..12358f1b619 100644 --- a/board/htkw/mcx/mcx.c +++ b/board/htkw/mcx/mcx.c @@ -100,7 +100,7 @@ void set_muxconf_regs(void) MUX_MCX(); } -#if defined(CONFIG_MMC_OMAP_HS) && !defined(CONFIG_SPL_BUILD) +#if defined(CONFIG_MMC_OMAP_HS) int board_mmc_init(bd_t *bis) { return omap_mmc_init(0, 0, 0, -1, -1); diff --git a/board/isee/igep00x0/igep00x0.c b/board/isee/igep00x0/igep00x0.c index e032f313a69..d3914a18847 100644 --- a/board/isee/igep00x0/igep00x0.c +++ b/board/isee/igep00x0/igep00x0.c @@ -199,7 +199,7 @@ int board_eth_init(bd_t *bis) static inline void setup_net_chip(void) {} #endif -#if defined(CONFIG_GENERIC_MMC) && !defined(CONFIG_SPL_BUILD) +#if defined(CONFIG_GENERIC_MMC) int board_mmc_init(bd_t *bis) { return omap_mmc_init(0, 0, 0, -1, -1); diff --git a/board/lg/sniper/sniper.c b/board/lg/sniper/sniper.c index b2b8f8861f1..f924645dc07 100644 --- a/board/lg/sniper/sniper.c +++ b/board/lg/sniper/sniper.c @@ -179,12 +179,10 @@ int fb_set_reboot_flag(void) return omap_reboot_mode_store("b"); } -#ifndef CONFIG_SPL_BUILD int board_mmc_init(bd_t *bis) { return omap_mmc_init(1, 0, 0, -1, -1); } -#endif void board_mmc_power_init(void) { diff --git a/board/logicpd/am3517evm/am3517evm.c b/board/logicpd/am3517evm/am3517evm.c index a6aff4e6df3..1aaeb8d75f3 100644 --- a/board/logicpd/am3517evm/am3517evm.c +++ b/board/logicpd/am3517evm/am3517evm.c @@ -152,7 +152,7 @@ void set_muxconf_regs(void) MUX_AM3517EVM(); } -#if defined(CONFIG_GENERIC_MMC) && !defined(CONFIG_SPL_BUILD) +#if defined(CONFIG_GENERIC_MMC) int board_mmc_init(bd_t *bis) { return omap_mmc_init(0, 0, 0, -1, -1); diff --git a/board/logicpd/omap3som/omap3logic.c b/board/logicpd/omap3som/omap3logic.c index b2fcc28f8b4..4ad496e5e2b 100644 --- a/board/logicpd/omap3som/omap3logic.c +++ b/board/logicpd/omap3som/omap3logic.c @@ -231,7 +231,7 @@ int board_late_init(void) } #endif -#if defined(CONFIG_GENERIC_MMC) && !defined(CONFIG_SPL_BUILD) +#if defined(CONFIG_GENERIC_MMC) int board_mmc_init(bd_t *bis) { return omap_mmc_init(0, 0, 0, -1, -1); diff --git a/board/quipos/cairo/cairo.c b/board/quipos/cairo/cairo.c index 6b366dc43f1..7a1a61e3869 100644 --- a/board/quipos/cairo/cairo.c +++ b/board/quipos/cairo/cairo.c @@ -62,7 +62,7 @@ void set_muxconf_regs(void) MUX_CAIRO(); } -#if defined(CONFIG_GENERIC_MMC) && !defined(CONFIG_SPL_BUILD) +#if defined(CONFIG_GENERIC_MMC) int board_mmc_init(bd_t *bis) { return omap_mmc_init(0, 0, 0, -1, -1); diff --git a/board/technexion/tao3530/tao3530.c b/board/technexion/tao3530/tao3530.c index d51b5d940c2..cba48d48fcf 100644 --- a/board/technexion/tao3530/tao3530.c +++ b/board/technexion/tao3530/tao3530.c @@ -179,7 +179,7 @@ void set_muxconf_regs(void) #endif } -#if defined(CONFIG_GENERIC_MMC) && !defined(CONFIG_SPL_BUILD) +#if defined(CONFIG_GENERIC_MMC) int board_mmc_init(bd_t *bis) { omap_mmc_init(0, 0, 0, -1, -1); diff --git a/board/ti/am3517crane/am3517crane.c b/board/ti/am3517crane/am3517crane.c index 8d1c390e5d0..faa95d7da84 100644 --- a/board/ti/am3517crane/am3517crane.c +++ b/board/ti/am3517crane/am3517crane.c @@ -63,7 +63,7 @@ void set_muxconf_regs(void) MUX_AM3517CRANE(); } -#if defined(CONFIG_GENERIC_MMC) && !defined(CONFIG_SPL_BUILD) +#if defined(CONFIG_GENERIC_MMC) int board_mmc_init(bd_t *bis) { return omap_mmc_init(0, 0, 0, -1, -1); diff --git a/board/ti/am57xx/board.c b/board/ti/am57xx/board.c index 16115144170..df9039c7692 100644 --- a/board/ti/am57xx/board.c +++ b/board/ti/am57xx/board.c @@ -559,7 +559,7 @@ err: } #endif -#if !defined(CONFIG_SPL_BUILD) && defined(CONFIG_GENERIC_MMC) +#if defined(CONFIG_GENERIC_MMC) int board_mmc_init(bd_t *bis) { omap_mmc_init(0, 0, 0, -1, -1); diff --git a/board/ti/beagle/beagle.c b/board/ti/beagle/beagle.c index a6908d4bed5..e90fe1aba81 100644 --- a/board/ti/beagle/beagle.c +++ b/board/ti/beagle/beagle.c @@ -524,7 +524,7 @@ void set_muxconf_regs(void) MUX_BEAGLE(); } -#if defined(CONFIG_GENERIC_MMC) && !defined(CONFIG_SPL_BUILD) +#if defined(CONFIG_GENERIC_MMC) int board_mmc_init(bd_t *bis) { return omap_mmc_init(0, 0, 0, -1, -1); diff --git a/board/ti/dra7xx/evm.c b/board/ti/dra7xx/evm.c index bd1c80942e0..de6fc19cb0d 100644 --- a/board/ti/dra7xx/evm.c +++ b/board/ti/dra7xx/evm.c @@ -679,7 +679,7 @@ err: } #endif -#if !defined(CONFIG_SPL_BUILD) && defined(CONFIG_GENERIC_MMC) +#if defined(CONFIG_GENERIC_MMC) int board_mmc_init(bd_t *bis) { omap_mmc_init(0, 0, 0, -1, -1); diff --git a/board/ti/evm/evm.c b/board/ti/evm/evm.c index ff3971dda8a..4f132e5107e 100644 --- a/board/ti/evm/evm.c +++ b/board/ti/evm/evm.c @@ -259,7 +259,7 @@ int board_eth_init(bd_t *bis) } #endif /* CONFIG_CMD_NET */ -#if defined(CONFIG_GENERIC_MMC) && !defined(CONFIG_SPL_BUILD) +#if defined(CONFIG_GENERIC_MMC) int board_mmc_init(bd_t *bis) { return omap_mmc_init(0, 0, 0, -1, -1); diff --git a/board/ti/ks2_evm/board_k2g.c b/board/ti/ks2_evm/board_k2g.c index 40edbaa33f8..372fc35a5c6 100644 --- a/board/ti/ks2_evm/board_k2g.c +++ b/board/ti/ks2_evm/board_k2g.c @@ -102,7 +102,7 @@ s16 divn_val[16] = { -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1 }; -#if !defined(CONFIG_SPL_BUILD) && defined(CONFIG_GENERIC_MMC) +#if defined(CONFIG_GENERIC_MMC) int board_mmc_init(bd_t *bis) { if (psc_enable_module(KS2_LPSC_MMC)) { diff --git a/board/ti/omap5_uevm/evm.c b/board/ti/omap5_uevm/evm.c index b5d5ba9bdf9..64d772ca6e7 100644 --- a/board/ti/omap5_uevm/evm.c +++ b/board/ti/omap5_uevm/evm.c @@ -211,7 +211,7 @@ void set_muxconf_regs(void) sizeof(struct pad_conf_entry)); } -#if !defined(CONFIG_SPL_BUILD) && defined(CONFIG_GENERIC_MMC) +#if defined(CONFIG_GENERIC_MMC) int board_mmc_init(bd_t *bis) { omap_mmc_init(0, 0, 0, -1, -1); diff --git a/board/ti/panda/panda.c b/board/ti/panda/panda.c index 13b5dafe82f..187ff3cff4c 100644 --- a/board/ti/panda/panda.c +++ b/board/ti/panda/panda.c @@ -287,17 +287,19 @@ void set_muxconf_regs(void) sizeof(struct pad_conf_entry)); } -#if !defined(CONFIG_SPL_BUILD) && defined(CONFIG_GENERIC_MMC) +#if defined(CONFIG_GENERIC_MMC) int board_mmc_init(bd_t *bis) { return omap_mmc_init(0, 0, 0, -1, -1); } +#if !defined(CONFIG_SPL_BUILD) void board_mmc_power_init(void) { twl6030_power_mmc_init(0); } #endif +#endif #ifdef CONFIG_USB_EHCI diff --git a/board/ti/sdp4430/sdp.c b/board/ti/sdp4430/sdp.c index 6037cdd6c19..0eb60e4271e 100644 --- a/board/ti/sdp4430/sdp.c +++ b/board/ti/sdp4430/sdp.c @@ -73,7 +73,7 @@ void set_muxconf_regs(void) sizeof(struct pad_conf_entry)); } -#if !defined(CONFIG_SPL_BUILD) && defined(CONFIG_GENERIC_MMC) +#if defined(CONFIG_GENERIC_MMC) int board_mmc_init(bd_t *bis) { omap_mmc_init(0, 0, 0, -1, -1); @@ -81,12 +81,14 @@ int board_mmc_init(bd_t *bis) return 0; } +#if !defined(CONFIG_SPL_BUILD) void board_mmc_power_init(void) { twl6030_power_mmc_init(0); twl6030_power_mmc_init(1); } #endif +#endif /* * get_board_rev() - get board revision diff --git a/board/ti/ti814x/evm.c b/board/ti/ti814x/evm.c index e406dabfc0d..e85794c60e9 100644 --- a/board/ti/ti814x/evm.c +++ b/board/ti/ti814x/evm.c @@ -111,7 +111,7 @@ int board_init(void) return 0; } -#if !defined(CONFIG_SPL_BUILD) && defined(CONFIG_GENERIC_MMC) +#if defined(CONFIG_GENERIC_MMC) int board_mmc_init(bd_t *bis) { omap_mmc_init(1, 0, 0, -1, -1); diff --git a/board/timll/devkit8000/devkit8000.c b/board/timll/devkit8000/devkit8000.c index b2f060b2ddb..5f57956ca3d 100644 --- a/board/timll/devkit8000/devkit8000.c +++ b/board/timll/devkit8000/devkit8000.c @@ -131,7 +131,7 @@ void set_muxconf_regs(void) MUX_DEVKIT8000(); } -#if defined(CONFIG_GENERIC_MMC) && !defined(CONFIG_SPL_BUILD) +#if defined(CONFIG_GENERIC_MMC) int board_mmc_init(bd_t *bis) { return omap_mmc_init(0, 0, 0, -1, -1); |