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
/
mcx.h
diff --git
a/include/configs/mcx.h
b/include/configs/mcx.h
index
fd8cf1d
..
5160758
100644
(file)
--- a/
include/configs/mcx.h
+++ b/
include/configs/mcx.h
@@
-20,9
+20,7
@@
#define CONFIG_ARM_ERRATA_430973
#define CONFIG_ARM_ERRATA_621766
#define CONFIG_ARM_ERRATA_430973
#define CONFIG_ARM_ERRATA_621766
-#define MACH_TYPE_MCX 3656
#define CONFIG_MACH_TYPE MACH_TYPE_MCX
#define CONFIG_MACH_TYPE MACH_TYPE_MCX
-#define CONFIG_BOARD_LATE_INIT
#define CONFIG_EMIF4 /* The chip has EMIF4 controller */
#define CONFIG_EMIF4 /* The chip has EMIF4 controller */
@@
-81,8
+79,6
@@
#define CONFIG_BAUDRATE 115200
#define CONFIG_SYS_BAUDRATE_TABLE {4800, 9600, 19200, 38400, 57600,\
115200}
#define CONFIG_BAUDRATE 115200
#define CONFIG_SYS_BAUDRATE_TABLE {4800, 9600, 19200, 38400, 57600,\
115200}
-#define CONFIG_GENERIC_MMC
-#define CONFIG_DOS_PARTITION
/* EHCI */
#define CONFIG_OMAP3_GPIO_2
/* EHCI */
#define CONFIG_OMAP3_GPIO_2