include/boot: Move zipl/boot/error.h to include/boot

- Move zipl/boot/error.h to include/boot
- Adjust include statements in zipb/boot and genprotimg/boot
- Remove error.h from tunedasd/src/tunedasd.c as not needed
- Fix tunedasd/src/Makefile

Signed-off-by: Mikhail Zaslonko <zaslonko@linux.ibm.com>
Reviewed-by: Marc Hartmayer <mhartmay@linux.ibm.com>
Signed-off-by: Jan Höppner <hoeppner@linux.ibm.com>

genprotimg/boot/stage3a.c

@@ -11,9 +11,10 @@
 #include "stage3a.h"
 
 #include "lib/zt_common.h"
+#include "boot/error.h"
+#include "boot/s390.h"
 #include "boot/ipl.h"
 #include "sclp.h"
-#include "error.h"
 
 
 static volatile struct stage3a_args __section(".loader_parms") loader_parms;

genprotimg/boot/stage3b.c

@@ -12,10 +12,11 @@
 
 #include "lib/zt_common.h"
 #include "boot/psw.h"
+#include "boot/error.h"
+#include "boot/s390.h"
 #include "boot/linux_layout.h"
 #include "boot/loaders_layout.h"
 #include "sclp.h"
-#include "error.h"
 
 
 static volatile struct stage3b_args __section(".loader_parms") loader_parms;

include/boot/error.h

@@ -34,10 +34,10 @@
 /* Secure IPL error */
 #define ESECUREBOOT		0x00004512
 
-/* kdump: No operating system information was found */
+/* os_info error: No operating system information was found */
 #define EOS_INFO_MISSING	0x00004520
 
-/* kdump: The checksum of the operating system information is incorrect */
+/* os_info error: The checksum of the operating system information is incorrect */
 #define EOS_INFO_CSUM_FAILED	0x00004521
 
 /* kdump: The major version of the operating system information is too high */

tunedasd/src/Makefile

@@ -1,6 +1,6 @@
 include ../../common.mak
 
-ALL_CPPFLAGS += -I../include -I../boot
+ALL_CPPFLAGS += -I../include
 
 libs =	$(rootdir)/libdasd/libdasd.a \
 	$(rootdir)/libutil/libutil.a

tunedasd/src/tunedasd.c

@@ -20,7 +20,6 @@
 #include "lib/zt_common.h"
 
 #include "disk.h"
-#include "error.h"
 #include "tunedasd.h"
 
 static const struct util_prg prg = {

zipl/boot/cio.c

@@ -10,8 +10,8 @@
  */
 
 #include "cio.h"
-#include "error.h"
 #include "libc.h"
+#include "boot/error.h"
 #include "boot/s390.h"
 
 static unsigned long initial_lpm = 0x00;

zipl/boot/eckd2dump.c

@@ -11,7 +11,7 @@
 
 #include "cio.h"
 #include "eckd2dump.h"
-#include "error.h"
+#include "boot/error.h"
 #include "boot/s390.h"
 #include "stage2dump.h"
 

zipl/boot/eckd2dump_mv.c

@@ -10,9 +10,9 @@
  */
 
 #include "lib/zt_common.h"
+#include "boot/error.h"
 
 #include "eckd2dump.h"
-#include "error.h"
 #include "stage2dump.h"
 
 #define MVDUMP_TOOL_SIZE	0x3000	/* Size of dump record */

zipl/boot/eckd2dump_sv.c

@@ -11,9 +11,9 @@
 
 #include "lib/zt_common.h"
 #include "boot/boot_defs.h"
+#include "boot/error.h"
 
 #include "eckd2dump.h"
-#include "error.h"
 #include "stage2dump.h"
 
 /*

zipl/boot/fba.h

@@ -13,7 +13,7 @@
 #ifndef FBA_H
 #define FBA_H
 
-#include "error.h"
+#include "boot/error.h"
 #include "libc.h"
 #include "stage2.h"
 

zipl/boot/fba2dump.c

@@ -11,8 +11,8 @@
 
 #include "lib/zt_common.h"
 #include "boot/boot_defs.h"
+#include "boot/error.h"
 
-#include "error.h"
 #include "fba.h"
 #include "stage2dump.h"
 

zipl/boot/kdump.c

@@ -9,10 +9,10 @@
  * it under the terms of the MIT license. See LICENSE for details.
  */
 
-#include "error.h"
 #include "kdump.h"
 #include "libc.h"
 #include "menu.h"
+#include "boot/error.h"
 #include "boot/s390.h"
 #include "boot/os_info.h"
 

zipl/boot/kdump.h

@@ -13,6 +13,7 @@
 #ifndef KDUMP_H
 #define KDUMP_H
 
+#include "libc.h"
 #include "boot/os_info.h"
 
 #define OS_INFO_VERSION_MAJOR_SUPPORTED	1

zipl/boot/kdump2.c

@@ -9,11 +9,11 @@
  * it under the terms of the MIT license. See LICENSE for details.
  */
 
-#include "error.h"
 #include "kdump.h"
 #include "libc.h"
 #include "menu.h"
 #include "stage2.h"
+#include "boot/error.h"
 #include "boot/os_info.h"
 
 /*

zipl/boot/kdump3.c

@@ -9,11 +9,11 @@
  * it under the terms of the MIT license. See LICENSE for details.
  */
 
-#include "error.h"
 #include "kdump.h"
 #include "libc.h"
 #include "sclp_stage3.h"
 #include "stage3.h"
+#include "boot/error.h"
 #include "boot/os_info.h"
 
 /*

zipl/boot/libc.c

@@ -13,9 +13,9 @@
 
 #include <stdarg.h>
 
+#include "boot/error.h"
 #include "boot/s390.h"
 
-#include "error.h"
 #include "sclp.h"
 #include "ebcdic.h"
 

zipl/boot/sclp.c

@@ -10,7 +10,7 @@
  */
 
 #include "libc.h"
-#include "error.h"
+#include "boot/error.h"
 #include "boot/s390.h"
 #include "sclp.h"
 #include "ebcdic.h"

zipl/boot/stage2.c

@@ -11,9 +11,9 @@
 
 #include "lib/zt_common.h"
 
-#include "error.h"
 #include "libc.h"
 #include "menu.h"
+#include "boot/error.h"
 #include "boot/s390.h"
 #include "boot/loaders_layout.h"
 #include "stage2.h"

zipl/boot/stage2.h

@@ -22,9 +22,9 @@
 #include "boot/boot_defs.h"
 
 #include "libc.h"
+#include "boot/error.h"
 #include "boot/s390.h"
 #include "cio.h"
-#include "error.h"
 
 struct stage2_descr {
 	uint8_t reserved[16];

zipl/boot/stage2dump.c

@@ -12,9 +12,9 @@
 #include <stdarg.h>
 
 #include "lib/zt_common.h"
+#include "boot/error.h"
 
 #include "libc.h"
-#include "error.h"
 #include "sclp.h"
 #include "stage2dump.h"
 

zipl/boot/stage3.c

@@ -12,6 +12,7 @@
 #include "libc.h"
 #include "sclp.h"
 #include "menu.h"
+#include "boot/error.h"
 #include "boot/sigp.h"
 #include "boot/s390.h"
 #include "boot/sigp.h"
@@ -19,7 +20,6 @@
 #include "boot/loaders_layout.h"
 
 #include "stage3.h"
-#include "error.h"
 #include "ebcdic.h"
 #include "ebcdic_conv.h"
 

zipl/boot/tape2dump.c

@@ -11,11 +11,11 @@
 
 #include "libc.h"
 #include "lib/zt_common.h"
+#include "boot/error.h"
 #include "boot/loaders_layout.h"
 #include "boot/s390.h"
 
 #include "cio.h"
-#include "error.h"
 #include "stage2dump.h"
 
 #define BLK_SIZE	0x8000 /* We write 32 KB at a time */