summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorAlbert ARIBAUD <albert.u.boot@aribaud.net>2012-09-29 11:12:34 +0200
committerAlbert ARIBAUD <albert.u.boot@aribaud.net>2012-09-29 11:12:34 +0200
commit8f0732ac3dc3bdbbcada313dc4b4b38d5d2c376a (patch)
treeb20bde0a30aa7902bdfc43a2097acc6f2f58cf5d /include
parentfa651cce4f89f6d33f1ea301a6f1f781758c7dfd (diff)
parent7577a4b3c27af9ad21a4aedf732754ae96225448 (diff)
downloadu-boot-imx-8f0732ac3dc3bdbbcada313dc4b4b38d5d2c376a.zip
u-boot-imx-8f0732ac3dc3bdbbcada313dc4b4b38d5d2c376a.tar.gz
u-boot-imx-8f0732ac3dc3bdbbcada313dc4b4b38d5d2c376a.tar.bz2
Merge remote-tracking branch 'u-boot-imx/master'
Diffstat (limited to 'include')
-rw-r--r--include/configs/mx28evk.h1
-rw-r--r--include/configs/mx51evk.h1
-rw-r--r--include/ipu_pixfmt.h1
3 files changed, 3 insertions, 0 deletions
diff --git a/include/configs/mx28evk.h b/include/configs/mx28evk.h
index dffb744..7cdbec6 100644
--- a/include/configs/mx28evk.h
+++ b/include/configs/mx28evk.h
@@ -63,6 +63,7 @@
#define CONFIG_CMD_NET
#define CONFIG_CMD_NFS
#define CONFIG_CMD_PING
+#define CONFIG_CMD_SETEXPR
#define CONFIG_CMD_SF
#define CONFIG_CMD_SPI
#define CONFIG_CMD_USB
diff --git a/include/configs/mx51evk.h b/include/configs/mx51evk.h
index ba4a4a6..7b027b4 100644
--- a/include/configs/mx51evk.h
+++ b/include/configs/mx51evk.h
@@ -44,6 +44,7 @@
#define CONFIG_CMDLINE_TAG /* enable passing of ATAGs */
#define CONFIG_SETUP_MEMORY_TAGS
#define CONFIG_INITRD_TAG
+#define CONFIG_REVISION_TAG
#define CONFIG_OF_LIBFDT
diff --git a/include/ipu_pixfmt.h b/include/ipu_pixfmt.h
index 0019898..4baa711 100644
--- a/include/ipu_pixfmt.h
+++ b/include/ipu_pixfmt.h
@@ -77,5 +77,6 @@
#define IPU_PIX_FMT_YUV422P fourcc('4', '2', '2', 'P') /*< 16 YUV 4:2:2 */
int ipuv3_fb_init(struct fb_videomode *mode, uint8_t disp, uint32_t pixfmt);
+void ipuv3_fb_shutdown(void);
#endif