From eb06ebe24553e31179d6baf232808c6c33ca6030 Mon Sep 17 00:00:00 2001 From: Mikhail Zaslonko Date: Fri, 21 Apr 2023 16:41:04 +0200 Subject: [PATCH] include/boot: Move zipl/boot/error.h to include/boot MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 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 Reviewed-by: Marc Hartmayer Signed-off-by: Jan Höppner --- genprotimg/boot/stage3a.c | 3 ++- genprotimg/boot/stage3b.c | 3 ++- {zipl => include}/boot/error.h | 4 ++-- tunedasd/src/Makefile | 2 +- tunedasd/src/tunedasd.c | 1 - zipl/boot/cio.c | 2 +- zipl/boot/eckd2dump.c | 2 +- zipl/boot/eckd2dump_mv.c | 2 +- zipl/boot/eckd2dump_sv.c | 2 +- zipl/boot/fba.h | 2 +- zipl/boot/fba2dump.c | 2 +- zipl/boot/kdump.c | 2 +- zipl/boot/kdump.h | 1 + zipl/boot/kdump2.c | 2 +- zipl/boot/kdump3.c | 2 +- zipl/boot/libc.c | 2 +- zipl/boot/sclp.c | 2 +- zipl/boot/stage2.c | 2 +- zipl/boot/stage2.h | 2 +- zipl/boot/stage2dump.c | 2 +- zipl/boot/stage3.c | 2 +- zipl/boot/tape2dump.c | 2 +- 22 files changed, 24 insertions(+), 22 deletions(-) rename {zipl => include}/boot/error.h (93%) diff --git a/genprotimg/boot/stage3a.c b/genprotimg/boot/stage3a.c index 543b70a0..a4388b6f 100644 --- a/genprotimg/boot/stage3a.c +++ b/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; diff --git a/genprotimg/boot/stage3b.c b/genprotimg/boot/stage3b.c index c40e29f1..89f17bec 100644 --- a/genprotimg/boot/stage3b.c +++ b/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; diff --git a/zipl/boot/error.h b/include/boot/error.h similarity index 93% rename from zipl/boot/error.h rename to include/boot/error.h index 63eae4bd..2568eb27 100644 --- a/zipl/boot/error.h +++ b/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 */ diff --git a/tunedasd/src/Makefile b/tunedasd/src/Makefile index c79a2357..48043f7c 100644 --- a/tunedasd/src/Makefile +++ b/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 diff --git a/tunedasd/src/tunedasd.c b/tunedasd/src/tunedasd.c index 691841c0..84a20a37 100644 --- a/tunedasd/src/tunedasd.c +++ b/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 = { diff --git a/zipl/boot/cio.c b/zipl/boot/cio.c index 8a0d1406..44374f80 100644 --- a/zipl/boot/cio.c +++ b/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; diff --git a/zipl/boot/eckd2dump.c b/zipl/boot/eckd2dump.c index 6e49c4cc..eaa8e4f6 100644 --- a/zipl/boot/eckd2dump.c +++ b/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" diff --git a/zipl/boot/eckd2dump_mv.c b/zipl/boot/eckd2dump_mv.c index f0bb2c1d..6b6ea49b 100644 --- a/zipl/boot/eckd2dump_mv.c +++ b/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 */ diff --git a/zipl/boot/eckd2dump_sv.c b/zipl/boot/eckd2dump_sv.c index 955010f0..27e01552 100644 --- a/zipl/boot/eckd2dump_sv.c +++ b/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" /* diff --git a/zipl/boot/fba.h b/zipl/boot/fba.h index 6243a021..ae609f00 100644 --- a/zipl/boot/fba.h +++ b/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" diff --git a/zipl/boot/fba2dump.c b/zipl/boot/fba2dump.c index 9a76d2c6..196cfa8d 100644 --- a/zipl/boot/fba2dump.c +++ b/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" diff --git a/zipl/boot/kdump.c b/zipl/boot/kdump.c index 8bec3ef4..f06654f8 100644 --- a/zipl/boot/kdump.c +++ b/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" diff --git a/zipl/boot/kdump.h b/zipl/boot/kdump.h index fd2ade74..6f566cca 100644 --- a/zipl/boot/kdump.h +++ b/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 diff --git a/zipl/boot/kdump2.c b/zipl/boot/kdump2.c index a06fab34..4b6a1a64 100644 --- a/zipl/boot/kdump2.c +++ b/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" /* diff --git a/zipl/boot/kdump3.c b/zipl/boot/kdump3.c index 73d3d117..47386757 100644 --- a/zipl/boot/kdump3.c +++ b/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" /* diff --git a/zipl/boot/libc.c b/zipl/boot/libc.c index e1adb1e6..527c315c 100644 --- a/zipl/boot/libc.c +++ b/zipl/boot/libc.c @@ -13,9 +13,9 @@ #include +#include "boot/error.h" #include "boot/s390.h" -#include "error.h" #include "sclp.h" #include "ebcdic.h" diff --git a/zipl/boot/sclp.c b/zipl/boot/sclp.c index 95229ac1..063f3fb3 100644 --- a/zipl/boot/sclp.c +++ b/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" diff --git a/zipl/boot/stage2.c b/zipl/boot/stage2.c index ecfbd6aa..9431eb8f 100644 --- a/zipl/boot/stage2.c +++ b/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" diff --git a/zipl/boot/stage2.h b/zipl/boot/stage2.h index d1fbf70e..48d47bad 100644 --- a/zipl/boot/stage2.h +++ b/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]; diff --git a/zipl/boot/stage2dump.c b/zipl/boot/stage2dump.c index 05fe290a..1a920abd 100644 --- a/zipl/boot/stage2dump.c +++ b/zipl/boot/stage2dump.c @@ -12,9 +12,9 @@ #include #include "lib/zt_common.h" +#include "boot/error.h" #include "libc.h" -#include "error.h" #include "sclp.h" #include "stage2dump.h" diff --git a/zipl/boot/stage3.c b/zipl/boot/stage3.c index 35079419..69ad7932 100644 --- a/zipl/boot/stage3.c +++ b/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" diff --git a/zipl/boot/tape2dump.c b/zipl/boot/tape2dump.c index 652d23d3..d71e7944 100644 --- a/zipl/boot/tape2dump.c +++ b/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 */