summaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorTom Rini <trini@konsulko.com>2015-11-30 07:11:53 -0500
committerTom Rini <trini@konsulko.com>2015-11-30 07:11:53 -0500
commit60e12b3a7143687cacb4b66b849563c4b9719e51 (patch)
tree0dd8ca7ba9ed913f0ee79835c65dce0250292437 /include
parent30f56399e7c740be043ecbc57cd96ce95998208a (diff)
parent5aeeabf43c27b1bf4b3bb86e2b713dd98801df63 (diff)
downloadtalos-obmc-uboot-60e12b3a7143687cacb4b66b849563c4b9719e51.tar.gz
talos-obmc-uboot-60e12b3a7143687cacb4b66b849563c4b9719e51.zip
Merge git://www.denx.de/git/u-boot-cfi-flash
Diffstat (limited to 'include')
-rw-r--r--include/flash.h7
1 files changed, 4 insertions, 3 deletions
diff --git a/include/flash.h b/include/flash.h
index 13e03842c8..f53ace7889 100644
--- a/include/flash.h
+++ b/include/flash.h
@@ -8,7 +8,10 @@
#ifndef _FLASH_H_
#define _FLASH_H_
-#ifndef CONFIG_SYS_NO_FLASH
+#ifndef CONFIG_SYS_MAX_FLASH_SECT
+#define CONFIG_SYS_MAX_FLASH_SECT 512
+#endif
+
/*-----------------------------------------------------------------------
* FLASH Info: contains chip specific data, per FLASH bank
*/
@@ -503,6 +506,4 @@ extern flash_info_t *flash_get_info(ulong base);
#define FLASH_ERASE_TIMEOUT 120000 /* timeout for erasing in ms */
#define FLASH_WRITE_TIMEOUT 500 /* timeout for writes in ms */
-#endif /* !CONFIG_SYS_NO_FLASH */
-
#endif /* _FLASH_H_ */
OpenPOWER on IntegriCloud