* 0x0000_0000    0x2fff_ffff     DDR                     512M
  * 0x8000_0000    0x9fff_ffff     PCI1 MEM                512M
  * 0xc000_0000    0xc00f_ffff     FPGA                    1M
+ * 0xc800_0000    0xcbff_ffff     LIME                    64M
  * 0xe000_0000    0xe00f_ffff     CCSR                    1M (mapped by CCSRBAR)
  * 0xe200_0000    0xe2ff_ffff     PCI1 IO                 16M
  * 0xfc00_0000    0xffff_ffff     FLASH                   64M
 struct law_entry law_table[] = {
        SET_LAW(CFG_DDR_SDRAM_BASE, LAW_SIZE_512M, LAW_TRGT_IF_DDR),
        SET_LAW(CFG_PCI1_MEM_PHYS, LAW_SIZE_512M, LAW_TRGT_IF_PCI),
-       SET_LAW(CFG_LBC_FLASH_BASE, LAW_SIZE_128M, LAW_TRGT_IF_LBC),
+       SET_LAW(CFG_LBC_FLASH_BASE, LAW_SIZE_64M, LAW_TRGT_IF_LBC),
        SET_LAW(CFG_PCI1_IO_PHYS, LAW_SIZE_16M, LAW_TRGT_IF_PCI),
 #if defined(CFG_FPGA_BASE)
        SET_LAW(CFG_FPGA_BASE, LAWAR_SIZE_1M, LAW_TRGT_IF_LBC),
 #endif
+       SET_LAW(CFG_LIME_BASE, LAWAR_SIZE_64M, LAW_TRGT_IF_LBC),
 };
 
 int num_law_entries = ARRAY_SIZE(law_table);
 
        /* Init UPMA for FPGA access */
        out_be32 (&lbc->mamr, 0x44440); /* Use a customer-supplied value */
        upmconfig (UPMA, (uint *)UPMTableA, sizeof(UPMTableA)/sizeof(int));
+
+       if (getenv("lime")) {
+               /* Init UPMB for Lime controller access */
+               out_be32 (&lbc->mbmr, 0x444440); /* Use a customer-supplied value */
+               upmconfig (UPMB, (uint *)UPMTableB, sizeof(UPMTableB)/sizeof(int));
+       }
 }
 
 #if defined(CONFIG_PCI)
        val[i++] = gd->bd->bi_flashstart;
        val[i++] = gd->bd->bi_flashsize;
 
+       if (getenv("lime")) {
+               /* Fixup LIME mapping */
+               val[i++] = 2;                   /* chip select number */
+               val[i++] = 0;                   /* always 0 */
+               val[i++] = CFG_LIME_BASE;
+               val[i++] = CFG_LIME_SIZE;
+       }
+
        /* Fixup FPGA mapping */
        val[i++] = 3;                           /* chip select number */
        val[i++] = 0;                           /* always 0 */
                       fdt_strerror(rc));
 }
 #endif /* defined(CONFIG_OF_LIBFDT) && defined(CONFIG_OF_BOARD_SETUP) */
+
+#include <i2c.h>
+#include <mb862xx.h>
+#include <video_fb.h>
+
+#define CFG_LIME_SRST          ((CFG_LIME_BASE) + 0x01FC002C)
+#define CFG_LIME_CCF           ((CFG_LIME_BASE) + 0x01FC0038)
+#define CFG_LIME_MMR           ((CFG_LIME_BASE) + 0x01FCFFFC)
+/* Lime clock frequency */
+#define CFG_LIME_CLK_100MHZ    0x00000
+#define CFG_LIME_CLK_133MHZ    0x10000
+/* SDRAM parameter */
+#define CFG_LIME_MMR_VALUE     0x4157BA63
+
+#define DISPLAY_WIDTH          800
+#define DISPLAY_HEIGHT         480
+#define DEFAULT_BRIGHTNESS     25
+#define BACKLIGHT_ENABLE       (1 << 31)
+
+extern GraphicDevice mb862xx;
+
+static const gdc_regs init_regs [] =
+{
+       {0x0100, 0x00010f00},
+       {0x0020, 0x801901df},
+       {0x0024, 0x00000000},
+       {0x0028, 0x00000000},
+       {0x002c, 0x00000000},
+       {0x0110, 0x00000000},
+       {0x0114, 0x00000000},
+       {0x0118, 0x01df0320},
+       {0x0004, 0x041f0000},
+       {0x0008, 0x031f031f},
+       {0x000c, 0x017f0349},
+       {0x0010, 0x020c0000},
+       {0x0014, 0x01df01e9},
+       {0x0018, 0x00000000},
+       {0x001c, 0x01e00320},
+       {0x0100, 0x80010f00},
+       {0x0, 0x0}
+};
+
+const gdc_regs *board_get_regs (void)
+{
+       return init_regs;
+}
+
+/* Returns Lime base address */
+unsigned int board_video_init (void)
+{
+
+       if (!getenv("lime"))
+               return 0;
+
+       /*
+        * Reset Lime controller
+        */
+       out_be32((void *)CFG_LIME_SRST, 0x1);
+       udelay(200);
+
+       /* Set Lime clock to 133MHz */
+       out_be32((void *)CFG_LIME_CCF, CFG_LIME_CLK_133MHZ);
+       /* Delay required */
+       udelay(300);
+       /* Set memory parameters */
+       out_be32((void *)CFG_LIME_MMR, CFG_LIME_MMR_VALUE);
+
+       mb862xx.winSizeX = DISPLAY_WIDTH;
+       mb862xx.winSizeY = DISPLAY_HEIGHT;
+       mb862xx.gdfIndex = GDF_15BIT_555RGB;
+       mb862xx.gdfBytesPP = 2;
+
+       return CFG_LIME_BASE;
+}
+
+#define W83782D_REG_CFG                0x40
+#define W83782D_REG_BANK_SEL   0x4e
+#define W83782D_REG_ADCCLK     0x4b
+#define W83782D_REG_BEEP_CTRL  0x4d
+#define W83782D_REG_BEEP_CTRL2 0x57
+#define W83782D_REG_PWMOUT1    0x5b
+#define W83782D_REG_VBAT       0x5d
+
+static int w83782d_hwmon_init(void)
+{
+       u8 buf;
+
+       if (i2c_read(CFG_I2C_W83782G_ADDR, W83782D_REG_CFG, 1, &buf, 1))
+               return -1;
+
+       i2c_reg_write(CFG_I2C_W83782G_ADDR, W83782D_REG_CFG, 0x80);
+       i2c_reg_write(CFG_I2C_W83782G_ADDR, W83782D_REG_BANK_SEL, 0);
+       i2c_reg_write(CFG_I2C_W83782G_ADDR, W83782D_REG_ADCCLK, 0x40);
+
+       buf = i2c_reg_read(CFG_I2C_W83782G_ADDR, W83782D_REG_BEEP_CTRL);
+       i2c_reg_write(CFG_I2C_W83782G_ADDR, W83782D_REG_BEEP_CTRL,
+                     buf | 0x80);
+       i2c_reg_write(CFG_I2C_W83782G_ADDR, W83782D_REG_BEEP_CTRL2, 0);
+       i2c_reg_write(CFG_I2C_W83782G_ADDR, W83782D_REG_PWMOUT1, 0x47);
+       i2c_reg_write(CFG_I2C_W83782G_ADDR, W83782D_REG_VBAT, 0x01);
+
+       buf = i2c_reg_read(CFG_I2C_W83782G_ADDR, W83782D_REG_CFG);
+       i2c_reg_write(CFG_I2C_W83782G_ADDR, W83782D_REG_CFG,
+                     (buf & 0xf4) | 0x01);
+       return 0;
+}
+
+static void board_backlight_brightness(int br)
+{
+       u32 reg;
+       u8 buf;
+       u8 old_buf;
+
+       /* Select bank 0 */
+       if (i2c_read(CFG_I2C_W83782G_ADDR, 0x4e, 1, &old_buf, 1))
+               goto err;
+       else
+               buf = old_buf & 0xf8;
+
+       if (i2c_write(CFG_I2C_W83782G_ADDR, 0x4e, 1, &buf, 1))
+               goto err;
+
+       if (br > 0) {
+               /* PWMOUT1 duty cycle ctrl */
+               buf = 255 / (100 / br);
+               if (i2c_write(CFG_I2C_W83782G_ADDR, 0x5b, 1, &buf, 1))
+                       goto err;
+
+               /* LEDs on */
+               reg = in_be32((void *)(CFG_FPGA_BASE + 0x0c));
+               if (!(reg & BACKLIGHT_ENABLE));
+                       out_be32((void *)(CFG_FPGA_BASE + 0x0c),
+                                reg | BACKLIGHT_ENABLE);
+       } else {
+               buf = 0;
+               if (i2c_write(CFG_I2C_W83782G_ADDR, 0x5b, 1, &buf, 1))
+                       goto err;
+
+               /* LEDs off */
+               reg = in_be32((void *)(CFG_FPGA_BASE + 0x0c));
+               reg &= ~BACKLIGHT_ENABLE;
+               out_be32((void *)(CFG_FPGA_BASE + 0x0c), reg);
+       }
+       /* Restore previous bank setting */
+       if (i2c_write(CFG_I2C_W83782G_ADDR, 0x4e, 1, &old_buf, 1))
+               goto err;
+
+       return;
+err:
+       printf("W83782G I2C access failed\n");
+}
+
+void board_backlight_switch (int flag)
+{
+       char * param;
+       int rc;
+
+       if (w83782d_hwmon_init())
+               printf ("hwmon IC init failed\n");
+
+       if (flag) {
+               param = getenv("brightness");
+               rc = param ? simple_strtol(param, NULL, 10) : -1;
+               if (rc < 0)
+                       rc = DEFAULT_BRIGHTNESS;
+       } else {
+               rc = 0;
+       }
+       board_backlight_brightness(rc);
+}
+
+#if defined(CONFIG_CONSOLE_EXTRA_INFO)
+/*
+ * Return text to be printed besides the logo.
+ */
+void video_get_info_str (int line_number, char *info)
+{
+       if (line_number == 1) {
+               strcpy (info, " Board: Socrates");
+       } else {
+               info [0] = '\0';
+       }
+}
+#endif
 
 
 
        /*
-        * TLB 0:       64M     Non-cacheable, guarded
+        * TLB 1:       64M     Non-cacheable, guarded
         * 0xfc000000   64M     FLASH
         * Out of reset this entry is only 4K.
         */
                      0, 4, BOOKE_PAGESZ_1M, 1),
 #endif
 
+       /*
+        * TLB 5:       64M     Non-cacheable, guarded
+        * 0xc8000000   16M     LIME GDC framebuffer
+        * 0xc9fc0000   256K    LIME GDC MMIO
+        * (0xcbfc0000  256K    LIME GDC MMIO)
+        * MMIO is relocatable and could be at 0xcbfc0000
+        */
+       SET_TLB_ENTRY(1, CFG_LIME_BASE, CFG_LIME_BASE,
+                     MAS3_SX|MAS3_SW|MAS3_SR, MAS2_I|MAS2_G,
+                     0, 5, BOOKE_PAGESZ_64M, 1),
+
        /*
         * TLB 6:       64M     Non-cacheable, guarded
         * 0xe000_0000  1M      CCSRBAR
 
        0xffffec00,  0xffffec00,  0xffffec00,  0xffffec01  /* Words 60 to 63    */
 };
 
+/* LIME UPM B Table Configuration Code */
+static unsigned int UPMTableB[] =
+{
+       0x0ffefc00,  0x0ffcfc00,  0x0ffcfc00,  0x0ffcfc00, /* Words 0 to 3      */
+       0x0ffcfc00,  0x0ffcfc00,  0x0ffcfc04,  0x0ffffc01, /* Words 4 to 7      */
+       0x0ffefc00,  0x0ffcfc00,  0x0ffcfc00,  0x0ffcfc00, /* Words 8 to 11     */
+       0x0ffcfc00,  0x0ffcfc00,  0x0ffcfc04,  0x0ffcfc04, /* Words 12 to 15    */
+       0x0ffcfc04,  0x0ffcfc04,  0x0ffcfc04,  0x0ffcfc04, /* Words 16 to 19    */
+       0x0ffcfc04,  0x0ffcfc04,  0x0ffffc00,  0xfffffc01, /* Words 20 to 23    */
+       0x0cfffc00,  0x00fffc00,  0x00fffc00,  0x00fffc00, /* Words 24 to 27    */
+       0x00fffc00,  0x00fffc00,  0x00fffc04,  0x0ffffc01, /* Words 28 to 31    */
+       0x0cfffc00,  0x00fffc00,  0x00fffc00,  0x00fffc00, /* Words 32 to 35    */
+       0x00fffc00,  0x00fffc00,  0x00fffc04,  0x00fffc04, /* Words 36 to 39    */
+       0x00fffc04,  0x00fffc04,  0x00fffc04,  0x00fffc04, /* Words 40 to 43    */
+       0x00fffc04,  0x00fffc04,  0x0ffffc00,  0xfffffc01, /* Words 44 to 47    */
+       0xfffffc00,  0xfffffc00,  0xfffffc00,  0xfffffc00, /* Words 48 to 51    */
+       0xfffffc00,  0xfffffc00,  0xfffffc00,  0xfffffc00, /* Words 52 to 55    */
+       0xfffffc00,  0xfffffc00,  0xfffffc00,  0xfffffc01, /* Words 56 to 59    */
+       0xfffffc00,  0xfffffc00,  0xfffffc00,  0xfffffc01  /* Words 60 to 63    */
+};
 #endif
 
        board_disp_init();
 #endif
 
-#if defined(CONFIG_LWMON5) && !(CONFIG_POST & CFG_POST_SYSMON)
+#if (defined(CONFIG_LWMON5) || \
+     defined(CONFIG_SOCRATES)) && !(CONFIG_POST & CFG_POST_SYSMON)
        /* Lamp on */
        board_backlight_switch (1);
 #endif
 
 #define NAND_MAX_CHIPS         1
 #define CONFIG_CMD_NAND
 
+/* LIME GDC */
+#define CFG_LIME_BASE          0xc8000000
+#define CFG_LIME_SIZE          0x04000000      /* 64 MB        */
+#define CFG_BR2_PRELIM         0xc80018a1      /* UPMB, 32-bit */
+#define CFG_OR2_PRELIM         0xfc000000      /* 64 MB        */
+
+#define CONFIG_VIDEO
+#define CONFIG_VIDEO_MB862xx
+#define CONFIG_CFB_CONSOLE
+#define CONFIG_VIDEO_LOGO
+#define CONFIG_VIDEO_BMP_LOGO
+#define CONFIG_CONSOLE_EXTRA_INFO
+#define VIDEO_FB_16BPP_PIXEL_SWAP
+#define CONFIG_VGA_AS_SINGLE_DEVICE
+#define CFG_CONSOLE_IS_IN_ENV
+#define CONFIG_VIDEO_SW_CURSOR
+#define CONFIG_SPLASH_SCREEN
+#define CONFIG_VIDEO_BMP_GZIP
+#define CFG_VIDEO_LOGO_MAX_SIZE        (2 << 20)       /* decompressed img */
+
 /* Serial Port */
 
 #define CONFIG_CONS_INDEX     1
 #define CONFIG_RTC_RX8025              /* Use Epson rx8025 rtc via i2c */
 #define CFG_I2C_RTC_ADDR       0x32    /* at address 0x32              */
 
+/* I2C W83782G HW-Monitoring IC */
+#define CFG_I2C_W83782G_ADDR   0x28    /* W83782G address              */
+
 /* I2C temp sensor */
 /* Socrates uses Maxim's       DS75, which is compatible with LM75 */
 #define CONFIG_DTT_LM75                1
 #define CONFIG_CMD_SNTP
 #define CONFIG_CMD_USB
 #define CONFIG_CMD_EXT2                /* EXT2 Support                 */
+#define CONFIG_CMD_BMP
 
 #if defined(CONFIG_PCI)
     #define CONFIG_CMD_PCI