diff options
| author | Jan Luebbe <jlu@pengutronix.de> | 2013-04-15 14:03:58 +0200 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2013-04-18 08:01:26 +0200 |
| commit | d7a913469c34553e96c887f8a9934bacd794e81c (patch) | |
| tree | b2e5bf5b8437437312890ec389b48b9d9d7e0fb4 /arch/arm/mach-omap/xload.c | |
| parent | bb18fee0d8d3f9ddb377ece250486a1a473f6763 (diff) | |
| download | barebox-d7a913469c34553e96c887f8a9934bacd794e81c.tar.gz barebox-d7a913469c34553e96c887f8a9934bacd794e81c.tar.xz | |
omap: move to common bootsource framework
Signed-off-by: Jan Luebbe <jlu@pengutronix.de>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Folded fix into this patch:
[PATCH] omap4 regression: set correct boot source
Signed-off-by: Vicente Bergas <vicencb@gmail.com>
Diffstat (limited to 'arch/arm/mach-omap/xload.c')
| -rw-r--r-- | arch/arm/mach-omap/xload.c | 26 |
1 files changed, 14 insertions, 12 deletions
diff --git a/arch/arm/mach-omap/xload.c b/arch/arm/mach-omap/xload.c index 72aa3791e4..3cce3f2be9 100644 --- a/arch/arm/mach-omap/xload.c +++ b/arch/arm/mach-omap/xload.c @@ -1,4 +1,5 @@ #include <common.h> +#include <bootsource.h> #include <partition.h> #include <nand.h> #include <init.h> @@ -6,7 +7,6 @@ #include <linux/mtd/mtd.h> #include <fs.h> #include <fcntl.h> -#include <mach/generic.h> #include <sizes.h> #include <filetype.h> @@ -165,30 +165,32 @@ static __noreturn int omap_xload(void) { int (*func)(void) = NULL; - switch (omap_bootsrc()) + switch (bootsource_get()) { - case OMAP_BOOTSRC_MMC1: - printf("booting from MMC1\n"); + case BOOTSOURCE_MMC: + printf("booting from MMC\n"); func = omap_xload_boot_mmc(); break; - case OMAP_BOOTSRC_USB1: + case BOOTSOURCE_USB: if (IS_ENABLED(CONFIG_FS_OMAP4_USBBOOT)) { - printf("booting from USB1\n"); + printf("booting from USB\n"); func = omap4_xload_boot_usb(); break; } else { - printf("booting from usb1 not enabled\n"); + printf("booting from USB not enabled\n"); } - case OMAP_BOOTSRC_UNKNOWN: - printf("unknown boot source. Fall back to nand\n"); - case OMAP_BOOTSRC_NAND: + case BOOTSOURCE_NAND: printf("booting from NAND\n"); func = omap_xload_boot_nand(SZ_128K); break; - case OMAP_BOOTSRC_SPI1: - printf("booting from SPI1\n"); + case BOOTSOURCE_SPI: + printf("booting from SPI\n"); func = omap_xload_boot_spi(SZ_128K); break; + default: + printf("unknown boot source. Fall back to nand\n"); + func = omap_xload_boot_nand(SZ_128K); + break; } if (!func) { |