From ee1363f2da3996bafdecdd8f4e48862ebff3f271 Mon Sep 17 00:00:00 2001
From: Alessandro Rubini <rubini@unipv.it>
Date: Mon, 22 Jun 2009 09:18:37 +0200
Subject: [PATCH] arm nomadik: rename board to nhk8815

This is an error in my side in the initial submission: nobody
calls it ""nmdk8815", it's "nomadik hardware kit", nhk8815, instead.

Signed-off-by: Alessandro Rubini <rubini@unipv.it>
Acked-by: Andrea Gallo <andrea.gallo@stericsson.com>
---
 Makefile                                            | 6 +++---
 board/st/{nmdk8815 => nhk8815}/Makefile             | 2 +-
 board/st/{nmdk8815 => nhk8815}/config.mk            | 0
 board/st/{nmdk8815/nmdk8815.c => nhk8815/nhk8815.c} | 0
 board/st/{nmdk8815 => nhk8815}/platform.S           | 0
 doc/{README.nmdk8815 => README.nhk8815}             | 0
 include/configs/{nmdk8815.h => nhk8815.h}           | 3 ++-
 7 files changed, 6 insertions(+), 5 deletions(-)
 rename board/st/{nmdk8815 => nhk8815}/Makefile (98%)
 rename board/st/{nmdk8815 => nhk8815}/config.mk (100%)
 rename board/st/{nmdk8815/nmdk8815.c => nhk8815/nhk8815.c} (100%)
 rename board/st/{nmdk8815 => nhk8815}/platform.S (100%)
 rename doc/{README.nmdk8815 => README.nhk8815} (100%)
 rename include/configs/{nmdk8815.h => nhk8815.h} (97%)

diff --git a/Makefile b/Makefile
index 9b9f7bf..3877c97 100644
--- a/Makefile
+++ b/Makefile
@@ -2854,8 +2854,8 @@ mx1fs2_config	:	unconfig
 netstar_config:		unconfig
 	@$(MKCONFIG) $(@:_config=) arm arm925t netstar
 
-nmdk8815_config \
-nmdk8815_onenand_config:	unconfig
+nhk8815_config \
+nhk8815_onenand_config:	unconfig
 	@mkdir -p $(obj)include
 	@ > $(obj)include/config.h
 	@if [ "$(findstring _onenand, $@)" ] ; then \
@@ -2864,7 +2864,7 @@ nmdk8815_onenand_config:	unconfig
 	else \
 		$(XECHO) "... configured for Nand Flash"; \
 	fi
-	@$(MKCONFIG) -a nmdk8815 arm arm926ejs nmdk8815 st nomadik
+	@$(MKCONFIG) -a nhk8815 arm arm926ejs nhk8815 st nomadik
 
 omap1510inn_config :	unconfig
 	@$(MKCONFIG) $(@:_config=) arm arm925t omap1510inn
diff --git a/board/st/nmdk8815/Makefile b/board/st/nhk8815/Makefile
similarity index 98%
rename from board/st/nmdk8815/Makefile
rename to board/st/nhk8815/Makefile
index be9a424..b37fe53 100644
--- a/board/st/nmdk8815/Makefile
+++ b/board/st/nhk8815/Makefile
@@ -29,7 +29,7 @@ include $(TOPDIR)/config.mk
 
 LIB	= $(obj)lib$(BOARD).a
 
-COBJS	:= nmdk8815.o
+COBJS	:= nhk8815.o
 SOBJS	:= platform.o
 
 SRCS	:= $(SOBJS:.o=.S) $(COBJS:.o=.c)
diff --git a/board/st/nmdk8815/config.mk b/board/st/nhk8815/config.mk
similarity index 100%
rename from board/st/nmdk8815/config.mk
rename to board/st/nhk8815/config.mk
diff --git a/board/st/nmdk8815/nmdk8815.c b/board/st/nhk8815/nhk8815.c
similarity index 100%
rename from board/st/nmdk8815/nmdk8815.c
rename to board/st/nhk8815/nhk8815.c
diff --git a/board/st/nmdk8815/platform.S b/board/st/nhk8815/platform.S
similarity index 100%
rename from board/st/nmdk8815/platform.S
rename to board/st/nhk8815/platform.S
diff --git a/doc/README.nmdk8815 b/doc/README.nhk8815
similarity index 100%
rename from doc/README.nmdk8815
rename to doc/README.nhk8815
diff --git a/include/configs/nmdk8815.h b/include/configs/nhk8815.h
similarity index 97%
rename from include/configs/nmdk8815.h
rename to include/configs/nhk8815.h
index 6d7b94f..df9d523 100644
--- a/include/configs/nmdk8815.h
+++ b/include/configs/nhk8815.h
@@ -1,7 +1,8 @@
 /*
  * (C) Copyright 2005
  * STMicroelectronics.
- * Configuration settings for the STn8815 nomadik board.
+ * Configuration settings for the "Nomadik Hardware Kit" NHK-8815,
+ * the evaluation board for the Nomadik 8815 System on Chip.
  *
  * See file CREDITS for list of people who contributed to this
  * project.