projects
/
oweals
/
u-boot.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'master' of git://www.denx.de/git/u-boot-dm
[oweals/u-boot.git]
/
arch
/
arm
/
mach-omap2
/
omap5
/
boot.c
diff --git
a/arch/arm/mach-omap2/omap5/boot.c
b/arch/arm/mach-omap2/omap5/boot.c
index 583beccad5a14a7303158595a0c018dae07aeb37..18750b810a3a0461bd53671bfe2893cd384e50b4 100644
(file)
--- a/
arch/arm/mach-omap2/omap5/boot.c
+++ b/
arch/arm/mach-omap2/omap5/boot.c
@@
-12,7
+12,7
@@
#include <spl.h>
static u32 boot_devices[] = {
-#if defined(CONFIG_DRA7XX)
|| defined(CONFIG_AM57XX)
+#if defined(CONFIG_DRA7XX)
BOOT_DEVICE_MMC2,
BOOT_DEVICE_NAND,
BOOT_DEVICE_MMC1,