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 'agust@denx.de' of git://git.denx.de/u-boot-staging
[oweals/u-boot.git]
/
include
/
configs
/
omap3_mvblx.h
diff --git
a/include/configs/omap3_mvblx.h
b/include/configs/omap3_mvblx.h
index eb51ea9f9baa279eaf977ac65445d413887bccf2..b819d213408e7ac1ca1f14a937d707cebb359bfe 100644
(file)
--- a/
include/configs/omap3_mvblx.h
+++ b/
include/configs/omap3_mvblx.h
@@
-102,9
+102,6
@@
#define CONFIG_OMAP_HSMMC 1
#define CONFIG_DOS_PARTITION 1
#define CONFIG_OMAP_HSMMC 1
#define CONFIG_DOS_PARTITION 1
-/* DDR - I use Micron DDR */
-#define CONFIG_OMAP3_MICRON_DDR 1
-
/* USB */
#define CONFIG_MUSB_UDC 1
#define CONFIG_USB_OMAP3 1
/* USB */
#define CONFIG_MUSB_UDC 1
#define CONFIG_USB_OMAP3 1
@@
-272,7
+269,6
@@
*----------------------------------------------------------------------------
*/
#if defined(CONFIG_CMD_NET)
*----------------------------------------------------------------------------
*/
#if defined(CONFIG_CMD_NET)
- #define CONFIG_NET_MULTI
#define CONFIG_SMC911X 1
#define CONFIG_SMC911X_32_BIT
#define CONFIG_SMC911X_BASE 0x2C000000
#define CONFIG_SMC911X 1
#define CONFIG_SMC911X_32_BIT
#define CONFIG_SMC911X_BASE 0x2C000000