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/omap_generic.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/omap_generic.c')
| -rw-r--r-- | arch/arm/mach-omap/omap_generic.c | 15 |
1 files changed, 2 insertions, 13 deletions
diff --git a/arch/arm/mach-omap/omap_generic.c b/arch/arm/mach-omap/omap_generic.c index 580ed3e165..cfd3dec453 100644 --- a/arch/arm/mach-omap/omap_generic.c +++ b/arch/arm/mach-omap/omap_generic.c @@ -13,23 +13,12 @@ * */ #include <common.h> +#include <bootsource.h> #include <envfs.h> #include <init.h> #include <io.h> #include <fs.h> #include <linux/stat.h> -#include <mach/generic.h> - -enum omap_boot_src omap_bootsrc(void) -{ -#if defined(CONFIG_ARCH_OMAP3) - return omap3_bootsrc(); -#elif defined(CONFIG_ARCH_OMAP4) - return omap4_bootsrc(); -#elif defined(CONFIG_ARCH_AM33XX) - return am33xx_bootsrc(); -#endif -} #if defined(CONFIG_DEFAULT_ENVIRONMENT) && defined(CONFIG_MCI_STARTUP) static int omap_env_init(void) @@ -38,7 +27,7 @@ static int omap_env_init(void) char *diskdev = "/dev/disk0.0"; int ret; - if (omap_bootsrc() != OMAP_BOOTSRC_MMC1) + if (bootsource_get() != BOOTSOURCE_MMC) return 0; ret = stat(diskdev, &s); |