diff options
| author | Jonas Gorski <jogo@openwrt.org> | 2016-06-20 05:27:37 -0400 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 2016-08-02 08:00:16 -0400 |
| commit | 15f37e1588920e010f20b53f04af94e91b8ee714 (patch) | |
| tree | 09a5b4558b6915dadd2c4a3878feb37765514e1d /arch/mips/kernel/setup.c | |
| parent | b8f54f2cde788623f41d11327688c75aed34092f (diff) | |
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/kernel/setup.c')
| -rw-r--r-- | arch/mips/kernel/setup.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/arch/mips/kernel/setup.c b/arch/mips/kernel/setup.c index ef408a03e818..36cf8d65c47d 100644 --- a/arch/mips/kernel/setup.c +++ b/arch/mips/kernel/setup.c | |||
| @@ -875,6 +875,10 @@ void __init setup_arch(char **cmdline_p) | |||
| 875 | unsigned long kernelsp[NR_CPUS]; | 875 | unsigned long kernelsp[NR_CPUS]; |
| 876 | unsigned long fw_arg0, fw_arg1, fw_arg2, fw_arg3; | 876 | unsigned long fw_arg0, fw_arg1, fw_arg2, fw_arg3; |
| 877 | 877 | ||
| 878 | #ifdef CONFIG_USE_OF | ||
| 879 | unsigned long fw_passed_dtb; | ||
| 880 | #endif | ||
| 881 | |||
| 878 | #ifdef CONFIG_DEBUG_FS | 882 | #ifdef CONFIG_DEBUG_FS |
| 879 | struct dentry *mips_debugfs_dir; | 883 | struct dentry *mips_debugfs_dir; |
| 880 | static int __init debugfs_mips(void) | 884 | static int __init debugfs_mips(void) |