From e0ffb3c584f57783538773b3edabbbb5f48caefc Mon Sep 17 00:00:00 2001
From: Marc Hartmayer <mhartmay@linux.ibm.com>
Date: Thu, 26 Mar 2020 09:08:58 +0100
Subject: [PATCH] zipl/boot: make stage2.h assembler compatible
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

In preparation for the linker script generation make the stage2.h
assembler compatible.

Reviewed-by: Philipp Rudo <prudo@linux.ibm.com>
Reviewed-by: Jan Höppner <hoeppner@linux.ibm.com>
Signed-off-by: Marc Hartmayer <mhartmay@linux.ibm.com>
Signed-off-by: Jan Höppner <hoeppner@linux.ibm.com>
---
 zipl/boot/stage2.h | 18 ++++++++++++------
 1 file changed, 12 insertions(+), 6 deletions(-)

diff --git a/zipl/boot/stage2.h b/zipl/boot/stage2.h
index b9b27d8b..ecdf58ef 100644
--- a/zipl/boot/stage2.h
+++ b/zipl/boot/stage2.h
@@ -12,15 +12,20 @@
 #ifndef COMMON_H
 #define COMMON_H
 
-#include "cio.h"
-#include "error.h"
-#include "libc.h"
-#include "boot/s390.h"
+#include "lib/zt_common.h"
 
-#define DESCR_PER_BLOCK         16
+#define DESCR_PER_BLOCK         _AC(16, U)
 
 /* ADRESS */
-#define STAGE2_DESC 0x78
+#define STAGE2_DESC		_AC(0x78, UL)
+
+
+#ifndef __ASSEMBLER__
+
+#include "libc.h"
+#include "boot/s390.h"
+#include "cio.h"
+#include "error.h"
 
 /* Layout of ECKD disk block pointer */
 struct eckd_blockptr {
@@ -74,5 +79,6 @@ int extract_length(void *);
 int is_zero_block(void *);
 void kdump_stage2(unsigned long);
 
+#endif /* __ASSEMBLER__ */
 
 #endif /* COMMON_H */