Merge branch 'master' of git://git.denx.de/u-boot-samsung

diff --git a/arch/arm/cpu/armv7/s5p-common/timer.c b/arch/arm/cpu/armv7/s5p-common/timer.c
index 04906503e6e40332507211ac070a3d1054eb6301..651fd5ddff4bc62c3d41c7dbe8ef1199c35786ae 100644 (file)
--- a/arch/arm/cpu/armv7/s5p-common/timer.c
+++ b/arch/arm/cpu/armv7/s5p-common/timer.c
@@ -65,15 +65,12 @@ int timer_init(void)
        writel((PRESCALER_1 & 0xff) << 8, &timer->tcfg0);
        writel((MUX_DIV_2 & 0xf) << MUX4_DIV_SHIFT, &timer->tcfg1);
 
-       if (count_value == 0) {
-               /* reset initial value */
-               /* count_value = 2085937.5(HZ) (per 1 sec)*/
-               count_value = get_pwm_clk() / ((PRESCALER_1 + 1) *
-                               (MUX_DIV_2 + 1));
-
-               /* count_value / 100 = 20859.375(HZ) (per 10 msec) */
-               count_value = count_value / 100;
-       }
+       /* count_value = 2085937.5(HZ) (per 1 sec)*/
+       count_value = get_pwm_clk() / ((PRESCALER_1 + 1) *
+                       (MUX_DIV_2 + 1));
+
+       /* count_value / 100 = 20859.375(HZ) (per 10 msec) */
+       count_value = count_value / 100;
 
        /* set count value */
        writel(count_value, &timer->tcntb4);
@@ -114,8 +111,11 @@ void set_timer(unsigned long t)
 /* delay x useconds */
 void __udelay(unsigned long usec)
 {
+       struct s5p_timer *const timer = s5p_get_base_timer();
        unsigned long tmo, tmp;
 
+       count_value = readl(&timer->tcntb4);
+
        if (usec >= 1000) {
                /*
                 * if "big" number, spread normalization

diff --git a/board/samsung/goni/goni.c b/board/samsung/goni/goni.c
index 0b09ebaf898b90db4f6c302d155626ef96efe689..581935d0547689d623e0ec3ff5e78f4bc31e82c3 100644 (file)
--- a/board/samsung/goni/goni.c
+++ b/board/samsung/goni/goni.c
@@ -42,6 +42,14 @@ int board_init(void)
 }
 
 int dram_init(void)
+{
+       gd->ram_size = PHYS_SDRAM_1_SIZE + PHYS_SDRAM_2_SIZE +
+                       PHYS_SDRAM_3_SIZE;
+
+       return 0;
+}
+
+void dram_init_banksize(void)
 {
        gd->bd->bi_dram[0].start = PHYS_SDRAM_1;
        gd->bd->bi_dram[0].size = PHYS_SDRAM_1_SIZE;
@@ -49,8 +57,6 @@ int dram_init(void)
        gd->bd->bi_dram[1].size = PHYS_SDRAM_2_SIZE;
        gd->bd->bi_dram[2].start = PHYS_SDRAM_3;
        gd->bd->bi_dram[2].size = PHYS_SDRAM_3_SIZE;
-
-       return 0;
 }
 
 #ifdef CONFIG_DISPLAY_BOARDINFO

diff --git a/board/samsung/smdkc100/smdkc100.c b/board/samsung/smdkc100/smdkc100.c
index 31e8d9e0ec32d7617c40fa7cdfe14f00ce7c3374..d3189f6b780109ef942715c0918ab835a668a668 100644 (file)
--- a/board/samsung/smdkc100/smdkc100.c
+++ b/board/samsung/smdkc100/smdkc100.c
@@ -65,13 +65,17 @@ int board_init(void)
 
 int dram_init(void)
 {
-       gd->bd->bi_dram[0].start = PHYS_SDRAM_1;
-       gd->bd->bi_dram[0].size = get_ram_size((long *)PHYS_SDRAM_1,
-                                               PHYS_SDRAM_1_SIZE);
+       gd->ram_size = get_ram_size((long *)PHYS_SDRAM_1, PHYS_SDRAM_1_SIZE);
 
        return 0;
 }
 
+void dram_init_banksize(void)
+{
+       gd->bd->bi_dram[0].start = PHYS_SDRAM_1;
+       gd->bd->bi_dram[0].size = PHYS_SDRAM_1_SIZE;
+}
+
 #ifdef CONFIG_DISPLAY_BOARDINFO
 int checkboard(void)
 {

diff --git a/include/configs/s5p_goni.h b/include/configs/s5p_goni.h
index 541aec05ff18d0b5ff71a19fbc16b771c0cb6c98..f53e79810b256ddc435f09a16cd7d8e11939d81d 100644 (file)
--- a/include/configs/s5p_goni.h
+++ b/include/configs/s5p_goni.h
@@ -217,4 +217,6 @@
 
 #define CONFIG_DOS_PARTITION           1
 
+#define CONFIG_SYS_INIT_SP_ADDR        (CONFIG_SYS_LOAD_ADDR - 0x1000000)
+
 #endif /* __CONFIG_H */

diff --git a/include/configs/smdkc100.h b/include/configs/smdkc100.h
index e36b262a8ec56b8471f3e13e0ba5691b9773d5cd..fb8b43c06dc4db937a27a5383b7db7cb181c4c2c 100644 (file)
--- a/include/configs/smdkc100.h
+++ b/include/configs/smdkc100.h
@@ -231,6 +231,8 @@
 
 #define CONFIG_DOS_PARTITION           1
 
+#define CONFIG_SYS_INIT_SP_ADDR        (CONFIG_SYS_LOAD_ADDR - 0x1000000)
+
 /*
  * Ethernet Contoller driver
  */