diff options
| author | Tom Rini <trini@konsulko.com> | 2020-12-18 13:06:02 -0500 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2020-12-18 13:06:02 -0500 |
| commit | 549e7cb70843d4729524cbb03fe3a4b5dab42d94 (patch) | |
| tree | d42cd9c31699f2af89a01b01e3060a9d71b16199 /include | |
| parent | 233a4d47e71114b8a48105a169a82da5b67ff47f (diff) | |
| parent | 936a645609145363b9580adeda831ab3d9ac1d78 (diff) | |
Merge branch 'master' of https://gitlab.denx.de/u-boot/custodians/u-boot-spi
Diffstat (limited to 'include')
| -rw-r--r-- | include/configs/cm_fx6.h | 7 | ||||
| -rw-r--r-- | include/configs/dh_imx6.h | 6 | ||||
| -rw-r--r-- | include/spi.h | 2 |
3 files changed, 1 insertions, 14 deletions
diff --git a/include/configs/cm_fx6.h b/include/configs/cm_fx6.h index 72eb19b581..9892fb8817 100644 --- a/include/configs/cm_fx6.h +++ b/include/configs/cm_fx6.h @@ -150,13 +150,6 @@ /* APBH DMA is required for NAND support */ #endif -/* SPI Flash Configs */ -#if defined(CONFIG_SPL_BUILD) -#undef CONFIG_DM_SPI -#undef CONFIG_DM_SPI_FLASH -#undef CONFIG_SPI_FLASH_MTD -#endif - /* Ethernet */ #define CONFIG_FEC_MXC #define CONFIG_FEC_MXC_PHYADDR 0 diff --git a/include/configs/dh_imx6.h b/include/configs/dh_imx6.h index 008a70a7c2..4a469af5e6 100644 --- a/include/configs/dh_imx6.h +++ b/include/configs/dh_imx6.h @@ -52,12 +52,6 @@ /* SATA Configs */ #define CONFIG_LBA48 -/* SPI Flash Configs */ -#if defined(CONFIG_SPL_BUILD) -#undef CONFIG_DM_SPI -#undef CONFIG_DM_SPI_FLASH -#endif - /* UART */ #define CONFIG_MXC_UART_BASE UART1_BASE diff --git a/include/spi.h b/include/spi.h index ef8c1f6692..2d34e4af11 100644 --- a/include/spi.h +++ b/include/spi.h @@ -51,7 +51,7 @@ struct dm_spi_bus { * struct from a spi_slave, use dev_get_parent_platdata(dev) or * dev_get_parent_platdata(slave->dev). * - * This data is immuatable. Each time the device is probed, @max_hz and @mode + * This data is immutable. Each time the device is probed, @max_hz and @mode * will be copied to struct spi_slave. * * @cs: Chip select number (0..n-1) |