kata-containers/s390-tools
1
0
Fork 0
mirror of https://github.com/ibm-s390-linux/s390-tools.git synced 2026-08-05 02:14:52 +00:00
Code Issues Packages Projects Releases Wiki Activity

zipl: Move macro definition to Makefile

Browse Source 
In the zipl Makefile macros are defined with the sole purpose to define
other macros in zipl.h. Remove this unnecessary indirection.

Signed-off-by: Philipp Rudo <prudo@linux.ibm.com>
Reviewed-by: Hendrik Brueckner <brueckner@linux.ibm.com>
Reviewed-by: Javier Martinez Canillas <javierm@redhat.com>
Signed-off-by: Jan Höppner <hoeppner@linux.ibm.com>
This commit is contained in:
Philipp Rudo
2018-07-05 11:15:49 +02:00
committed by Jan Höppner
parent 724f1fea2c
commit d08bd23c1e
2 changed files with 2 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
zipl/include/zipl.h
View File

@@ -48,11 +48,6 @@
#define MENU_DEFAULT_PROMPT 0
#define MENU_DEFAULT_TIMEOUT 0
#define ZFCPDUMP_IMAGE STRINGIFY(ZFCPDUMP_DIR) "/" \
STRINGIFY(ZFCPDUMP_PART_IMAGE)
#define ZFCPDUMP_INITRD STRINGIFY(ZFCPDUMP_DIR) "/" \
STRINGIFY(ZFCPDUMP_PART_RD)
#define MAX_DUMP_VOLUMES 32
/* Internal component load address type */

5
zipl/src/Makefile
View File

@@ -2,9 +2,8 @@
include ../../common.mak
ALL_CPPFLAGS += -I../include -I../boot \
-DZFCPDUMP_DIR=$(ZFCPDUMP_DIR) \
-DZFCPDUMP_PART_IMAGE=$(ZFCPDUMP_IMAGE) \
-DZFCPDUMP_PART_RD=$(ZFCPDUMP_INITRD) \
-DZFCPDUMP_IMAGE="STRINGIFY($(ZFCPDUMP_DIR)/$(ZFCPDUMP_IMAGE))" \
-DZFCPDUMP_INITRD="STRINGIFY($(ZFCPDUMP_DIR)/$(ZFCPDUMP_INITRD))" \
-D_FILE_OFFSET_BITS=64 $(NO_PIE_CFLAGS)
ALL_LDFLAGS += -Wl,-z,noexecstack $(NO_PIE_LDFLAGS)