diff options
Diffstat (limited to 'include/configs/aev.h')
| -rw-r--r-- | include/configs/aev.h | 172 | 
1 files changed, 86 insertions, 86 deletions
| diff --git a/include/configs/aev.h b/include/configs/aev.h index 2dcaa581e..2b4826d90 100644 --- a/include/configs/aev.h +++ b/include/configs/aev.h @@ -39,7 +39,7 @@  #define CONFIG_STK52XX		1	/* ... on a STK52XX base board */  #define CONFIG_STK52XX_REV100	1	/*  define for revision 100 baseboards */  #define CONFIG_AEVFIFO		1 -#define CFG_MPC5XXX_CLKIN	33000000 /* ... running at 33.000000MHz */ +#define CONFIG_SYS_MPC5XXX_CLKIN	33000000 /* ... running at 33.000000MHz */  #define CONFIG_HIGH_BATS	1	/* High BATs supported */ @@ -51,7 +51,7 @@   */  #define CONFIG_PSC_CONSOLE	1	/* console is on PSC1 */  #define CONFIG_BAUDRATE		115200	/* ... at 115200 bps */ -#define CFG_BAUDRATE_TABLE	{ 9600, 19200, 38400, 57600, 115200, 230400 } +#define CONFIG_SYS_BAUDRATE_TABLE	{ 9600, 19200, 38400, 57600, 115200, 230400 }  /*   * PCI Mapping: @@ -74,7 +74,7 @@  #define CONFIG_NET_MULTI	1  #define CONFIG_EEPRO100		1 -#define CFG_RX_ETH_BUFFER	8  /* use 8 rx buffer on eepro100  */ +#define CONFIG_SYS_RX_ETH_BUFFER	8  /* use 8 rx buffer on eepro100  */  #define CONFIG_NS8382X		1  #endif	/* CONFIG_AEVFIFO */ @@ -84,9 +84,9 @@  #define CONFIG_ISO_PARTITION  /* POST support */ -#define CONFIG_POST		(CFG_POST_MEMORY   | \ -				 CFG_POST_CPU	   | \ -				 CFG_POST_I2C) +#define CONFIG_POST		(CONFIG_SYS_POST_MEMORY   | \ +				 CONFIG_SYS_POST_CPU	   | \ +				 CONFIG_SYS_POST_I2C)  #ifdef CONFIG_POST  /* preserve space for the post_word at end of on-chip SRAM */ @@ -129,7 +129,7 @@  #define	CONFIG_TIMESTAMP		/* display image timestamps */  #if (TEXT_BASE == 0xFC000000)		/* Boot low */ -#   define CFG_LOWBOOT		1 +#   define CONFIG_SYS_LOWBOOT		1  #endif  /* @@ -172,17 +172,17 @@  /*   * IPB Bus clocking configuration.   */ -#define CFG_IPBCLK_EQUALS_XLBCLK		/* define for 133MHz speed */ +#define CONFIG_SYS_IPBCLK_EQUALS_XLBCLK		/* define for 133MHz speed */ -#if defined(CFG_IPBCLK_EQUALS_XLBCLK) +#if defined(CONFIG_SYS_IPBCLK_EQUALS_XLBCLK)  /*   * PCI Bus clocking configuration   *   * Actually a PCI Clock of 66 MHz is only set (in cpu_init.c) if - * CFG_IPBCLK_EQUALS_XLBCLK is defined. This is because a PCI Clock + * CONFIG_SYS_IPBCLK_EQUALS_XLBCLK is defined. This is because a PCI Clock   * of 66 MHz yet hasn't been tested with a IPB Bus Clock of 66 MHz.   */ -#define CFG_PCICLK_EQUALS_IPBCLK_DIV2	/* define for 66MHz speed */ +#define CONFIG_SYS_PCICLK_EQUALS_IPBCLK_DIV2	/* define for 66MHz speed */  #endif  /* @@ -190,9 +190,9 @@   */  #define CONFIG_HARD_I2C		1	/* I2C with hardware support */  #ifdef CONFIG_TQM5200_REV100 -#define CFG_I2C_MODULE		1	/* Select I2C module #1 for rev. 100 board */ +#define CONFIG_SYS_I2C_MODULE		1	/* Select I2C module #1 for rev. 100 board */  #else -#define CFG_I2C_MODULE		2	/* Select I2C module #2 for all other revs */ +#define CONFIG_SYS_I2C_MODULE		2	/* Select I2C module #2 for all other revs */  #endif  /* @@ -201,11 +201,11 @@   * Please notice, that the resulting clock frequency could differ from the   * configured value. This is because the I2C clock is derived from system   * clock over a frequency divider with only a few divider values. U-boot - * calculates the best approximation for CFG_I2C_SPEED. However the calculated + * calculates the best approximation for CONFIG_SYS_I2C_SPEED. However the calculated   * approximation allways lies below the configured value, never above.   */ -#define CFG_I2C_SPEED		100000 /* 100 kHz */ -#define CFG_I2C_SLAVE		0x7F +#define CONFIG_SYS_I2C_SPEED		100000 /* 100 kHz */ +#define CONFIG_SYS_I2C_SLAVE		0x7F  /*   * EEPROM configuration for onboard EEPROM M24C32 (M24C64 should work @@ -213,34 +213,34 @@   * EEPROM (24C64) is on the same I2C address (but on other I2C bus), so the   * same configuration could be used.   */ -#define CFG_I2C_EEPROM_ADDR		0x50	/* 1010000x */ -#define CFG_I2C_EEPROM_ADDR_LEN		2 -#define CFG_EEPROM_PAGE_WRITE_BITS	5	/* =32 Bytes per write */ -#define CFG_EEPROM_PAGE_WRITE_DELAY_MS	20 +#define CONFIG_SYS_I2C_EEPROM_ADDR		0x50	/* 1010000x */ +#define CONFIG_SYS_I2C_EEPROM_ADDR_LEN		2 +#define CONFIG_SYS_EEPROM_PAGE_WRITE_BITS	5	/* =32 Bytes per write */ +#define CONFIG_SYS_EEPROM_PAGE_WRITE_DELAY_MS	20  /*   * Flash configuration   */ -#define CFG_FLASH_BASE		TEXT_BASE /* 0xFC000000 */ +#define CONFIG_SYS_FLASH_BASE		TEXT_BASE /* 0xFC000000 */  /* use CFI flash driver if no module variant is spezified */ -#define CFG_FLASH_CFI		1	/* Flash is CFI conformant */ +#define CONFIG_SYS_FLASH_CFI		1	/* Flash is CFI conformant */  #define CONFIG_FLASH_CFI_DRIVER	1	/* Use the common driver */ -#define CFG_FLASH_BANKS_LIST	{ CFG_BOOTCS_START } -#define CFG_FLASH_EMPTY_INFO -#define CFG_FLASH_SIZE		0x04000000 /* 64 MByte */ -#define CFG_MAX_FLASH_SECT	512	/* max num of sects on one chip */ -#undef CFG_FLASH_USE_BUFFER_WRITE	/* not supported yet for AMD */ +#define CONFIG_SYS_FLASH_BANKS_LIST	{ CONFIG_SYS_BOOTCS_START } +#define CONFIG_SYS_FLASH_EMPTY_INFO +#define CONFIG_SYS_FLASH_SIZE		0x04000000 /* 64 MByte */ +#define CONFIG_SYS_MAX_FLASH_SECT	512	/* max num of sects on one chip */ +#undef CONFIG_SYS_FLASH_USE_BUFFER_WRITE	/* not supported yet for AMD */ -#if !defined(CFG_LOWBOOT) -#define CONFIG_ENV_ADDR		(CFG_FLASH_BASE + 0x00760000 + 0x00800000) -#else	/* CFG_LOWBOOT */ -#define CONFIG_ENV_ADDR		(CFG_FLASH_BASE + 0x00060000) -#endif	/* CFG_LOWBOOT */ -#define CFG_MAX_FLASH_BANKS	1	/* max num of flash banks +#if !defined(CONFIG_SYS_LOWBOOT) +#define CONFIG_ENV_ADDR		(CONFIG_SYS_FLASH_BASE + 0x00760000 + 0x00800000) +#else	/* CONFIG_SYS_LOWBOOT */ +#define CONFIG_ENV_ADDR		(CONFIG_SYS_FLASH_BASE + 0x00060000) +#endif	/* CONFIG_SYS_LOWBOOT */ +#define CONFIG_SYS_MAX_FLASH_BANKS	1	/* max num of flash banks  					   (= chip selects) */ -#define CFG_FLASH_ERASE_TOUT	240000	/* Flash Erase Timeout (in ms)	*/ -#define CFG_FLASH_WRITE_TOUT	500	/* Flash Write Timeout (in ms)	*/ +#define CONFIG_SYS_FLASH_ERASE_TOUT	240000	/* Flash Erase Timeout (in ms)	*/ +#define CONFIG_SYS_FLASH_WRITE_TOUT	500	/* Flash Write Timeout (in ms)	*/  /* @@ -255,32 +255,32 @@  /*   * Memory map   */ -#define CFG_MBAR		0xF0000000 -#define CFG_SDRAM_BASE		0x00000000 -#define CFG_DEFAULT_MBAR	0x80000000 +#define CONFIG_SYS_MBAR		0xF0000000 +#define CONFIG_SYS_SDRAM_BASE		0x00000000 +#define CONFIG_SYS_DEFAULT_MBAR	0x80000000  /* Use ON-Chip SRAM until RAM will be available */ -#define CFG_INIT_RAM_ADDR	MPC5XXX_SRAM +#define CONFIG_SYS_INIT_RAM_ADDR	MPC5XXX_SRAM  #ifdef CONFIG_POST  /* preserve space for the post_word at end of on-chip SRAM */ -#define CFG_INIT_RAM_END	MPC5XXX_SRAM_POST_SIZE +#define CONFIG_SYS_INIT_RAM_END	MPC5XXX_SRAM_POST_SIZE  #else -#define CFG_INIT_RAM_END	MPC5XXX_SRAM_SIZE +#define CONFIG_SYS_INIT_RAM_END	MPC5XXX_SRAM_SIZE  #endif -#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_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 -#define CFG_MONITOR_BASE	TEXT_BASE -#if (CFG_MONITOR_BASE < CFG_FLASH_BASE) -#   define CFG_RAMBOOT		1 +#define CONFIG_SYS_MONITOR_BASE	TEXT_BASE +#if (CONFIG_SYS_MONITOR_BASE < CONFIG_SYS_FLASH_BASE) +#   define CONFIG_SYS_RAMBOOT		1  #endif -#define CFG_MONITOR_LEN		(384 << 10)	/* Reserve 384 kB for Monitor	*/ -#define CFG_MALLOC_LEN		(128 << 10)	/* Reserve 128 kB for malloc()	*/ -#define CFG_BOOTMAPSZ		(8 << 20)	/* Initial Memory map for Linux */ +#define CONFIG_SYS_MONITOR_LEN		(384 << 10)	/* Reserve 384 kB for Monitor	*/ +#define CONFIG_SYS_MALLOC_LEN		(128 << 10)	/* Reserve 128 kB for malloc()	*/ +#define CONFIG_SYS_BOOTMAPSZ		(8 << 20)	/* Initial Memory map for Linux */  /*   * Ethernet configuration @@ -318,7 +318,7 @@   *   GPIO on PSC6_3 is used in post_hotkeys_pressed() to enable extended POST   *   tests.   */ -#define CFG_GPS_PORT_CONFIG	0x81500014 +#define CONFIG_SYS_GPS_PORT_CONFIG	0x81500014  /*   * RTC configuration @@ -328,30 +328,30 @@  /*   * 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   */  #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	*/  /* Enable an alternate, more extensive memory test */ -#define CFG_ALT_MEMTEST +#define CONFIG_SYS_ALT_MEMTEST -#define CFG_MEMTEST_START	0x00100000	/* memtest works on */ -#define CFG_MEMTEST_END		0x00f00000	/* 1 ... 15 MB in DRAM	*/ +#define CONFIG_SYS_MEMTEST_START	0x00100000	/* memtest works on */ +#define CONFIG_SYS_MEMTEST_END		0x00f00000	/* 1 ... 15 MB in DRAM	*/ -#define CFG_LOAD_ADDR		0x100000	/* default load address */ +#define CONFIG_SYS_LOAD_ADDR		0x100000	/* default load address */ -#define CFG_HZ			1000	/* decrementer freq: 1 ms ticks */ +#define CONFIG_SYS_HZ			1000	/* decrementer freq: 1 ms ticks */ -#define CFG_CACHELINE_SIZE	32	/* For MPC5xxx CPUs */ +#define CONFIG_SYS_CACHELINE_SIZE	32	/* For MPC5xxx CPUs */  #if defined(CONFIG_CMD_KGDB) -#  define CFG_CACHELINE_SHIFT	5	/* log base 2 of the above value */ +#  define CONFIG_SYS_CACHELINE_SHIFT	5	/* log base 2 of the above value */  #endif  /* @@ -363,22 +363,22 @@   * Various low-level settings   */  #if defined(CONFIG_MPC5200) -#define CFG_HID0_INIT		HID0_ICE | HID0_ICFI -#define CFG_HID0_FINAL		HID0_ICE +#define CONFIG_SYS_HID0_INIT		HID0_ICE | HID0_ICFI +#define CONFIG_SYS_HID0_FINAL		HID0_ICE  #else -#define CFG_HID0_INIT		0 -#define CFG_HID0_FINAL		0 +#define CONFIG_SYS_HID0_INIT		0 +#define CONFIG_SYS_HID0_FINAL		0  #endif -#define CFG_BOOTCS_START	CFG_FLASH_BASE -#define CFG_BOOTCS_SIZE		CFG_FLASH_SIZE -#ifdef CFG_PCICLK_EQUALS_IPBCLK_DIV2 -#define CFG_BOOTCS_CFG		0x0008DF30 /* for pci_clk  = 66 MHz */ +#define CONFIG_SYS_BOOTCS_START	CONFIG_SYS_FLASH_BASE +#define CONFIG_SYS_BOOTCS_SIZE		CONFIG_SYS_FLASH_SIZE +#ifdef CONFIG_SYS_PCICLK_EQUALS_IPBCLK_DIV2 +#define CONFIG_SYS_BOOTCS_CFG		0x0008DF30 /* for pci_clk  = 66 MHz */  #else -#define CFG_BOOTCS_CFG		0x0004DF30 /* for pci_clk = 33 MHz */ +#define CONFIG_SYS_BOOTCS_CFG		0x0004DF30 /* for pci_clk = 33 MHz */  #endif -#define CFG_CS0_START		CFG_FLASH_BASE -#define CFG_CS0_SIZE		CFG_FLASH_SIZE +#define CONFIG_SYS_CS0_START		CONFIG_SYS_FLASH_BASE +#define CONFIG_SYS_CS0_SIZE		CONFIG_SYS_FLASH_SIZE  #define CONFIG_LAST_STAGE_INIT @@ -386,23 +386,23 @@   * SRAM - Do not map below 2 GB in address space, because this area is used   * for SDRAM autosizing.   */ -#define CFG_CS2_START		0xE5000000 -#define CFG_CS2_SIZE		0x80000		/* 512 kByte */ -#define CFG_CS2_CFG		0x0004D930 +#define CONFIG_SYS_CS2_START		0xE5000000 +#define CONFIG_SYS_CS2_SIZE		0x80000		/* 512 kByte */ +#define CONFIG_SYS_CS2_CFG		0x0004D930  /*   * Grafic controller - Do not map below 2 GB in address space, because this   * area is used for SDRAM autosizing.   */  #define SM501_FB_BASE           0xE0000000 -#define CFG_CS1_START           (SM501_FB_BASE) -#define CFG_CS1_SIZE            0x4000000       /* 64 MByte */ -#define CFG_CS1_CFG             0x8F48FF70 -#define SM501_MMIO_BASE         CFG_CS1_START + 0x03E00000 +#define CONFIG_SYS_CS1_START           (SM501_FB_BASE) +#define CONFIG_SYS_CS1_SIZE            0x4000000       /* 64 MByte */ +#define CONFIG_SYS_CS1_CFG             0x8F48FF70 +#define SM501_MMIO_BASE         CONFIG_SYS_CS1_START + 0x03E00000 -#define CFG_CS_BURST            0x00000000 -#define CFG_CS_DEADCYCLE        0x33333311      /* 1 dead cycle for flash and SM501 */ +#define CONFIG_SYS_CS_BURST            0x00000000 +#define CONFIG_SYS_CS_DEADCYCLE        0x33333311      /* 1 dead cycle for flash and SM501 */ -#define CFG_RESET_ADDRESS	0xff000000 +#define CONFIG_SYS_RESET_ADDRESS	0xff000000  #endif /* __CONFIG_H */ |