arm: Remove support for smdk6400

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

diff --git a/board/samsung/smdkv310/smdkv310.c b/board/samsung/smdkv310/smdkv310.c
index acf9ee7b8775aa9836be947ff7c1b3f89ec892e9..81ac8f6f4a698158bb59d52fa4e7db45d985aa56 100644 (file)
--- a/board/samsung/smdkv310/smdkv310.c
+++ b/board/samsung/smdkv310/smdkv310.c
@@ -29,15 +29,15 @@
 #include <asm/arch/sromc.h>
 
 DECLARE_GLOBAL_DATA_PTR;
-struct s5pc210_gpio_part1 *gpio1;
-struct s5pc210_gpio_part2 *gpio2;
+struct exynos4_gpio_part1 *gpio1;
+struct exynos4_gpio_part2 *gpio2;
 
 static void smc9115_pre_init(void)
 {
        u32 smc_bw_conf, smc_bc_conf;
 
        /* gpio configuration GPK0CON */
-       gpio_cfg_pin(&gpio2->y0, CONFIG_ENV_SROM_BANK, GPIO_FUNC(2));
+       s5p_gpio_cfg_pin(&gpio2->y0, CONFIG_ENV_SROM_BANK, GPIO_FUNC(2));
 
        /* Ethernet needs bus width of 16 bits */
        smc_bw_conf = SROMC_DATA16_WIDTH(CONFIG_ENV_SROM_BANK);
@@ -52,12 +52,11 @@ static void smc9115_pre_init(void)
 
 int board_init(void)
 {
-       gpio1 = (struct s5pc210_gpio_part1 *) S5PC210_GPIO_PART1_BASE;
-       gpio2 = (struct s5pc210_gpio_part2 *) S5PC210_GPIO_PART2_BASE;
+       gpio1 = (struct exynos4_gpio_part1 *) EXYNOS4_GPIO_PART1_BASE;
+       gpio2 = (struct exynos4_gpio_part2 *) EXYNOS4_GPIO_PART2_BASE;
 
        smc9115_pre_init();
 
-       gd->bd->bi_arch_number = MACH_TYPE_SMDKV310;
        gd->bd->bi_boot_params = (PHYS_SDRAM_1 + 0x100UL);
        return 0;
 }
@@ -75,13 +74,17 @@ int dram_init(void)
 void dram_init_banksize(void)
 {
        gd->bd->bi_dram[0].start = PHYS_SDRAM_1;
-       gd->bd->bi_dram[0].size = PHYS_SDRAM_1_SIZE;
+       gd->bd->bi_dram[0].size = get_ram_size((long *)PHYS_SDRAM_1, \
+                                                       PHYS_SDRAM_1_SIZE);
        gd->bd->bi_dram[1].start = PHYS_SDRAM_2;
-       gd->bd->bi_dram[1].size = PHYS_SDRAM_2_SIZE;
+       gd->bd->bi_dram[1].size = get_ram_size((long *)PHYS_SDRAM_2, \
+                                                       PHYS_SDRAM_2_SIZE);
        gd->bd->bi_dram[2].start = PHYS_SDRAM_3;
-       gd->bd->bi_dram[2].size = PHYS_SDRAM_3_SIZE;
+       gd->bd->bi_dram[2].size = get_ram_size((long *)PHYS_SDRAM_3, \
+                                                       PHYS_SDRAM_3_SIZE);
        gd->bd->bi_dram[3].start = PHYS_SDRAM_4;
-       gd->bd->bi_dram[3].size = PHYS_SDRAM_4_SIZE;
+       gd->bd->bi_dram[3].size = get_ram_size((long *)PHYS_SDRAM_4, \
+                                                       PHYS_SDRAM_4_SIZE);
 }
 
 int board_eth_init(bd_t *bis)
@@ -116,19 +119,19 @@ int board_mmc_init(bd_t *bis)
         */
        for (i = 0; i < 7; i++) {
                /* GPK2[0:6] special function 2 */
-               gpio_cfg_pin(&gpio2->k2, i, GPIO_FUNC(0x2));
+               s5p_gpio_cfg_pin(&gpio2->k2, i, GPIO_FUNC(0x2));
 
                /* GPK2[0:6] drv 4x */
-               gpio_set_drv(&gpio2->k2, i, GPIO_DRV_4X);
+               s5p_gpio_set_drv(&gpio2->k2, i, GPIO_DRV_4X);
 
                /* GPK2[0:1] pull disable */
                if (i == 0 || i == 1) {
-                       gpio_set_pull(&gpio2->k2, i, GPIO_PULL_NONE);
+                       s5p_gpio_set_pull(&gpio2->k2, i, GPIO_PULL_NONE);
                        continue;
                }
 
                /* GPK2[2:6] pull up */
-               gpio_set_pull(&gpio2->k2, i, GPIO_PULL_UP);
+               s5p_gpio_set_pull(&gpio2->k2, i, GPIO_PULL_UP);
        }
        err = s5p_mmc_init(2, 4);
        return err;