Merge branch 'sf' of git://git.denx.de/u-boot-blackfin

[oweals/u-boot.git] / arch / arm / cpu / armv7 / tegra2 / board.c

diff --git a/arch/arm/cpu/armv7/tegra2/board.c b/arch/arm/cpu/armv7/tegra2/board.c
index ea06570bfaf71ed0f4d2cb5ef950b8cd2259d4fe..349d50e1ac4adbc1b509d0d5a7302d384a42c663 100644 (file)
--- a/arch/arm/cpu/armv7/tegra2/board.c
+++ b/arch/arm/cpu/armv7/tegra2/board.c
@@ -58,9 +58,9 @@ unsigned int query_sdram_size(void)
        case 1:
                return 0x10000000;      /* 256 MB */
        case 2:
+       default:
                return 0x20000000;      /* 512 MB */
        case 3:
-       default:
                return 0x40000000;      /* 1GB */
        }
 }
@@ -120,7 +120,7 @@ static void setup_uarts(int uart_ids)
                if (uart_ids & (1 << i)) {
                        enum periph_id id = id_for_uart[i];
 
-                       funcmux_select(id, 0);
+                       funcmux_select(id, FUNCMUX_DEFAULT);
                        clock_ll_start_uart(id);
                }
        }
@@ -141,3 +141,11 @@ void board_init_uart_f(void)
 #endif
        setup_uarts(uart_ids);
 }
+
+#ifndef CONFIG_SYS_DCACHE_OFF
+void enable_caches(void)
+{
+       /* Enable D-cache. I-cache is already enabled in start.S */
+       dcache_enable();
+}
+#endif