summaryrefslogtreecommitdiffstats
path: root/arch/mips/pic32
diff options
context:
space:
mode:
authorJonas Gorski <jogo@openwrt.org>2016-06-20 11:27:37 +0200
committerRalf Baechle <ralf@linux-mips.org>2016-08-02 14:00:16 +0200
commit15f37e1588920e010f20b53f04af94e91b8ee714 (patch)
tree09a5b4558b6915dadd2c4a3878feb37765514e1d /arch/mips/pic32
parentb8f54f2cde788623f41d11327688c75aed34092f (diff)
downloadlinux-stable-15f37e1588920e010f20b53f04af94e91b8ee714.tar.gz
linux-stable-15f37e1588920e010f20b53f04af94e91b8ee714.tar.bz2
linux-stable-15f37e1588920e010f20b53f04af94e91b8ee714.zip
MIPS: store the appended dtb address in a variable
Instead of rewriting the arguments to match the UHI spec, store the address of a appended or UHI supplied dtb in fw_supplied_dtb. That way the original bootloader arugments are kept intact while still making the use of an appended dtb invisible for mach code. Mach code can still find out if it is an appended dtb by comparing fw_arg1 with fw_supplied_dtb. Signed-off-by: Jonas Gorski <jogo@openwrt.org> Cc: Kevin Cernekee <cernekee@gmail.com> Cc: Florian Fainelli <f.fainelli@gmail.com> Cc: John Crispin <john@phrozen.org> Cc: Paul Burton <paul.burton@imgtec.com> Cc: James Hogan <james.hogan@imgtec.com> Cc: Alban Bedel <albeu@free.fr> Cc: Daniel Gimpelevich <daniel@gimpelevich.san-francisco.ca.us> Cc: Antony Pavlov <antonynpavlov@gmail.com> Cc: linux-mips@linux-mips.org Patchwork: https://patchwork.linux-mips.org/patch/13699/ Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
Diffstat (limited to 'arch/mips/pic32')
-rw-r--r--arch/mips/pic32/pic32mzda/init.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/mips/pic32/pic32mzda/init.c b/arch/mips/pic32/pic32mzda/init.c
index 775ff90a9962..a794037a2d81 100644
--- a/arch/mips/pic32/pic32mzda/init.c
+++ b/arch/mips/pic32/pic32mzda/init.c
@@ -33,8 +33,8 @@ static ulong get_fdtaddr(void)
{
ulong ftaddr = 0;
- if ((fw_arg0 == -2) && fw_arg1 && !fw_arg2 && !fw_arg3)
- return (ulong)fw_arg1;
+ if (fw_passed_dtb && !fw_arg2 && !fw_arg3)
+ return (ulong)fw_passed_dtb;
if (__dtb_start < __dtb_end)
ftaddr = (ulong)__dtb_start;