From 87648ca8876814f8ec4e056f8c4b2b80633a28e3 Mon Sep 17 00:00:00 2001 From: Jason Jin Date: Thu, 26 Jul 2012 15:30:22 +0800 Subject: Add NFC support for faraday board Signed-off-by: Jason Jin --- include/configs/vybrid.h | 19 ++++++++++++++++--- include/configs/vybrid_iram.h | 27 ++++++++++++++++++++------- 2 files changed, 36 insertions(+), 10 deletions(-) (limited to 'include/configs') diff --git a/include/configs/vybrid.h b/include/configs/vybrid.h index 9cf8e376a76..c8719c810f3 100644 --- a/include/configs/vybrid.h +++ b/include/configs/vybrid.h @@ -78,7 +78,7 @@ #define CONFIG_CMD_NET #undef CONFIG_CMD_NFS /* NFS support */ #define CONFIG_CMD_PING - +#define CONFIG_CMD_NAND #undef CONFIG_CMD_DATE #undef CONFIG_CMD_IMI /* iminfo */ #undef CONFIG_CMD_IMLS @@ -106,6 +106,19 @@ #define CONFIG_DOS_PARTITION #endif +/* + * NAND FLASH + */ +#ifdef CONFIG_CMD_NAND +#define CONFIG_JFFS2_NAND +#define CONFIG_NAND_FSL_NFC +#define CONFIG_SYS_NAND_BASE 0x400E0000 +#define CONFIG_SYS_MAX_NAND_DEVICE 1 +#define NAND_MAX_CHIPS CONFIG_SYS_MAX_NAND_DEVICE +#define CONFIG_SYS_NAND_SELECT_DEVICE +#define CONFIG_SYS_64BIT_VSPRINTF /* needed for nand_util.c */ +#endif + #define CONFIG_QUAD_SPI /* Network configuration */ @@ -225,8 +238,8 @@ #define CONFIG_SYS_CLKCTRL_CACRR 0x00000810 #define CONFIG_SYS_CLKCTRL_CSCMR1 0x03CA0000 #define CONFIG_SYS_CLKCTRL_CSCDR1 0x01000000 -#define CONFIG_SYS_CLKCTRL_CSCDR2 0x30110000 -#define CONFIG_SYS_CLKCTRL_CSCDR3 0x00001F1F +#define CONFIG_SYS_CLKCTRL_CSCDR2 0x30114240 +#define CONFIG_SYS_CLKCTRL_CSCDR3 0x00003F1F #define CONFIG_SYS_CLKCTRL_CSCMR2 0x00000000 #define CONFIG_SYS_CLKCTRL_CSCDR4 0x00000000 #define CONFIG_SYS_CLKCTRL_CLPCR 0x00000078 diff --git a/include/configs/vybrid_iram.h b/include/configs/vybrid_iram.h index 6ff77b4d549..108fcec4d4b 100644 --- a/include/configs/vybrid_iram.h +++ b/include/configs/vybrid_iram.h @@ -34,7 +34,7 @@ #define CONFIG_SYS_ICACHE_OFF #define CONFIG_SYS_CACHELINE_SIZE 64 -#define CONFIG_SYS_UBOOT_IN_GPURAM +/*#define CONFIG_SYS_UBOOT_IN_GPURAM*/ #include /* @@ -51,7 +51,7 @@ #define CONFIG_MACH_TYPE MACH_TYPE_VYBRID_VF6XX /* Size of malloc() pool */ -#define CONFIG_SYS_MALLOC_LEN (16 << 10) +#define CONFIG_SYS_MALLOC_LEN ((1024 * 2) << 10) #define CONFIG_BOARD_LATE_INIT @@ -80,7 +80,7 @@ #define CONFIG_CMD_NET #undef CONFIG_CMD_NFS /* NFS support */ #define CONFIG_CMD_PING - +#define CONFIG_CMD_NAND #undef CONFIG_CMD_DATE #undef CONFIG_CMD_IMI /* iminfo */ #undef CONFIG_CMD_IMLS @@ -108,6 +108,19 @@ #define CONFIG_DOS_PARTITION #endif +/* + * NAND FLASH + */ +#ifdef CONFIG_CMD_NAND +#define CONFIG_JFFS2_NAND +#define CONFIG_NAND_FSL_NFC +#define CONFIG_SYS_NAND_BASE 0x400E0000 +#define CONFIG_SYS_MAX_NAND_DEVICE 1 +#define NAND_MAX_CHIPS CONFIG_SYS_MAX_NAND_DEVICE +#define CONFIG_SYS_NAND_SELECT_DEVICE +#define CONFIG_SYS_64BIT_VSPRINTF /* needed for nand_util.c */ +#endif + #define CONFIG_QUAD_SPI /* Network configuration */ @@ -190,11 +203,11 @@ /* Physical Memory Map */ #define CONFIG_NR_DRAM_BANKS 1 -#define PHYS_SDRAM_1_SIZE (512 * 1024 * 1024) +#define PHYS_SDRAM_1_SIZE (128 * 1024 * 1024) /*#define CONFIG_SYS_SDRAM_BASE (PHYS_SDRAM_1)*/ /*#define CONFIG_SYS_SDRAM_BASE (CONFIG_SYS_INIT_RAM_ADDR)*/ -#define CONFIG_SYS_SDRAM_BASE (0x3f400000) +#define CONFIG_SYS_SDRAM_BASE (0x80000000) #define CONFIG_SYS_INIT_RAM_ADDR (IRAM_BASE_ADDR) #define CONFIG_SYS_INIT_RAM_SIZE (IRAM_SIZE) @@ -228,8 +241,8 @@ #define CONFIG_SYS_CLKCTRL_CACRR 0x00000810 #define CONFIG_SYS_CLKCTRL_CSCMR1 0x03CA0000 #define CONFIG_SYS_CLKCTRL_CSCDR1 0x01000000 -#define CONFIG_SYS_CLKCTRL_CSCDR2 0x30110000 -#define CONFIG_SYS_CLKCTRL_CSCDR3 0x00001F1F +#define CONFIG_SYS_CLKCTRL_CSCDR2 0x30114240 +#define CONFIG_SYS_CLKCTRL_CSCDR3 0x00003F1F #define CONFIG_SYS_CLKCTRL_CSCMR2 0x00000000 #define CONFIG_SYS_CLKCTRL_CSCDR4 0x00000000 #define CONFIG_SYS_CLKCTRL_CLPCR 0x00000078 -- cgit v1.2.3