Merge branch 'master' of mj.ham@party:/pub/git/u-boot-s5pc1xx

diff --combined board/samsung/universal/universal.c
index 6ddf1ec,d792640..fdfb6da
--- 1/board/samsung/universal/universal.c
--- 2/board/samsung/universal/universal.c
+++ b/board/samsung/universal/universal.c
@@@ -692,7 -692,7 +692,7 @@@ static void show_hw_revision(void
        }
  
        if (cpu_is_s5pc110())
 -              writel(0xc1100000 | 0xffff & s5pc1xx_get_cpu_rev(),
 +              writel(0xc1100000 | (0xffff & s5pc1xx_get_cpu_rev()),
                                S5PC110_INFORM3);
  
        empty_device_info_buffer();
@@@ -2174,6 -2174,17 +2174,17 @@@ void init_panel_info(vidinfo_t *vid
  }
  #endif
  
+ #ifdef CONFIG_LCD
+ void fb_set_reserved_mem(void)
+ {
+       unsigned int addr = CONFIG_FB_RESERVED_MEM_BASE;
+ 
+       lcd_setmem(addr);
+ 
+       gd->fb_base = addr;
+ }
+ #endif
+ 
  static void setup_meminfo(void)
  {
        char meminfo[64] = {0, };