aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--board/Marvell/openrd/Makefile (renamed from board/Marvell/openrd_base/Makefile)2
-rw-r--r--board/Marvell/openrd/kwbimage.cfg (renamed from board/Marvell/openrd_base/kwbimage.cfg)0
-rw-r--r--board/Marvell/openrd/openrd.c (renamed from board/Marvell/openrd_base/openrd_base.c)2
-rw-r--r--board/Marvell/openrd/openrd.h (renamed from board/Marvell/openrd_base/openrd_base.h)0
-rw-r--r--boards.cfg2
-rw-r--r--include/configs/openrd.h (renamed from include/configs/openrd_base.h)4
6 files changed, 5 insertions, 5 deletions
diff --git a/board/Marvell/openrd_base/Makefile b/board/Marvell/openrd/Makefile
index d6d0ed337..19020e435 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
index 757eb2816..757eb2816 100644
--- a/board/Marvell/openrd_base/kwbimage.cfg
+++ b/board/Marvell/openrd/kwbimage.cfg
diff --git a/board/Marvell/openrd_base/openrd_base.c b/board/Marvell/openrd/openrd.c
index 10109c132..e53fa16a2 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
index f3daf176a..f3daf176a 100644
--- a/board/Marvell/openrd_base/openrd_base.h
+++ b/board/Marvell/openrd/openrd.h
diff --git a/boards.cfg b/boards.cfg
index f0d3440c6..6bcda28ce 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
index cfdd09cda..13dc34c2a 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