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 git://git.denx.de/u-boot-mpc85xx
[platform/kernel/u-boot.git]
/
include
/
configs
/
zc5202.h
diff --git
a/include/configs/zc5202.h
b/include/configs/zc5202.h
index
040c695
..
a7988e0
100644
(file)
--- a/
include/configs/zc5202.h
+++ b/
include/configs/zc5202.h
@@
-10,7
+10,7
@@
#define __EL_ZC5202_H
#define CONFIG_MXC_UART_BASE UART2_BASE
#define __EL_ZC5202_H
#define CONFIG_MXC_UART_BASE UART2_BASE
-#define CON
FIG_CONSOLE_DEV
"ttymxc1"
+#define CON
SOLE_DEV
"ttymxc1"
#define CONFIG_MMCROOT "/dev/mmcblk0p2"
#define CONFIG_SUPPORT_EMMC_BOOT /* eMMC specific */
#define CONFIG_MMCROOT "/dev/mmcblk0p2"
#define CONFIG_SUPPORT_EMMC_BOOT /* eMMC specific */
@@
-27,8
+27,6
@@
#define CONFIG_MV88E6352_SWITCH
#define CONFIG_CMD_PCI
#define CONFIG_MV88E6352_SWITCH
#define CONFIG_CMD_PCI
-#define CONFIG_PCI
-#define CONFIG_PCI_PNP
#define CONFIG_PCI_SCAN_SHOW
#define CONFIG_PCIE_IMX
#define CONFIG_PCI_SCAN_SHOW
#define CONFIG_PCIE_IMX