From ce65c39e18a62743bf65eeec92eaedbe22d035da Mon Sep 17 00:00:00 2001 From: Marc Hartmayer Date: Wed, 25 Mar 2020 10:58:34 +0100 Subject: [PATCH] zipl: consolidate COMMAND_LINE_EXTRA and COMMAND_LINE_SIZE MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Move COMMAND_LINE_EXTRA to `boot/loaders_layout.h` so it can be reused by `menu.c`and `stage3.c`. Additionally, reuse COMMAND_LINE_SIZE from `linux_layout.h` in `menu.c`. Reviewed-by: Philipp Rudo Reviewed-by: Stefan Haberland Signed-off-by: Marc Hartmayer Signed-off-by: Jan Höppner --- include/boot/loaders_layout.h | 1 + zipl/boot/menu.c | 2 ++ zipl/boot/menu.h | 5 ----- zipl/boot/stage3.c | 1 + zipl/boot/stage3.h | 2 -- 5 files changed, 4 insertions(+), 7 deletions(-) diff --git a/include/boot/loaders_layout.h b/include/boot/loaders_layout.h index 72aff0df..dd82ce17 100644 --- a/include/boot/loaders_layout.h +++ b/include/boot/loaders_layout.h @@ -26,6 +26,7 @@ #define STAGE3_STACK_ADDRESS _AC(0xF000, UL) #define STAGE3_PARAMS_ADDRESS _AC(0x9000, UL) +#define COMMAND_LINE_EXTRA _AC(0xE000, UL) #ifndef __ASSEMBLER__ #endif /* __ASSEMBLER__ */ diff --git a/zipl/boot/menu.c b/zipl/boot/menu.c index de001c7e..1e40c088 100644 --- a/zipl/boot/menu.c +++ b/zipl/boot/menu.c @@ -13,6 +13,8 @@ #include "menu.h" #include "sclp.h" #include "ebcdic.h" +#include "boot/linux_layout.h" +#include "boot/loaders_layout.h" static const char *msg_econfig = "Error: undefined configuration\n"; diff --git a/zipl/boot/menu.h b/zipl/boot/menu.h index ee0f2c5f..c6d688c1 100644 --- a/zipl/boot/menu.h +++ b/zipl/boot/menu.h @@ -14,11 +14,6 @@ #include "stage2.h" -/* address of extra command line */ -#define COMMAND_LINE_EXTRA 0xE000 - -/* max command line length */ -#define COMMAND_LINE_SIZE 896 #define BOOT_MENU_ENTRIES 63 #define PARAM_SIZE 8 #define TEXT_OFFSET 4 diff --git a/zipl/boot/stage3.c b/zipl/boot/stage3.c index 1511e801..3185448c 100644 --- a/zipl/boot/stage3.c +++ b/zipl/boot/stage3.c @@ -13,6 +13,7 @@ #include "boot/sigp.h" #include "boot/s390.h" #include "boot/sigp.h" +#include "boot/linux_layout.h" #include "boot/loaders_layout.h" #include "stage3.h" diff --git a/zipl/boot/stage3.h b/zipl/boot/stage3.h index cb771150..5ac4623d 100644 --- a/zipl/boot/stage3.h +++ b/zipl/boot/stage3.h @@ -18,8 +18,6 @@ #include "boot/linux_layout.h" -#define COMMAND_LINE_EXTRA 0xE000 - #define STAGE3_FLAG_SCSI 0x0001000000000000ULL #define STAGE3_FLAG_KDUMP 0x0002000000000000ULL