Firmware/opensbi
8
0
Fork 0
forked from Mirrors/opensbi
Code Pull Requests Activity

Makefile: Improve readability

Browse Source 
Repeating "ifdef CROSS_COMPILE" multiple times does not help with
readability. Simplify by grouping compilation command setup under a
single ifdef statement.

Signed-off-by: Damien Le Moal <damien.lemoal@wdc.com>
This commit is contained in:
Damien Le Moal
2019-01-18 15:57:31 +09:00
committed by Anup Patel
parent 0df8269477
commit 9c4aca4f1b
1 changed files with 13 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
Makefile
View File

@@ -101,12 +101,24 @@ GENFLAGS += $(platform-common-genflags-y)
GENFLAGS += $(platform-genflags-y) GENFLAGS += $(platform-genflags-y)
GENFLAGS += $(firmware-genflags-y) GENFLAGS += $(firmware-genflags-y)
# Setup compilation environment # Setup compilation commands
ifdef CROSS_COMPILE ifdef CROSS_COMPILE
CC = $(CROSS_COMPILE)gcc CC = $(CROSS_COMPILE)gcc
CPP = $(CROSS_COMPILE)cpp
AR = $(CROSS_COMPILE)ar
LD = $(CROSS_COMPILE)ld
OBJCOPY = $(CROSS_COMPILE)objcopy
else else
CC ?= gcc CC ?= gcc
CPP ?= cpp
AR ?= ar
LD ?= ld
OBJCOPY ?= objcopy
endif endif
AS = $(CC)
DTC = dtc
# Setup compilation commands flags
CFLAGS = -g -Wall -Werror -nostdlib -fno-strict-aliasing -O2 CFLAGS = -g -Wall -Werror -nostdlib -fno-strict-aliasing -O2
CFLAGS += -fno-omit-frame-pointer -fno-optimize-sibling-calls CFLAGS += -fno-omit-frame-pointer -fno-optimize-sibling-calls
CFLAGS += -mno-save-restore -mstrict-align CFLAGS += -mno-save-restore -mstrict-align
@@ -114,16 +126,10 @@ CFLAGS += $(GENFLAGS)
CFLAGS += $(platform-cflags-y) CFLAGS += $(platform-cflags-y)
CFLAGS += $(firmware-cflags-y) CFLAGS += $(firmware-cflags-y)
ifdef CROSS_COMPILE
CPP = $(CROSS_COMPILE)cpp
else
CPP ?= cpp
endif
CPPFLAGS += $(GENFLAGS) CPPFLAGS += $(GENFLAGS)
CPPFLAGS += $(platform-cppflags-y) CPPFLAGS += $(platform-cppflags-y)
CPPFLAGS += $(firmware-cppflags-y) CPPFLAGS += $(firmware-cppflags-y)
AS = $(CC)
ASFLAGS = -g -Wall -nostdlib -D__ASSEMBLY__ ASFLAGS = -g -Wall -nostdlib -D__ASSEMBLY__
ASFLAGS += -fno-omit-frame-pointer -fno-optimize-sibling-calls ASFLAGS += -fno-omit-frame-pointer -fno-optimize-sibling-calls
ASFLAGS += -mno-save-restore -mstrict-align ASFLAGS += -mno-save-restore -mstrict-align
@@ -131,31 +137,14 @@ ASFLAGS += $(GENFLAGS)
ASFLAGS += $(platform-asflags-y) ASFLAGS += $(platform-asflags-y)
ASFLAGS += $(firmware-asflags-y) ASFLAGS += $(firmware-asflags-y)
ifdef CROSS_COMPILE
AR = $(CROSS_COMPILE)ar
else
AR ?= ar
endif
ARFLAGS = rcs ARFLAGS = rcs
ifdef CROSS_COMPILE
LD = $(CROSS_COMPILE)ld
else
LD ?= ld
endif
LDFLAGS += -g -Wall -nostdlib -Wl,--build-id=none -N LDFLAGS += -g -Wall -nostdlib -Wl,--build-id=none -N
LDFLAGS += $(platform-ldflags-y) LDFLAGS += $(platform-ldflags-y)
LDFLAGS += $(firmware-ldflags-y) LDFLAGS += $(firmware-ldflags-y)
MERGEFLAGS += -r MERGEFLAGS += -r
ifdef CROSS_COMPILE
OBJCOPY = $(CROSS_COMPILE)objcopy
else
OBJCOPY ?= objcopy
endif
DTC = dtc
DTCFLAGS = -O dtb DTCFLAGS = -O dtb
# Setup functions for compilation # Setup functions for compilation