[U-Boot] [PATCH 08/17] xes: Make X-ES board names more generic

Peter Tyser ptyser at xes-inc.com
Wed Sep 29 21:05:47 CEST 2010


Some U-Boot images for X-ES boards support multiple products in the same
family.  For example, the XPedite5370, XPedite5371, and XPedite5372 are
similar enough that one U-Boot image can work on all 3 cards.  To make it
clear that a U-Boot image can work on boards of the same family, rename
the boards with the least significant digit of 'x'.

While we're at it, change the board config file and make targets to be
lowercase.

Also change the default uImage and fdt filenames to "board.uImage" and
"board.dtb" to be more generic.

Signed-off-by: Peter Tyser <ptyser at xes-inc.com>
CC: Kumar Gala <galak at kernel.crashing.org>
---
 board/xes/{xpedite5170 => xpedite517x}/Makefile    |    0
 board/xes/{xpedite5170 => xpedite517x}/config.mk   |    2 +-
 board/xes/{xpedite5170 => xpedite517x}/ddr.c       |    0
 board/xes/{xpedite5170 => xpedite517x}/law.c       |    0
 board/xes/{xpedite5170 => xpedite517x}/u-boot.lds  |    0
 .../xpedite5170.c => xpedite517x/xpedite517x.c}    |    0
 board/xes/{xpedite5200 => xpedite520x}/Makefile    |    0
 board/xes/{xpedite5200 => xpedite520x}/config.mk   |    2 +-
 board/xes/{xpedite5200 => xpedite520x}/ddr.c       |    0
 board/xes/{xpedite5200 => xpedite520x}/law.c       |    0
 board/xes/{xpedite5200 => xpedite520x}/tlb.c       |    0
 .../xpedite5200.c => xpedite520x/xpedite520x.c}    |    0
 board/xes/{xpedite5370 => xpedite537x}/Makefile    |    0
 board/xes/{xpedite5370 => xpedite537x}/config.mk   |    2 +-
 board/xes/{xpedite5370 => xpedite537x}/ddr.c       |    0
 board/xes/{xpedite5370 => xpedite537x}/law.c       |    0
 board/xes/{xpedite5370 => xpedite537x}/tlb.c       |    0
 .../xpedite5370.c => xpedite537x/xpedite537x.c}    |    0
 board/xes/{xpedite5500 => xpedite550x}/Makefile    |    0
 board/xes/{xpedite5500 => xpedite550x}/config.mk   |    2 +-
 board/xes/{xpedite5500 => xpedite550x}/ddr.c       |    0
 board/xes/{xpedite5500 => xpedite550x}/law.c       |    0
 board/xes/{xpedite5500 => xpedite550x}/tlb.c       |    0
 .../xpedite5500.c => xpedite550x/xpedite550x.c}    |    0
 boards.cfg                                         |   10 +++++-----
 include/configs/{XPEDITE1000.h => xpedite1000.h}   |    4 ++--
 include/configs/{XPEDITE5170.h => xpedite517x.h}   |    6 +++---
 include/configs/{XPEDITE5200.h => xpedite520x.h}   |    6 +++---
 include/configs/{XPEDITE5370.h => xpedite537x.h}   |    6 +++---
 include/configs/{XPEDITE5500.h => xpedite550x.h}   |    6 +++---
 30 files changed, 23 insertions(+), 23 deletions(-)
 rename board/xes/{xpedite5170 => xpedite517x}/Makefile (100%)
 rename board/xes/{xpedite5170 => xpedite517x}/config.mk (98%)
 rename board/xes/{xpedite5170 => xpedite517x}/ddr.c (100%)
 rename board/xes/{xpedite5170 => xpedite517x}/law.c (100%)
 rename board/xes/{xpedite5170 => xpedite517x}/u-boot.lds (100%)
 rename board/xes/{xpedite5170/xpedite5170.c => xpedite517x/xpedite517x.c} (100%)
 rename board/xes/{xpedite5200 => xpedite520x}/Makefile (100%)
 rename board/xes/{xpedite5200 => xpedite520x}/config.mk (97%)
 rename board/xes/{xpedite5200 => xpedite520x}/ddr.c (100%)
 rename board/xes/{xpedite5200 => xpedite520x}/law.c (100%)
 rename board/xes/{xpedite5200 => xpedite520x}/tlb.c (100%)
 rename board/xes/{xpedite5200/xpedite5200.c => xpedite520x/xpedite520x.c} (100%)
 rename board/xes/{xpedite5370 => xpedite537x}/Makefile (100%)
 rename board/xes/{xpedite5370 => xpedite537x}/config.mk (97%)
 rename board/xes/{xpedite5370 => xpedite537x}/ddr.c (100%)
 rename board/xes/{xpedite5370 => xpedite537x}/law.c (100%)
 rename board/xes/{xpedite5370 => xpedite537x}/tlb.c (100%)
 rename board/xes/{xpedite5370/xpedite5370.c => xpedite537x/xpedite537x.c} (100%)
 rename board/xes/{xpedite5500 => xpedite550x}/Makefile (100%)
 rename board/xes/{xpedite5500 => xpedite550x}/config.mk (97%)
 rename board/xes/{xpedite5500 => xpedite550x}/ddr.c (100%)
 rename board/xes/{xpedite5500 => xpedite550x}/law.c (100%)
 rename board/xes/{xpedite5500 => xpedite550x}/tlb.c (100%)
 rename board/xes/{xpedite5500/xpedite5500.c => xpedite550x/xpedite550x.c} (100%)
 rename include/configs/{XPEDITE1000.h => xpedite1000.h} (99%)
 rename include/configs/{XPEDITE5170.h => xpedite517x.h} (99%)
 rename include/configs/{XPEDITE5200.h => xpedite520x.h} (99%)
 rename include/configs/{XPEDITE5370.h => xpedite537x.h} (99%)
 rename include/configs/{XPEDITE5500.h => xpedite550x.h} (99%)

diff --git a/board/xes/xpedite5170/Makefile b/board/xes/xpedite517x/Makefile
similarity index 100%
rename from board/xes/xpedite5170/Makefile
rename to board/xes/xpedite517x/Makefile
diff --git a/board/xes/xpedite5170/config.mk b/board/xes/xpedite517x/config.mk
similarity index 98%
rename from board/xes/xpedite5170/config.mk
rename to board/xes/xpedite517x/config.mk
index 1abae97..19677e2 100644
--- a/board/xes/xpedite5170/config.mk
+++ b/board/xes/xpedite517x/config.mk
@@ -22,6 +22,6 @@
 #
 
 #
-# XPedite5170
+# XPedite517x
 #
 TEXT_BASE = 0xfff00000
diff --git a/board/xes/xpedite5170/ddr.c b/board/xes/xpedite517x/ddr.c
similarity index 100%
rename from board/xes/xpedite5170/ddr.c
rename to board/xes/xpedite517x/ddr.c
diff --git a/board/xes/xpedite5170/law.c b/board/xes/xpedite517x/law.c
similarity index 100%
rename from board/xes/xpedite5170/law.c
rename to board/xes/xpedite517x/law.c
diff --git a/board/xes/xpedite5170/u-boot.lds b/board/xes/xpedite517x/u-boot.lds
similarity index 100%
rename from board/xes/xpedite5170/u-boot.lds
rename to board/xes/xpedite517x/u-boot.lds
diff --git a/board/xes/xpedite5170/xpedite5170.c b/board/xes/xpedite517x/xpedite517x.c
similarity index 100%
rename from board/xes/xpedite5170/xpedite5170.c
rename to board/xes/xpedite517x/xpedite517x.c
diff --git a/board/xes/xpedite5200/Makefile b/board/xes/xpedite520x/Makefile
similarity index 100%
rename from board/xes/xpedite5200/Makefile
rename to board/xes/xpedite520x/Makefile
diff --git a/board/xes/xpedite5200/config.mk b/board/xes/xpedite520x/config.mk
similarity index 97%
rename from board/xes/xpedite5200/config.mk
rename to board/xes/xpedite520x/config.mk
index 0761579..77557d0 100644
--- a/board/xes/xpedite5200/config.mk
+++ b/board/xes/xpedite520x/config.mk
@@ -22,7 +22,7 @@
 #
 
 #
-# xpedite5200 board
+# xpedite520x board
 #
 ifndef TEXT_BASE
 TEXT_BASE = 0xfff80000
diff --git a/board/xes/xpedite5200/ddr.c b/board/xes/xpedite520x/ddr.c
similarity index 100%
rename from board/xes/xpedite5200/ddr.c
rename to board/xes/xpedite520x/ddr.c
diff --git a/board/xes/xpedite5200/law.c b/board/xes/xpedite520x/law.c
similarity index 100%
rename from board/xes/xpedite5200/law.c
rename to board/xes/xpedite520x/law.c
diff --git a/board/xes/xpedite5200/tlb.c b/board/xes/xpedite520x/tlb.c
similarity index 100%
rename from board/xes/xpedite5200/tlb.c
rename to board/xes/xpedite520x/tlb.c
diff --git a/board/xes/xpedite5200/xpedite5200.c b/board/xes/xpedite520x/xpedite520x.c
similarity index 100%
rename from board/xes/xpedite5200/xpedite5200.c
rename to board/xes/xpedite520x/xpedite520x.c
diff --git a/board/xes/xpedite5370/Makefile b/board/xes/xpedite537x/Makefile
similarity index 100%
rename from board/xes/xpedite5370/Makefile
rename to board/xes/xpedite537x/Makefile
diff --git a/board/xes/xpedite5370/config.mk b/board/xes/xpedite537x/config.mk
similarity index 97%
rename from board/xes/xpedite5370/config.mk
rename to board/xes/xpedite537x/config.mk
index 995def8..e70d040 100644
--- a/board/xes/xpedite5370/config.mk
+++ b/board/xes/xpedite537x/config.mk
@@ -22,7 +22,7 @@
 #
 
 #
-# xpedite5370 board
+# xpedite537x board
 #
 ifndef TEXT_BASE
 TEXT_BASE = 0xfff80000
diff --git a/board/xes/xpedite5370/ddr.c b/board/xes/xpedite537x/ddr.c
similarity index 100%
rename from board/xes/xpedite5370/ddr.c
rename to board/xes/xpedite537x/ddr.c
diff --git a/board/xes/xpedite5370/law.c b/board/xes/xpedite537x/law.c
similarity index 100%
rename from board/xes/xpedite5370/law.c
rename to board/xes/xpedite537x/law.c
diff --git a/board/xes/xpedite5370/tlb.c b/board/xes/xpedite537x/tlb.c
similarity index 100%
rename from board/xes/xpedite5370/tlb.c
rename to board/xes/xpedite537x/tlb.c
diff --git a/board/xes/xpedite5370/xpedite5370.c b/board/xes/xpedite537x/xpedite537x.c
similarity index 100%
rename from board/xes/xpedite5370/xpedite5370.c
rename to board/xes/xpedite537x/xpedite537x.c
diff --git a/board/xes/xpedite5500/Makefile b/board/xes/xpedite550x/Makefile
similarity index 100%
rename from board/xes/xpedite5500/Makefile
rename to board/xes/xpedite550x/Makefile
diff --git a/board/xes/xpedite5500/config.mk b/board/xes/xpedite550x/config.mk
similarity index 97%
rename from board/xes/xpedite5500/config.mk
rename to board/xes/xpedite550x/config.mk
index fd118ab..951ab21 100644
--- a/board/xes/xpedite5500/config.mk
+++ b/board/xes/xpedite550x/config.mk
@@ -22,7 +22,7 @@
 #
 
 #
-# xpedite5500 board
+# xpedite550x board
 #
 
 ifndef TEXT_BASE
diff --git a/board/xes/xpedite5500/ddr.c b/board/xes/xpedite550x/ddr.c
similarity index 100%
rename from board/xes/xpedite5500/ddr.c
rename to board/xes/xpedite550x/ddr.c
diff --git a/board/xes/xpedite5500/law.c b/board/xes/xpedite550x/law.c
similarity index 100%
rename from board/xes/xpedite5500/law.c
rename to board/xes/xpedite550x/law.c
diff --git a/board/xes/xpedite5500/tlb.c b/board/xes/xpedite550x/tlb.c
similarity index 100%
rename from board/xes/xpedite5500/tlb.c
rename to board/xes/xpedite550x/tlb.c
diff --git a/board/xes/xpedite5500/xpedite5500.c b/board/xes/xpedite550x/xpedite550x.c
similarity index 100%
rename from board/xes/xpedite5500/xpedite5500.c
rename to board/xes/xpedite550x/xpedite550x.c
diff --git a/boards.cfg b/boards.cfg
index 5a4b70d..3af487a 100644
--- a/boards.cfg
+++ b/boards.cfg
@@ -340,13 +340,13 @@ MPC8544DS	powerpc	mpc85xx		mpc8544ds	freescale
 MPC8560ADS	powerpc	mpc85xx		mpc8560ads	freescale
 MPC8568MDS	powerpc	mpc85xx		mpc8568mds	freescale
 P4080DS		powerpc	mpc85xx		corenet_ds	freescale
-XPEDITE5200	powerpc	mpc85xx		xpedite5200	xes
-XPEDITE5370	powerpc	mpc85xx		xpedite5370	xes
-XPEDITE5500	powerpc	mpc85xx		xpedite5500	xes
+xpedite520x	powerpc	mpc85xx		-		xes
+xpedite537x	powerpc	mpc85xx		-		xes
+xpedite550x	powerpc	mpc85xx		-		xes
 P1022DS		powerpc	mpc85xx		p1022ds		freescale
 sbc8641d	powerpc	mpc86xx
 MPC8610HPCD	powerpc	mpc86xx		mpc8610hpcd	freescale
-XPEDITE5170	powerpc	mpc86xx		xpedite5170	xes
+xpedite517x	powerpc	mpc86xx		-		xes
 cogent_mpc8xx	powerpc	mpc8xx		cogent
 ESTEEM192E	powerpc	mpc8xx		esteem192e
 RPXClassic	powerpc	mpc8xx
@@ -360,7 +360,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
 grsim_leon2	sparc	leon2		-		gaisler
 gr_cpci_ax2000	sparc	leon3		-		gaisler
 gr_ep2s60	sparc	leon3		-		gaisler
diff --git a/include/configs/XPEDITE1000.h b/include/configs/xpedite1000.h
similarity index 99%
rename from include/configs/XPEDITE1000.h
rename to include/configs/xpedite1000.h
index ebed6d6..40c79b0 100644
--- a/include/configs/XPEDITE1000.h
+++ b/include/configs/xpedite1000.h
@@ -347,8 +347,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
similarity index 99%
rename from include/configs/XPEDITE5170.h
rename to include/configs/xpedite517x.h
index f420457..2f28efa 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
@@ -730,8 +730,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
similarity index 99%
rename from include/configs/XPEDITE5200.h
rename to include/configs/xpedite520x.h
index 5d5dd91..61b6087 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
@@ -524,8 +524,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
similarity index 99%
rename from include/configs/XPEDITE5370.h
rename to include/configs/xpedite537x.h
index 82bbd5c..9838bb7 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
@@ -582,8 +582,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"						\
diff --git a/include/configs/XPEDITE5500.h b/include/configs/xpedite550x.h
similarity index 99%
rename from include/configs/XPEDITE5500.h
rename to include/configs/xpedite550x.h
index 257f69c..a83625a 100644
--- a/include/configs/XPEDITE5500.h
+++ b/include/configs/xpedite550x.h
@@ -21,7 +21,7 @@
  */
 
 /*
- * xpedite5500 board configuration file
+ * xpedite550x board configuration file
  */
 #ifndef __CONFIG_H
 #define __CONFIG_H
@@ -570,8 +570,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-XPedite5500\0"			\
-	"fdtfile=/home/user/xpedite5500.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"						\
-- 
1.7.0.4



More information about the U-Boot mailing list