s5pc110: universal: change board name from "Neptune" to "Limo SDK"

[kernel/u-boot.git] / board / samsung / universal / universal.c

diff --git a/board/samsung/universal/universal.c b/board/samsung/universal/universal.c
index 0161132..b1c23b2 100644 (file)
--- a/board/samsung/universal/universal.c
+++ b/board/samsung/universal/universal.c
@@ -239,6 +239,11 @@ static int board_is_limo_real(void)
        return mach_is_aquila() && (board_rev & LIMO_REAL_BOARD);
 }
 
+static int board_is_bamboo(void)
+{
+       return mach_is_aquila() && (board_rev & BAMBOO_BOARD);
+}
+
 static int board_is_media(void)
 {
        return mach_is_aquila() && (board_rev & MEDIA_BOARD);
@@ -369,7 +374,7 @@ static const char *board_name[] = {
        "P1P2",         /* Don't remove it */
        "Geminus",
        "Cypress",
-       "Neptune",
+       "Limo SDK",
 };
 
 enum {
@@ -403,7 +408,7 @@ static char *display_features(int board, int board_rev)
                        name = "Bamboo";
        } else if (board == MACH_KESSLER) {
                if (board_rev & NEPTUNE_BOARD)
-                       name = "Neptune";
+                       name = "Limo SDK";
                if (board_rev & S1_BOARD)
                        name = "S1";
        }
@@ -685,6 +690,8 @@ static void show_hw_revision(void)
                        if ((board_rev & 0xf) < 8)
                                s5pc1xx_set_cpu_rev(0);
                }
+               else if (board_is_bamboo())
+                       s5pc1xx_set_cpu_rev(0);
        } else if (mach_is_kessler()) {
                if (board_is_neptune() && hwrevision(2))
                        s5pc1xx_set_cpu_rev(2); /* EVT1-Fused */
@@ -2331,9 +2338,12 @@ int dram_init(void)
                 * Aquila Rev0.5 4G3G1G
                 * Aquila Rev0.8 4G3G1G
                 * Aquila Rev0.9 4G3G1G
+                * Neptune Rev 0.2 4G3G1G
                 */
                if (mach_is_aquila() || mach_is_kessler()) {
-                       if (hwrevision(5) || hwrevision(8) || hwrevision(9)) {
+                       if ((!board_is_neptune() && (hwrevision(5) ||
+                               hwrevision(8) || hwrevision(9))) ||
+                               (board_is_neptune() && hwrevision(2))) {
                                memconfig1 = readl(base + MEMCONFIG1_OFFSET);
 
                                sz = (memconfig1 >> 16) & 0xFF;