diff options
| author | mattis fjallstrom <mattis@acm.org> | 2014-10-15 03:40:52 +0200 |
|---|---|---|
| committer | mattis fjallstrom <mattis@acm.org> | 2014-10-15 03:40:52 +0200 |
| commit | 95a5724b19c0c1281a7f72ad1812079a53a52dbc (patch) | |
| tree | 100f5fe1d385b5cd012cc1f4db0bf6aa46ffc30c /arch | |
| parent | a252a3577da19fb129333c4adc07fd473d10f289 (diff) | |
| download | olio-uboot-2014.01-95a5724b19c0c1281a7f72ad1812079a53a52dbc.tar.xz olio-uboot-2014.01-95a5724b19c0c1281a7f72ad1812079a53a52dbc.zip | |
Adding memtest and build-time flag for SPL serial boot
Change-Id: Iaf14e63498c3cdca4e2125b8217195b90caf842b
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/arm/cpu/armv7/omap3/board.c | 11 | ||||
| -rw-r--r-- | arch/arm/include/asm/arch-omap3/spl.h | 1 |
2 files changed, 12 insertions, 0 deletions
diff --git a/arch/arm/cpu/armv7/omap3/board.c b/arch/arm/cpu/armv7/omap3/board.c index 29228160c..2cd2df519 100644 --- a/arch/arm/cpu/armv7/omap3/board.c +++ b/arch/arm/cpu/armv7/omap3/board.c @@ -56,7 +56,18 @@ const struct gpio_bank *const omap_gpio_bank = gpio_bank_34xx; * We would not typically need to save these parameters in regular * U-Boot. This is needed only in SPL at the moment. */ + +/* + * We need two different builds, one for UART and one for NAND. + * In the future, consider changing this to make NAND the default, + * and if it isn't there or isn't working, try UART. + */ + +#ifdef SPL_BOOT_DEVICE_UART +u32 omap3_boot_device = BOOT_DEVICE_UART; +#else u32 omap3_boot_device = BOOT_DEVICE_NAND; +#endif /* auto boot mode detection is not possible for OMAP3 - hard code */ u32 spl_boot_mode(void) diff --git a/arch/arm/include/asm/arch-omap3/spl.h b/arch/arm/include/asm/arch-omap3/spl.h index 2ec319c08..e9c33d981 100644 --- a/arch/arm/include/asm/arch-omap3/spl.h +++ b/arch/arm/include/asm/arch-omap3/spl.h @@ -14,6 +14,7 @@ #define BOOT_DEVICE_MMC2 5 /*emmc*/ #define BOOT_DEVICE_MMC1 6 #define BOOT_DEVICE_XIPWAIT 7 +#define BOOT_DEVICE_UART 8 #define BOOT_DEVICE_MMC2_2 0xFF #define MMC_BOOT_DEVICES_START BOOT_DEVICE_MMC2 |