usb: pci: Add XHCI driver for PCI

[u-boot] / board / cm-bf548 / video.c

diff --git a/board/cm-bf548/video.c b/board/cm-bf548/video.c
index 4703098149590df0487ff13d3744d1d47145dc70..b098615d4c04a2f71e611a08f6e0d87a8efca07f 100644 (file)
--- a/board/cm-bf548/video.c
+++ b/board/cm-bf548/video.c
@@ -11,6 +11,7 @@
 #include <config.h>
 #include <malloc.h>
 #include <asm/blackfin.h>
+#include <asm/clock.h>
 #include <asm/gpio.h>
 #include <asm/portmux.h>
 #include <asm/mach-common/bits/dma.h>
@@ -18,13 +19,15 @@
 #include <linux/types.h>
 #include <stdio_dev.h>
 
-#ifdef CONFIG_VIDEO
+#include <lzma/LzmaTypes.h>
+#include <lzma/LzmaDec.h>
+#include <lzma/LzmaTools.h>
 
 #define DMA_SIZE16     2
 
 #include <asm/mach-common/bits/eppi.h>
 
-#include <asm/bfin_logo_230x230.h>
+#include EASYLOGO_HEADER
 
 #define LCD_X_RES              480     /*Horizontal Resolution */
 #define LCD_Y_RES              272     /* Vertical Resolution */
@@ -280,14 +283,6 @@ static void dma_bitblit(void *dst, fastimage_t *logo, int x, int y)
 
 }
 
-void video_putc(const char c)
-{
-}
-
-void video_puts(const char *s)
-{
-}
-
 int drv_video_init(void)
 {
        int error, devices = 1;
@@ -303,16 +298,27 @@ int drv_video_init(void)
                printf("Failed to alloc FB memory\n");
                return -1;
        }
+
 #ifdef EASYLOGO_ENABLE_GZIP
        unsigned char *data = EASYLOGO_DECOMP_BUFFER;
        unsigned long src_len = EASYLOGO_ENABLE_GZIP;
-       if (gunzip(data, bfin_logo.size, bfin_logo.data, &src_len)) {
+       error = gunzip(data, bfin_logo.size, bfin_logo.data, &src_len);
+       bfin_logo.data = data;
+#elif defined(EASYLOGO_ENABLE_LZMA)
+       unsigned char *data = EASYLOGO_DECOMP_BUFFER;
+       SizeT lzma_len = bfin_logo.size;
+       error = lzmaBuffToBuffDecompress(data, &lzma_len,
+               bfin_logo.data, EASYLOGO_ENABLE_LZMA);
+       bfin_logo.data = data;
+#else
+       error = 0;
+#endif
+
+       if (error) {
                puts("Failed to decompress logo\n");
                free(dst);
                return -1;
        }
-       bfin_logo.data = data;
-#endif
 
        memset(dst + ACTIVE_VIDEO_MEM_OFFSET, bfin_logo.data[0],
               fbmem_size - ACTIVE_VIDEO_MEM_OFFSET);
@@ -328,12 +334,8 @@ int drv_video_init(void)
        strcpy(videodev.name, "video");
        videodev.ext = DEV_EXT_VIDEO;   /* Video extensions */
        videodev.flags = DEV_FLAGS_SYSTEM;      /* No Output */
-       videodev.putc = video_putc;     /* 'putc' function */
-       videodev.puts = video_puts;     /* 'puts' function */
 
        error = stdio_register(&videodev);
 
        return (error == 0) ? devices : error;
 }
-
-#endif