From: patrick <patrick@openbsd.org>
Date: Sat, 30 Jul 2022 21:06:54 +0000 (+0000)
Subject: Now that we have proper .text and .data sections we need to move dt_blob to
X-Git-Url: http://artulab.com/gitweb/?a=commitdiff_plain;h=fd00aceb18b1211889e4340948e3d6683182b0ee;p=openbsd

Now that we have proper .text and .data sections we need to move dt_blob to
.data.  dt_blob is a basic device tree that is populated from ACPI tables
when booting with ACPI instead of DT.  Since we're modifying its content we
need to put it somewhere writeable.

Found and proposed by mlarkin@
ok kettenis@ mlarkin@
---

diff --git a/sys/arch/arm64/stand/efiboot/Makefile b/sys/arch/arm64/stand/efiboot/Makefile
index 5ed83a20382..e7f6a3d30ec 100644
--- a/sys/arch/arm64/stand/efiboot/Makefile
+++ b/sys/arch/arm64/stand/efiboot/Makefile
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile,v 1.15 2022/03/14 19:09:32 kettenis Exp $
+#	$OpenBSD: Makefile,v 1.16 2022/07/30 21:06:54 patrick Exp $
 
 NOMAN=		#
 
@@ -9,7 +9,7 @@ OBJFMT=		binary
 INSTALL_STRIP=
 BINDIR=		/usr/mdec
 SRCS=		start.S self_reloc.c efiboot.c conf.c exec.c efiacpi.c
-SRCS+=		efidev.c efipxe.c efirng.c fdt.c dt_blob.S
+SRCS+=		efidev.c efipxe.c efirng.c fdt.c
 SRCS+=		softraid_arm64.c
 
 S=		${.CURDIR}/../../../..
diff --git a/sys/arch/arm64/stand/efiboot/conf.c b/sys/arch/arm64/stand/efiboot/conf.c
index 68a063d310c..7497d21e0ba 100644
--- a/sys/arch/arm64/stand/efiboot/conf.c
+++ b/sys/arch/arm64/stand/efiboot/conf.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: conf.c,v 1.38 2022/07/29 21:34:59 kettenis Exp $	*/
+/*	$OpenBSD: conf.c,v 1.39 2022/07/30 21:06:54 patrick Exp $	*/
 
 /*
  * Copyright (c) 1996 Michael Shalayeff
@@ -46,7 +46,7 @@
 #include "efipxe.h"
 #include "softraid_arm64.h"
 
-const char version[] = "1.10";
+const char version[] = "1.11";
 int	debug = 0;
 
 struct fs_ops file_system[] = {
diff --git a/sys/arch/arm64/stand/efiboot/start.S b/sys/arch/arm64/stand/efiboot/start.S
index 2cdb214275d..feb869ebb1e 100644
--- a/sys/arch/arm64/stand/efiboot/start.S
+++ b/sys/arch/arm64/stand/efiboot/start.S
@@ -1,4 +1,4 @@
-/* $OpenBSD: start.S,v 1.4 2022/07/29 21:34:59 kettenis Exp $ */
+/* $OpenBSD: start.S,v 1.5 2022/07/30 21:06:54 patrick Exp $ */
 /*-
  * Copyright (c) 2014 Andrew Turner
  * All rights reserved.
@@ -170,3 +170,7 @@ _start:
 	bl	efi_main
 
 1:	b	1b
+
+	.data
+	.align 4
+#include "dt_blob.S"