diff options
| author | Bjorn Andersson <bjorn.andersson@sonymobile.com> | 2014-05-06 22:16:16 -0700 |
|---|---|---|
| committer | Andrey Konovalov <andrey.konovalov@linaro.org> | 2014-07-21 20:12:13 +0400 |
| commit | 535a70a9eae24bd7bf00dfaaf11805df650f62ad (patch) | |
| tree | 53b1470b00cbd07c32c05e6371d02f561296409d | |
| parent | 78f7fb31366c0da042e0df5f6c56d1f1a478d727 (diff) | |
| download | linux-linaro-tracking-535a70a9eae24bd7bf00dfaaf11805df650f62ad.tar.gz | |
ARM: zImage: Allow DTB to override broken ATAG_MEM
Support overriding ATAG_MEM, by specifying non-zero content of the /memory/reg
property in the appended DTB. This is needed to work around bootloaders passing
broken tags.
Signed-off-by: Bjorn Andersson <bjorn.andersson@sonymobile.com>
| -rw-r--r-- | arch/arm/boot/compressed/atags_to_fdt.c | 18 |
1 files changed, 17 insertions, 1 deletions
diff --git a/arch/arm/boot/compressed/atags_to_fdt.c b/arch/arm/boot/compressed/atags_to_fdt.c index 9448aa0c6686..34b448c0e9ae 100644 --- a/arch/arm/boot/compressed/atags_to_fdt.c +++ b/arch/arm/boot/compressed/atags_to_fdt.c @@ -97,6 +97,22 @@ static void merge_fdt_bootargs(void *fdt, const char *fdt_cmdline) setprop_string(fdt, "/chosen", "bootargs", cmdline); } +static int fdt_overrides_atag_mem(void *fdt) +{ + const char *memory; + int len = 0; + + memory = getprop(fdt, "/memory", "reg", &len); + if (memory) { + while (len--) { + if (*memory != '\0') + return 1; + } + } + + return 0; +} + /* * Convert and fold provided ATAGs into the provided FDT. * @@ -182,7 +198,7 @@ int atags_to_fdt(void *atag_list, void *fdt, int total_space) } } - if (memcount) { + if (memcount && !fdt_overrides_atag_mem(fdt)) { setprop(fdt, "/memory", "reg", mem_reg_property, 4 * memcount * memsize); } |