summaryrefslogtreecommitdiff
path: root/include/configs/omap3_cairo.h
diff options
context:
space:
mode:
authorAlbert ARIBAUD <albert.u.boot@aribaud.net>2015-07-07 11:38:44 +0200
committerAlbert ARIBAUD <albert.u.boot@aribaud.net>2015-07-07 11:38:44 +0200
commit6f43ba70d15e15a08c25b3d956c70addb6740737 (patch)
treee5ddc8498043c0c47559737ea60e4d7fc866e20a /include/configs/omap3_cairo.h
parent003b09dad492ebc385b28067b8028a0c0ff9323f (diff)
parent9c6b05cb724e18d1db3f9e1a75b2272572f06fbd (diff)
Merge branch 'u-boot/master' into 'u-boot-arm/master'
Diffstat (limited to 'include/configs/omap3_cairo.h')
-rw-r--r--include/configs/omap3_cairo.h6
1 files changed, 0 insertions, 6 deletions
diff --git a/include/configs/omap3_cairo.h b/include/configs/omap3_cairo.h
index ed7956694b..81d4b34876 100644
--- a/include/configs/omap3_cairo.h
+++ b/include/configs/omap3_cairo.h
@@ -60,14 +60,8 @@
#define CONFIG_NAND
/* commands to include */
-#include <config_cmd_default.h>
-
#define CONFIG_CMD_NAND_LOCK_UNLOCK
-/* Disable some commands */
-#undef CONFIG_CMD_FPGA /* FPGA configuration Support */
-#undef CONFIG_CMD_IMI /* iminfo */
-
/*
* TWL4030
*/