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
[platform/kernel/u-boot.git]
/
include
/
configs
/
mx6sabre_common.h
diff --git
a/include/configs/mx6sabre_common.h
b/include/configs/mx6sabre_common.h
index
f0f721e
..
4aa8101
100644
(file)
--- a/
include/configs/mx6sabre_common.h
+++ b/
include/configs/mx6sabre_common.h
@@
-25,9
+25,6
@@
#define CONFIG_INITRD_TAG
#define CONFIG_REVISION_TAG
#define CONFIG_INITRD_TAG
#define CONFIG_REVISION_TAG
-#define CONFIG_DM
-#define CONFIG_DM_THERMAL
-#define CONFIG_SYS_MALLOC_F_LEN (1 << 10)
#define CONFIG_IMX6_THERMAL
#define CONFIG_SYS_GENERIC_BOARD
#define CONFIG_IMX6_THERMAL
#define CONFIG_SYS_GENERIC_BOARD