projects
/
oweals
/
u-boot.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge git://git.denx.de/u-boot-marvell
[oweals/u-boot.git]
/
include
/
flash.h
diff --git
a/include/flash.h
b/include/flash.h
index 30aa080b883eb0ec1febcb067965cea758491bfd..5754cf97737c1b5658327c3f521408cacec78b9e 100644
(file)
--- a/
include/flash.h
+++ b/
include/flash.h
@@
-459,6
+459,9
@@
extern flash_info_t *flash_get_info(ulong base);
#define FLASH_S29GL064M 0x00F0 /* Spansion S29GL064M-R6 */
#define FLASH_S29GL128N 0x00F1 /* Spansion S29GL128N */
#define FLASH_S29GL064M 0x00F0 /* Spansion S29GL064M-R6 */
#define FLASH_S29GL128N 0x00F1 /* Spansion S29GL128N */
+#define FLASH_STM32F4 0x00F2 /* STM32F4 Embedded Flash */
+#define FLASH_STM32F1 0x00F3 /* STM32F1 Embedded Flash */
+
#define FLASH_UNKNOWN 0xFFFF /* unknown flash type */
#define FLASH_UNKNOWN 0xFFFF /* unknown flash type */