diff options
| -rw-r--r-- | MAINTAINERS | 2 | ||||
| -rwxr-xr-x | MAKEALL | 2 | ||||
| -rw-r--r-- | Makefile | 4 | ||||
| -rw-r--r-- | board/xes/xpedite1000/Makefile (renamed from board/xpedite1k/Makefile) | 0 | ||||
| -rw-r--r-- | board/xes/xpedite1000/config.mk (renamed from board/xpedite1k/config.mk) | 0 | ||||
| -rw-r--r-- | board/xes/xpedite1000/init.S (renamed from board/xpedite1k/init.S) | 0 | ||||
| -rw-r--r-- | board/xes/xpedite1000/u-boot.lds (renamed from board/xpedite1k/u-boot.lds) | 2 | ||||
| -rw-r--r-- | board/xes/xpedite1000/u-boot.lds.debug (renamed from board/xpedite1k/u-boot.lds.debug) | 2 | ||||
| -rw-r--r-- | board/xes/xpedite1000/xpedite1000.c (renamed from board/xpedite1k/xpedite1k.c) | 0 | ||||
| -rw-r--r-- | include/configs/XPEDITE1000.h (renamed from include/configs/XPEDITE1K.h) | 2 |
10 files changed, 7 insertions, 7 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index acb65fc89ad..0797387e8b9 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -382,7 +382,6 @@ Travis Sawyer (travis.sawyer@sandburst.com> KAREF PPC440GX METROBOX PPC440GX - XPEDITE1K PPC440GX Georg Schardt <schardt@team-ctech.de> @@ -437,6 +436,7 @@ Rune Torgersen <runet@innovsys.com> Peter Tyser <ptyser@xes-inc.com> + XPEDITE1000 PPC440GX XPEDITE5170 MPC8640 XPEDITE5200 MPC8548 XPEDITE5370 MPC8572 @@ -259,7 +259,7 @@ LIST_4xx=" \ WUH405 \ xilinx-ppc440-generic \ xilinx-ppc440-generic_flash \ - XPEDITE1K \ + XPEDITE1000 \ yellowstone \ yosemite \ yucca \ @@ -1607,8 +1607,8 @@ xilinx-ppc440-generic_config: unconfig >> $(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 index b93f2c3890e..b93f2c3890e 100644 --- a/board/xpedite1k/Makefile +++ b/board/xes/xpedite1000/Makefile diff --git a/board/xpedite1k/config.mk b/board/xes/xpedite1000/config.mk index 33dfbf1c0d2..33dfbf1c0d2 100644 --- a/board/xpedite1k/config.mk +++ b/board/xes/xpedite1000/config.mk diff --git a/board/xpedite1k/init.S b/board/xes/xpedite1000/init.S index 54371e276b9..54371e276b9 100644 --- a/board/xpedite1k/init.S +++ b/board/xes/xpedite1000/init.S diff --git a/board/xpedite1k/u-boot.lds b/board/xes/xpedite1000/u-boot.lds index fc001b247c1..46b52fc5359 100644 --- a/board/xpedite1k/u-boot.lds +++ b/board/xes/xpedite1000/u-boot.lds @@ -66,7 +66,7 @@ SECTIONS /* 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 index 5824cd9d57a..68cd72d12dc 100644 --- a/board/xpedite1k/u-boot.lds.debug +++ b/board/xes/xpedite1000/u-boot.lds.debug @@ -56,7 +56,7 @@ SECTIONS /* 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 index 4529b7eded8..4529b7eded8 100644 --- a/board/xpedite1k/xpedite1k.c +++ b/board/xes/xpedite1000/xpedite1000.c diff --git a/include/configs/XPEDITE1K.h b/include/configs/XPEDITE1000.h index bb6208cce91..658e9473bc2 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 |