diff options
| -rw-r--r-- | include/configs/FPS850L.h | 60 | ||||
| -rw-r--r-- | include/configs/FPS860L.h | 46 | ||||
| -rw-r--r-- | include/configs/TQM823L.h | 5 | ||||
| -rw-r--r-- | include/configs/TQM823M.h | 5 | ||||
| -rw-r--r-- | include/configs/TQM850L.h | 5 | ||||
| -rw-r--r-- | include/configs/TQM850M.h | 5 | ||||
| -rw-r--r-- | include/configs/TQM855L.h | 5 | ||||
| -rw-r--r-- | include/configs/TQM855M.h | 5 | ||||
| -rw-r--r-- | include/configs/TQM860L.h | 5 | ||||
| -rw-r--r-- | include/configs/TQM860M.h | 5 | ||||
| -rw-r--r-- | include/configs/TQM862L.h | 5 | ||||
| -rw-r--r-- | include/configs/TQM862M.h | 5 | ||||
| -rw-r--r-- | include/configs/TQM866M.h | 5 | 
13 files changed, 111 insertions, 50 deletions
| diff --git a/include/configs/FPS850L.h b/include/configs/FPS850L.h index 322158c7b..3b0ddb4ec 100644 --- a/include/configs/FPS850L.h +++ b/include/configs/FPS850L.h @@ -39,28 +39,44 @@  #undef	CONFIG_8xx_CONS_SMC1  #define	CONFIG_8xx_CONS_SMC2	1	/* Console is on SMC2		*/  #undef	CONFIG_8xx_CONS_NONE -#define CONFIG_BAUDRATE		19200 -#if 0 -#define CONFIG_BOOTDELAY	-1	/* autoboot disabled		*/ -#else -#define CONFIG_BOOTDELAY	5	/* autoboot after 5 seconds	*/ -#endif -#define CONFIG_BOOTCOMMAND	"bootm 40020000" /* autoboot command	*/ +#define CONFIG_BAUDRATE		115200 -#define	CONFIG_CLOCKS_IN_MHZ	1	/* clocks passsed to Linux in MHz */ +#define	CONFIG_BOOTCOUNT_LIMIT + +#define CONFIG_BOOTDELAY	5	/* autoboot after 5 seconds	*/  #define CONFIG_BOARD_TYPES	1	/* support board types		*/ -#define CONFIG_BOOTARGS		"root=/dev/nfs rw "			\ -				"nfsroot=10.0.0.2:/opt/eldk/ppc_8xx "	\ -				"nfsaddrs=10.0.0.99:10.0.0.2" +#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"							\ +	"nfsargs=setenv bootargs root=/dev/nfs rw "			\ +		"nfsroot=${serverip}:${rootpath}\0"			\ +	"ramargs=setenv bootargs root=/dev/ram rw\0"			\ +	"addip=setenv bootargs ${bootargs} "				\ +		"ip=${ipaddr}:${serverip}:${gatewayip}:${netmask}"	\ +		":${hostname}:${netdev}:off panic=1\0"			\ +	"flash_nfs=run nfsargs addip;"					\ +		"bootm ${kernel_addr}\0"				\ +	"flash_self=run ramargs addip;"					\ +		"bootm ${kernel_addr} ${ramdisk_addr}\0"		\ +	"net_nfs=tftp 200000 ${bootfile};run nfsargs addip;bootm\0"	\ +	"rootpath=/opt/eldk/ppc_8xx\0"					\ +	"bootfile=/tftpboot/fps850L/uImage\0"				\ +	"fdt_addr=40040000\0"						\ +	"kernel_addr=40060000\0"					\ +	"ramdisk_addr=40200000\0"					\ +	"" +#define CONFIG_BOOTCOMMAND	"run flash_self"  #define CONFIG_LOADS_ECHO	1	/* echo on for serial download	*/  #undef	CFG_LOADS_BAUD_CHANGE		/* don't allow baudrate change	*/  #undef	CONFIG_WATCHDOG			/* watchdog disabled		*/ -  /*   * BOOTP options   */ @@ -80,24 +96,32 @@  #define CONFIG_BOOTP_NTPSERVER  #define CONFIG_BOOTP_TIMEOFFSET +#define	CONFIG_RTC_MPC8xx		/* use internal RTC of MPC8xx	*/  /*   * Command line configuration.   */  #include <config_cmd_default.h> -#undef CONFIG_CMD_CONSOLE -#undef CONFIG_CMD_BDI -#undef CONFIG_CMD_LOADS -#undef CONFIG_CMD_LOADB -#undef CONFIG_CMD_CACHE +#define CONFIG_CMD_ASKENV +#define CONFIG_CMD_DATE +#define CONFIG_CMD_DHCP +#define CONFIG_CMD_NFS +#define CONFIG_CMD_SNTP  /*   * Miscellaneous configurable options   */  #define	CFG_LONGHELP			/* undef to save memory		*/ -#define	CFG_PROMPT	"=> "		/* Monitor Command Prompt	*/ +#define	CFG_PROMPT		"=> "	/* Monitor Command Prompt	*/ + +#define CONFIG_CMDLINE_EDITING	1	/* add command line history	*/ +#define CFG_HUSH_PARSER		1	/* Use the HUSH parser		*/ +#ifdef	CFG_HUSH_PARSER +#define	CFG_PROMPT_HUSH_PS2	"> " +#endif +  #if defined(CONFIG_CMD_KGDB)  #define	CFG_CBSIZE	1024		/* Console I/O Buffer Size	*/  #else diff --git a/include/configs/FPS860L.h b/include/configs/FPS860L.h index f8698b570..6fec07540 100644 --- a/include/configs/FPS860L.h +++ b/include/configs/FPS860L.h @@ -40,18 +40,37 @@  #define	CONFIG_8xx_CONS_SMC2	1	/* Console is on SMC2		*/  #undef	CONFIG_8xx_CONS_NONE  #define CONFIG_BAUDRATE		115200 -#if 0 -#define CONFIG_BOOTDELAY	-1	/* autoboot disabled		*/ -#else + +#define	CONFIG_BOOTCOUNT_LIMIT +  #define CONFIG_BOOTDELAY	5	/* autoboot after 5 seconds	*/ -#endif -#define CONFIG_BOOTCOMMAND	"bootm 40040000" /* autoboot command	*/  #define CONFIG_BOARD_TYPES	1	/* support board types		*/ -#define CONFIG_BOOTARGS		"root=/dev/nfs rw "			\ -				"nfsroot=10.0.0.2:/opt/eldk/ppc_8xx "	\ -				"nfsaddrs=10.0.0.99:10.0.0.2" +#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"							\ +	"nfsargs=setenv bootargs root=/dev/nfs rw "			\ +		"nfsroot=${serverip}:${rootpath}\0"			\ +	"ramargs=setenv bootargs root=/dev/ram rw\0"			\ +	"addip=setenv bootargs ${bootargs} "				\ +		"ip=${ipaddr}:${serverip}:${gatewayip}:${netmask}"	\ +		":${hostname}:${netdev}:off panic=1\0"			\ +	"flash_nfs=run nfsargs addip;"					\ +		"bootm ${kernel_addr}\0"				\ +	"flash_self=run ramargs addip;"					\ +		"bootm ${kernel_addr} ${ramdisk_addr}\0"		\ +	"net_nfs=tftp 200000 ${bootfile};run nfsargs addip;bootm\0"	\ +	"rootpath=/opt/eldk/ppc_8xx\0"					\ +	"bootfile=/tftpboot/fps850L/uImage\0"				\ +	"fdt_addr=40040000\0"						\ +	"kernel_addr=40060000\0"					\ +	"ramdisk_addr=40200000\0"					\ +	"" +#define CONFIG_BOOTCOMMAND	"run flash_self"  #define CONFIG_LOADS_ECHO	1	/* echo on for serial download	*/  #undef	CFG_LOADS_BAUD_CHANGE		/* don't allow baudrate change	*/ @@ -79,11 +98,11 @@  #define	CONFIG_RTC_MPC8xx		/* use internal RTC of MPC8xx	*/ -  /*   * Command line configuration.   */  #include <config_cmd_default.h> +  #define CONFIG_CMD_ASKENV  #define CONFIG_CMD_DATE  #define CONFIG_CMD_DHCP @@ -95,7 +114,14 @@   * Miscellaneous configurable options   */  #define	CFG_LONGHELP			/* undef to save memory		*/ -#define	CFG_PROMPT	"=> "		/* Monitor Command Prompt	*/ +#define	CFG_PROMPT		"=> "	/* Monitor Command Prompt	*/ + +#define CONFIG_CMDLINE_EDITING	1	/* add command line history	*/ +#define CFG_HUSH_PARSER		1	/* Use the HUSH parser		*/ +#ifdef	CFG_HUSH_PARSER +#define	CFG_PROMPT_HUSH_PS2	"> " +#endif +  #if defined(CONFIG_CMD_KGDB)  #define	CFG_CBSIZE	1024		/* Console I/O Buffer Size	*/  #else diff --git a/include/configs/TQM823L.h b/include/configs/TQM823L.h index 2bdcf2cf9..384789b13 100644 --- a/include/configs/TQM823L.h +++ b/include/configs/TQM823L.h @@ -70,8 +70,9 @@  	"net_nfs=tftp 200000 ${bootfile};run nfsargs addip;bootm\0"	\  	"rootpath=/opt/eldk/ppc_8xx\0"					\  	"bootfile=/tftpboot/TQM823L/uImage\0"				\ -	"kernel_addr=40040000\0"					\ -	"ramdisk_addr=40100000\0"					\ +	"fdt_addr=40040000\0"						\ +	"kernel_addr=40060000\0"					\ +	"ramdisk_addr=40200000\0"					\  	""  #define CONFIG_BOOTCOMMAND	"run flash_self" diff --git a/include/configs/TQM823M.h b/include/configs/TQM823M.h index 58bc5d3f9..47f416b49 100644 --- a/include/configs/TQM823M.h +++ b/include/configs/TQM823M.h @@ -70,8 +70,9 @@  	"net_nfs=tftp 200000 ${bootfile};run nfsargs addip;bootm\0"	\  	"rootpath=/opt/eldk/ppc_8xx\0"					\  	"bootfile=/tftpboot/TQM823M/uImage\0"				\ -	"kernel_addr=40080000\0"					\ -	"ramdisk_addr=40180000\0"					\ +	"fdt_addr=40080000\0"						\ +	"kernel_addr=400A0000\0"					\ +	"ramdisk_addr=40280000\0"					\  	""  #define CONFIG_BOOTCOMMAND	"run flash_self" diff --git a/include/configs/TQM850L.h b/include/configs/TQM850L.h index 74b16c7cf..e4b0bd279 100644 --- a/include/configs/TQM850L.h +++ b/include/configs/TQM850L.h @@ -66,8 +66,9 @@  	"net_nfs=tftp 200000 ${bootfile};run nfsargs addip;bootm\0"	\  	"rootpath=/opt/eldk/ppc_8xx\0"					\  	"bootfile=/tftpboot/TQM850L/uImage\0"				\ -	"kernel_addr=40040000\0"					\ -	"ramdisk_addr=40100000\0"					\ +	"fdt_addr=40040000\0"						\ +	"kernel_addr=40060000\0"					\ +	"ramdisk_addr=40200000\0"					\  	""  #define CONFIG_BOOTCOMMAND	"run flash_self" diff --git a/include/configs/TQM850M.h b/include/configs/TQM850M.h index e3936c330..f26c46e99 100644 --- a/include/configs/TQM850M.h +++ b/include/configs/TQM850M.h @@ -64,8 +64,9 @@  	"net_nfs=tftp 200000 ${bootfile};run nfsargs addip;bootm\0"	\  	"rootpath=/opt/eldk/ppc_8xx\0"					\  	"bootfile=/tftpboot/TQM850M/uImage\0"				\ -	"kernel_addr=40080000\0"					\ -	"ramdisk_addr=40180000\0"					\ +	"fdt_addr=40080000\0"						\ +	"kernel_addr=400A0000\0"					\ +	"ramdisk_addr=40280000\0"					\  	""  #define CONFIG_BOOTCOMMAND	"run flash_self" diff --git a/include/configs/TQM855L.h b/include/configs/TQM855L.h index ae22b77d7..330c931cc 100644 --- a/include/configs/TQM855L.h +++ b/include/configs/TQM855L.h @@ -69,8 +69,9 @@  	"net_nfs=tftp 200000 ${bootfile};run nfsargs addip;bootm\0"	\  	"rootpath=/opt/eldk/ppc_8xx\0"					\  	"bootfile=/tftpboot/TQM855L/uImage\0"				\ -	"kernel_addr=40040000\0"					\ -	"ramdisk_addr=40100000\0"					\ +	"fdt_addr=40040000\0"						\ +	"kernel_addr=40060000\0"					\ +	"ramdisk_addr=40200000\0"					\  	""  #define CONFIG_BOOTCOMMAND	"run flash_self" diff --git a/include/configs/TQM855M.h b/include/configs/TQM855M.h index 5d54f876c..77c2f114a 100644 --- a/include/configs/TQM855M.h +++ b/include/configs/TQM855M.h @@ -69,8 +69,9 @@  	"net_nfs=tftp 200000 ${bootfile};run nfsargs addip;bootm\0"	\  	"rootpath=/opt/eldk/ppc_8xx\0"					\  	"bootfile=/tftpboot/TQM855M/uImage\0"				\ -	"kernel_addr=40080000\0"					\ -	"ramdisk_addr=40180000\0"					\ +	"fdt_addr=40080000\0"						\ +	"kernel_addr=400A0000\0"					\ +	"ramdisk_addr=40280000\0"					\  	""  #define CONFIG_BOOTCOMMAND	"run flash_self" diff --git a/include/configs/TQM860L.h b/include/configs/TQM860L.h index 40c0940d5..a903c2b34 100644 --- a/include/configs/TQM860L.h +++ b/include/configs/TQM860L.h @@ -69,8 +69,9 @@  	"net_nfs=tftp 200000 ${bootfile};run nfsargs addip;bootm\0"	\  	"rootpath=/opt/eldk/ppc_8xx\0"					\  	"bootfile=/tftpboot/TQM860L/uImage\0"				\ -	"kernel_addr=40040000\0"					\ -	"ramdisk_addr=40100000\0"					\ +	"fdt_addr=40040000\0"						\ +	"kernel_addr=40060000\0"					\ +	"ramdisk_addr=40200000\0"					\  	""  #define CONFIG_BOOTCOMMAND	"run flash_self" diff --git a/include/configs/TQM860M.h b/include/configs/TQM860M.h index 481e3d0d5..b905a0a63 100644 --- a/include/configs/TQM860M.h +++ b/include/configs/TQM860M.h @@ -69,8 +69,9 @@  	"net_nfs=tftp 200000 ${bootfile};run nfsargs addip;bootm\0"	\  	"rootpath=/opt/eldk/ppc_8xx\0"					\  	"bootfile=/tftpboot/TQM860M/uImage\0"				\ -	"kernel_addr=40080000\0"					\ -	"ramdisk_addr=40180000\0"					\ +	"fdt_addr=40080000\0"						\ +	"kernel_addr=400A0000\0"					\ +	"ramdisk_addr=40280000\0"					\  	""  #define CONFIG_BOOTCOMMAND	"run flash_self" diff --git a/include/configs/TQM862L.h b/include/configs/TQM862L.h index bb3b1cc54..d8ddf37fa 100644 --- a/include/configs/TQM862L.h +++ b/include/configs/TQM862L.h @@ -72,8 +72,9 @@  	"net_nfs=tftp 200000 ${bootfile};run nfsargs addip;bootm\0"	\  	"rootpath=/opt/eldk/ppc_8xx\0"					\  	"bootfile=/tftpboot/TQM862L/uImage\0"				\ -	"kernel_addr=40040000\0"					\ -	"ramdisk_addr=40100000\0"					\ +	"fdt_addr=40040000\0"						\ +	"kernel_addr=40060000\0"					\ +	"ramdisk_addr=40200000\0"					\  	""  #define CONFIG_BOOTCOMMAND	"run flash_self" diff --git a/include/configs/TQM862M.h b/include/configs/TQM862M.h index d687d082c..50607f0e5 100644 --- a/include/configs/TQM862M.h +++ b/include/configs/TQM862M.h @@ -72,8 +72,9 @@  	"net_nfs=tftp 200000 ${bootfile};run nfsargs addip;bootm\0"	\  	"rootpath=/opt/eldk/ppc_8xx\0"					\  	"bootfile=/tftpboot/TQM862M/uImage\0"				\ -	"kernel_addr=40080000\0"					\ -	"ramdisk_addr=40180000\0"					\ +	"fdt_addr=40080000\0"						\ +	"kernel_addr=400A0000\0"					\ +	"ramdisk_addr=40280000\0"					\  	""  #define CONFIG_BOOTCOMMAND	"run flash_self" diff --git a/include/configs/TQM866M.h b/include/configs/TQM866M.h index ff00c1330..ea310c423 100644 --- a/include/configs/TQM866M.h +++ b/include/configs/TQM866M.h @@ -81,8 +81,9 @@  	"net_nfs=tftp 200000 ${bootfile};run nfsargs addip;bootm\0"	\  	"rootpath=/opt/eldk/ppc_8xx\0"					\  	"bootfile=/tftpboot/TQM866M/uImage\0"				\ -	"kernel_addr=40080000\0"					\ -	"ramdisk_addr=40180000\0"					\ +	"fdt_addr=40080000\0"						\ +	"kernel_addr=400A0000\0"					\ +	"ramdisk_addr=40280000\0"					\  	""  #define CONFIG_BOOTCOMMAND	"run flash_self" |