Revert "lib: fdt: Split fdtdec_setup_mem_size_base()"

This reverts commit 3ebe09d09a.

There is no user of this split function that's why remove it.

Signed-off-by: Michal Simek <michal.simek@xilinx.com>
Reviewed-by: Simon Glass <sjg@chromium.org>
This commit is contained in:
Michal Simek 2020-07-10 13:16:50 +02:00 committed by Simon Glass
parent 62897c4344
commit 50c7b723bd
2 changed files with 3 additions and 28 deletions

View file

@ -908,26 +908,6 @@ struct display_timing {
int fdtdec_decode_display_timing(const void *blob, int node, int index, int fdtdec_decode_display_timing(const void *blob, int node, int index,
struct display_timing *config); struct display_timing *config);
/**
* fdtdec_setup_mem_size_base_fdt() - decode and setup gd->ram_size and
* gd->ram_start
*
* Decode the /memory 'reg' property to determine the size and start of the
* first memory bank, populate the global data with the size and start of the
* first bank of memory.
*
* This function should be called from a boards dram_init(). This helper
* function allows for boards to query the device tree for DRAM size and start
* address instead of hard coding the value in the case where the memory size
* and start address cannot be detected automatically.
*
* @param blob FDT blob
*
* @return 0 if OK, -EINVAL if the /memory node or reg property is missing or
* invalid
*/
int fdtdec_setup_mem_size_base_fdt(const void *blob);
/** /**
* fdtdec_setup_mem_size_base() - decode and setup gd->ram_size and * fdtdec_setup_mem_size_base() - decode and setup gd->ram_size and
* gd->ram_start * gd->ram_start

View file

@ -1030,18 +1030,18 @@ int fdtdec_decode_display_timing(const void *blob, int parent, int index,
return ret; return ret;
} }
int fdtdec_setup_mem_size_base_fdt(const void *blob) int fdtdec_setup_mem_size_base(void)
{ {
int ret, mem; int ret, mem;
struct fdt_resource res; struct fdt_resource res;
mem = fdt_path_offset(blob, "/memory"); mem = fdt_path_offset(gd->fdt_blob, "/memory");
if (mem < 0) { if (mem < 0) {
debug("%s: Missing /memory node\n", __func__); debug("%s: Missing /memory node\n", __func__);
return -EINVAL; return -EINVAL;
} }
ret = fdt_get_resource(blob, mem, "reg", 0, &res); ret = fdt_get_resource(gd->fdt_blob, mem, "reg", 0, &res);
if (ret != 0) { if (ret != 0) {
debug("%s: Unable to decode first memory bank\n", __func__); debug("%s: Unable to decode first memory bank\n", __func__);
return -EINVAL; return -EINVAL;
@ -1055,11 +1055,6 @@ int fdtdec_setup_mem_size_base_fdt(const void *blob)
return 0; return 0;
} }
int fdtdec_setup_mem_size_base(void)
{
return fdtdec_setup_mem_size_base_fdt(gd->fdt_blob);
}
#if defined(CONFIG_NR_DRAM_BANKS) #if defined(CONFIG_NR_DRAM_BANKS)
static int get_next_memory_node(const void *blob, int mem) static int get_next_memory_node(const void *blob, int mem)