summaryrefslogtreecommitdiff
path: root/include/jffs2/load_kernel.h
diff options
context:
space:
mode:
authorTom Rini <[email protected]>2018-10-02 13:02:22 -0400
committerTom Rini <[email protected]>2018-10-02 17:01:46 -0400
commit592cd5defd4f71d34ffcbd8dd3326bc10f662e20 (patch)
tree0824c4d2c60d79b7be18ba82209d899e4d4f8c34 /include/jffs2/load_kernel.h
parent2ba8bf207481cfb319f54a1bef67f6f068831a58 (diff)
parentb3bec2525604d6b42bb9e7fd719c84b022447db3 (diff)
Merge branch 'master' of git://git.denx.de/u-boot-spi
This is the PR for SPI-NAND changes along with few spi changes. [trini: Re-sync changes for ls1012afrwy_qspi*_defconfig] Signed-off-by: Tom Rini <[email protected]>
Diffstat (limited to 'include/jffs2/load_kernel.h')
-rw-r--r--include/jffs2/load_kernel.h7
1 files changed, 5 insertions, 2 deletions
diff --git a/include/jffs2/load_kernel.h b/include/jffs2/load_kernel.h
index 1ddff062ad7..9346d7ee9f1 100644
--- a/include/jffs2/load_kernel.h
+++ b/include/jffs2/load_kernel.h
@@ -15,9 +15,12 @@
#define MTD_DEV_TYPE_NOR 0x0001
#define MTD_DEV_TYPE_NAND 0x0002
#define MTD_DEV_TYPE_ONENAND 0x0004
+#define MTD_DEV_TYPE_SPINAND 0x0008
-#define MTD_DEV_TYPE(type) ((type == MTD_DEV_TYPE_NAND) ? "nand" : \
- (type == MTD_DEV_TYPE_ONENAND) ? "onenand" : "nor")
+#define MTD_DEV_TYPE(type) (type == MTD_DEV_TYPE_NAND ? "nand" : \
+ (type == MTD_DEV_TYPE_NOR ? "nor" : \
+ (type == MTD_DEV_TYPE_ONENAND ? "onenand" : \
+ "spi-nand"))) \
struct mtd_device {
struct list_head link;