| Message ID | 20180917190327.16434-1-vz@mleia.com |
|---|---|
| State | Accepted |
| Commit | 72f6d6b7ea5efbe76e9132a87f8f991b055c2b11 |
| Delegated to: | Tom Rini |
| Headers | show |
| Series | [U-Boot] arm: lpc32xx: remove phantom CONFIG_LPC32XX_SDRAM_ config option | expand |
On Mon, Sep 17, 2018 at 10:03:27PM +0300, Vladimir Zapolskiy wrote: > The option has never existed and config whitelist script accumulates > it from a comment block, wipe it out from the source code. > > Signed-off-by: Vladimir Zapolskiy <vz@mleia.com> Applied to u-boot/master, thanks!
diff --git a/arch/arm/cpu/arm926ejs/lpc32xx/dram.c b/arch/arm/cpu/arm926ejs/lpc32xx/dram.c index 2dce00234330..4f975694fd69 100644 --- a/arch/arm/cpu/arm926ejs/lpc32xx/dram.c +++ b/arch/arm/cpu/arm926ejs/lpc32xx/dram.c @@ -8,9 +8,6 @@ * This is called by SPL to gain access to the SDR DRAM. * * This code runs from SRAM. - * - * Actual CONFIG_LPC32XX_SDRAM_* parameters must be provided - * by the board configuration file. */ #include <common.h> diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt index 68780ac87f8e..30d54e7634b3 100644 --- a/scripts/config_whitelist.txt +++ b/scripts/config_whitelist.txt @@ -1179,7 +1179,6 @@ CONFIG_LPC32XX_NAND_SLC_WDR_CLKS CONFIG_LPC32XX_NAND_SLC_WHOLD CONFIG_LPC32XX_NAND_SLC_WSETUP CONFIG_LPC32XX_NAND_SLC_WWIDTH -CONFIG_LPC32XX_SDRAM_ CONFIG_LPC32XX_SSP_TIMEOUT CONFIG_LPC_BASE CONFIG_LPC_IO_BASE
The option has never existed and config whitelist script accumulates it from a comment block, wipe it out from the source code. Signed-off-by: Vladimir Zapolskiy <vz@mleia.com> --- The change has a trivial merge conflict with another config symbol removal from https://patchwork.ozlabs.org/patch/970788/ , this change depends on it, so please apply work_92105 clean-up firstly. arch/arm/cpu/arm926ejs/lpc32xx/dram.c | 3 --- scripts/config_whitelist.txt | 1 - 2 files changed, 4 deletions(-)