summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichal Simek <monstr@monstr.eu>2008-12-19 13:14:05 +0100
committerMichal Simek <monstr@monstr.eu>2009-01-23 10:39:56 +0100
commit52a822ed9c37a2ea0ed112a26d8ff5a6cb1c6f10 (patch)
treed620c96d3027e23e60de54b0239910ecda5f4486
parent72d15e705bc3983884105cb7755c7ba80e74a0a5 (diff)
downloadu-boot-imx-52a822ed9c37a2ea0ed112a26d8ff5a6cb1c6f10.zip
u-boot-imx-52a822ed9c37a2ea0ed112a26d8ff5a6cb1c6f10.tar.gz
u-boot-imx-52a822ed9c37a2ea0ed112a26d8ff5a6cb1c6f10.tar.bz2
microblaze: Rename ml401 to microblaze-generic
Signed-off-by: Michal Simek <monstr@monstr.eu>
-rw-r--r--MAINTAINERS2
-rwxr-xr-xMAKEALL6
-rw-r--r--Makefile5
-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 60def0c..dfe54a7 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: #
diff --git a/MAKEALL b/MAKEALL
index 5ce3f31..f6271a2 100755
--- a/MAKEALL
+++ b/MAKEALL
@@ -697,9 +697,9 @@ LIST_nios2=" \
## MicroBlaze Systems
#########################################################################
-LIST_microblaze=" \
- ml401 \
- suzaku \
+LIST_microblaze=" \
+ microblaze-generic \
+ suzaku \
"
#########################################################################
diff --git a/Makefile b/Makefile
index d533564..5cc950d 100644
--- a/Makefile
+++ b/Makefile
@@ -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 10b47b2..10b47b2 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 c75daaf..c75daaf 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 f388b77..f388b77 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 b38f648..b38f648 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 d805061..d805061 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 c802dcb..ed4bf6d 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