Merge branch '2021-02-02-drop-asm_global_data-when-unused'

[platform/kernel/u-boot.git] / board / AndesTech / ax25-ae350 / ax25-ae350.c

diff --git a/board/AndesTech/ax25-ae350/ax25-ae350.c b/board/AndesTech/ax25-ae350/ax25-ae350.c
index b0164a9..81b0ee9 100644 (file)
--- a/board/AndesTech/ax25-ae350/ax25-ae350.c
+++ b/board/AndesTech/ax25-ae350/ax25-ae350.c
@@ -5,9 +5,14 @@
  */
 
 #include <common.h>
+#include <flash.h>
+#include <image.h>
+#include <init.h>
+#include <net.h>
 #if defined(CONFIG_FTMAC100) && !defined(CONFIG_DM_ETH)
 #include <netdev.h>
 #endif
+#include <asm/global_data.h>
 #include <linux/io.h>
 #include <faraday/ftsmc020.h>
 #include <fdtdec.h>
@@ -30,33 +35,16 @@ int board_init(void)
 
 int dram_init(void)
 {
-       unsigned long sdram_base = PHYS_SDRAM_0;
-       unsigned long expected_size = PHYS_SDRAM_0_SIZE + PHYS_SDRAM_1_SIZE;
-       unsigned long actual_size;
-
-       actual_size = get_ram_size((void *)sdram_base, expected_size);
-       gd->ram_size = actual_size;
-
-       if (expected_size != actual_size) {
-               printf("Warning: Only %lu of %lu MiB SDRAM is working\n",
-                       actual_size >> 20, expected_size >> 20);
-       }
-
-       return 0;
+       return fdtdec_setup_mem_size_base();
 }
 
 int dram_init_banksize(void)
 {
-       gd->bd->bi_dram[0].start = PHYS_SDRAM_0;
-       gd->bd->bi_dram[0].size =  PHYS_SDRAM_0_SIZE;
-       gd->bd->bi_dram[1].start = PHYS_SDRAM_1;
-       gd->bd->bi_dram[1].size =  PHYS_SDRAM_1_SIZE;
-
-       return 0;
+       return fdtdec_setup_memory_banksize();
 }
 
 #if defined(CONFIG_FTMAC100) && !defined(CONFIG_DM_ETH)
-int board_eth_init(bd_t *bd)
+int board_eth_init(struct bd_info *bd)
 {
        return ftmac100_initialize(bd);
 }
@@ -84,12 +72,13 @@ int smc_init(void)
        if (node < 0)
                return -FDT_ERR_NOTFOUND;
 
-       addr = fdtdec_get_addr(blob, node, "reg");
+       addr = fdtdec_get_addr_size_auto_noparent(blob, node,
+               "reg", 0, NULL, false);
 
        if (addr == FDT_ADDR_T_NONE)
                return -EINVAL;
 
-       regs = (struct ftsmc020_bank *)addr;
+       regs = (struct ftsmc020_bank *)(uintptr_t)addr;
        regs->cr &= ~FTSMC020_BANK_WPROT;
 
        return 0;