From c00ac259f60112bb263a73f211ce3bb8f529c2c0 Mon Sep 17 00:00:00 2001 From: Peter Tyser Date: Fri, 22 Oct 2010 00:20:26 -0500 Subject: [PATCH] xes: Make X-ES board names more generic 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 Signed-off-by: Kumar Gala --- MAINTAINERS | 8 ++++---- board/xes/{xpedite5170 => xpedite517x}/Makefile | 0 board/xes/{xpedite5170 => xpedite517x}/ddr.c | 0 board/xes/{xpedite5170 => xpedite517x}/law.c | 0 .../xpedite5170.c => xpedite517x/xpedite517x.c} | 0 board/xes/{xpedite5200 => xpedite520x}/Makefile | 0 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}/ddr.c | 0 board/xes/{xpedite5370 => xpedite537x}/law.c | 0 board/xes/{xpedite5370 => xpedite537x}/tlb.c | 0 .../xpedite5370.c => xpedite537x/xpedite537x.c} | 0 boards.cfg | 8 ++++---- 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 +++--- 20 files changed, 19 insertions(+), 19 deletions(-) rename board/xes/{xpedite5170 => xpedite517x}/Makefile (100%) rename board/xes/{xpedite5170 => xpedite517x}/ddr.c (100%) rename board/xes/{xpedite5170 => xpedite517x}/law.c (100%) rename board/xes/{xpedite5170/xpedite5170.c => xpedite517x/xpedite517x.c} (100%) rename board/xes/{xpedite5200 => xpedite520x}/Makefile (100%) 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}/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 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%) diff --git a/MAINTAINERS b/MAINTAINERS index 2f61776e91..2da05611ad 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -462,10 +462,10 @@ Rune Torgersen Peter Tyser - XPEDITE1000 PPC440GX - XPEDITE5170 MPC8640 - XPEDITE5200 MPC8548 - XPEDITE5370 MPC8572 + xpedite1000 PPC440GX + xpedite5170 MPC8640 + xpedite5200 MPC8548 + xpedite5370 MPC8572 David Updegraff 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/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/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/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/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/boards.cfg b/boards.cfg index 0f3292fd39..a524272404 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 similarity index 99% rename from include/configs/XPEDITE1000.h rename to include/configs/xpedite1000.h index 64030dd218..d0f9363533 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 similarity index 99% rename from include/configs/XPEDITE5170.h rename to include/configs/xpedite517x.h index eeae5f0ff6..2b6e895ec8 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 similarity index 99% rename from include/configs/XPEDITE5200.h rename to include/configs/xpedite520x.h index 1ad9b461d3..fc15d8e83e 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 similarity index 99% rename from include/configs/XPEDITE5370.h rename to include/configs/xpedite537x.h index 9b0ac4b404..309e32c568 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" \ -- 2.30.2