diff options
| -rw-r--r-- | MAINTAINERS | 8 | ||||
| -rw-r--r-- | board/xes/xpedite517x/Makefile (renamed from board/xes/xpedite5170/Makefile) | 0 | ||||
| -rw-r--r-- | board/xes/xpedite517x/ddr.c (renamed from board/xes/xpedite5170/ddr.c) | 0 | ||||
| -rw-r--r-- | board/xes/xpedite517x/law.c (renamed from board/xes/xpedite5170/law.c) | 0 | ||||
| -rw-r--r-- | board/xes/xpedite517x/xpedite517x.c (renamed from board/xes/xpedite5170/xpedite5170.c) | 0 | ||||
| -rw-r--r-- | board/xes/xpedite520x/Makefile (renamed from board/xes/xpedite5200/Makefile) | 0 | ||||
| -rw-r--r-- | board/xes/xpedite520x/ddr.c (renamed from board/xes/xpedite5200/ddr.c) | 0 | ||||
| -rw-r--r-- | board/xes/xpedite520x/law.c (renamed from board/xes/xpedite5200/law.c) | 0 | ||||
| -rw-r--r-- | board/xes/xpedite520x/tlb.c (renamed from board/xes/xpedite5200/tlb.c) | 0 | ||||
| -rw-r--r-- | board/xes/xpedite520x/xpedite520x.c (renamed from board/xes/xpedite5200/xpedite5200.c) | 0 | ||||
| -rw-r--r-- | board/xes/xpedite537x/Makefile (renamed from board/xes/xpedite5370/Makefile) | 0 | ||||
| -rw-r--r-- | board/xes/xpedite537x/ddr.c (renamed from board/xes/xpedite5370/ddr.c) | 0 | ||||
| -rw-r--r-- | board/xes/xpedite537x/law.c (renamed from board/xes/xpedite5370/law.c) | 0 | ||||
| -rw-r--r-- | board/xes/xpedite537x/tlb.c (renamed from board/xes/xpedite5370/tlb.c) | 0 | ||||
| -rw-r--r-- | board/xes/xpedite537x/xpedite537x.c (renamed from board/xes/xpedite5370/xpedite5370.c) | 0 | ||||
| -rw-r--r-- | boards.cfg | 8 | ||||
| -rw-r--r-- | include/configs/xpedite1000.h (renamed from include/configs/XPEDITE1000.h) | 4 | ||||
| -rw-r--r-- | include/configs/xpedite517x.h (renamed from include/configs/XPEDITE5170.h) | 6 | ||||
| -rw-r--r-- | include/configs/xpedite520x.h (renamed from include/configs/XPEDITE5200.h) | 6 | ||||
| -rw-r--r-- | include/configs/xpedite537x.h (renamed from include/configs/XPEDITE5370.h) | 6 | 
20 files changed, 19 insertions, 19 deletions
| diff --git a/MAINTAINERS b/MAINTAINERS index 2f61776e9..2da05611a 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -462,10 +462,10 @@ Rune Torgersen <runet@innovsys.com>  Peter Tyser <ptyser@xes-inc.com> -	XPEDITE1000	PPC440GX -	XPEDITE5170	MPC8640 -	XPEDITE5200	MPC8548 -	XPEDITE5370	MPC8572 +	xpedite1000	PPC440GX +	xpedite5170	MPC8640 +	xpedite5200	MPC8548 +	xpedite5370	MPC8572  David Updegraff <dave@cray.com> diff --git a/board/xes/xpedite5170/Makefile b/board/xes/xpedite517x/Makefile index fea6686e6..fea6686e6 100644 --- a/board/xes/xpedite5170/Makefile +++ b/board/xes/xpedite517x/Makefile diff --git a/board/xes/xpedite5170/ddr.c b/board/xes/xpedite517x/ddr.c index 1d57d0909..1d57d0909 100644 --- a/board/xes/xpedite5170/ddr.c +++ b/board/xes/xpedite517x/ddr.c diff --git a/board/xes/xpedite5170/law.c b/board/xes/xpedite517x/law.c index 0b7d9ef8d..0b7d9ef8d 100644 --- a/board/xes/xpedite5170/law.c +++ b/board/xes/xpedite517x/law.c diff --git a/board/xes/xpedite5170/xpedite5170.c b/board/xes/xpedite517x/xpedite517x.c index 0f7fa6c43..0f7fa6c43 100644 --- a/board/xes/xpedite5170/xpedite5170.c +++ b/board/xes/xpedite517x/xpedite517x.c diff --git a/board/xes/xpedite5200/Makefile b/board/xes/xpedite520x/Makefile index 02fe8fcd2..02fe8fcd2 100644 --- a/board/xes/xpedite5200/Makefile +++ b/board/xes/xpedite520x/Makefile diff --git a/board/xes/xpedite5200/ddr.c b/board/xes/xpedite520x/ddr.c index c5616d546..c5616d546 100644 --- a/board/xes/xpedite5200/ddr.c +++ b/board/xes/xpedite520x/ddr.c diff --git a/board/xes/xpedite5200/law.c b/board/xes/xpedite520x/law.c index bbfcb9da8..bbfcb9da8 100644 --- a/board/xes/xpedite5200/law.c +++ b/board/xes/xpedite520x/law.c diff --git a/board/xes/xpedite5200/tlb.c b/board/xes/xpedite520x/tlb.c index bd7bff820..bd7bff820 100644 --- a/board/xes/xpedite5200/tlb.c +++ b/board/xes/xpedite520x/tlb.c diff --git a/board/xes/xpedite5200/xpedite5200.c b/board/xes/xpedite520x/xpedite520x.c index dc5c96511..dc5c96511 100644 --- a/board/xes/xpedite5200/xpedite5200.c +++ b/board/xes/xpedite520x/xpedite520x.c diff --git a/board/xes/xpedite5370/Makefile b/board/xes/xpedite537x/Makefile index 919397c40..919397c40 100644 --- a/board/xes/xpedite5370/Makefile +++ b/board/xes/xpedite537x/Makefile diff --git a/board/xes/xpedite5370/ddr.c b/board/xes/xpedite537x/ddr.c index 4d3f255d7..4d3f255d7 100644 --- a/board/xes/xpedite5370/ddr.c +++ b/board/xes/xpedite537x/ddr.c diff --git a/board/xes/xpedite5370/law.c b/board/xes/xpedite537x/law.c index daee676c4..daee676c4 100644 --- a/board/xes/xpedite5370/law.c +++ b/board/xes/xpedite537x/law.c diff --git a/board/xes/xpedite5370/tlb.c b/board/xes/xpedite537x/tlb.c index a465ce386..a465ce386 100644 --- a/board/xes/xpedite5370/tlb.c +++ b/board/xes/xpedite537x/tlb.c diff --git a/board/xes/xpedite5370/xpedite5370.c b/board/xes/xpedite537x/xpedite537x.c index 89fa6c78b..89fa6c78b 100644 --- a/board/xes/xpedite5370/xpedite5370.c +++ b/board/xes/xpedite537x/xpedite537x.c diff --git a/boards.cfg b/boards.cfg index 0f3292fd3..a52427240 100644 --- a/boards.cfg +++ b/boards.cfg @@ -556,8 +556,8 @@ MPC8540ADS	powerpc	mpc85xx		mpc8540ads	freescale  MPC8544DS	powerpc	mpc85xx		mpc8544ds	freescale  MPC8560ADS	powerpc	mpc85xx		mpc8560ads	freescale  MPC8568MDS	powerpc	mpc85xx		mpc8568mds	freescale -XPEDITE5200	powerpc	mpc85xx		xpedite5200	xes -XPEDITE5370	powerpc	mpc85xx		xpedite5370	xes +xpedite520x	powerpc	mpc85xx		-		xes +xpedite537x	powerpc	mpc85xx		-		xes  sbc8540_33	powerpc	mpc85xx		sbc8560		-		-	SBC8540  sbc8540_66	powerpc	mpc85xx		sbc8560		-		-	SBC8540  sbc8548_PCI_33	powerpc	mpc85xx		sbc8548		-		-	sbc8548:PCI,33 @@ -597,7 +597,7 @@ P2020RDB_NAND	powerpc	mpc85xx		p1_p2_rdb	freescale	-	P1_P2_RDB:P2020,NAND  P2020RDB_SDCARD	powerpc	mpc85xx		p1_p2_rdb	freescale	-	P1_P2_RDB:P2020,SDCARD  sbc8641d	powerpc	mpc86xx  MPC8610HPCD	powerpc	mpc86xx		mpc8610hpcd	freescale -XPEDITE5170	powerpc	mpc86xx		xpedite5170	xes +xpedite517x	powerpc	mpc86xx		-		xes  MPC8641HPCN	powerpc	mpc86xx		mpc8641hpcn	freescale	-	MPC8641HPCN  cogent_mpc8xx	powerpc	mpc8xx		cogent  ESTEEM192E	powerpc	mpc8xx		esteem192e @@ -648,7 +648,7 @@ CPCIISER4	powerpc	ppc4xx		cpciiser4	esd  DASA_SIM	powerpc	ppc4xx		dasa_sim	esd  PMC405DE	powerpc	ppc4xx		pmc405de	esd  METROBOX	powerpc	ppc4xx		metrobox	sandburst -XPEDITE1000	powerpc	ppc4xx		xpedite1000	xes +xpedite1000	powerpc	ppc4xx		-		xes  korat_perm	powerpc	ppc4xx		korat		-		-	korat:KORAT_PERMANENT  haleakala	powerpc	ppc4xx		kilauea		amcc		-	kilauea:HALEAKALA  sycamore	powerpc	ppc4xx		walnut		amcc		-	walnut diff --git a/include/configs/XPEDITE1000.h b/include/configs/xpedite1000.h index 64030dd21..d0f936353 100644 --- a/include/configs/XPEDITE1000.h +++ b/include/configs/xpedite1000.h @@ -342,8 +342,8 @@ extern void out32(unsigned int, unsigned long);  	"misc_args=ip=on\0"						\  	"set_bootargs=setenv bootargs ${console_args} ${root_args} ${misc_args}\0" \  	"bootfile=/home/user/file\0"					\ -	"osfile=/home/user/uImage-XPedite1000\0"			\ -	"fdtfile=/home/user/xpedite1000.dtb\0"				\ +	"osfile=/home/user/board.uImage\0"				\ +	"fdtfile=/home/user/board.dtb\0"				\  	"ubootfile=/home/user/u-boot.bin\0"				\  	"fdtaddr=c00000\0"						\  	"osaddr=0x1000000\0"						\ diff --git a/include/configs/XPEDITE5170.h b/include/configs/xpedite517x.h index eeae5f0ff..2b6e895ec 100644 --- a/include/configs/XPEDITE5170.h +++ b/include/configs/xpedite517x.h @@ -22,7 +22,7 @@   */  /* - * xpedite5170 board configuration file + * xpedite517x board configuration file   */  #ifndef __CONFIG_H  #define __CONFIG_H @@ -727,8 +727,8 @@ extern unsigned long get_board_sys_clk(unsigned long dummy);  	"misc_args=ip=on\0"						\  	"set_bootargs=setenv bootargs ${console_args} ${root_args} ${misc_args}\0" \  	"bootfile=/home/user/file\0"					\ -	"osfile=/home/user/uImage-XPedite5170\0"			\ -	"fdtfile=/home/user/xpedite5170.dtb\0"				\ +	"osfile=/home/user/board.uImage\0"				\ +	"fdtfile=/home/user/board.dtb\0"				\  	"ubootfile=/home/user/u-boot.bin\0"				\  	"fdtaddr=c00000\0"						\  	"osaddr=0x1000000\0"						\ diff --git a/include/configs/XPEDITE5200.h b/include/configs/xpedite520x.h index 1ad9b461d..fc15d8e83 100644 --- a/include/configs/XPEDITE5200.h +++ b/include/configs/xpedite520x.h @@ -22,7 +22,7 @@   */  /* - * xpedite5200 board configuration file + * xpedite520x board configuration file   */  #ifndef __CONFIG_H  #define __CONFIG_H @@ -523,8 +523,8 @@  	"misc_args=ip=on\0"						\  	"set_bootargs=setenv bootargs ${console_args} ${root_args} ${misc_args}\0" \  	"bootfile=/home/user/file\0"					\ -	"osfile=/home/user/uImage-XPedite5200\0"			\ -	"fdtfile=/home/user/xpedite5200.dtb\0"				\ +	"osfile=/home/user/board.uImage\0"				\ +	"fdtfile=/home/user/board.dtb\0"				\  	"ubootfile=/home/user/u-boot.bin\0"				\  	"fdtaddr=c00000\0"						\  	"osaddr=0x1000000\0"						\ diff --git a/include/configs/XPEDITE5370.h b/include/configs/xpedite537x.h index 9b0ac4b40..309e32c56 100644 --- a/include/configs/XPEDITE5370.h +++ b/include/configs/xpedite537x.h @@ -22,7 +22,7 @@   */  /* - * xpedite5370 board configuration file + * xpedite537x board configuration file   */  #ifndef __CONFIG_H  #define __CONFIG_H @@ -580,8 +580,8 @@ extern unsigned long get_board_ddr_clk(unsigned long dummy);  	"misc_args=ip=on\0"						\  	"set_bootargs=setenv bootargs ${console_args} ${root_args} ${misc_args}\0" \  	"bootfile=/home/user/file\0"					\ -	"osfile=/home/user/uImage-XPedite5370\0"			\ -	"fdtfile=/home/user/xpedite5370.dtb\0"				\ +	"osfile=/home/user/board.uImage\0"				\ +	"fdtfile=/home/user/board.dtb\0"				\  	"ubootfile=/home/user/u-boot.bin\0"				\  	"fdtaddr=c00000\0"						\  	"osaddr=0x1000000\0"						\ |