diff options
| author | Tom Rini <[email protected]> | 2020-05-22 10:27:06 -0400 |
|---|---|---|
| committer | Tom Rini <[email protected]> | 2020-05-22 10:27:06 -0400 |
| commit | 74ce1f8c6f29ddc153d31d01703980c99ee7a7ee (patch) | |
| tree | 4c325ab1f54eff37acd70bb264be281c06a1ee65 /drivers | |
| parent | 2fa581ba910368d0f7f995fb906d6c5e4218b594 (diff) | |
| parent | 6cbe90486c581db5be84f0a0d9384705f54edabc (diff) | |
Merge tag 'uniphier-v2020.07' of https://gitlab.denx.de/u-boot/custodians/u-boot-uniphier
UniPhier SoC updates for v2020.07
- De-assert write protect for Denali NAND driver
- Clean up include directives
- Migrate to DM_ETH, and remove legacy board_eth_init()
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/mtd/nand/raw/Kconfig | 18 | ||||
| -rw-r--r-- | drivers/mtd/nand/raw/denali.c | 1 |
2 files changed, 10 insertions, 9 deletions
diff --git a/drivers/mtd/nand/raw/Kconfig b/drivers/mtd/nand/raw/Kconfig index c4d9d313883..06b2ff972ca 100644 --- a/drivers/mtd/nand/raw/Kconfig +++ b/drivers/mtd/nand/raw/Kconfig @@ -121,15 +121,6 @@ config NAND_DENALI_DT Enable the driver for NAND flash on platforms using a Denali NAND controller as a DT device. -config NAND_DENALI_SPARE_AREA_SKIP_BYTES - int "Number of bytes skipped in OOB area" - depends on NAND_DENALI - range 0 63 - help - This option specifies the number of bytes to skip from the beginning - of OOB area before last ECC sector data starts. This is potentially - used to preserve the bad block marker in the OOB area. - config NAND_LPC32XX_SLC bool "Support LPC32XX_SLC controller" help @@ -404,6 +395,15 @@ config SPL_NAND_DENALI This is a small implementation of the Denali NAND controller for use on SPL. +config NAND_DENALI_SPARE_AREA_SKIP_BYTES + int "Number of bytes skipped in OOB area" + depends on SPL_NAND_DENALI + range 0 63 + help + This option specifies the number of bytes to skip from the beginning + of OOB area before last ECC sector data starts. This is potentially + used to preserve the bad block marker in the OOB area. + config SPL_NAND_SIMPLE bool "Use simple SPL NAND driver" depends on !SPL_NAND_AM33XX_BCH diff --git a/drivers/mtd/nand/raw/denali.c b/drivers/mtd/nand/raw/denali.c index 5bae7f1197e..15e90291de0 100644 --- a/drivers/mtd/nand/raw/denali.c +++ b/drivers/mtd/nand/raw/denali.c @@ -1095,6 +1095,7 @@ static void denali_hw_init(struct denali_nand_info *denali) iowrite32(CHIP_EN_DONT_CARE__FLAG, denali->reg + CHIP_ENABLE_DONT_CARE); iowrite32(0xffff, denali->reg + SPARE_AREA_MARKER); + iowrite32(WRITE_PROTECT__FLAG, denali->reg + WRITE_PROTECT); } int denali_calc_ecc_bytes(int step_size, int strength) |