projects
/
platform
/
kernel
/
u-boot.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
compact
(merge:
0959649
a0269bb
)
Merge branch 'master' of git://git.denx.de/u-boot-mmc
author
Tom Rini
<trini@konsulko.com>
Thu, 9 Feb 2017 16:56:19 +0000
(11:56 -0500)
committer
Tom Rini
<trini@konsulko.com>
Thu, 9 Feb 2017 16:56:19 +0000
(11:56 -0500)
1
2
configs/omap3_logic_defconfig
patch
|
diff1
|
diff2
|
blob
|
history
diff --combined
configs/omap3_logic_defconfig
index
7479c52
,
37ee267
..
fe762c0
---
1
/
configs/omap3_logic_defconfig
---
2
/
configs/omap3_logic_defconfig
+++ b/
configs/omap3_logic_defconfig
@@@
-5,7
-5,6
+5,7
@@@
CONFIG_SYS_EXTRA_OPTIONS="NAND
CONFIG_SYS_CONSOLE_INFO_QUIET=y
CONFIG_VERSION_VARIABLE=y
CONFIG_SPL=y
+CONFIG_SPL_SYS_MALLOC_SIMPLE=y
CONFIG_SPL_MTD_SUPPORT=y
CONFIG_SPL_OS_BOOT=y
CONFIG_HUSH_PARSER=y
@@@
-34,6
-33,7
+34,7
@@@
CONFIG_CMD_UBI=
CONFIG_ISO_PARTITION=y
CONFIG_EFI_PARTITION=y
CONFIG_MMC_OMAP_HS=y
+ CONFIG_MMC_OMAP36XX_PINS=y
CONFIG_SYS_NS16550=y
CONFIG_USB=y
CONFIG_USB_MUSB_GADGET=y