projects
/
platform
/
kernel
/
u-boot.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge https://gitlab.denx.de/u-boot/custodians/u-boot-imx
[platform/kernel/u-boot.git]
/
include
/
configs
/
MPC832XEMDS.h
diff --git
a/include/configs/MPC832XEMDS.h
b/include/configs/MPC832XEMDS.h
index
bfcff2e
..
94d7329
100644
(file)
--- a/
include/configs/MPC832XEMDS.h
+++ b/
include/configs/MPC832XEMDS.h
@@
-196,7
+196,6
@@
#define CONFIG_83XX_PCI_STREAMING
#define CONFIG_83XX_PCI_STREAMING
-#undef CONFIG_EEPRO100
#undef CONFIG_PCI_SCAN_SHOW /* show pci devices on startup */
#define CONFIG_SYS_PCI_SUBSYS_VENDORID 0x1957 /* Freescale */
#undef CONFIG_PCI_SCAN_SHOW /* show pci devices on startup */
#define CONFIG_SYS_PCI_SUBSYS_VENDORID 0x1957 /* Freescale */
@@
-244,10
+243,6
@@
*/
#define CONFIG_BOOTP_BOOTFILESIZE
*/
#define CONFIG_BOOTP_BOOTFILESIZE
-/*
- * Command line configuration.
- */
-
#undef CONFIG_WATCHDOG /* watchdog disabled */
/*
#undef CONFIG_WATCHDOG /* watchdog disabled */
/*
@@
-268,10
+263,6
@@
#define CONFIG_KGDB_BAUDRATE 230400 /* speed of kgdb serial port */
#endif
#define CONFIG_KGDB_BAUDRATE 230400 /* speed of kgdb serial port */
#endif
-/*
- * Environment Configuration
- */ #define CONFIG_ENV_OVERWRITE
-
#if defined(CONFIG_UEC_ETH)
#define CONFIG_HAS_ETH0
#define CONFIG_HAS_ETH1
#if defined(CONFIG_UEC_ETH)
#define CONFIG_HAS_ETH0
#define CONFIG_HAS_ETH1