diff options
| author | andy.hu <andy.hu@starfivetech.com> | 2024-07-05 05:22:01 +0300 |
|---|---|---|
| committer | andy.hu <andy.hu@starfivetech.com> | 2024-07-05 05:22:01 +0300 |
| commit | fcd8b14f0a7505e8b888989407b524d83c1fcf74 (patch) | |
| tree | e73e33444a7adccb6ea2e2d40f90e4fa56c57aea | |
| parent | 2519a0e18a42d88b399934af6870fc2bc0fbc348 (diff) | |
| parent | fb18b3957b4fbb1fb0167e63dff0403c621df48e (diff) | |
| download | u-boot-fcd8b14f0a7505e8b888989407b524d83c1fcf74.tar.xz | |
Merge branch 'CR_12353_add_XM25QU128C_flash_support_ziv.xu' into 'jh7110-master'
CR_12353_add_XM25QU128C_flash_support_ziv.xu
See merge request sdk/u-boot!87
| -rw-r--r-- | configs/starfive_devkits_defconfig | 1 | ||||
| -rw-r--r-- | drivers/mtd/spi/spi-nor-ids.c | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/configs/starfive_devkits_defconfig b/configs/starfive_devkits_defconfig index 5105b62263..2ba91e4f75 100644 --- a/configs/starfive_devkits_defconfig +++ b/configs/starfive_devkits_defconfig @@ -103,6 +103,7 @@ CONFIG_SF_DEFAULT_SPEED=100000000 CONFIG_SPI_FLASH_GIGADEVICE=y CONFIG_SPI_FLASH_MACRONIX=y CONFIG_SPI_FLASH_SPANSION=y +CONFIG_SPI_FLASH_XMC=y CONFIG_PHY_MARVELL=y CONFIG_PHY_MICREL=y CONFIG_PHY_MICREL_KSZ90X1=y diff --git a/drivers/mtd/spi/spi-nor-ids.c b/drivers/mtd/spi/spi-nor-ids.c index 35fa347c44..87646ff925 100644 --- a/drivers/mtd/spi/spi-nor-ids.c +++ b/drivers/mtd/spi/spi-nor-ids.c @@ -366,6 +366,7 @@ const struct flash_info spi_nor_ids[] = { { INFO("XM25QH64A", 0x207017, 0, 64 * 1024, 128, SECT_4K | SPI_NOR_DUAL_READ | SPI_NOR_QUAD_READ) }, { INFO("XM25QH64C", 0x204017, 0, 64 * 1024, 128, SECT_4K | SPI_NOR_DUAL_READ | SPI_NOR_QUAD_READ) }, { INFO("XM25QH128A", 0x207018, 0, 64 * 1024, 256, SECT_4K | SPI_NOR_DUAL_READ | SPI_NOR_QUAD_READ) }, + { INFO("XM25QU128C", 0x204118, 0, 64 * 1024, 256, SECT_4K | SPI_NOR_DUAL_READ | SPI_NOR_QUAD_READ) }, #endif #ifdef CONFIG_SPI_FLASH_XTX /* XTX Technology (Shenzhen) Limited */ |