diff options
-rw-r--r-- | MAINTAINERS | 2 | ||||
-rwxr-xr-x | MAKEALL | 6 | ||||
-rw-r--r-- | Makefile | 5 | ||||
-rw-r--r-- | board/xilinx/microblaze-generic/Makefile (renamed from board/xilinx/ml401/Makefile) | 0 | ||||
-rw-r--r-- | board/xilinx/microblaze-generic/config.mk (renamed from board/xilinx/ml401/config.mk) | 0 | ||||
-rw-r--r-- | board/xilinx/microblaze-generic/microblaze-generic.c (renamed from board/xilinx/ml401/ml401.c) | 0 | ||||
-rw-r--r-- | board/xilinx/microblaze-generic/u-boot.lds (renamed from board/xilinx/ml401/u-boot.lds) | 0 | ||||
-rw-r--r-- | board/xilinx/microblaze-generic/xparameters.h (renamed from board/xilinx/ml401/xparameters.h) | 0 | ||||
-rw-r--r-- | include/configs/microblaze-generic.h (renamed from include/configs/ml401.h) | 3 |
9 files changed, 7 insertions, 9 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index 60def0c34d..dfe54a7cb7 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -707,7 +707,7 @@ Yasushi Shoji <yashi@atmark-techno.com> Michal Simek <monstr@monstr.eu> - ML401 MicroBlaze + microblaze-generic MicroBlaze ######################################################################### # Coldfire Systems: # @@ -697,9 +697,9 @@ LIST_nios2=" \ ## MicroBlaze Systems ######################################################################### -LIST_microblaze=" \ - ml401 \ - suzaku \ +LIST_microblaze=" \ + microblaze-generic \ + suzaku \ " ######################################################################### @@ -3170,10 +3170,9 @@ PCI5441_config : unconfig ## Microblaze #======================================================================== -ml401_config: unconfig +microblaze-generic_config: unconfig @mkdir -p $(obj)include - @echo "#define CONFIG_ML401 1" > $(obj)include/config.h - @$(MKCONFIG) -a $(@:_config=) microblaze microblaze ml401 xilinx + @$(MKCONFIG) -a $(@:_config=) microblaze microblaze microblaze-generic xilinx suzaku_config: unconfig @mkdir -p $(obj)include diff --git a/board/xilinx/ml401/Makefile b/board/xilinx/microblaze-generic/Makefile index 10b47b2ae5..10b47b2ae5 100644 --- a/board/xilinx/ml401/Makefile +++ b/board/xilinx/microblaze-generic/Makefile diff --git a/board/xilinx/ml401/config.mk b/board/xilinx/microblaze-generic/config.mk index c75daaf0b5..c75daaf0b5 100644 --- a/board/xilinx/ml401/config.mk +++ b/board/xilinx/microblaze-generic/config.mk diff --git a/board/xilinx/ml401/ml401.c b/board/xilinx/microblaze-generic/microblaze-generic.c index f388b775c2..f388b775c2 100644 --- a/board/xilinx/ml401/ml401.c +++ b/board/xilinx/microblaze-generic/microblaze-generic.c diff --git a/board/xilinx/ml401/u-boot.lds b/board/xilinx/microblaze-generic/u-boot.lds index b38f648772..b38f648772 100644 --- a/board/xilinx/ml401/u-boot.lds +++ b/board/xilinx/microblaze-generic/u-boot.lds diff --git a/board/xilinx/ml401/xparameters.h b/board/xilinx/microblaze-generic/xparameters.h index d805061c0d..d805061c0d 100644 --- a/board/xilinx/ml401/xparameters.h +++ b/board/xilinx/microblaze-generic/xparameters.h diff --git a/include/configs/ml401.h b/include/configs/microblaze-generic.h index c802dcb6a2..ed4bf6d359 100644 --- a/include/configs/ml401.h +++ b/include/configs/microblaze-generic.h @@ -25,11 +25,10 @@ #ifndef __CONFIG_H #define __CONFIG_H -#include "../board/xilinx/ml401/xparameters.h" +#include "../board/xilinx/microblaze-generic/xparameters.h" #define CONFIG_MICROBLAZE 1 /* MicroBlaze CPU */ #define MICROBLAZE_V5 1 -#define CONFIG_ML401 1 /* ML401 Board */ /* uart */ #ifdef XILINX_UARTLITE_BASEADDR |