[PATCH 06/39] video: Drop CONFIG_LCD_ALIGNMENT

[Simon Glass]

This option is not needed now that the LCD implementation is being
removed. Drop it.

Signed-off-by: Simon Glass <sjg at chromium.org>
---

 README                           | 8 --------
 common/lcd.c                     | 8 --------
 include/configs/nyan-big.h       | 5 -----
 include/configs/tegra20-common.h | 5 -----
 scripts/config_whitelist.txt     | 1 -
 5 files changed, 27 deletions(-)

diff --git a/README b/README
index ec492f9926c..d1d4a62947a 100644
--- a/README
+++ b/README
@@ -815,14 +815,6 @@ The following options need to be configured:
 
 			320x240. Black & white.
 
-		CONFIG_LCD_ALIGNMENT
-
-		Normally the LCD is page-aligned (typically 4KB). If this is
-		defined then the LCD will be aligned to this value instead.
-		For ARM it is sometimes useful to use MMU_SECTION_SIZE
-		here, since it is cheaper to change data cache settings on
-		a per-section basis.
-
 - MII/PHY support:
 		CONFIG_PHY_CLOCK_FREQ (ppc4xx)
 
diff --git a/common/lcd.c b/common/lcd.c
index a462b22a477..2134e603243 100644
--- a/common/lcd.c
+++ b/common/lcd.c
@@ -35,10 +35,6 @@
 #endif
 #endif
 
-#ifndef CONFIG_LCD_ALIGNMENT
-#define CONFIG_LCD_ALIGNMENT PAGE_SIZE
-#endif
-
 #if (LCD_BPP != LCD_COLOR8) && (LCD_BPP != LCD_COLOR16) && \
 	(LCD_BPP != LCD_COLOR32)
 #error Unsupported LCD BPP.
@@ -239,10 +235,6 @@ ulong lcd_setmem(ulong addr)
 
 	size = lcd_get_size(&line_length);
 
-	/* Round up to nearest full page, or MMU section if defined */
-	size = ALIGN(size, CONFIG_LCD_ALIGNMENT);
-	addr = ALIGN(addr - CONFIG_LCD_ALIGNMENT + 1, CONFIG_LCD_ALIGNMENT);
-
 	/* Allocate pages for the frame buffer. */
 	addr -= size;
 
diff --git a/include/configs/nyan-big.h b/include/configs/nyan-big.h
index bc5754566bd..c59e1032439 100644
--- a/include/configs/nyan-big.h
+++ b/include/configs/nyan-big.h
@@ -18,11 +18,6 @@
 #define CONFIG_TEGRA_ENABLE_UARTA
 #define CONFIG_SYS_NS16550_COM1		NV_PA_APB_UARTA_BASE
 
-/* Environment in eMMC, at the end of 2nd "boot sector" */
-
-/* Align LCD to 1MB boundary */
-#define CONFIG_LCD_ALIGNMENT	MMU_SECTION_SIZE
-
 /* SPI */
 #define CONFIG_SPI_FLASH_SIZE          (4 << 20)
 
diff --git a/include/configs/tegra20-common.h b/include/configs/tegra20-common.h
index 71867bb6baa..617bfb2197c 100644
--- a/include/configs/tegra20-common.h
+++ b/include/configs/tegra20-common.h
@@ -54,11 +54,6 @@
 	"fdt_addr_r=0x03000000\0" \
 	"ramdisk_addr_r=0x03100000\0"
 
-/* Defines for SPL */
-
-/* Align LCD to 1MB boundary */
-#define CONFIG_LCD_ALIGNMENT	MMU_SECTION_SIZE
-
 #ifdef CONFIG_TEGRA_LP0
 #define TEGRA_LP0_ADDR			0x1C406000
 #define TEGRA_LP0_SIZE			0x2000
diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt
index 4ef98b9c75d..1284b76f61b 100644
--- a/scripts/config_whitelist.txt
+++ b/scripts/config_whitelist.txt
@@ -263,7 +263,6 @@ CONFIG_KSNET_SERDES_SGMII2_BASE
 CONFIG_KSNET_SERDES_SGMII_BASE
 CONFIG_L1_INIT_RAM
 CONFIG_L2_CACHE
-CONFIG_LCD_ALIGNMENT
 CONFIG_LCD_MENU
 CONFIG_LD9040
 CONFIG_LEGACY_BOOTCMD_ENV
-- 
2.38.0.413.g74048e4d9e-goog