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 branch 'master' of git://git.denx.de/u-boot-net
[platform/kernel/u-boot.git]
/
include
/
configs
/
mcx.h
diff --git
a/include/configs/mcx.h
b/include/configs/mcx.h
index
94b1332
..
5f7423b
100644
(file)
--- a/
include/configs/mcx.h
+++ b/
include/configs/mcx.h
@@
-58,7
+58,6
@@
* select serial console configuration
*/
#define CONFIG_SYS_NS16550_COM3 OMAP34XX_UART3
* select serial console configuration
*/
#define CONFIG_SYS_NS16550_COM3 OMAP34XX_UART3
-#define CONFIG_SERIAL3 3 /* UART3 */
/* allow to overwrite serial and ethaddr */
#define CONFIG_ENV_OVERWRITE
/* allow to overwrite serial and ethaddr */
#define CONFIG_ENV_OVERWRITE
@@
-292,6
+291,5
@@
#define CONFIG_SPLASH_SCREEN
#define CONFIG_VIDEO_BMP_RLE8
#define CONFIG_SPLASH_SCREEN
#define CONFIG_VIDEO_BMP_RLE8
-#define CONFIG_VIDEO_OMAP3
#endif /* __CONFIG_H */
#endif /* __CONFIG_H */