Merge branch 'master' of /home/wd/git/u-boot/custodians

[u-boot] / board / samsung / smdkc100 / smdkc100.c

diff --git a/board/samsung/smdkc100/smdkc100.c b/board/samsung/smdkc100/smdkc100.c
index fb466c6ece4fe43331ba86cfb9f6869c1f599145..d3189f6b780109ef942715c0918ab835a668a668 100644 (file)
--- a/board/samsung/smdkc100/smdkc100.c
+++ b/board/samsung/smdkc100/smdkc100.c
@@ -38,10 +38,10 @@ static void smc9115_pre_init(void)
        u32 smc_bw_conf, smc_bc_conf;
 
        struct s5pc100_gpio *const gpio =
-               (struct s5pc100_gpio *)S5PC100_GPIO_BASE;
+               (struct s5pc100_gpio *)samsung_get_base_gpio();
 
        /* gpio configuration GPK0CON */
-       gpio_cfg_pin(&gpio->gpio_k0, CONFIG_ENV_SROM_BANK, GPIO_FUNC(2));
+       gpio_cfg_pin(&gpio->k0, CONFIG_ENV_SROM_BANK, GPIO_FUNC(2));
 
        /* Ethernet needs bus width of 16 bits */
        smc_bw_conf = SMC_DATA16_WIDTH(CONFIG_ENV_SROM_BANK);
@@ -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)
 {