diff options
Diffstat (limited to 'include/configs/CPCI2DP.h')
| -rw-r--r-- | include/configs/CPCI2DP.h | 148 | 
1 files changed, 74 insertions, 74 deletions
| diff --git a/include/configs/CPCI2DP.h b/include/configs/CPCI2DP.h index 208f1a211..328773430 100644 --- a/include/configs/CPCI2DP.h +++ b/include/configs/CPCI2DP.h @@ -49,7 +49,7 @@  #define CONFIG_PREBOOT                  /* enable preboot variable      */  #define CONFIG_LOADS_ECHO	1	/* echo on for serial download	*/ -#define CFG_LOADS_BAUD_CHANGE	1	/* allow baudrate change	*/ +#define CONFIG_SYS_LOADS_BAUD_CHANGE	1	/* allow baudrate change	*/  #define CONFIG_MII		1	/* MII PHY management		*/  #define CONFIG_PHY_ADDR		0	/* PHY address			*/ @@ -85,46 +85,46 @@  /*   * Miscellaneous configurable options   */ -#define CFG_LONGHELP			/* undef to save memory		*/ -#define CFG_PROMPT	"=> "		/* Monitor Command Prompt	*/ +#define CONFIG_SYS_LONGHELP			/* undef to save memory		*/ +#define CONFIG_SYS_PROMPT	"=> "		/* Monitor Command Prompt	*/ -#undef	CFG_HUSH_PARSER			/* use "hush" command parser	*/ -#ifdef	CFG_HUSH_PARSER -#define CFG_PROMPT_HUSH_PS2	"> " +#undef	CONFIG_SYS_HUSH_PARSER			/* use "hush" command parser	*/ +#ifdef	CONFIG_SYS_HUSH_PARSER +#define CONFIG_SYS_PROMPT_HUSH_PS2	"> "  #endif  #if defined(CONFIG_CMD_KGDB) -#define CFG_CBSIZE	1024		/* Console I/O Buffer Size	*/ +#define CONFIG_SYS_CBSIZE	1024		/* Console I/O Buffer Size	*/  #else -#define CFG_CBSIZE	256		/* Console I/O Buffer Size	*/ +#define CONFIG_SYS_CBSIZE	256		/* Console I/O Buffer Size	*/  #endif -#define CFG_PBSIZE (CFG_CBSIZE+sizeof(CFG_PROMPT)+16) /* Print Buffer Size */ -#define CFG_MAXARGS	16		/* max number of command args	*/ -#define CFG_BARGSIZE	CFG_CBSIZE	/* Boot Argument Buffer Size	*/ +#define CONFIG_SYS_PBSIZE (CONFIG_SYS_CBSIZE+sizeof(CONFIG_SYS_PROMPT)+16) /* Print Buffer Size */ +#define CONFIG_SYS_MAXARGS	16		/* max number of command args	*/ +#define CONFIG_SYS_BARGSIZE	CONFIG_SYS_CBSIZE	/* Boot Argument Buffer Size	*/ -#define CFG_DEVICE_NULLDEV	1	/* include nulldev device	*/ +#define CONFIG_SYS_DEVICE_NULLDEV	1	/* include nulldev device	*/ -#define CFG_CONSOLE_INFO_QUIET	1	/* don't print console @ startup*/ +#define CONFIG_SYS_CONSOLE_INFO_QUIET	1	/* don't print console @ startup*/  #define CONFIG_AUTO_COMPLETE	1       /* add autocompletion support   */ -#define CFG_MEMTEST_START	0x0400000	/* memtest works on	*/ -#define CFG_MEMTEST_END		0x0C00000	/* 4 ... 12 MB in DRAM	*/ +#define CONFIG_SYS_MEMTEST_START	0x0400000	/* memtest works on	*/ +#define CONFIG_SYS_MEMTEST_END		0x0C00000	/* 4 ... 12 MB in DRAM	*/ -#undef	CFG_EXT_SERIAL_CLOCK	       /* no external serial clock used */ -#define CFG_IGNORE_405_UART_ERRATA_59	/* ignore ppc405gp errata #59	*/ -#define CFG_BASE_BAUD	    691200 +#undef	CONFIG_SYS_EXT_SERIAL_CLOCK	       /* no external serial clock used */ +#define CONFIG_SYS_IGNORE_405_UART_ERRATA_59	/* ignore ppc405gp errata #59	*/ +#define CONFIG_SYS_BASE_BAUD	    691200  #define CONFIG_UART1_CONSOLE            /* define for uart1 as console  */  /* The following table includes the supported baudrates */ -#define CFG_BAUDRATE_TABLE	\ +#define CONFIG_SYS_BAUDRATE_TABLE	\  	{ 300, 600, 1200, 2400, 4800, 9600, 19200, 38400,     \  	 57600, 115200, 230400, 460800, 921600 } -#define CFG_LOAD_ADDR	0x100000	/* default load address */ -#define CFG_EXTBDINFO	1		/* To use extended board_into (bd_t) */ +#define CONFIG_SYS_LOAD_ADDR	0x100000	/* default load address */ +#define CONFIG_SYS_EXTBDINFO	1		/* To use extended board_into (bd_t) */ -#define CFG_HZ		1000		/* decrementer freq: 1 ms ticks */ +#define CONFIG_SYS_HZ		1000		/* decrementer freq: 1 ms ticks */  #define CONFIG_LOOPW            1       /* enable loopw command         */ @@ -132,7 +132,7 @@  #define CONFIG_VERSION_VARIABLE 1	/* include version env variable */ -#define CFG_RX_ETH_BUFFER	16	/* use 16 rx buffer on 405 emac */ +#define CONFIG_SYS_RX_ETH_BUFFER	16	/* use 16 rx buffer on 405 emac */  /*-----------------------------------------------------------------------   * PCI stuff @@ -153,52 +153,52 @@  #define CONFIG_PCI_BOOTDELAY    0       /* enable pci bootdelay variable*/ -#define CFG_PCI_SUBSYS_VENDORID 0x12FE  /* PCI Vendor ID: esd gmbh      */ -#define CFG_PCI_SUBSYS_DEVICEID 0x040b  /* PCI Device ID: CPCI-2DP      */ -#define CFG_PCI_CLASSCODE       0x0280	/* PCI Class Code: Network/Other*/ +#define CONFIG_SYS_PCI_SUBSYS_VENDORID 0x12FE  /* PCI Vendor ID: esd gmbh      */ +#define CONFIG_SYS_PCI_SUBSYS_DEVICEID 0x040b  /* PCI Device ID: CPCI-2DP      */ +#define CONFIG_SYS_PCI_CLASSCODE       0x0280	/* PCI Class Code: Network/Other*/ -#define CFG_PCI_PTM1LA  (bd->bi_memstart) /* point to sdram               */ -#define CFG_PCI_PTM1MS  (~(bd->bi_memsize - 1) | 1) /* memsize, enable hard-wired to 1 */ -#define CFG_PCI_PTM1PCI 0x00000000      /* Host: use this pci address   */ -#define CFG_PCI_PTM2LA	0xef000000	/* point to internal regs + PB0/1 */ -#define CFG_PCI_PTM2MS  0xff000001      /* 16MB, enable                  */ -#define CFG_PCI_PTM2PCI 0x00000000      /* Host: use this pci address   */ +#define CONFIG_SYS_PCI_PTM1LA  (bd->bi_memstart) /* point to sdram               */ +#define CONFIG_SYS_PCI_PTM1MS  (~(bd->bi_memsize - 1) | 1) /* memsize, enable hard-wired to 1 */ +#define CONFIG_SYS_PCI_PTM1PCI 0x00000000      /* Host: use this pci address   */ +#define CONFIG_SYS_PCI_PTM2LA	0xef000000	/* point to internal regs + PB0/1 */ +#define CONFIG_SYS_PCI_PTM2MS  0xff000001      /* 16MB, enable                  */ +#define CONFIG_SYS_PCI_PTM2PCI 0x00000000      /* Host: use this pci address   */  /*-----------------------------------------------------------------------   * Start addresses for the final memory configuration   * (Set up by the startup code) - * Please note that CFG_SDRAM_BASE _must_ start at 0 + * Please note that CONFIG_SYS_SDRAM_BASE _must_ start at 0   */ -#define CFG_SDRAM_BASE		0x00000000 -#define CFG_FLASH_BASE		0xFFFC0000 -#define CFG_MONITOR_BASE	CFG_FLASH_BASE -#define CFG_MONITOR_LEN		(256 * 1024)	/* Reserve 256 kB for Monitor	*/ -#define CFG_MALLOC_LEN		(128 * 1024)	/* Reserve 128 kB for malloc()	*/ +#define CONFIG_SYS_SDRAM_BASE		0x00000000 +#define CONFIG_SYS_FLASH_BASE		0xFFFC0000 +#define CONFIG_SYS_MONITOR_BASE	CONFIG_SYS_FLASH_BASE +#define CONFIG_SYS_MONITOR_LEN		(256 * 1024)	/* Reserve 256 kB for Monitor	*/ +#define CONFIG_SYS_MALLOC_LEN		(128 * 1024)	/* Reserve 128 kB for malloc()	*/  /*   * For booting Linux, the board info and command line data   * have to be in the first 8 MB of memory, since this is   * the maximum mapped by the Linux kernel during initialization.   */ -#define CFG_BOOTMAPSZ		(8 << 20)	/* Initial Memory map for Linux */ +#define CONFIG_SYS_BOOTMAPSZ		(8 << 20)	/* Initial Memory map for Linux */  /*-----------------------------------------------------------------------   * FLASH organization   */ -#define CFG_MAX_FLASH_BANKS	1	/* max number of memory banks		*/ -#define CFG_MAX_FLASH_SECT	256	/* max number of sectors on one chip	*/ +#define CONFIG_SYS_MAX_FLASH_BANKS	1	/* max number of memory banks		*/ +#define CONFIG_SYS_MAX_FLASH_SECT	256	/* max number of sectors on one chip	*/ -#define CFG_FLASH_ERASE_TOUT	120000	/* Timeout for Flash Erase (in ms)	*/ -#define CFG_FLASH_WRITE_TOUT	500	/* Timeout for Flash Write (in ms)	*/ +#define CONFIG_SYS_FLASH_ERASE_TOUT	120000	/* Timeout for Flash Erase (in ms)	*/ +#define CONFIG_SYS_FLASH_WRITE_TOUT	500	/* Timeout for Flash Write (in ms)	*/ -#define CFG_FLASH_WORD_SIZE	unsigned short	/* flash word size (width)	*/ -#define CFG_FLASH_ADDR0		0x5555	/* 1st address for flash config cycles	*/ -#define CFG_FLASH_ADDR1		0x2AAA	/* 2nd address for flash config cycles	*/ +#define CONFIG_SYS_FLASH_WORD_SIZE	unsigned short	/* flash word size (width)	*/ +#define CONFIG_SYS_FLASH_ADDR0		0x5555	/* 1st address for flash config cycles	*/ +#define CONFIG_SYS_FLASH_ADDR1		0x2AAA	/* 2nd address for flash config cycles	*/ -#define CFG_FLASH_READ0		0x0000	/* 0 is standard			*/ -#define CFG_FLASH_READ1		0x0001	/* 1 is standard			*/ -#define CFG_FLASH_READ2		0x0002	/* 2 is standard			*/ +#define CONFIG_SYS_FLASH_READ0		0x0000	/* 0 is standard			*/ +#define CONFIG_SYS_FLASH_READ1		0x0001	/* 1 is standard			*/ +#define CONFIG_SYS_FLASH_READ2		0x0002	/* 2 is standard			*/ -#define CFG_FLASH_EMPTY_INFO		/* print 'E' for empty sector on flinfo */ +#define CONFIG_SYS_FLASH_EMPTY_INFO		/* print 'E' for empty sector on flinfo */  #define CONFIG_ENV_IS_IN_EEPROM	1	/* use EEPROM for environment vars */  #define CONFIG_ENV_OFFSET		0x000	/* environment starts at the beginning of the EEPROM */ @@ -208,19 +208,19 @@   * I2C EEPROM (CAT24WC16) for environment   */  #define CONFIG_HARD_I2C			/* I2c with hardware support */ -#define CFG_I2C_SPEED		400000	/* I2C speed and slave address */ -#define CFG_I2C_SLAVE		0x7F +#define CONFIG_SYS_I2C_SPEED		400000	/* I2C speed and slave address */ +#define CONFIG_SYS_I2C_SLAVE		0x7F -#define CFG_I2C_EEPROM_ADDR	0x50	/* EEPROM CAT28WC08		*/ -#define CFG_I2C_EEPROM_ADDR_LEN 1	/* Bytes of address		*/ +#define CONFIG_SYS_I2C_EEPROM_ADDR	0x50	/* EEPROM CAT28WC08		*/ +#define CONFIG_SYS_I2C_EEPROM_ADDR_LEN 1	/* Bytes of address		*/  /* mask of address bits that overflow into the "EEPROM chip address"	*/ -#define CFG_I2C_EEPROM_ADDR_OVERFLOW	0x07 -#define CFG_EEPROM_PAGE_WRITE_BITS 4	/* The Catalyst CAT24WC08 has	*/ +#define CONFIG_SYS_I2C_EEPROM_ADDR_OVERFLOW	0x07 +#define CONFIG_SYS_EEPROM_PAGE_WRITE_BITS 4	/* The Catalyst CAT24WC08 has	*/  					/* 16 byte page write mode using*/  					/* last 4 bits of the address	*/ -#define CFG_EEPROM_PAGE_WRITE_DELAY_MS	10   /* and takes up to 10 msec */ +#define CONFIG_SYS_EEPROM_PAGE_WRITE_DELAY_MS	10   /* and takes up to 10 msec */ -#define CFG_EEPROM_WREN         1 +#define CONFIG_SYS_EEPROM_WREN         1  /*   * Init Memory Controller: @@ -235,35 +235,35 @@   */  /* Memory Bank 0 (Flash Bank 0) initialization					*/ -#define CFG_EBC_PB0AP		0x92015480 -#define CFG_EBC_PB0CR		0xFFC5A000  /* BAS=0xFFC,BS=4MB,BU=R/W,BW=16bit */ +#define CONFIG_SYS_EBC_PB0AP		0x92015480 +#define CONFIG_SYS_EBC_PB0CR		0xFFC5A000  /* BAS=0xFFC,BS=4MB,BU=R/W,BW=16bit */  /* Memory Bank 2 (PB0) initialization					*/ -#define CFG_EBC_PB2AP		0x03004580  /* TWT=6,WBN=1,TH=2,RE=1,SOR=1 */ -#define CFG_EBC_PB2CR		0xEF018000  /* BAS=0xF00,BS=1MB,BU=R/W,BW=8bit	*/ +#define CONFIG_SYS_EBC_PB2AP		0x03004580  /* TWT=6,WBN=1,TH=2,RE=1,SOR=1 */ +#define CONFIG_SYS_EBC_PB2CR		0xEF018000  /* BAS=0xF00,BS=1MB,BU=R/W,BW=8bit	*/  /* Memory Bank 3 (PB1) initialization				*/ -#define CFG_EBC_PB3AP		0x03004580  /* TWT=6,WBN=1,TH=2,RE=1,SOR=1 */ -#define CFG_EBC_PB3CR		0xEF118000  /* BAS=0xF01,BS=1MB,BU=R/W,BW=8bit */ +#define CONFIG_SYS_EBC_PB3AP		0x03004580  /* TWT=6,WBN=1,TH=2,RE=1,SOR=1 */ +#define CONFIG_SYS_EBC_PB3CR		0xEF118000  /* BAS=0xF01,BS=1MB,BU=R/W,BW=8bit */  /*-----------------------------------------------------------------------   * Definitions for initial stack pointer and data area (in data cache)   */ -#define CFG_INIT_DCACHE_CS	7	/* use cs # 7 for data cache memory    */ +#define CONFIG_SYS_INIT_DCACHE_CS	7	/* use cs # 7 for data cache memory    */ -#define CFG_INIT_RAM_ADDR	0x40000000  /* use data cache		       */ -#define CFG_INIT_RAM_END	0x2000	/* End of used area in RAM	       */ -#define CFG_GBL_DATA_SIZE       128  /* size in bytes reserved for initial data */ -#define CFG_GBL_DATA_OFFSET     (CFG_INIT_RAM_END - CFG_GBL_DATA_SIZE) -#define CFG_INIT_SP_OFFSET	CFG_GBL_DATA_OFFSET +#define CONFIG_SYS_INIT_RAM_ADDR	0x40000000  /* use data cache		       */ +#define CONFIG_SYS_INIT_RAM_END	0x2000	/* End of used area in RAM	       */ +#define CONFIG_SYS_GBL_DATA_SIZE       128  /* size in bytes reserved for initial data */ +#define CONFIG_SYS_GBL_DATA_OFFSET     (CONFIG_SYS_INIT_RAM_END - CONFIG_SYS_GBL_DATA_SIZE) +#define CONFIG_SYS_INIT_SP_OFFSET	CONFIG_SYS_GBL_DATA_OFFSET  /*-----------------------------------------------------------------------   * GPIO definitions   */ -#define CFG_EEPROM_WP		(0x80000000 >> 13)   /* GPIO13 */ -#define CFG_SELF_RST		(0x80000000 >> 14)   /* GPIO14 */ -#define CFG_PB_LED		(0x80000000 >> 16)   /* GPIO16 */ -#define CFG_INTA_FAKE		(0x80000000 >> 23)   /* GPIO23 */ +#define CONFIG_SYS_EEPROM_WP		(0x80000000 >> 13)   /* GPIO13 */ +#define CONFIG_SYS_SELF_RST		(0x80000000 >> 14)   /* GPIO14 */ +#define CONFIG_SYS_PB_LED		(0x80000000 >> 16)   /* GPIO16 */ +#define CONFIG_SYS_INTA_FAKE		(0x80000000 >> 23)   /* GPIO23 */  /*   * Internal Definitions |