Spacemit: revert XMC flash chip addon, use .config instead

This commit is contained in:
Sven-Ola Tuecke 2026-02-03 08:38:46 +01:00 committed by c0rnelius
parent 6326273663
commit b99f4bc53b

View File

@ -1,25 +1,25 @@
From 7666dd63e71f0b7bd42f786070ff03d822f3bfc4 Mon Sep 17 00:00:00 2001
From b724bb58891905fb2a6423299b4865538d36e577 Mon Sep 17 00:00:00 2001
From: Sven-Ola Tuecke <sven-ola@gmx.de>
Date: Mon, 12 Jan 2026 22:15:06 +0100
Subject: [PATCH] u-boot support for XM25QH128A flash
Date: Mon, 2 Feb 2026 22:15:22 +0100
Subject: [PATCH] Orange Pi RV2: u-boot support for XM25QH128A flash
Signed-off-by: Sven-Ola Tuecke <sven-ola@gmx.de>
---
drivers/mtd/spi/spi-nor-ids.c | 1 +
configs/k1_defconfig | 1 +
1 file changed, 1 insertion(+)
diff --git a/drivers/mtd/spi/spi-nor-ids.c b/drivers/mtd/spi/spi-nor-ids.c
index 14a797468eb..dec8d51e34e 100644
--- a/drivers/mtd/spi/spi-nor-ids.c
+++ b/drivers/mtd/spi/spi-nor-ids.c
@@ -444,6 +444,7 @@ const struct flash_info spi_nor_ids[] = {
{ INFO("w25m512jw", 0xef6119, 0, 64 * 1024, 1024, SECT_4K | SPI_NOR_DUAL_READ | SPI_NOR_QUAD_READ) },
{ INFO("w25m512jv", 0xef7119, 0, 64 * 1024, 1024, SECT_4K | SPI_NOR_DUAL_READ | SPI_NOR_QUAD_READ) },
{ INFO("w25h02jv", 0xef9022, 0, 64 * 1024, 4096, SECT_4K | SPI_NOR_DUAL_READ | SPI_NOR_QUAD_READ) },
+ { INFO("XM25QH128A", 0x204118, 0, 64 * 1024, 256, SECT_4K | SPI_NOR_DUAL_READ | SPI_NOR_QUAD_READ) },
#endif
#ifdef CONFIG_SPI_FLASH_XMC
/* XMC (Wuhan Xinxin Semiconductor Manufacturing Corp.) */
diff --git a/configs/k1_defconfig b/configs/k1_defconfig
index a134f8df14b..d157bc42348 100644
--- a/configs/k1_defconfig
+++ b/configs/k1_defconfig
@@ -204,6 +204,7 @@ CONFIG_DM_MTD=y
CONFIG_MTD_SPI_NAND=y
CONFIG_SPI_FLASH_GIGADEVICE=y
CONFIG_SPI_FLASH_WINBOND=y
+CONFIG_SPI_FLASH_XMC=y
CONFIG_SPI_FLASH_FM=y
CONFIG_SPINOR_BLOCK_SUPPORT=y
# CONFIG_SPI_FLASH_USE_4K_SECTORS is not set
--
2.34.1