diff mbox series

[U-Boot,v3,26/26] cfi_flash: Always define cfi_flash_num_flash_banks

Message ID 20180126134356.9393-26-mario.six@gdsys.cc
State Awaiting Upstream
Delegated to: Stefan Roese
Headers show
Series [U-Boot,v3,01/26] cfi_flash: Fix space between function name and parenthesis | expand

Commit Message

Mario Six Jan. 26, 2018, 1:43 p.m. UTC 
The variable cfi_flash_num_flash_banks is defined iff
CONFIG_SYS_MAX_FLASH_BANKS_DETECT is defined, but it is used
unconditionally in the function cfi_flash_init_dm. This leads to a
undefined variable compile error when CONFIG_SYS_MAX_FLASH_BANKS_DETECT
is not defined, but DM is enabled.

Fix this by always defining the cfi_flash_num_flash_banks variable.

Signed-off-by: Mario Six <mario.six@gdsys.cc>
---

v2 -> v3:
* Added proper commit message

v1 -> v2:
None

---
 drivers/mtd/cfi_flash.c | 2 ++
 1 file changed, 2 insertions(+)

--
2.11.0
diff mbox series

Patch

diff --git a/drivers/mtd/cfi_flash.c b/drivers/mtd/cfi_flash.c
index 347382f529..da44e6184e 100644
--- a/drivers/mtd/cfi_flash.c
+++ b/drivers/mtd/cfi_flash.c
@@ -91,6 +91,8 @@  static u16 cfi_flash_config_reg(int i)

 #if defined(CONFIG_SYS_MAX_FLASH_BANKS_DETECT)
 int cfi_flash_num_flash_banks = CONFIG_SYS_MAX_FLASH_BANKS_DETECT;
+#else
+int cfi_flash_num_flash_banks;
 #endif

 #ifdef CONFIG_CFI_FLASH /* for driver model */