diff options
| author | Tom Rini <[email protected]> | 2022-03-03 16:51:24 -0500 |
|---|---|---|
| committer | Tom Rini <[email protected]> | 2022-03-03 16:51:45 -0500 |
| commit | fd690a5e932010d0309a859169aeb77af94dff24 (patch) | |
| tree | 12f411ba7a217c285530f43de3f76ec838bc8cb9 /drivers | |
| parent | 09cb77d22e8b87f02718a2e8f8ec7952f7673622 (diff) | |
| parent | f9147d636ce26eec8719ce8167887736c321ef94 (diff) | |
Merge branch '2022-03-03-Kconfig-migrations' into next
- Assorted Kconfig migrations and related cleanups.
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/ddr/fsl/Kconfig | 4 | ||||
| -rw-r--r-- | drivers/mtd/Kconfig | 7 | ||||
| -rw-r--r-- | drivers/pci/pci_mpc85xx.c | 1 |
3 files changed, 11 insertions, 1 deletions
diff --git a/drivers/ddr/fsl/Kconfig b/drivers/ddr/fsl/Kconfig index b0e6df8be41..27716706043 100644 --- a/drivers/ddr/fsl/Kconfig +++ b/drivers/ddr/fsl/Kconfig @@ -49,6 +49,10 @@ config SYS_NUM_DDR_CTLRS ARCH_LX2162A default 1 +config CHIP_SELECTS_PER_CTRL + int "Number of chip selects per controller" + default 4 + config SYS_FSL_DDR_VER int default 50 if SYS_FSL_DDR_VER_50 diff --git a/drivers/mtd/Kconfig b/drivers/mtd/Kconfig index bde3004171a..588ebe9119b 100644 --- a/drivers/mtd/Kconfig +++ b/drivers/mtd/Kconfig @@ -52,6 +52,13 @@ config CFI_FLASH option. Visit <http://www.amd.com/products/nvd/overview/cfi.html> for more information on CFI. +config CFI_FLASH_USE_WEAK_ACCESSORS + bool "Allow read/write functions to be overridden" + depends on FLASH_CFI_DRIVER + help + Enable this option to allow for the flash_{read,write}{8,16,32,64} + functions to be overridden by the platform. + config SYS_FLASH_USE_BUFFER_WRITE bool "Enable buffered writes to flash" depends on FLASH_CFI_DRIVER diff --git a/drivers/pci/pci_mpc85xx.c b/drivers/pci/pci_mpc85xx.c index 1e180ee289b..8a81a74067e 100644 --- a/drivers/pci/pci_mpc85xx.c +++ b/drivers/pci/pci_mpc85xx.c @@ -6,7 +6,6 @@ */ #include <common.h> #include <asm/bitops.h> -#include <asm/cpm_85xx.h> #include <pci.h> #include <dm.h> #include <asm/fsl_law.h> |