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-i2c
[platform/kernel/u-boot.git]
/
include
/
configs
/
controlcenterd.h
diff --git
a/include/configs/controlcenterd.h
b/include/configs/controlcenterd.h
index
1bd3195
..
7535ad5
100644
(file)
--- a/
include/configs/controlcenterd.h
+++ b/
include/configs/controlcenterd.h
@@
-214,7
+214,6
@@
*/
#define CONFIG_FSL_DIU_FB
#define CONFIG_SYS_DIU_ADDR (CONFIG_SYS_CCSRBAR + 0x10000)
-#define CONFIG_CMD_BMP
/*
* General PCI
@@
-292,7
+291,6
@@
/*
* USB
*/
-#define CONFIG_USB_EHCI
#define CONFIG_HAS_FSL_DR_USB
#define CONFIG_USB_EHCI_FSL