aria: enable NAND flash support

Signed-off-by: Wolfgang Denk <wd@denx.de>

diff --git a/board/davedenx/aria/aria.c b/board/davedenx/aria/aria.c
index 9662308782830ffa38824f00796000b90edbd9e1..2064aa2c6c19bf35d93689c5526af71da1f9f858 100644 (file)
--- a/board/davedenx/aria/aria.c
+++ b/board/davedenx/aria/aria.c
@@ -42,6 +42,7 @@ DECLARE_GLOBAL_DATA_PTR;
                         CLOCK_SCCR1_PSCFIFO_EN |                       \
                         CLOCK_SCCR1_DDR_EN |                           \
                         CLOCK_SCCR1_FEC_EN |                           \
+                        CLOCK_SCCR1_NFC_EN |                           \
                         CLOCK_SCCR1_PATA_EN |                          \
                         CLOCK_SCCR1_PCI_EN |                           \
                         CLOCK_SCCR1_TPR_EN)

diff --git a/include/configs/aria.h b/include/configs/aria.h
index 3ae1238b7a14dd3a4fb66b9145a7d0a59dac9604..fb374722e5135e59bda118dfe554cd1108ead74e 100644 (file)
--- a/include/configs/aria.h
+++ b/include/configs/aria.h
@@ -241,6 +241,28 @@
 
 #undef CONFIG_SYS_FLASH_CHECKSUM
 
+/*
+ * NAND FLASH support
+ * drivers/mtd/nand/mpc5121_nfc.c (rev 2 silicon only)
+ */
+#define CONFIG_CMD_NAND
+
+#define CONFIG_NAND_MPC5121_NFC
+#define CONFIG_SYS_NAND_BASE           0x40000000
+
+#define CONFIG_SYS_MAX_NAND_DEVICE     1
+#define NAND_MAX_CHIPS                 CONFIG_SYS_MAX_NAND_DEVICE
+
+#define CONFIG_SYS_64BIT_VSPRINTF      /* needed for nand_util.c */
+
+/*
+ * Configuration parameters for MPC5121 NAND driver
+ */
+#define CONFIG_FSL_NFC_WIDTH           1
+#define CONFIG_FSL_NFC_WRITE_SIZE      2048
+#define CONFIG_FSL_NFC_SPARE_SIZE      64
+#define CONFIG_FSL_NFC_CHIPS           CONFIG_SYS_MAX_NAND_DEVICE
+
 #define CONFIG_SYS_SRAM_BASE           0x30000000
 #define CONFIG_SYS_SRAM_SIZE           0x00020000      /* 128 KB */
 
@@ -285,7 +307,7 @@
 #define CONFIG_SYS_INIT_SP_OFFSET      CONFIG_SYS_GBL_DATA_OFFSET
 
 #define CONFIG_SYS_MONITOR_BASE                TEXT_BASE
-#define CONFIG_SYS_MONITOR_LEN         (256 * 1024)
+#define CONFIG_SYS_MONITOR_LEN         (384 * 1024)
 
 #ifdef CONFIG_FSL_DIU_FB
 #define CONFIG_SYS_MALLOC_LEN          (6 * 1024 * 1024)