Skip to content

Commit

Permalink
ARM: 8496/1: OMAP: RX51: save ATAGS data in the early boot stage
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Ivaylo Dimitrov authored and Russell King committed Jan 4, 2016
1 parent 6e0306a commit 8c51b03
Showing 1 changed file with 11 additions and 1 deletion.
12 changes: 11 additions & 1 deletion arch/arm/mach-omap2/board-generic.c
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down Expand Up @@ -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,
Expand Down

0 comments on commit 8c51b03

Please sign in to comment.