[PATCH] Revert "ARM: Use armlinux_bootparams address for DTB"

[Sascha Hauer <s.hauer@pengutronix.de>]

This patch placed the flattened devicetree to armlinux_bootparams.
armlinux_bootparams normally is at SDRAM_START + 0x100. The kernels
initial page tables are normally at SDRAM_START + 0x4000, so the
flattened devicetree gets overwritten once it exceeds 0x3f00 bytes
which is quite common.

Revert this patch for now once a better solution can be found

This reverts commit 0c4108f9173ece75d96f19b447ef6464bdfdf187.

Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Cc: Alexander Shiyan <shc_work@mail.ru>
---
 arch/arm/lib/armlinux.c | 20 ++++++--------------
 1 file changed, 6 insertions(+), 14 deletions(-)

diff --git a/arch/arm/lib/armlinux.c b/arch/arm/lib/armlinux.c
index d962997..40a63ea 100644
--- a/arch/arm/lib/armlinux.c
+++ b/arch/arm/lib/armlinux.c
@@ -261,24 +261,16 @@ void start_linux(void *adr, int swap, unsigned long initrd_address,
 		unsigned long initrd_size, void *oftree)
 {
 	void (*kernel)(int zero, int arch, void *params) = adr;
+	void *params = NULL;
 	int architecture;
 
 	if (oftree) {
-		if (armlinux_bootparams) {
-			struct fdt_header *header = oftree;
-
-			memcpy(armlinux_bootparams, oftree,
-					fdt32_to_cpu(header->totalsize));
-		} else {
-			armlinux_bootparams = oftree;
-		}
-
-		printf("booting Linux kernel with devicetree at 0x%p\n",
-				armlinux_bootparams);
+		printf("booting Linux kernel with devicetree\n");
+		params = oftree;
 	} else {
 		setup_tags(initrd_address, initrd_size, swap);
+		params = armlinux_bootparams;
 	}
-
 	architecture = armlinux_get_architecture();
 
 	shutdown_barebox();
@@ -296,10 +288,10 @@ void start_linux(void *adr, int swap, unsigned long initrd_address,
 		"mov r2, %1\n"
 		"bx %2\n"
 		:
-		: "r" (architecture), "r" (armlinux_bootparams), "r" (kernel)
+		: "r" (architecture), "r" (params), "r" (kernel)
 		: "r0", "r1", "r2"
 	);
 #else
-	kernel(0, architecture, armlinux_bootparams);
+	kernel(0, architecture, params);
 #endif
 }
-- 
1.8.4.rc1


_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox