video: mb862xx: add option VIDEO_FB_16BPP_WORD_SWAP for IPEK01

In 16 bpp mode, the new IPEK01 board only requires swapping of D16 words
for D32 accesses due to the diffferent connecting to the GDC bus. This
patch introduces the configuration option VIDEO_FB_16BPP_WORD_SWAP,
which should be set for all board using the mb862xx in 16 bpp mode. For
the IPEK01, VIDEO_FB_16BPP_PIXEL_SWAP should not be set.

Signed-off-by: Wolfgang Grandegger <wg@denx.de>

diff --git a/drivers/video/cfb_console.c b/drivers/video/cfb_console.c
index 0df321cd44160dd70b1566fef48442336e5d47c9..16d6689f228a307cfb93c40874b0eb254481b48c 100644 (file)
--- a/drivers/video/cfb_console.c
+++ b/drivers/video/cfb_console.c
@@ -321,7 +321,7 @@ void        console_cursor (int state);
 #else
 #define SWAP16(x)       (x)
 #define SWAP32(x)       (x)
-#if defined(VIDEO_FB_16BPP_PIXEL_SWAP)
+#if defined(VIDEO_FB_16BPP_WORD_SWAP)
 #define SHORTSWAP32(x)  ( ((x) >> 16) | ((x) << 16) )
 #else
 #define SHORTSWAP32(x)  (x)

diff --git a/include/configs/lwmon5.h b/include/configs/lwmon5.h
index 927b80f9e2e98cc28456796b0589bc043d162160..011dd5c81abaaa19d248e934627186602d17eba7 100644 (file)
--- a/include/configs/lwmon5.h
+++ b/include/configs/lwmon5.h
@@ -349,6 +349,7 @@
 #define CONFIG_VIDEO_LOGO
 #define CONFIG_CONSOLE_EXTRA_INFO
 #define VIDEO_FB_16BPP_PIXEL_SWAP
+#define VIDEO_FB_16BPP_WORD_SWAP
 
 #define CONFIG_VGA_AS_SINGLE_DEVICE
 #define CONFIG_VIDEO_SW_CURSOR

diff --git a/include/configs/socrates.h b/include/configs/socrates.h
index 59a4b283712a658035e7aaa5f11f4e73b6cfeb51..3632b847f819eaf99bb3bfcbbc984958fbcbaad8 100644 (file)
--- a/include/configs/socrates.h
+++ b/include/configs/socrates.h
@@ -204,6 +204,7 @@
 #define CONFIG_VIDEO_BMP_LOGO
 #define CONFIG_CONSOLE_EXTRA_INFO
 #define VIDEO_FB_16BPP_PIXEL_SWAP
+#define VIDEO_FB_16BPP_WORD_SWAP
 #define CONFIG_VGA_AS_SINGLE_DEVICE
 #define CONFIG_SYS_CONSOLE_IS_IN_ENV
 #define CONFIG_VIDEO_SW_CURSOR