aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorClint Adams <[clint@debian.org]>2011-05-06 22:06:47 +0530
committerAlbert ARIBAUD <albert.u.boot@aribaud.net>2011-05-11 23:03:16 +0200
commit21861f2d39ac8cab88dd3cfa1285aa4f69023b10 (patch)
treea2d8714abb27c78831e88c17cc1ee9c880c16b35
parentf846604ff57487e0d6e5ddebf8c4c4c02bd5e077 (diff)
downloadu-boot-linaro-stable-21861f2d39ac8cab88dd3cfa1285aa4f69023b10.tar.gz
Add definitions for OpenRD-Client and OpenRD-Ultimate
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>
-rwxr-xr-xMAKEALL2
-rw-r--r--board/Marvell/openrd/openrd.c6
-rw-r--r--boards.cfg2
-rw-r--r--include/configs/openrd.h14
4 files changed, 23 insertions, 1 deletions
diff --git a/MAKEALL b/MAKEALL
index c3df6575e..d59237404 100755
--- a/MAKEALL
+++ b/MAKEALL
@@ -361,6 +361,8 @@ LIST_ARM9=" \
omap5912osk \
omap730p2 \
openrd_base \
+ openrd_client \
+ openrd_ultimate \
rd6281a \
sbc2410x \
scb9328 \
diff --git a/board/Marvell/openrd/openrd.c b/board/Marvell/openrd/openrd.c
index e53fa16a2..14ca88e5b 100644
--- a/board/Marvell/openrd/openrd.c
+++ b/board/Marvell/openrd/openrd.c
@@ -110,7 +110,13 @@ int board_init(void)
/*
* arch number of board
*/
+#if defined(CONFIG_BOARD_IS_OPENRD_BASE)
gd->bd->bi_arch_number = MACH_TYPE_OPENRD_BASE;
+#elif defined(CONFIG_BOARD_IS_OPENRD_CLIENT)
+ gd->bd->bi_arch_number = MACH_TYPE_OPENRD_CLIENT;
+#elif defined(CONFIG_BOARD_IS_OPENRD_ULTIMATE)
+ gd->bd->bi_arch_number = MACH_TYPE_OPENRD_ULTIMATE;
+#endif
/* adress of boot parameters */
gd->bd->bi_boot_params = kw_sdram_bar(0) + 0x100;
diff --git a/boards.cfg b/boards.cfg
index 6bcda28ce..4f48d196a 100644
--- a/boards.cfg
+++ b/boards.cfg
@@ -109,6 +109,8 @@ mgcoge2un arm arm926ejs km_arm keymile
guruplug arm arm926ejs - Marvell kirkwood
mv88f6281gtw_ge arm arm926ejs - Marvell kirkwood
openrd_base arm arm926ejs openrd Marvell kirkwood openrd:BOARD_IS_OPENRD_BASE
+openrd_client arm arm926ejs openrd Marvell kirkwood openrd:BOARD_IS_OPENRD_CLIENT
+openrd_ultimate arm arm926ejs openrd Marvell kirkwood openrd:BOARD_IS_OPENRD_ULTIMATE
rd6281a arm arm926ejs - Marvell kirkwood
sheevaplug arm arm926ejs - Marvell kirkwood
dockstar arm arm926ejs - Seagate kirkwood
diff --git a/include/configs/openrd.h b/include/configs/openrd.h
index 13dc34c2a..72997498b 100644
--- a/include/configs/openrd.h
+++ b/include/configs/openrd.h
@@ -33,7 +33,19 @@
/*
* Version number information
*/
-#define CONFIG_IDENT_STRING "\nOpenRD_base"
+#ifdef CONFIG_BOARD_IS_OPENRD_ULTIMATE
+# define CONFIG_IDENT_STRING "\nOpenRD-Ultimate"
+#else
+# ifdef CONFIG_BOARD_IS_OPENRD_CLIENT
+# define CONFIG_IDENT_STRING "\nOpenRD-Client"
+# else
+# ifdef CONFIG_BOARD_IS_OPENRD_BASE
+# define CONFIG_IDENT_STRING "\nOpenRD-Base"
+# else
+# error Unknown OpenRD board specified
+# endif
+# endif
+#endif
/*
* High Level Configuration Options (easy to change)