-----Original Message----- From: Julian Pidancet [mailto:swaplinker@gmail.com] On Behalf Of julian.pidancet@citrix.com Sent: Friday, March 25, 2011 2:19 PM To: u-boot@lists.denx.de Cc: tanmay.upadhyay@einfochips.com; Prafulla Wadaskar; Julian Pidancet Subject: [PATCH v2 1/4] Kirkwood: Rename openrd_base board files to openrd.
From: Julian Pidancet julian.pidancet@citrix.com
This patch renames openrd_base to openrd in order to add support for other boards of the OpenRD family in future commits. The openrd_base board name remain in use.
Signed-off-by: Julian Pidancet julian.pidancet@citrix.com
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} (97%) rename board/Marvell/{openrd_base/openrd_base.h => openrd/openrd.h} (95%) create mode 100644 include/configs/openrd.h
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 d6d0ed3..19020e4 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 97% rename from board/Marvell/openrd_base/openrd_base.c rename to board/Marvell/openrd/openrd.c index 10109c1..b395df7 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;
@@ -110,7 +110,7 @@ int board_init(void) /* * arch number of board */
- gd->bd->bi_arch_number = MACH_TYPE_OPENRD_BASE;
- gd->bd->bi_arch_number = MACH_TYPE_OPENRD;
NAK for this, the MACH_TYPE for any board is coming form external world. Tweaking it in u-boot is not recommended.
You can have conditional code here to use different predefined MACH_TYPES instead of macros defining it.
...snip...
diff --git a/boards.cfg b/boards.cfg index 45c3102..07c904b 100644 --- a/boards.cfg +++ b/boards.cfg @@ -96,7 +96,7 @@ davinci_sonata arm arm926ejs sonata davinci suen3 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
You can pass additional options here to identify your board uniquely out of several supported boards (to be coming) For ex: +openrd_base arm arm926ejs openrd +Marvell Kirkwood openrd_common:BOARD_IS_OPENRD_BASE
This approach will help better way to add conditional code for other boards type
For more details refer syntax in the top of this file.
Regards.. Prafulla . .