diff options
Diffstat (limited to 'include')
| -rw-r--r-- | include/configs/AdderII.h | 4 | ||||
| -rw-r--r-- | include/configs/MIP405.h | 10 | ||||
| -rw-r--r-- | include/configs/PIP405.h | 12 | ||||
| -rw-r--r-- | include/configs/SXNI855T.h | 29 | ||||
| -rw-r--r-- | include/fat.h | 1 | ||||
| -rw-r--r-- | include/jffs2/jffs2.h | 1 | ||||
| -rw-r--r-- | include/part.h | 1 | 
7 files changed, 42 insertions, 16 deletions
| diff --git a/include/configs/AdderII.h b/include/configs/AdderII.h index c2cff23a1..4c2ba7d58 100644 --- a/include/configs/AdderII.h +++ b/include/configs/AdderII.h @@ -48,10 +48,10 @@  #define CONFIG_CLOCKS_IN_MHZ	1  /* Monitor Functions */ -#define CONFIG_COMMANDS		( CFG_CMD_FLASH | \ +#define CONFIG_COMMANDS		( CFG_CMD_ENV	| \ +				  CFG_CMD_FLASH | \  				  CFG_CMD_MEMORY| \  				  CFG_CMD_NET   | \ -				  CFG_CMD_ENV	| \  				  CFG_CMD_PING  | \  				  CFG_CMD_SDRAM ) diff --git a/include/configs/MIP405.h b/include/configs/MIP405.h index 49b830b86..61a799daa 100644 --- a/include/configs/MIP405.h +++ b/include/configs/MIP405.h @@ -67,6 +67,7 @@  			CFG_CMD_DATE	| \  			CFG_CMD_ELF	| \  			CFG_CMD_MII	| \ +			CFG_CMD_FAT | \  			CFG_CMD_PING	| \  			CFG_CMD_SAVES	| \  			CFG_CMD_BSP	) @@ -246,9 +247,10 @@  /*   * Init Memory Controller:   */ - -#define FLASH_BASE0_PRELIM	0xFFC00000	/* FLASH bank #0	*/ -#define FLASH_BASE1_PRELIM	0		/* FLASH bank #1	*/ +#define FLASH_MAX_SIZE		0x00800000		/* 8MByte max */ +#define FLASH_BASE_PRELIM	0xFF800000  /* open the flash CS */ +/* Size: 0=1MB, 1=2MB, 2=4MB, 3=8MB, 4=16MB, 5=32MB, 6=64MB, 7=128MB */ +#define FLASH_SIZE_PRELIM	 3  /* maximal flash FLASH size bank #0	*/  #define CONFIG_BOARD_PRE_INIT @@ -325,7 +327,7 @@  #undef	CONFIG_IDE_LED	       /* no led for ide supported     */  #define CONFIG_IDE_RESET       /* reset for ide supported...	*/  #define CONFIG_IDE_RESET_ROUTINE /* with a special reset function */ - +#define CONFIG_SUPPORT_VFAT  /************************************************************   * ATAPI support (experimental)   ************************************************************/ diff --git a/include/configs/PIP405.h b/include/configs/PIP405.h index d9f8be8ee..b9107ccf7 100644 --- a/include/configs/PIP405.h +++ b/include/configs/PIP405.h @@ -50,11 +50,13 @@  			CFG_CMD_PCI	| \  			CFG_CMD_CACHE	| \  			CFG_CMD_IRQ	| \ +			CFG_CMD_ECHO	| \  			CFG_CMD_EEPROM	| \  			CFG_CMD_I2C	| \  			CFG_CMD_REGINFO | \  			CFG_CMD_FDC	| \  			CFG_CMD_SCSI	| \ +			CFG_CMD_FAT 	| \  			CFG_CMD_DATE	| \  			CFG_CMD_ELF	| \  			CFG_CMD_USB	| \ @@ -141,7 +143,7 @@  #define CONFIG_LOADS_ECHO	1	/* echo on for serial download	*/  #define CFG_LOADS_BAUD_CHANGE	1	/* allow baudrate change	*/ - +#define CONFIG_MISC_INIT_R  /***********************************************************   * Miscellaneous configurable options   **********************************************************/ @@ -231,9 +233,12 @@  /*   * Init Memory Controller:   */ +#define FLASH_MAX_SIZE		0x00800000		/* 8MByte max */ +#define FLASH_BASE_PRELIM	0xFF800000  /* open the flash CS */ +/* Size: 0=1MB, 1=2MB, 2=4MB, 3=8MB, 4=16MB, 5=32MB, 6=64MB, 7=128MB */ +#define FLASH_SIZE_PRELIM	 3  /* maximal flash FLASH size bank #0	*/ -#define FLASH_BASE0_PRELIM	0xFFC00000	/* FLASH bank #0	*/ -#define FLASH_BASE1_PRELIM	0		/* FLASH bank #1	*/ +#define CONFIG_BOARD_PRE_INIT  /* Configuration Port location */  #define CONFIG_PORT_ADDR	0xF4000000 @@ -299,6 +304,7 @@  #undef	CONFIG_IDE_LED			/* no led for ide supported	*/  #define CONFIG_IDE_RESET		/* reset for ide supported...	*/  #define CONFIG_IDE_RESET_ROUTINE	/* with a special reset function */ +#define CONFIG_SUPPORT_VFAT  /************************************************************   * ATAPI support (experimental) diff --git a/include/configs/SXNI855T.h b/include/configs/SXNI855T.h index bdaf683c3..d6fa79807 100644 --- a/include/configs/SXNI855T.h +++ b/include/configs/SXNI855T.h @@ -145,12 +145,22 @@  #define CONFIG_COMMANDS		(CONFIG_CMD_DFL		| \  				 CFG_CMD_EEPROM		| \ +				 CFG_CMD_JFFS2		| \  				 CFG_CMD_NAND		| \  				 CFG_CMD_DATE)  /* this must be included AFTER the definition of CONFIG_COMMANDS (if any) */  #include <cmd_confdefs.h> +#define CFG_JFFS_CUSTOM_PART +#define CFG_JFFS2_SORT_FRAGMENTS +/* JFFS2 location when using NOR flash */ +#define CFG_JFFS2_BASE	(CFG_FLASH_BASE + 0x80000) +#define CFG_JFFS2_SIZE	(0x780000) +/* JFFS2 location (in RAM) when using NAND flash */ +#define	CFG_JFFS2_RAMBASE 0x400000 +#define	CFG_JFFS2_RAMSIZE 0x200000	/* NAND boot partition is 2MiB	*/ +  /* NAND flash support */  #define CONFIG_MTD_NAND_ECC_JFFS2  #define CFG_MAX_NAND_DEVICE	1	/* Max number of NAND devices	*/ @@ -405,13 +415,18 @@  #define CONFIG_RESET_ON_PANIC		/* reset if system panic() */ -/* to put environment in EEROM */ -#define	CFG_ENV_IS_IN_EEPROM	1 -#define CFG_ENV_OFFSET		0	/* Start right at beginning of NVRAM */ -#define CFG_ENV_SIZE		1024	/* Use only a part of it*/ - -#if 1 -#define CONFIG_BOOT_RETRY_TIME	60	/* boot if no command in 60 seconds */ +#define CFG_ENV_IS_IN_FLASH +#ifdef CFG_ENV_IS_IN_FLASH +  /* environment is in FLASH */ +  #define CFG_ENV_ADDR		0xF8040000	/* AM29LV641 or AM29LV800BT */ +  #define CFG_ENV_ADDR_REDUND	0xF8050000	/* AM29LV641 or AM29LV800BT */ +  #define CFG_ENV_SECT_SIZE	0x00010000 +  #define CFG_ENV_SIZE		0x00002000 +#else +  /* environment is in EEPROM */ +  #define CFG_ENV_IS_IN_EEPROM		1 +  #define CFG_ENV_OFFSET		0	/* at beginning of EEPROM */ +  #define CFG_ENV_SIZE		     1024	/* Use only a part of it*/  #endif  #if 1 diff --git a/include/fat.h b/include/fat.h index b56219ced..6f0f40fa6 100644 --- a/include/fat.h +++ b/include/fat.h @@ -204,5 +204,6 @@ int file_fat_detectfs(void);  int file_fat_ls(const char *dir);  long file_fat_read(const char *filename, void *buffer, unsigned long maxsize);  const char *file_getfsname(int idx); +int fat_register_device(block_dev_desc_t *dev_desc, int part_no);  #endif /* _FAT_H_ */ diff --git a/include/jffs2/jffs2.h b/include/jffs2/jffs2.h index fc3a8419a..4bdc525ce 100644 --- a/include/jffs2/jffs2.h +++ b/include/jffs2/jffs2.h @@ -82,6 +82,7 @@  #define JFFS2_NODETYPE_DIRENT (JFFS2_FEATURE_INCOMPAT | JFFS2_NODE_ACCURATE | 1)  #define JFFS2_NODETYPE_INODE (JFFS2_FEATURE_INCOMPAT | JFFS2_NODE_ACCURATE | 2)  #define JFFS2_NODETYPE_CLEANMARKER (JFFS2_FEATURE_RWCOMPAT_DELETE | JFFS2_NODE_ACCURATE | 3) +#define JFFS2_NODETYPE_PADDING (JFFS2_FEATURE_RWCOMPAT_DELETE | JFFS2_NODE_ACCURATE | 4)  /* Maybe later... */  /*#define JFFS2_NODETYPE_CHECKPOINT (JFFS2_FEATURE_RWCOMPAT_DELETE | JFFS2_NODE_ACCURATE | 3) */ diff --git a/include/part.h b/include/part.h index 2f5a01dea..c24f90920 100644 --- a/include/part.h +++ b/include/part.h @@ -50,6 +50,7 @@ typedef struct block_dev_desc {  #define IF_TYPE_ATAPI		3  #define IF_TYPE_USB		4  #define IF_TYPE_DOC		5 +#define IF_TYPE_MMC		6  /* Part types */  #define	PART_TYPE_UNKNOWN	0x00 |