mirror of
https://github.com/Fishwaldo/u-boot.git
synced 2025-03-19 05:31:32 +00:00
Revert "fdt: fdtdec_setup_memory_banksize() use livetree"
This reverts commit c35a7d375e
.
This commit is breaking SPL on zc706.
Signed-off-by: Michal Simek <michal.simek@xilinx.com>
Reviewed-by: Simon Glass <sjg@chromium.org>
Tested-by: Patrice Chotard <patrice.chotard@st.com> [on STM32F746-disco]
This commit is contained in:
parent
6e7a186dc5
commit
658954cb47
1 changed files with 23 additions and 21 deletions
44
lib/fdtdec.c
44
lib/fdtdec.c
|
@ -15,7 +15,6 @@
|
||||||
#include <serial.h>
|
#include <serial.h>
|
||||||
#include <asm/sections.h>
|
#include <asm/sections.h>
|
||||||
#include <linux/ctype.h>
|
#include <linux/ctype.h>
|
||||||
#include <linux/ioport.h>
|
|
||||||
#include <linux/lzo.h>
|
#include <linux/lzo.h>
|
||||||
|
|
||||||
DECLARE_GLOBAL_DATA_PTR;
|
DECLARE_GLOBAL_DATA_PTR;
|
||||||
|
@ -1099,34 +1098,41 @@ int fdtdec_setup_mem_size_base(void)
|
||||||
|
|
||||||
#if defined(CONFIG_NR_DRAM_BANKS)
|
#if defined(CONFIG_NR_DRAM_BANKS)
|
||||||
|
|
||||||
static ofnode get_next_memory_node(ofnode mem)
|
static int get_next_memory_node(const void *blob, int mem)
|
||||||
{
|
{
|
||||||
do {
|
do {
|
||||||
mem = ofnode_by_prop_value(mem, "device_type", "memory", 7);
|
mem = fdt_node_offset_by_prop_value(gd->fdt_blob, mem,
|
||||||
} while (ofnode_valid(mem) && !ofnode_is_available(mem));
|
"device_type", "memory", 7);
|
||||||
|
} while (!fdtdec_get_is_enabled(blob, mem));
|
||||||
|
|
||||||
return mem;
|
return mem;
|
||||||
}
|
}
|
||||||
|
|
||||||
int fdtdec_setup_memory_banksize(void)
|
int fdtdec_setup_memory_banksize(void)
|
||||||
{
|
{
|
||||||
int bank, reg = 0;
|
int bank, ret, mem, reg = 0;
|
||||||
struct resource res;
|
struct fdt_resource res;
|
||||||
ofnode mem;
|
|
||||||
|
|
||||||
mem = get_next_memory_node(ofnode_null());
|
mem = get_next_memory_node(gd->fdt_blob, -1);
|
||||||
if (!ofnode_valid(mem))
|
if (mem < 0) {
|
||||||
goto missing_node;
|
debug("%s: Missing /memory node\n", __func__);
|
||||||
|
return -EINVAL;
|
||||||
|
}
|
||||||
|
|
||||||
for (bank = 0; bank < CONFIG_NR_DRAM_BANKS; bank++) {
|
for (bank = 0; bank < CONFIG_NR_DRAM_BANKS; bank++) {
|
||||||
while (ofnode_read_resource(mem, reg++, &res)) {
|
ret = fdt_get_resource(gd->fdt_blob, mem, "reg", reg++, &res);
|
||||||
|
if (ret == -FDT_ERR_NOTFOUND) {
|
||||||
reg = 0;
|
reg = 0;
|
||||||
mem = get_next_memory_node(mem);
|
mem = get_next_memory_node(gd->fdt_blob, mem);
|
||||||
if (!ofnode_valid(mem)) {
|
if (mem == -FDT_ERR_NOTFOUND)
|
||||||
if (bank)
|
break;
|
||||||
return 0;
|
|
||||||
goto missing_node;
|
ret = fdt_get_resource(gd->fdt_blob, mem, "reg", reg++, &res);
|
||||||
}
|
if (ret == -FDT_ERR_NOTFOUND)
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
if (ret != 0) {
|
||||||
|
return -EINVAL;
|
||||||
}
|
}
|
||||||
|
|
||||||
gd->bd->bi_dram[bank].start = (phys_addr_t)res.start;
|
gd->bd->bi_dram[bank].start = (phys_addr_t)res.start;
|
||||||
|
@ -1140,10 +1146,6 @@ int fdtdec_setup_memory_banksize(void)
|
||||||
}
|
}
|
||||||
|
|
||||||
return 0;
|
return 0;
|
||||||
|
|
||||||
missing_node:
|
|
||||||
debug("%s: Missing /memory node\n", __func__);
|
|
||||||
return -EINVAL;
|
|
||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
|
Loading…
Add table
Reference in a new issue