Merge branch '2019-11-20-env-migration'

[oweals/u-boot.git] / include / configs / sam9x60ek.h

diff --git a/include/configs/sam9x60ek.h b/include/configs/sam9x60ek.h
index b778bd8e83ebbedf89b3ee8ae09a39e4f1bf8ab2..3dda8696e4f71655481f1d5e30884ed71e7c1ad0 100644 (file)
--- a/include/configs/sam9x60ek.h
+++ b/include/configs/sam9x60ek.h
@@ -42,6 +42,26 @@
 #define CONFIG_SYS_INIT_SP_ADDR \
        (CONFIG_SYS_SDRAM_BASE + 16 * 1024 - GENERATED_GBL_DATA_SIZE)
 
+/* NAND flash */
+#ifdef CONFIG_CMD_NAND
+#define CONFIG_NAND_ATMEL
+#define CONFIG_SYS_MAX_NAND_DEVICE     1
+#define CONFIG_SYS_NAND_BASE           0x40000000
+#define CONFIG_SYS_NAND_MASK_ALE       BIT(21)
+#define CONFIG_SYS_NAND_MASK_CLE       BIT(22)
+#define CONFIG_SYS_NAND_ENABLE_PIN     AT91_PIN_PD4
+#define CONFIG_SYS_NAND_READY_PIN      AT91_PIN_PD5
+#define CONFIG_SYS_NAND_ONFI_DETECTION
+
+#define CONFIG_MTD_DEVICE
+#endif
+
+/* PMECC & PMERRLOC */
+#define CONFIG_ATMEL_NAND_HWECC
+#define CONFIG_ATMEL_NAND_HW_PMECC
+#define CONFIG_PMECC_CAP               8
+#define CONFIG_PMECC_SECTOR_SIZE       512
+
 #define CONFIG_SYS_LOAD_ADDR           0x22000000      /* load address */
 
 #ifdef CONFIG_SD_BOOT
@@ -50,6 +70,20 @@
                        "fatload mmc 0:1 0x21000000 at91-sam9x60ek.dtb;" \
                        "fatload mmc 0:1 0x22000000 zImage;" \
                        "bootz 0x22000000 - 0x21000000"
+
+#elif defined(CONFIG_NAND_BOOT)
+/* bootstrap + u-boot + env + linux in nandflash */
+#define CONFIG_BOOTCOMMAND     "nand read " \
+                               "0x22000000 0x200000 0x600000; " \
+                               "nand read 0x21000000 0x180000 0x20000; " \
+                               "bootz 0x22000000 - 0x21000000"
+
+#elif defined(CONFIG_QSPI_BOOT)
+/* bootstrap + u-boot + env + linux in SPI NOR flash */
+#define CONFIG_BOOTCOMMAND     "sf probe 0; "                                  \
+                               "sf read 0x21000000 0x180000 0x80000; "         \
+                               "sf read 0x22000000 0x200000 0x600000; "        \
+                               "bootz 0x22000000 - 0x21000000"
 #endif
 
 /*