[PATCH 02/17] lcd: Remove legacy CONFIG_FB_ADDR code

[Tom Rini]

No platforms set both CONFIG_LCD and CONFIG_FB_ADDR at this time, drop
this legacy code.

Signed-off-by: Tom Rini <trini at konsulko.com>
---
 README                         | 14 --------------
 common/board_f.c               |  4 ----
 include/configs/at91sam9rlek.h |  2 --
 include/configs/trats.h        |  1 -
 include/configs/trats2.h       |  1 -
 5 files changed, 22 deletions(-)

diff --git a/README b/README
index a8d43f63b7e3..40069ed17993 100644
--- a/README
+++ b/README
@@ -1509,20 +1509,6 @@ The following options need to be configured:
 		overwriting the architecture dependent default
 		settings.
 
-- Frame Buffer Address:
-		CONFIG_FB_ADDR
-
-		Define CONFIG_FB_ADDR if you want to use specific
-		address for frame buffer.  This is typically the case
-		when using a graphics controller has separate video
-		memory.  U-Boot will then place the frame buffer at
-		the given address instead of dynamically reserving it
-		in system RAM by calling lcd_setmem(), which grabs
-		the memory for the frame buffer depending on the
-		configured panel size.
-
-		Please see board_init_f function.
-
 - Automatic software updates via TFTP server
 		CONFIG_UPDATE_TFTP
 		CONFIG_UPDATE_TFTP_CNT_MAX
diff --git a/common/board_f.c b/common/board_f.c
index 51d2f3c365e9..cbfd42ce1235 100644
--- a/common/board_f.c
+++ b/common/board_f.c
@@ -400,13 +400,9 @@ static int reserve_video(void)
 	      ((unsigned long)gd->relocaddr - addr) >> 10, addr);
 	gd->relocaddr = addr;
 #elif defined(CONFIG_LCD)
-#  ifdef CONFIG_FB_ADDR
-	gd->fb_base = CONFIG_FB_ADDR;
-#  else
 	/* reserve memory for LCD display (always full pages) */
 	gd->relocaddr = lcd_setmem(gd->relocaddr);
 	gd->fb_base = gd->relocaddr;
-#  endif /* CONFIG_FB_ADDR */
 #endif
 
 	return 0;
diff --git a/include/configs/at91sam9rlek.h b/include/configs/at91sam9rlek.h
index e3350282bcf6..e418edddfbe5 100644
--- a/include/configs/at91sam9rlek.h
+++ b/include/configs/at91sam9rlek.h
@@ -22,8 +22,6 @@
 
 /* LCD */
 #define LCD_BPP				LCD_COLOR8
-/* Let board_init_f handle the framebuffer allocation */
-#undef CONFIG_FB_ADDR
 
 /* SDRAM */
 #define CONFIG_SYS_SDRAM_BASE		ATMEL_BASE_CS1
diff --git a/include/configs/trats.h b/include/configs/trats.h
index bca239ae817e..53f5a6996bd7 100644
--- a/include/configs/trats.h
+++ b/include/configs/trats.h
@@ -149,7 +149,6 @@
 #define LCD_BPP			LCD_COLOR16
 
 /* LCD */
-#define CONFIG_FB_ADDR		0x52504000
 #define CONFIG_SYS_VIDEO_LOGO_MAX_SIZE  ((500 * 160 * 4) + 54)
 
 #endif	/* __CONFIG_H */
diff --git a/include/configs/trats2.h b/include/configs/trats2.h
index 20bd116c9e3d..b7449dab8bdb 100644
--- a/include/configs/trats2.h
+++ b/include/configs/trats2.h
@@ -139,7 +139,6 @@
 #define LCD_BPP                 LCD_COLOR16
 
 /* LCD */
-#define CONFIG_FB_ADDR		0x52504000
 #define CONFIG_SYS_VIDEO_LOGO_MAX_SIZE ((500 * 160 * 4) + 54)
 
 #endif	/* __CONFIG_H */
-- 
2.25.1