zipl: consolidate COMMAND_LINE_EXTRA and COMMAND_LINE_SIZE

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 <prudo@linux.ibm.com>
Reviewed-by: Stefan Haberland <sth@linux.ibm.com>
Signed-off-by: Marc Hartmayer <mhartmay@linux.ibm.com>
Signed-off-by: Jan Höppner <hoeppner@linux.ibm.com>

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__ */

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";
 

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

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"

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