diff options
Diffstat (limited to 'include')
| -rw-r--r-- | include/configs/TB5200.h | 470 | ||||
| -rw-r--r-- | include/configs/gth2.h | 56 | ||||
| -rw-r--r-- | include/configs/ppmc7xx.h | 70 | ||||
| -rw-r--r-- | include/ns16550.h | 2 | 
4 files changed, 534 insertions, 64 deletions
| diff --git a/include/configs/TB5200.h b/include/configs/TB5200.h new file mode 100644 index 000000000..d7938474f --- /dev/null +++ b/include/configs/TB5200.h @@ -0,0 +1,470 @@ +/* + * (C) Copyright 2003-2006 + * Wolfgang Denk, DENX Software Engineering, wd@denx.de. + * + * (C) Copyright 2004-2006 + * Martin Krause, TQ-Systems GmbH, martin.krause@tqs.de + * + * See file CREDITS for list of people who contributed to this + * project. + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License as + * published by the Free Software Foundation; either version 2 of + * the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.	 See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, + * MA 02111-1307 USA + */ + +#ifndef __CONFIG_H +#define __CONFIG_H + +/* + * High Level Configuration Options + * (easy to change) + */ + +#define CONFIG_MPC5xxx		1	/* This is an MPC5xxx CPU */ +#define CONFIG_MPC5200		1	/* (more precisely an MPC5200 CPU) */ +#define CONFIG_TQM5200		1	/* ... on TQM5200 module */ +#define CONFIG_TB5200		1	/* ... on a TB5200 base board */ + +#define CFG_MPC5XXX_CLKIN	33000000 /* ... running at 33.000000MHz */ + +#define BOOTFLAG_COLD		0x01	/* Normal Power-On: Boot from FLASH  */ +#define BOOTFLAG_WARM		0x02	/* Software reboot	     */ + +#define CFG_CACHELINE_SIZE	32	/* For MPC5xxx CPUs */ +#if (CONFIG_COMMANDS & CFG_CMD_KGDB) +#  define CFG_CACHELINE_SHIFT	5	/* log base 2 of the above value */ +#endif + +/* + * Serial console configuration + */ +#define CONFIG_PSC_CONSOLE	1	/* default console is on PSC1 */ +#define CONFIG_SERIAL_MULTI	1	/* support multiple consoles */ +#define CONFIG_PSC_CONSOLE2	6	/* second console is on PSC6 */ +#define CONFIG_BAUDRATE		115200	/* ... at 115200 bps */ +#define CFG_BAUDRATE_TABLE	{ 9600, 19200, 38400, 57600, 115200, 230400 } + +/* + * Video console + */ +#if 1 +#define CONFIG_VIDEO +#define CONFIG_VIDEO_SM501 +#define CONFIG_VIDEO_SM501_32BPP +#define CONFIG_CFB_CONSOLE +#define CONFIG_VIDEO_LOGO +#define CONFIG_VGA_AS_SINGLE_DEVICE +#define CONFIG_CONSOLE_EXTRA_INFO +#define CONFIG_VIDEO_SW_CURSOR +#define CONFIG_SPLASH_SCREEN +#define CFG_CONSOLE_IS_IN_ENV +#endif + +#ifdef CONFIG_VIDEO +#define ADD_BMP_CMD		CFG_CMD_BMP +#else +#define ADD_BMP_CMD		0 +#endif + +/* Partitions */ +#define CONFIG_MAC_PARTITION +#define CONFIG_DOS_PARTITION +#define CONFIG_ISO_PARTITION + +/* USB */ +#define CONFIG_USB_OHCI +#define ADD_USB_CMD		CFG_CMD_USB | CFG_CMD_FAT +#define CONFIG_USB_STORAGE + +/* POST support */ +#define CONFIG_POST		(CFG_POST_MEMORY   | \ +				 CFG_POST_CPU	   | \ +				 CFG_POST_I2C) + +#ifdef CONFIG_POST +#define CFG_CMD_POST_DIAG CFG_CMD_DIAG +/* preserve space for the post_word at end of on-chip SRAM */ +#define MPC5XXX_SRAM_POST_SIZE MPC5XXX_SRAM_SIZE-4 +#else +#define CFG_CMD_POST_DIAG 0 +#endif + +/* IDE */ +#define ADD_IDE_CMD		(CFG_CMD_IDE | CFG_CMD_FAT | CFG_CMD_EXT2) + +/* + * Supported commands + */ +#define CONFIG_COMMANDS	       (CONFIG_CMD_DFL	| \ +				ADD_BMP_CMD	| \ +				ADD_IDE_CMD	| \ +				ADD_PCI_CMD	| \ +				ADD_USB_CMD	| \ +				CFG_CMD_ASKENV	| \ +				CFG_CMD_DATE	| \ +				CFG_CMD_DHCP	| \ +				CFG_CMD_ECHO	| \ +				CFG_CMD_EEPROM	| \ +				CFG_CMD_I2C	| \ +				CFG_CMD_JFFS2	| \ +				CFG_CMD_MII	| \ +				CFG_CMD_NFS	| \ +				CFG_CMD_PING	| \ +				CFG_CMD_POST_DIAG | \ +				CFG_CMD_REGINFO | \ +				CFG_CMD_SNTP	| \ +				CFG_CMD_BSP) + +/* this must be included AFTER the definition of CONFIG_COMMANDS (if any) */ +#include <cmd_confdefs.h> + +#define	CONFIG_TIMESTAMP		/* display image timestamps */ + +#if (TEXT_BASE == 0xFC000000)		/* Boot low */ +#   define CFG_LOWBOOT		1 +#endif + +/* + * Autobooting + */ +#define CONFIG_BOOTDELAY	5	/* autoboot after 5 seconds */ + +#define CONFIG_PREBOOT	"echo;" \ +	"echo Type \"run flash_nfs\" to mount root filesystem over NFS;" \ +	"echo" + +#undef	CONFIG_BOOTARGS + +#define CONFIG_EXTRA_ENV_SETTINGS					\ +	"netdev=eth0\0"							\ +	"rootpath=/opt/eldk/ppc_6xx\0"					\ +	"ramargs=setenv bootargs root=/dev/ram rw\0"			\ +	"nfsargs=setenv bootargs root=/dev/nfs rw "			\ +		"nfsroot=${serverip}:${rootpath}\0"			\ +	"addip=setenv bootargs ${bootargs} "				\ +		"ip=${ipaddr}:${serverip}:${gatewayip}:${netmask}"	\ +		":${hostname}:${netdev}:off panic=1\0"			\ +	"flash_self=run ramargs addip;"					\ +		"bootm ${kernel_addr} ${ramdisk_addr}\0"		\ +	"flash_nfs=run nfsargs addip;"					\ +		"bootm ${kernel_addr}\0"				\ +	"net_nfs=tftp 200000 ${bootfile};run nfsargs addip;bootm\0"	\ +	"bootfile=/tftpboot/tqm5200/uImage\0"				\ +	"load=tftp 200000 $(u-boot)\0"					\ +	"u-boot=/tftpboot/tqm5200/u-boot.bin\0"				\ +	"update=protect off FC000000 FC05FFFF;"				\ +		"erase FC000000 FC05FFFF;"				\ +		"cp.b 200000 FC000000 ${filesize};"			\ +		"protect on FC000000 FC05FFFF\0"			\ +	"" + +#define CONFIG_BOOTCOMMAND	"run net_nfs" + +/* + * IPB Bus clocking configuration. + */ +#define CFG_IPBSPEED_133		/* define for 133MHz speed */ + +#if defined(CFG_IPBSPEED_133) +/* + * PCI Bus clocking configuration + * + * Actually a PCI Clock of 66 MHz is only set (in cpu_init.c) if + * CFG_IPBSPEED_133 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_PCISPEED_66			/* define for 66MHz speed */ +#endif + +/* + * I2C configuration + */ +#define CONFIG_HARD_I2C		1	/* I2C with hardware support */ +#define CFG_I2C_MODULE		2	/* Select I2C module #2 */ + +/* + * I2C clock frequency + * + * 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 + * approximation allways lies below the configured value, never above. + */ +#define CFG_I2C_SPEED		100000 /* 100 kHz */ +#define CFG_I2C_SLAVE		0x7F + +/* + * EEPROM configuration for onboard EEPROM M24C32 (M24C64 should work + * also). For other EEPROMs configuration should be verified. On Mini-FAP the + * 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 + +/* List of I2C addresses to be verified by POST */ +#undef I2C_ADDR_LIST +#define I2C_ADDR_LIST	{	CFG_I2C_EEPROM_ADDR,	\ +				CFG_I2C_RTC_ADDR,	\ +				CFG_I2C_SLAVE } + +/* + * Flash configuration + */ +#define CFG_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 CFG_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 */ + +#if !defined(CFG_LOWBOOT) +#define CFG_ENV_ADDR		(CFG_FLASH_BASE + 0x00760000 + 0x00800000) +#else	/* CFG_LOWBOOT */ +#define CFG_ENV_ADDR		(CFG_FLASH_BASE + 0x00060000) +#endif	/* CFG_LOWBOOT */ +#define CFG_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)	*/ + +/* Dynamic MTD partition support */ +#define CONFIG_JFFS2_CMDLINE +#define MTDIDS_DEFAULT		"nor0=TQM5200-0" +#define MTDPARTS_DEFAULT	"mtdparts=TQM5200-0:640k(firmware),"	\ +						"1408k(kernel),"	\ +						"2m(initrd),"		\ +						"4m(small-fs),"		\ +						"16m(big-fs),"		\ +						"8m(misc)" + +/* + * Environment settings + */ +#define CFG_ENV_IS_IN_FLASH	1 +#define CFG_ENV_SIZE		0x10000 +#define CFG_ENV_SECT_SIZE	0x20000 +#define CFG_ENV_ADDR_REDUND	(CFG_ENV_ADDR + CFG_ENV_SECT_SIZE) +#define	CFG_ENV_SIZE_REDUND	(CFG_ENV_SIZE) + +/* + * Memory map + */ +#define CFG_MBAR		0xF0000000 +#define CFG_SDRAM_BASE		0x00000000 +#define CFG_DEFAULT_MBAR	0x80000000 + +/* Use ON-Chip SRAM until RAM will be available */ +#define CFG_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 +#else +#define CFG_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 CFG_MONITOR_BASE	TEXT_BASE +#if (CFG_MONITOR_BASE < CFG_FLASH_BASE) +#   define CFG_RAMBOOT		1 +#endif + +#define CFG_MONITOR_LEN		(384 << 10)	/* Reserve 384 kB for Monitor	*/ +#define CFG_MALLOC_LEN		(256 << 10)	/* Reserve 256 kB for malloc()	*/ +#define CFG_BOOTMAPSZ		(8 << 20)	/* Initial Memory map for Linux */ + +/* + * Ethernet configuration + */ +#define CONFIG_MPC5xxx_FEC	1 +/* + * Define CONFIG_FEC_10MBIT to force FEC at 10Mb + */ +/* #define CONFIG_FEC_10MBIT 1 */ +#define CONFIG_PHY_ADDR		0x00 + +/* + * GPIO configuration + * + * use pin gpio_wkup_6 as second SDRAM chip select (mem_cs1): + *	Bit 0 (mask: 0x80000000): 1 + * use ALT CAN position: Bits 2-3 (mask: 0x30000000): + *	00 -> No Alternatives, CAN1/2 on PSC2 according to PSC2 setting. + *	01 -> CAN1 on I2C1, CAN2 on Tmr0/1. + *	      Use for REV200 STK52XX boards. Do not use with REV100 modules + *	      (because, there I2C1 is used as I2C bus) + * use PSC1 as UART: Bits 28-31 (mask: 0x00000007): 0100 + * use PSC2 as CAN: Bits 25:27 (mask: 0x00000030) + *	000 -> All PSC2 pins are GIOPs + *	001 -> CAN1/2 on PSC2 pins + *	       Use for REV100 STK52xx boards + * use PSC3: Bits 20:23 (mask: 0x00000300): + *      0001 -> USB2 + *      0000 -> GPIO + * use PSC6: + *   on STK52xx: + *	use as UART. Pins PSC6_0 to PSC6_3 are used. + *	Bits 9:11 (mask: 0x00700000): + *	   101 -> PSC6 : Extended POST test is not available + *   on MINI-FAP and TQM5200_IB: + *	use PSC6_0 to PSC6_3 as GPIO: Bits 9:11 (mask: 0x00700000): + *	   000 -> PSC6 could not be used as UART, CODEC or IrDA + *   GPIO on PSC6_3 is used in post_hotkeys_pressed() to enable extended POST + *   tests. + */ +#define CFG_GPS_PORT_CONFIG	0x81500114 + +/* + * RTC configuration + */ +#define CONFIG_RTC_M41T11	1 +#define CFG_I2C_RTC_ADDR	0x68 +#define CFG_M41T11_BASE_YEAR	1900    /* because Linux uses the same base +					   year */ + +/* + * Miscellaneous configurable options + */ +#define CFG_LONGHELP			/* undef to save memory	    */ +#define CFG_PROMPT		"=> "	/* Monitor Command Prompt   */ +#if (CONFIG_COMMANDS & CFG_CMD_KGDB) +#define CFG_CBSIZE		1024	/* Console I/O Buffer Size  */ +#else +#define CFG_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	*/ + +/* Enable an alternate, more extensive memory test */ +#define CFG_ALT_MEMTEST + +#define CFG_MEMTEST_START	0x00100000	/* memtest works on */ +#define CFG_MEMTEST_END		0x00f00000	/* 1 ... 15 MB in DRAM	*/ + +#define CFG_LOAD_ADDR		0x100000	/* default load address */ + +#define CFG_HZ			1000	/* decrementer freq: 1 ms ticks */ + +/* + * Enable loopw commando. This has only affect, if CFG_CMD_MEM is defined, + * which is normally part of the default commands (CFV_CMD_DFL) + */ +#define CONFIG_LOOPW + +/* + * Various low-level settings + */ +#if defined(CONFIG_MPC5200) +#define CFG_HID0_INIT		HID0_ICE | HID0_ICFI +#define CFG_HID0_FINAL		HID0_ICE +#else +#define CFG_HID0_INIT		0 +#define CFG_HID0_FINAL		0 +#endif + +#define CFG_BOOTCS_START	CFG_FLASH_BASE +#define CFG_BOOTCS_SIZE		CFG_FLASH_SIZE +#ifdef CFG_PCISPEED_66 +#define CFG_BOOTCS_CFG		0x0008DF30 /* for pci_clk  = 66 MHz */ +#else +#define CFG_BOOTCS_CFG		0x0004DF30 /* for pci_clk = 33 MHz */ +#endif +#define CFG_CS0_START		CFG_FLASH_BASE +#define CFG_CS0_SIZE		CFG_FLASH_SIZE + +/* automatic configuration of chip selects */ +#ifdef CONFIG_CS_AUTOCONF +#define CONFIG_LAST_STAGE_INIT +#endif + +/* + * SRAM - Do not map below 2 GB in address space, because this area is used + * for SDRAM autosizing. + */ +#if defined (CONFIG_CS_AUTOCONF) +#define CFG_CS2_START		0xE5000000 +#define CFG_CS2_SIZE		0x100000	/* 1 MByte */ +#define CFG_CS2_CFG		0x0004D930 +#endif + +/* + * Grafic controller - Do not map below 2 GB in address space, because this + * area is used for SDRAM autosizing. + */ +#if defined (CONFIG_CS_AUTOCONF) +#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 +#endif + +#define CFG_CS_BURST		0x00000000 +#define CFG_CS_DEADCYCLE	0x33333311	/* 1 dead cycle for flash and SM501 */ + +#define CFG_RESET_ADDRESS	0xff000000 + +/*----------------------------------------------------------------------- + * USB stuff + *----------------------------------------------------------------------- + */ +#define CONFIG_USB_CLOCK	0x0001BBBB +#define CONFIG_USB_CONFIG	0x00001000 + +/*----------------------------------------------------------------------- + * IDE/ATA stuff Supports IDE harddisk + *----------------------------------------------------------------------- + */ + +#undef	CONFIG_IDE_8xx_PCCARD		/* Use IDE with PC Card Adapter */ + +#undef	CONFIG_IDE_8xx_DIRECT		/* Direct IDE	 not supported	*/ +#undef	CONFIG_IDE_LED			/* LED	 for ide not supported	*/ + +#define CONFIG_IDE_RESET		/* reset for ide supported	*/ +#define CONFIG_IDE_PREINIT + +#define CFG_IDE_MAXBUS		1	/* max. 1 IDE bus		*/ +#define CFG_IDE_MAXDEVICE	2	/* max. 2 drives per IDE bus	*/ + +#define CFG_ATA_IDE0_OFFSET	0x0000 + +#define CFG_ATA_BASE_ADDR	MPC5XXX_ATA + +/* Offset for data I/O			*/ +#define CFG_ATA_DATA_OFFSET	(0x0060) + +/* Offset for normal register accesses	*/ +#define CFG_ATA_REG_OFFSET	(CFG_ATA_DATA_OFFSET) + +/* Offset for alternate registers	*/ +#define CFG_ATA_ALT_OFFSET	(0x005C) + +/* Interval between registers						     */ +#define CFG_ATA_STRIDE		4 + +#endif /* __CONFIG_H */ diff --git a/include/configs/gth2.h b/include/configs/gth2.h index 77d2d56e8..a49ed3bae 100644 --- a/include/configs/gth2.h +++ b/include/configs/gth2.h @@ -12,7 +12,7 @@   *   * This program is distributed in the hope that it will be useful,   * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.	 See the   * GNU General Public License for more details.   *   * You should have received a copy of the GNU General Public License @@ -34,7 +34,7 @@  #define CONFIG_AU1000		1 -#define CONFIG_MISC_INIT_R      1 +#define CONFIG_MISC_INIT_R	1  #define CONFIG_ETHADDR		DE:AD:BE:EF:01:02    /* Ethernet address */ @@ -59,21 +59,21 @@  #define CONFIG_AUTOBOOT_DELAY_STR "d"  #define CONFIG_AUTOBOOT_STOP_STR " " -#define	CONFIG_TIMESTAMP		/* Print image info with timestamp */ -#define	CONFIG_BOOTARGS "panic=1" +#define CONFIG_TIMESTAMP		/* Print image info with timestamp */ +#define CONFIG_BOOTARGS "panic=1" -#define	CONFIG_EXTRA_ENV_SETTINGS					\ +#define CONFIG_EXTRA_ENV_SETTINGS					\  	"addmisc=setenv bootargs $(bootargs) "				\ -	        "ethaddr=$(ethaddr) \0"					\ -        "netboot=bootp;run addmisc;bootm\0"                             \ -                "" +		"ethaddr=$(ethaddr) \0"					\ +	"netboot=bootp;run addmisc;bootm\0"				\ +		""  /* Boot from Compact flash partition 2 as default */  #define CONFIG_BOOTCOMMAND	"ide reset;disk 0x81000000 0:2;run addmisc;bootm" -#define CONFIG_COMMANDS	((CONFIG_CMD_DFL | CFG_CMD_IDE | CFG_CMD_DHCP ) & \ +#define CONFIG_COMMANDS ((CONFIG_CMD_DFL | CFG_CMD_IDE | CFG_CMD_DHCP ) & \   ~(CFG_CMD_ENV | CFG_CMD_FAT | CFG_CMD_FLASH | CFG_CMD_FPGA | \ -   CFG_CMD_MII | CFG_CMD_LOADS  | CFG_CMD_LOADB | CFG_CMD_ELF | \ +   CFG_CMD_MII | CFG_CMD_LOADS	| CFG_CMD_LOADB | CFG_CMD_ELF | \     CFG_CMD_BDI | CFG_CMD_BEDBUG | CFG_CMD_NFS | CFG_CMD_AUTOSCRIPT ))  #include <cmd_confdefs.h> @@ -81,11 +81,11 @@  /*   * Miscellaneous configurable options   */ -#define	CFG_LONGHELP				/* undef to save memory      */ -#define	CFG_PROMPT		"GTH2 # "	/* Monitor Command Prompt    */ -#define	CFG_CBSIZE		256		/* Console I/O Buffer Size   */ -#define	CFG_PBSIZE (CFG_CBSIZE+sizeof(CFG_PROMPT)+16)  /* Print Buffer Size */ -#define	CFG_MAXARGS		16		/* max number of command args*/ +#define CFG_LONGHELP				/* undef to save memory	     */ +#define CFG_PROMPT		"GTH2 # "	/* Monitor Command Prompt    */ +#define CFG_CBSIZE		256		/* Console I/O Buffer Size   */ +#define CFG_PBSIZE (CFG_CBSIZE+sizeof(CFG_PROMPT)+16)  /* Print Buffer Size */ +#define CFG_MAXARGS		16		/* max number of command args*/  #define CFG_MALLOC_LEN		128*1024 @@ -93,16 +93,16 @@  #define CFG_MHZ			500 -#define CFG_HZ                  (CFG_MHZ * 1000000) /* FIXME causes overflow in net.c */ +#define CFG_HZ			(CFG_MHZ * 1000000) /* FIXME causes overflow in net.c */  #define CFG_SDRAM_BASE		0x80000000     /* Cached addr */ -#define	CFG_LOAD_ADDR		0x81000000     /* default load address	*/ +#define CFG_LOAD_ADDR		0x81000000     /* default load address	*/  #define CFG_MEMTEST_START	0x80100000  #define CFG_MEMTEST_END		0x83000000 -#define CONFIG_HW_WATCHDOG      1 +#define CONFIG_HW_WATCHDOG	1  /*-----------------------------------------------------------------------   * FLASH and environment organization @@ -113,8 +113,8 @@  #define PHYS_FLASH		0xbfc00000 /* Flash Bank #1 */  /* The following #defines are needed to get flash environment right */ -#define	CFG_MONITOR_BASE	TEXT_BASE -#define	CFG_MONITOR_LEN		(192 << 10) +#define CFG_MONITOR_BASE	TEXT_BASE +#define CFG_MONITOR_LEN		(192 << 10)  #define CFG_INIT_SP_OFFSET	0x400000 @@ -125,7 +125,7 @@  #define CFG_FLASH_ERASE_TOUT	(2 * CFG_HZ) /* Timeout for Flash Erase */  #define CFG_FLASH_WRITE_TOUT	(2 * CFG_HZ) /* Timeout for Flash Write */ -#define	CFG_ENV_IS_NOWHERE	1 +#define CFG_ENV_IS_NOWHERE	1  /* Address and size of Primary Environment Sector	*/  #define CFG_ENV_ADDR		0xB0030000 @@ -158,21 +158,21 @@  #define CFG_IDE_MAXBUS		1	/* max. 1 IDE bus		*/  #define CFG_IDE_MAXDEVICE	1	/* max. 1 drive per IDE bus	*/ -#undef	CONFIG_IDE_LED			/* LED   for ide not supported	*/ +#undef	CONFIG_IDE_LED			/* LED	 for ide not supported	*/  #undef	CONFIG_IDE_RESET		/* reset for ide not supported	*/  #define CFG_ATA_IDE0_OFFSET	0 -#define CFG_ATA_BASE_ADDR       CFG_PCMCIA_IO_BASE +#define CFG_ATA_BASE_ADDR	CFG_PCMCIA_IO_BASE  /* Offset for data I/O			*/ -#define CFG_ATA_DATA_OFFSET     0 +#define CFG_ATA_DATA_OFFSET	0 -/* Offset for normal register accesses  */ -#define CFG_ATA_REG_OFFSET      0 +/* Offset for normal register accesses	*/ +#define CFG_ATA_REG_OFFSET	0 -/* Offset for alternate registers       */ -#define CFG_ATA_ALT_OFFSET      0x0200 +/* Offset for alternate registers	*/ +#define CFG_ATA_ALT_OFFSET	0x0200  /*-----------------------------------------------------------------------   * Cache Configuration diff --git a/include/configs/ppmc7xx.h b/include/configs/ppmc7xx.h index ea15524be..072b9dd5b 100644 --- a/include/configs/ppmc7xx.h +++ b/include/configs/ppmc7xx.h @@ -1,9 +1,9 @@  /*   * ppmc7xx.h   * --------- - *  + *   * Wind River PPMC 7xx/74xx board configuration file. - *  + *   * By Richard Danter (richard.danter@windriver.com)   * Copyright (C) 2005 Wind River Systems   */ @@ -16,15 +16,15 @@  /*=================================================================== - *  + *   * User configurable settings - Modify to your preference - *  + *   *===================================================================   */  /*   * Debug - *  + *   * DEBUG			- Define this is you want extra debug info   * GTREGREAD			- Required to build with debug   * do_bdinfo			- Required to build with debug @@ -37,7 +37,7 @@  /*   * CPU type - *  + *   * CONFIG_7xx			- We have a 750 or 755 CPU   * CONFIG_74xx			- We have a 7400 CPU   * CONFIG_ALTIVEC		- We have altivec enabled CPU (only 7400) @@ -52,11 +52,11 @@  /*   * Monitor configuration - *  + *   * CONFIG_COMMANDS		- List of command sets to include in shell - *  + *   * The following command sets have been tested and known to work: - *  + *   * CFG_CMD_CACHE		- Cache control commands   * CFG_CMD_MEMORY		- Memory display, change and test commands   * CFG_CMD_FLASH		- Erase and program flash @@ -91,7 +91,7 @@  /*   * PCI config - *  + *   * CONFIG_PCI				- Enable PCI bus   * CONFIG_PCI_PNP			- Enable Plug & Play support   * CONFIG_PCI_SCAN_SHOW		- Enable display of devices at startup @@ -104,7 +104,7 @@  /*   * Network config - *  + *   * CONFIG_NET_MULTI			- Support for multiple network interfaces   * CONFIG_EEPRO100			- Intel 8255x Ethernet Controller   * CONFIG_EEPRO100_SROM_WRITE - Enable writing to network card ROM @@ -117,18 +117,18 @@  /*   * Enable extra init functions - *  + *   * CONFIG_MISC_INIT_F		- Call pre-relocation init functions   * CONFIG_MISC_INIT_R		- Call post relocation init functions   */  #undef	CONFIG_MISC_INIT_F -#define CONFIG_MISC_INIT_R  +#define CONFIG_MISC_INIT_R  /*   * Boot config - *  + *   * CONFIG_BOOTCOMMAND		- Command(s) to execute to auto-boot   * CONFIG_BOOTDELAY			- How long to wait before auto-boot (in sec)   */ @@ -142,9 +142,9 @@  /*=================================================================== - *  + *   * Board configuration settings - You should not need to modify these - *  + *   *===================================================================   */ @@ -154,9 +154,9 @@  /*   * Memory map - *  + *   * This board runs in a standard CHRP (Map-B) configuration. - *  + *   *	Type		Start		End			Size	Width	Chip Sel   *	----------- ----------- ----------- ------- ------- --------   *	SDRAM		0x00000000	0x04000000	64MB	64b		SDRAMCS0 @@ -164,9 +164,9 @@   *	UART		0x7C000000						RCS2   *	Mailbox		0xFF000000						RCS1   *	Flash		0xFFC00000	0xFFFFFFFF	4MB	64b		RCS0 - *  + *   * Flash sectors are laid out as follows. - *  + *   *	Sector	Start		End			Size	Comments   *	------- ----------- ----------- ------- -----------   *	 0		0xFFC00000	0xFFC3FFFF	256KB @@ -193,7 +193,7 @@  /*   * SDRAM config - see memory map details above. - *  + *   * CFG_SDRAM_BASE			- Start address of SDRAM, this _must_ be zero!   * CFG_SDRAM_SIZE			- Total size of contiguous SDRAM bank(s)   */ @@ -202,9 +202,9 @@  #define CFG_SDRAM_SIZE			0x04000000 -/*  +/*   * Flash config - see memory map details above. - *  + *   * CFG_FLASH_BASE			- Start address of flash memory   * CFG_FLASH_SIZE			- Total size of contiguous flash mem   * CFG_FLASH_ERASE_TOUT		- Erase timeout in ms @@ -223,7 +223,7 @@  /*   * Monitor config - see memory map details above - *  + *   * CFG_MONITOR_BASE			- Base address of monitor code   * CFG_MALLOC_LEN			- Size of malloc pool (128KB)   */ @@ -234,7 +234,7 @@  /*   * Command shell settings - *  + *   * CFG_BARGSIZE			- Boot Argument buffer size   * CFG_BOOTMAPSZ		- Size of app's mapped RAM at boot (Linux=8MB)   * CFG_CBSIZE			- Console Buffer (input) size @@ -261,10 +261,10 @@  /*   * Environment config - see memory map details above - *  + *   * CFG_ENV_IS_IN_FLASH		- The env variables are stored in flash   * CFG_ENV_ADDR			- Address of the sector containing env vars - * CFG_ENV_SIZE			- Ammount of RAM for env vars (used to save RAM, 4KB)  + * CFG_ENV_SIZE			- Ammount of RAM for env vars (used to save RAM, 4KB)   * CFG_ENV_SECT_SIZE		- Size of sector containing env vars (32KB)   */ @@ -282,7 +282,7 @@   * Since the main system RAM is initialised very early, we place the INIT_RAM   * in the main system RAM just above the exception vectors. The contents are   * copied to top of RAM by the init code. - *  + *   * CFG_INIT_RAM_ADDR		- Address of Init RAM, above exception vect   * CFG_INIT_RAM_END			- Size of Init RAM   * CFG_GBL_DATA_SIZE		- Ammount of RAM to reserve for global data @@ -297,7 +297,7 @@  /*   * Initial BAT config - *  + *   * BAT0	- System SDRAM   * BAT1 - LED's and Serial Port   * BAT2 - PCI Memory @@ -327,7 +327,7 @@  /*   * Cache config - *  + *   * CFG_CACHELINE_SIZE		- Size of a cache line (CPU specific)   * CFG_L2					- L2 cache enabled if defined   * L2_INIT					- L2 cache init flags @@ -342,7 +342,7 @@  /*   * Clocks config - *  + *   * CFG_BUS_HZ				- Bus clock frequency in Hz   * CFG_BUS_CLK				- As above (?)   * CFG_HZ					- Decrementer freq in Hz @@ -355,7 +355,7 @@  /*   * Serial port config - *  + *   * CFG_BAUDRATE_TABLE		- List of valid baud rates   * CFG_NS16550				- Include the NS16550 driver   * CFG_NS16550_SERIAL		- Include the serial (wrapper) driver @@ -398,7 +398,7 @@  /*   * Extra init functions - *  + *   * CFG_BOARD_ASM_INIT		- Call assembly init code   */ @@ -407,11 +407,11 @@  /*   * Boot flags - *  + *   * BOOTFLAG_COLD			- Indicates a power-on boot   * BOOTFLAG_WARM			- Indicates a software reset   */ -  +  #define BOOTFLAG_COLD			0x01  #define BOOTFLAG_WARM			0x02 diff --git a/include/ns16550.h b/include/ns16550.h index 996d915f9..34888a102 100644 --- a/include/ns16550.h +++ b/include/ns16550.h @@ -7,7 +7,7 @@   * added prototypes for ns16550.c   * reduced no of com ports to 2   * modifications (c) Rob Taylor, Flying Pig Systems. 2000. - *  + *   * added support for port on 64-bit bus   * by Richard Danter (richard.danter@windriver.com), (C) 2005 Wind River Systems   */ |