diff options
| author | Vicente <vicencb@gmail.com> | 2012-10-09 00:55:16 +0200 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2012-11-16 15:31:32 +0100 |
| commit | 9a6fd89480e4191432958c5a2491124701212aa5 (patch) | |
| tree | af908607b53e3c44b831c44f10b844580676f9a3 /arch | |
| parent | b474168b906e2319166a13323aabc7637897df38 (diff) | |
| download | barebox-9a6fd89480e4191432958c5a2491124701212aa5.tar.gz barebox-9a6fd89480e4191432958c5a2491124701212aa5.tar.xz | |
omap4: add usb boot source
Signed-off-by: Vicente <vicencb@gmail.com>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/arm/mach-omap/include/mach/xload.h | 1 | ||||
| -rw-r--r-- | arch/arm/mach-omap/omap4_generic.c | 2 |
2 files changed, 3 insertions, 0 deletions
diff --git a/arch/arm/mach-omap/include/mach/xload.h b/arch/arm/mach-omap/include/mach/xload.h index 63b68df15c..44d37543d5 100644 --- a/arch/arm/mach-omap/include/mach/xload.h +++ b/arch/arm/mach-omap/include/mach/xload.h @@ -6,6 +6,7 @@ enum omap_boot_src { OMAP_BOOTSRC_MMC1, OMAP_BOOTSRC_NAND, OMAP_BOOTSRC_SPI1, + OMAP_BOOTSRC_USB1, }; enum omap_boot_src omap3_bootsrc(void); diff --git a/arch/arm/mach-omap/omap4_generic.c b/arch/arm/mach-omap/omap4_generic.c index d7771bf543..ea4af68f72 100644 --- a/arch/arm/mach-omap/omap4_generic.c +++ b/arch/arm/mach-omap/omap4_generic.c @@ -481,6 +481,8 @@ enum omap_boot_src omap4_bootsrc(void) return OMAP_BOOTSRC_MMC1; if (bootsrc & (1 << 3)) return OMAP_BOOTSRC_NAND; + if (bootsrc & (1<<20)) + return OMAP_BOOTSRC_USB1; return OMAP_BOOTSRC_UNKNOWN; } |