diff options
| author | Ivaylo Dimitrov <ivo.g.dimitrov.75@gmail.com> | 2016-01-01 12:49:36 +0100 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2016-01-04 11:26:00 +0000 |
| commit | 8c51b034938fb37b7ffc2e7c49a39b284f5c08c0 (patch) | |
| tree | 9a3ed1552f7da64fd15bfb08bd956f76b5a19bcb | |
| parent | 6e0306a97d18bb9bec71b1f3db0dbc6b14c5f51b (diff) | |
| download | op-kernel-dev-8c51b034938fb37b7ffc2e7c49a39b284f5c08c0.zip op-kernel-dev-8c51b034938fb37b7ffc2e7c49a39b284f5c08c0.tar.gz | |
ARM: 8496/1: OMAP: RX51: save ATAGS data in the early boot stage
This fixes a regression with device tree based booting compared to legacy booting for n900 to make the n900 legacy user space to also work with device tree based booting
Signed-off-by: Ivaylo Dimitrov <ivo.g.dimitrov.75@gmail.com>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
| -rw-r--r-- | arch/arm/mach-omap2/board-generic.c | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/arch/arm/mach-omap2/board-generic.c b/arch/arm/mach-omap2/board-generic.c index 04a56cc..8098272 100644 --- a/arch/arm/mach-omap2/board-generic.c +++ b/arch/arm/mach-omap2/board-generic.c @@ -16,6 +16,7 @@ #include <linux/of_platform.h> #include <linux/irqdomain.h> +#include <asm/setup.h> #include <asm/mach/arch.h> #include "common.h" @@ -76,8 +77,17 @@ static const char *const n900_boards_compat[] __initconst = { NULL, }; +/* Legacy userspace on Nokia N900 needs ATAGS exported in /proc/atags, + * save them while the data is still not overwritten + */ +static void __init rx51_reserve(void) +{ + save_atags((const struct tag *)(PAGE_OFFSET + 0x100)); + omap_reserve(); +} + DT_MACHINE_START(OMAP3_N900_DT, "Nokia RX-51 board") - .reserve = omap_reserve, + .reserve = rx51_reserve, .map_io = omap3_map_io, .init_early = omap3430_init_early, .init_machine = omap_generic_init, |
