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>

diff --git a/MAKEALL b/MAKEALL
index c3df6575e2fd4cdd76c9eac0d2476ba9df173d79..d592374049960a802f2adac10f075f6ac6715110 100755 (executable)
--- 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 e53fa16a249ec748e7c78de3a6d4a5521b5bbf0b..14ca88e5b2dee154172668b572108d3fcbfd77dc 100644 (file)
--- 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 6bcda28ce216042e3afd787b5ac0d598cb94b8ba..4f48d196ae2312510f8fad7bd07af98f51a546a2 100644 (file)
--- 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 13dc34c2ac10b6a9c14c7995d413b9997899ffd2..72997498ba8f4c3c23143562767a219668dd82d7 100644 (file)
--- 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)