summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDongjin Kim <tobetter@gmail.com>2019-09-07 12:47:02 +0300
committerDongjin Kim <tobetter@gmail.com>2019-09-09 17:49:06 +0300
commit03d3ec34b7047b2bf78d0cefc2a5aacfa16b3ae7 (patch)
tree4c7a3ba31d2e9e7201df614d9555f4a6dbf2f65d
parent2c9059820b961de210634f2dc739cb8b48f6bd99 (diff)
downloadu-boot-03d3ec34b7047b2bf78d0cefc2a5aacfa16b3ae7.tar.xz
ODROID-COMMON: bootm: not to read FDT address when bootingtravis/odroidn2-59
The address of FDT is already given by the command 'boot*' as its parameter, not neceesary to read from U-boot environment. Change-Id: If2c5f377e276400e463a9b0ec9028f2dac491494 Signed-off-by: Dongjin Kim <tobetter@gmail.com>
-rw-r--r--common/bootm.c14
1 files changed, 2 insertions, 12 deletions
diff --git a/common/bootm.c b/common/bootm.c
index 9a3abfad7a..6a3e5d50c6 100644
--- a/common/bootm.c
+++ b/common/bootm.c
@@ -346,22 +346,12 @@ static int get_fdto_totalsize(u32 *tz)
#if defined(CONFIG_ODROID_COMMON)
extern int get_boot_device(void);
-static int bootm_add_ignore_mpt_to_fdt(void)
+static int bootm_add_ignore_mpt_to_fdt(void *fdth)
{
- struct fdt_header *fdth = NULL;
- ulong fdt_mem_addr;
char *pathp = NULL;
int nodeoffset;
int ret;
- if (getenv("fdt_addr_r"))
- fdt_mem_addr = simple_strtoul(getenv("fdt_addr_r"), NULL, 16);
- else
- fdt_mem_addr = simple_strtoul(getenv("dtb_mem_addr"), NULL, 16);
-
- images.ft_addr = (char *)map_sysmem(fdt_mem_addr, 0);
- fdth = (struct fdt_header *)(images.ft_addr);
-
switch (get_boot_device()) {
case 1: // emmc boot
pathp = "/sd/sd";
@@ -519,7 +509,7 @@ static int bootm_find_fdt(int flag, int argc, char * const argv[])
set_working_fdt_addr(images.ft_addr);
#if defined(CONFIG_ODROID_COMMON)
- bootm_add_ignore_mpt_to_fdt();
+ bootm_add_ignore_mpt_to_fdt(images.ft_addr);
#endif
#ifdef CONFIG_OF_LIBFDT_OVERLAY