diff options
| author | Tom Rini <trini@konsulko.com> | 2019-08-12 18:47:53 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2019-08-12 18:47:53 -0400 |
| commit | 9c6115822e894ead72fa4c094bf718eaabb9e103 (patch) | |
| tree | 4f8843a5cfbe2895a168d96dee111dd31e443b2a /board/overo | |
| parent | 5939afc9611e8ba4a86b96e67670b765ee27668e (diff) | |
| parent | 0805fe151d8c47cfbcfddf71c0891ed4f3c10b56 (diff) | |
| download | u-boot-9c6115822e894ead72fa4c094bf718eaabb9e103.zip u-boot-9c6115822e894ead72fa4c094bf718eaabb9e103.tar.gz u-boot-9c6115822e894ead72fa4c094bf718eaabb9e103.tar.bz2 | |
Merge branch '2019-08-11-ti-imports'
- More DaVinci updates and fixes
- PCIe support on am65x
- Watchdog converted to DM
- Assorted other bugfixes
Diffstat (limited to 'board/overo')
| -rw-r--r-- | board/overo/common.c | 26 | ||||
| -rw-r--r-- | board/overo/overo.c | 14 |
2 files changed, 26 insertions, 14 deletions
diff --git a/board/overo/common.c b/board/overo/common.c index fc02d66..2c4f412 100644 --- a/board/overo/common.c +++ b/board/overo/common.c @@ -17,6 +17,7 @@ #include <asm/arch/mux.h> #include <asm/arch/sys_proto.h> #include <asm/gpio.h> +#include <asm/omap_mmc.h> #include <asm/mach-types.h> DECLARE_GLOBAL_DATA_PTR; @@ -38,6 +39,31 @@ int board_init(void) return 0; } +#if defined(CONFIG_MMC) +int board_mmc_init(bd_t *bis) +{ + return omap_mmc_init(0, 0, 0, -1, -1); +} +#endif + +#if defined(CONFIG_MMC) +void board_mmc_power_init(void) +{ + twl4030_power_mmc_init(0); +} +#endif + +#if defined(CONFIG_SPL_OS_BOOT) +int spl_start_uboot(void) +{ + /* break into full u-boot on 'c' */ + if (serial_tstc() && serial_getc() == 'c') + return 1; + + return 0; +} +#endif /* CONFIG_SPL_OS_BOOT */ + #define MUX_OVERO() \ /*SDRC*/\ MUX_VAL(CP(SDRC_D0), (IEN | PTD | DIS | M0)) /*SDRC_D0*/\ diff --git a/board/overo/overo.c b/board/overo/overo.c index f13bff1..442028a 100644 --- a/board/overo/overo.c +++ b/board/overo/overo.c @@ -377,20 +377,6 @@ int board_eth_init(bd_t *bis) } #endif -#if defined(CONFIG_MMC) -int board_mmc_init(bd_t *bis) -{ - return omap_mmc_init(0, 0, 0, -1, -1); -} -#endif - -#if defined(CONFIG_MMC) -void board_mmc_power_init(void) -{ - twl4030_power_mmc_init(0); -} -#endif - #if defined(CONFIG_USB_EHCI_HCD) static struct omap_usbhs_board_data usbhs_bdata = { .port_mode[0] = OMAP_USBHS_PORT_MODE_UNUSED, |