Re: [U-Boot] [PATCH v2 1/4] Kirkwood: Rename openrd_base board files to openrd.
On Tue, Mar 29, 2011 at 05:53:14AM -0700, Prafulla Wadaskar wrote: > 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 > +MarvellKirkwood 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. The following two patches use that method, without the file rename. ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [PATCH v2 1/4] Kirkwood: Rename openrd_base board files to openrd.
> -Original Message-
> From: Julian Pidancet [mailto:swaplin...@gmail.com] On Behalf Of
> julian.pidan...@citrix.com
> Sent: Friday, March 25, 2011 2:19 PM
> To: u-boot@lists.denx.de
> Cc: tanmay.upadh...@einfochips.com; Prafulla Wadaskar; Julian Pidancet
> Subject: [PATCH v2 1/4] Kirkwood: Rename openrd_base board files to
> openrd.
>
> From: Julian Pidancet
>
> 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
>
> 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
> #include
> #include
> -#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
> suen3arm arm926ejs km_arm
> keymilekirkwood
> guruplug arm arm926ejs -
> Marvellkirkwood
> mv88f6281gtw_ge arm arm926ejs -
> Marvellkirkwood
> -openrd_base arm arm926ejs -
> Marvellkirkwood
> +openrd_base arm arm926ejs openrd
> MarvellKirkwood
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
+MarvellKirkwoodopenrd_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 . .
___
U-Boot mailing list
U-Boot@lists.denx.de
http://lists.denx.de/mailman/listinfo/u-boot
[U-Boot] [PATCH v2 1/4] Kirkwood: Rename openrd_base board files to openrd.
From: Julian Pidancet
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
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
#include
#include
-#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;
/* adress of boot parameters */
gd->bd->bi_boot_params = kw_sdram_bar(0) + 0x100;
diff --git a/board/Marvell/openrd_base/openrd_base.h
b/board/Marvell/openrd/openrd.h
similarity index 95%
rename from board/Marvell/openrd_base/openrd_base.h
rename to board/Marvell/openrd/openrd.h
index f3daf17..638d2ff 100644
--- a/board/Marvell/openrd_base/openrd_base.h
+++ b/board/Marvell/openrd/openrd.h
@@ -27,8 +27,8 @@
* MA 02110-1301 USA
*/
-#ifndef __OPENRD_BASE_H
-#define __OPENRD_BASE_H
+#ifndef __OPENRD_H
+#define __OPENRD_H
#define OPENRD_OE_LOW (~(1<<28))/* RS232 / RS485 */
#define OPENRD_OE_HIGH (~(1<<2)) /* SD / UART1 */
@@ -43,4 +43,4 @@
#define MV88E1116_RGMII_TXTM_CTRL (1 << 4)
#define MV88E1116_RGMII_RXTM_CTRL (1 << 5)
-#endif /* __OPENRD_BASE_H */
+#endif /* __OPENRD_H */
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
suen3arm arm926ejs km_arm
keymilekirkwood
guruplug arm arm926ejs -
Marvellkirkwood
mv88f6281gtw_ge arm arm926ejs -
Marvellkirkwood
-openrd_base arm arm926ejs -
Marvellkirkwood
+openrd_base arm arm926ejs openrd
Marvellkirkwood
rd6281a arm arm926ejs -
Marvellkirkwood
sheevaplug arm arm926ejs -
Marvellkirkwood
dockstar arm arm926ejs -
Seagatekirkwood
diff --git a/include/configs/openrd.h b/include/configs/openrd.h
new file mode 100644
index 000..d7973dc
--- /dev/null
+++ b/include/configs/openrd.h
@@ -0,0 +1,107 @@
+/*
+ * (C) Copyright 2009
+ * Net Insight
+ * Written-by: Simon Kagstrom
+ *
+ * Based on sheevaplug.h:
+ * (C) Copyright 2009
+ * Marvell Semiconductor
+ * Written-by: Prafulla Wadaskar
+ *
+ * See file CREDITS for list of people who contributed to this
+ * project.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation; either version 2 of
+ * the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ * MA 02110-1301 USA
+ */
+
+#ifndef _CONFIG_OPENRD_H
+#define _CONFIG_OPENRD_H
+
+/*
+ *
