diff options
| author | Tom Rini <trini@konsulko.com> | 2021-10-06 19:26:33 +0300 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2021-10-06 20:46:31 +0300 |
| commit | ea67f467a43e4c8852bd1ce1bb75f5dc6c3788d1 (patch) | |
| tree | 1bbf310f2b22ad465d5698bfdf71347129834561 /scripts | |
| parent | 7240e1b8f94a56db88a2af688cad27e2e6545302 (diff) | |
| parent | 6115f1c4fe81015369e110ea9830a6e36710677c (diff) | |
| download | u-boot-ea67f467a43e4c8852bd1ce1bb75f5dc6c3788d1.tar.xz | |
Merge branch '2021-10-06-assorted-improvements'
- Use better values for ACPI OEM_VERSION
- Assorted NAND related Kconifg migrations and another dependency fix
Diffstat (limited to 'scripts')
| -rw-r--r-- | scripts/config_whitelist.txt | 10 |
1 files changed, 0 insertions, 10 deletions
diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt index 5bcd2c26c4..02d86d79cf 100644 --- a/scripts/config_whitelist.txt +++ b/scripts/config_whitelist.txt @@ -849,13 +849,9 @@ CONFIG_NAND_CS_INIT CONFIG_NAND_DATA_REG CONFIG_NAND_ECC_BCH CONFIG_NAND_ENV_DST -CONFIG_NAND_FSL_ELBC -CONFIG_NAND_FSL_IFC CONFIG_NAND_KIRKWOOD CONFIG_NAND_KMETER1 -CONFIG_NAND_LPC32XX_MLC CONFIG_NAND_MODE_REG -CONFIG_NAND_OMAP_ECCSCHEME CONFIG_NAND_OMAP_GPMC_WSCFG CONFIG_NAND_SECBOOT CONFIG_NAND_SPL @@ -1192,7 +1188,6 @@ CONFIG_SPL_MAX_PEB_SIZE CONFIG_SPL_MAX_SIZE CONFIG_SPL_MXS_PSWITCH_WAIT CONFIG_SPL_NAND_INIT -CONFIG_SPL_NAND_LOAD CONFIG_SPL_NAND_MINIMAL CONFIG_SPL_NAND_RAW_ONLY CONFIG_SPL_NAND_SOFTECC @@ -2358,15 +2353,12 @@ CONFIG_SYS_MX7_CLK32 CONFIG_SYS_MX7_HCLK CONFIG_SYS_MXS_VDD5V_ONLY CONFIG_SYS_NAND_4BIT_HW_ECC_OOBFIRST -CONFIG_SYS_NAND_4_ADDR_CYCLE -CONFIG_SYS_NAND_5_ADDR_CYCLE CONFIG_SYS_NAND_ACTL_ALE CONFIG_SYS_NAND_ACTL_CLE CONFIG_SYS_NAND_ACTL_DELAY CONFIG_SYS_NAND_ACTL_NCE CONFIG_SYS_NAND_ALE CONFIG_SYS_NAND_AMASK -CONFIG_SYS_NAND_BAD_BLOCK_POS CONFIG_SYS_NAND_BASE CONFIG_SYS_NAND_BASE2 CONFIG_SYS_NAND_BASE_LIST @@ -2406,11 +2398,9 @@ CONFIG_SYS_NAND_MAX_ECCPOS CONFIG_SYS_NAND_MAX_OOBFREE CONFIG_SYS_NAND_MX7_GPMI_62_ECC_BYTES CONFIG_SYS_NAND_NO_SUBPAGE_WRITE -CONFIG_SYS_NAND_ONFI_DETECTION CONFIG_SYS_NAND_OR_PRELIM CONFIG_SYS_NAND_PAGE_2K CONFIG_SYS_NAND_PAGE_4K -CONFIG_SYS_NAND_PAGE_COUNT CONFIG_SYS_NAND_QUIET CONFIG_SYS_NAND_READY_PIN CONFIG_SYS_NAND_REGS_BASE |