board_f: Drop setup_dram_config() wrapper

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

diff --git a/board/samsung/smdkc100/smdkc100.c b/board/samsung/smdkc100/smdkc100.c
index 31e8d9e0ec32d7617c40fa7cdfe14f00ce7c3374..79e127d99abff27031b82a691d24778a1810c3e0 100644 (file)
--- a/board/samsung/smdkc100/smdkc100.c
+++ b/board/samsung/smdkc100/smdkc100.c
@@ -3,29 +3,13 @@
  *  Minkyu Kang <mk7.kang@samsung.com>
  *  Kyungmin Park <kyungmin.park@samsung.com>
  *
- * See file CREDITS for list of people who contributed to this
- * project.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of
- * the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
- * MA 02111-1307 USA
+ * SPDX-License-Identifier:    GPL-2.0+
  */
 
 #include <common.h>
+#include <asm/gpio.h>
 #include <asm/io.h>
-#include <asm/arch/smc.h>
-#include <asm/arch/gpio.h>
+#include <asm/arch/sromc.h>
 #include <netdev.h>
 
 DECLARE_GLOBAL_DATA_PTR;
@@ -37,11 +21,8 @@ static void smc9115_pre_init(void)
 {
        u32 smc_bw_conf, smc_bc_conf;
 
-       struct s5pc100_gpio *const gpio =
-               (struct s5pc100_gpio *)samsung_get_base_gpio();
-
        /* gpio configuration GPK0CON */
-       gpio_cfg_pin(&gpio->k0, CONFIG_ENV_SROM_BANK, GPIO_FUNC(2));
+       gpio_cfg_pin(S5PC100_GPIO_K00 + CONFIG_ENV_SROM_BANK, S5P_GPIO_FUNC(2));
 
        /* Ethernet needs bus width of 16 bits */
        smc_bw_conf = SMC_DATA16_WIDTH(CONFIG_ENV_SROM_BANK);
@@ -50,7 +31,7 @@ static void smc9115_pre_init(void)
                        | SMC_BC_TACP(0x6) | SMC_BC_PMC(0x0);
 
        /* Select and configure the SROMC bank */
-       s5pc1xx_config_sromc(CONFIG_ENV_SROM_BANK, smc_bw_conf, smc_bc_conf);
+       s5p_config_sromc(CONFIG_ENV_SROM_BANK, smc_bw_conf, smc_bc_conf);
 }
 
 int board_init(void)
@@ -64,10 +45,16 @@ int board_init(void)
 }
 
 int dram_init(void)
+{
+       gd->ram_size = get_ram_size((long *)PHYS_SDRAM_1, PHYS_SDRAM_1_SIZE);
+
+       return 0;
+}
+
+int dram_init_banksize(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->bd->bi_dram[0].size = PHYS_SDRAM_1_SIZE;
 
        return 0;
 }