From f846604ff57487e0d6e5ddebf8c4c4c02bd5e077 Mon Sep 17 00:00:00 2001
From: Clint Adams <[clint@debian.org]>
Date: Fri, 6 May 2011 22:06:47 +0530
Subject: [PATCH] Rename openrd_base files to openrd
Signed-off-by: Clint Adams <clint@debian.org>
Cc: Albert ARIBAUD <albert.u.boot@aribaud.net>
Cc: Prafulla Wadaskar <prafulla@marvell.com>
Cc: Julian Pidancet <julian.pidancet@citrix.com>
---
board/Marvell/{openrd_base => openrd}/Makefile | 2 +-
board/Marvell/{openrd_base => openrd}/kwbimage.cfg | 0
board/Marvell/{openrd_base/openrd_base.c => openrd/openrd.c} | 2 +-
board/Marvell/{openrd_base/openrd_base.h => openrd/openrd.h} | 0
boards.cfg | 2 +-
include/configs/{openrd_base.h => openrd.h} | 4 ++--
6 files changed, 5 insertions(+), 5 deletions(-)
rename board/Marvell/{openrd_base => openrd}/Makefile (98%)
rename board/Marvell/{openrd_base => openrd}/kwbimage.cfg (100%)
rename board/Marvell/{openrd_base/openrd_base.c => openrd/openrd.c} (99%)
rename board/Marvell/{openrd_base/openrd_base.h => openrd/openrd.h} (100%)
rename include/configs/{openrd_base.h => openrd.h} (98%)
diff --git a/board/Marvell/openrd_base/Makefile b/board/Marvell/openrd/Makefile
similarity index 98%
rename from board/Marvell/openrd_base/Makefile
rename to board/Marvell/openrd/Makefile
index d6d0ed3379..19020e435f 100644
--- a/board/Marvell/openrd_base/Makefile
+++ b/board/Marvell/openrd/Makefile
@@ -31,7 +31,7 @@ include $(TOPDIR)/config.mk
LIB = $(obj)lib$(BOARD).o
-COBJS := openrd_base.o
+COBJS := openrd.o
SRCS := $(SOBJS:.o=.S) $(COBJS:.o=.c)
OBJS := $(addprefix $(obj),$(COBJS))
diff --git a/board/Marvell/openrd_base/kwbimage.cfg b/board/Marvell/openrd/kwbimage.cfg
similarity index 100%
rename from board/Marvell/openrd_base/kwbimage.cfg
rename to board/Marvell/openrd/kwbimage.cfg
diff --git a/board/Marvell/openrd_base/openrd_base.c b/board/Marvell/openrd/openrd.c
similarity index 99%
rename from board/Marvell/openrd_base/openrd_base.c
rename to board/Marvell/openrd/openrd.c
index 10109c1322..e53fa16a24 100644
--- a/board/Marvell/openrd_base/openrd_base.c
+++ b/board/Marvell/openrd/openrd.c
@@ -31,7 +31,7 @@
#include <miiphy.h>
#include <asm/arch/kirkwood.h>
#include <asm/arch/mpp.h>
-#include "openrd_base.h"
+#include "openrd.h"
DECLARE_GLOBAL_DATA_PTR;
diff --git a/board/Marvell/openrd_base/openrd_base.h b/board/Marvell/openrd/openrd.h
similarity index 100%
rename from board/Marvell/openrd_base/openrd_base.h
rename to board/Marvell/openrd/openrd.h
diff --git a/boards.cfg b/boards.cfg
index f0d3440c61..6bcda28ce2 100644
--- a/boards.cfg
+++ b/boards.cfg
@@ -108,7 +108,7 @@ suen8 arm arm926ejs km_arm keymile
mgcoge2un arm arm926ejs km_arm keymile kirkwood
guruplug arm arm926ejs - Marvell kirkwood
mv88f6281gtw_ge arm arm926ejs - Marvell kirkwood
-openrd_base arm arm926ejs - Marvell kirkwood
+openrd_base arm arm926ejs openrd Marvell kirkwood openrd:BOARD_IS_OPENRD_BASE
rd6281a arm arm926ejs - Marvell kirkwood
sheevaplug arm arm926ejs - Marvell kirkwood
dockstar arm arm926ejs - Seagate kirkwood
diff --git a/include/configs/openrd_base.h b/include/configs/openrd.h
similarity index 98%
rename from include/configs/openrd_base.h
rename to include/configs/openrd.h
index cfdd09cda0..13dc34c2ac 100644
--- a/include/configs/openrd_base.h
+++ b/include/configs/openrd.h
@@ -27,8 +27,8 @@
* MA 02110-1301 USA
*/
-#ifndef _CONFIG_OPENRD_BASE_H
-#define _CONFIG_OPENRD_BASE_H
+#ifndef _CONFIG_OPENRD_H
+#define _CONFIG_OPENRD_H
/*
* Version number information
--
GitLab