zipl: Move macro definition to Makefile
PATCH v2 4/5 zipl: Move macro definition to Makefile
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 <[email protected]>
Reviewed-by Hendrik Brueckner <[email protected]>
Reviewed-by Javier Martinez Canillas <[email protected]>
--- zipl/include/zipl.h | 5 ----- zipl/src/Makefile | 5 ++--- 2 files changed, 2 insertions(+), 8 deletions(-)
zipl/include/zipl.h +0 -5
@@ -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 */
zipl/src/Makefile +2 -3
@@ -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)
Signature · 1 line
2.16.4