Merge https://source.denx.de/u-boot/custodians/u-boot-cfi-flash
- Some CFI flash related fixups (Kconfig & header) (Bin)
- Enable CFI flash support on the QEMU RISC-V virt machine. (Bin)
diff --git a/board/emulation/qemu-riscv/Kconfig b/board/emulation/qemu-riscv/Kconfig
index 0818048..a7de82d 100644
--- a/board/emulation/qemu-riscv/Kconfig
+++ b/board/emulation/qemu-riscv/Kconfig
@@ -64,5 +64,7 @@
imply VIRTIO_PCI
imply VIRTIO_NET
imply VIRTIO_BLK
+ imply MTD_NOR_FLASH
+ imply CFI_FLASH
endif
diff --git a/drivers/mtd/Kconfig b/drivers/mtd/Kconfig
index ad50c5e..b303fab 100644
--- a/drivers/mtd/Kconfig
+++ b/drivers/mtd/Kconfig
@@ -42,6 +42,7 @@
config CFI_FLASH
bool "Enable Driver Model for CFI Flash driver"
depends on DM_MTD
+ select FLASH_CFI_DRIVER
help
The Common Flash Interface specification was developed by Intel,
AMD and other flash manufactures. It provides a universal method
diff --git a/include/configs/qemu-riscv.h b/include/configs/qemu-riscv.h
index 5291de8..bbeea96 100644
--- a/include/configs/qemu-riscv.h
+++ b/include/configs/qemu-riscv.h
@@ -29,6 +29,8 @@
#define CONFIG_STANDALONE_LOAD_ADDR 0x80200000
+#define CONFIG_SYS_MAX_FLASH_BANKS 2
+
#define RISCV_MMODE_TIMERBASE 0x2000000
#define RISCV_MMODE_TIMER_FREQ 1000000
diff --git a/include/flash.h b/include/flash.h
index 42b18a6..f3959f5 100644
--- a/include/flash.h
+++ b/include/flash.h
@@ -21,7 +21,6 @@
ulong flash_id; /* combined device & manufacturer code */
ulong start[CONFIG_SYS_MAX_FLASH_SECT]; /* virtual sector start address */
uchar protect[CONFIG_SYS_MAX_FLASH_SECT]; /* sector protection status */
-#ifdef CONFIG_SYS_FLASH_CFI
uchar portwidth; /* the width of the port */
uchar chipwidth; /* the width of the chip */
uchar chip_lsb; /* extra Least Significant Bit in the */
@@ -45,7 +44,6 @@
ulong addr_unlock2; /* unlock address 2 for AMD flash roms */
uchar sr_supported; /* status register supported */
const char *name; /* human-readable name */
-#endif
#ifdef CONFIG_DM_MTD
struct mtd_info *mtd;
#endif