xpedite1k: Move to X-ES vendor directory
The XPedite1000 is an X-ES product thus it can be put in board/xes along
with other X-ES boards. Along with the move, the board was renamed to
XPedite1000 from XPedite1K to fit X-ES's standard naming convention.
Maintainership was also transfered to Peter Tyser.
Signed-off-by: Peter Tyser <ptyser@xes-inc.com>
Signed-off-by: Stefan Roese <sr@denx.de>
diff --git a/MAINTAINERS b/MAINTAINERS
index acb65fc..0797387 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -382,7 +382,6 @@
KAREF PPC440GX
METROBOX PPC440GX
- XPEDITE1K PPC440GX
Georg Schardt <schardt@team-ctech.de>
@@ -437,6 +436,7 @@
Peter Tyser <ptyser@xes-inc.com>
+ XPEDITE1000 PPC440GX
XPEDITE5170 MPC8640
XPEDITE5200 MPC8548
XPEDITE5370 MPC8572
diff --git a/MAKEALL b/MAKEALL
index d86f71c..fe6fff4 100755
--- a/MAKEALL
+++ b/MAKEALL
@@ -259,7 +259,7 @@
WUH405 \
xilinx-ppc440-generic \
xilinx-ppc440-generic_flash \
- XPEDITE1K \
+ XPEDITE1000 \
yellowstone \
yosemite \
yucca \
diff --git a/Makefile b/Makefile
index 4a7e13e..afe8674 100644
--- a/Makefile
+++ b/Makefile
@@ -1607,8 +1607,8 @@
>> $(obj)board/xilinx/ppc440-generic/config.tmp
@$(MKCONFIG) xilinx-ppc440-generic ppc ppc4xx ppc440-generic xilinx
-XPEDITE1K_config: unconfig
- @$(MKCONFIG) $(@:_config=) ppc ppc4xx xpedite1k
+XPEDITE1000_config: unconfig
+ @$(MKCONFIG) $(@:_config=) ppc ppc4xx xpedite1000 xes
yosemite_config \
yellowstone_config: unconfig
diff --git a/board/xpedite1k/Makefile b/board/xes/xpedite1000/Makefile
similarity index 100%
rename from board/xpedite1k/Makefile
rename to board/xes/xpedite1000/Makefile
diff --git a/board/xpedite1k/config.mk b/board/xes/xpedite1000/config.mk
similarity index 100%
rename from board/xpedite1k/config.mk
rename to board/xes/xpedite1000/config.mk
diff --git a/board/xpedite1k/init.S b/board/xes/xpedite1000/init.S
similarity index 100%
rename from board/xpedite1k/init.S
rename to board/xes/xpedite1000/init.S
diff --git a/board/xpedite1k/u-boot.lds b/board/xes/xpedite1000/u-boot.lds
similarity index 98%
rename from board/xpedite1k/u-boot.lds
rename to board/xes/xpedite1000/u-boot.lds
index fc001b24..46b52fc 100644
--- a/board/xpedite1k/u-boot.lds
+++ b/board/xes/xpedite1000/u-boot.lds
@@ -66,7 +66,7 @@
/* the sector layout of our flash chips! XXX FIXME XXX */
cpu/ppc4xx/start.o (.text)
- board/xpedite1k/init.o (.text)
+ board/xes/xpedite1000/init.o (.text)
cpu/ppc4xx/kgdb.o (.text)
cpu/ppc4xx/traps.o (.text)
cpu/ppc4xx/interrupts.o (.text)
diff --git a/board/xpedite1k/u-boot.lds.debug b/board/xes/xpedite1000/u-boot.lds.debug
similarity index 98%
rename from board/xpedite1k/u-boot.lds.debug
rename to board/xes/xpedite1000/u-boot.lds.debug
index 5824cd9..68cd72d 100644
--- a/board/xpedite1k/u-boot.lds.debug
+++ b/board/xes/xpedite1000/u-boot.lds.debug
@@ -56,7 +56,7 @@
/* the sector layout of our flash chips! XXX FIXME XXX */
cpu/ppc4xx/start.o (.text)
- board/xpedite1k/init.o (.text)
+ board/xes/xpedite1000/init.o (.text)
cpu/ppc4xx/kgdb.o (.text)
cpu/ppc4xx/traps.o (.text)
cpu/ppc4xx/interrupts.o (.text)
diff --git a/board/xpedite1k/xpedite1k.c b/board/xes/xpedite1000/xpedite1000.c
similarity index 100%
rename from board/xpedite1k/xpedite1k.c
rename to board/xes/xpedite1000/xpedite1000.c
diff --git a/include/configs/XPEDITE1K.h b/include/configs/XPEDITE1000.h
similarity index 99%
rename from include/configs/XPEDITE1K.h
rename to include/configs/XPEDITE1000.h
index bb6208c..658e947 100644
--- a/include/configs/XPEDITE1K.h
+++ b/include/configs/XPEDITE1000.h
@@ -31,7 +31,7 @@
#define __CONFIG_H
/* High Level Configuration Options */
-#define CONFIG_XPEDITE1K 1 /* Board is XPedite 1000 */
+#define CONFIG_XPEDITE1000 1
#define CONFIG_SYS_BOARD_NAME "XPedite1000"
#define CONFIG_4xx 1 /* ... PPC4xx family */
#define CONFIG_440 1