From 199e14ea560248adc17fc8cb9409bbfcded1220b Mon Sep 17 00:00:00 2001
From: daeinki <inki.dae@samsung.com>
Date: Fri, 19 Mar 2010 18:12:02 +0900
Subject: [PATCH] Revert "s5pc110: fb: moved framebuffer region to reserved
 one."

This reverts commit c5ae09fa97700e9e5858db9c87fdddec9832bc93.
---
 board/samsung/universal/universal.c | 11 -----------
 include/common.h                    |  4 ----
 include/configs/s5pc1xx_universal.h |  9 ++++-----
 lib_arm/board.c                     |  2 --
 4 files changed, 4 insertions(+), 22 deletions(-)

diff --git a/board/samsung/universal/universal.c b/board/samsung/universal/universal.c
index d792640..7c1cf49 100644
--- a/board/samsung/universal/universal.c
+++ b/board/samsung/universal/universal.c
@@ -2174,17 +2174,6 @@ 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, };
diff --git a/include/common.h b/include/common.h
index 7f083a7..1805fda 100644
--- a/include/common.h
+++ b/include/common.h
@@ -306,10 +306,6 @@ void	pciinfo	      (int, int);
 int	misc_init_f   (void);
 int	misc_init_r   (void);
 
-#ifdef CONFIG_LCD
-void fb_set_reserved_mem(void);
-#endif
-
 /* common/exports.c */
 void	jumptable_init(void);
 
diff --git a/include/configs/s5pc1xx_universal.h b/include/configs/s5pc1xx_universal.h
index 7e833d5..348de26 100644
--- a/include/configs/s5pc1xx_universal.h
+++ b/include/configs/s5pc1xx_universal.h
@@ -372,11 +372,10 @@
 
 /* LCD */
 #if 1		/* For LCD test */
-#define CONFIG_FB_RESERVED_MEM_BASE	0x42504000
-#define CONFIG_LCD			1
-#define CONFIG_S5PC1XXFB		1
-#define CONFIG_S6E63M0			1
-#define CONFIG_S6D16A0X			1
+#define CONFIG_LCD		1
+#define CONFIG_S5PC1XXFB	1
+#define CONFIG_S6E63M0		1
+#define CONFIG_S6D16A0X		1
 #define CONFIG_CMD_BMP
 #endif
 
diff --git a/lib_arm/board.c b/lib_arm/board.c
index da989c6..f5660a9 100644
--- a/lib_arm/board.c
+++ b/lib_arm/board.c
@@ -318,8 +318,6 @@ void start_armboot (void)
 #endif /* CONFIG_VFD */
 
 #ifdef CONFIG_LCD
-	fb_set_reserved_mem();
-
 	/* board init may have inited fb_base */
 	if (!gd->fb_base) {
 #		ifndef PAGE_SIZE
-- 
2.7.4