diff options
| author | Marco Felsch <m.felsch@pengutronix.de> | 2023-02-02 14:26:10 +0100 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2023-02-03 09:04:37 +0100 |
| commit | 9ed407dd8d065fa3ec2fc34a8fe2f499f2b9e476 (patch) | |
| tree | 9c716bf1b3afd4121d318fd9cdb342b75e75d56d /arch/riscv | |
| parent | bc435c410902066ce91009c43b53f0eaa839e706 (diff) | |
| download | barebox-9ed407dd8d065fa3ec2fc34a8fe2f499f2b9e476.tar.gz barebox-9ed407dd8d065fa3ec2fc34a8fe2f499f2b9e476.tar.xz | |
RISC-V: Makefile: cleanup layout
The cflag and cppflag handling is rather complicated for this small
Makefile. The code uses two helper variables riscv-cflags-y cflags-y
which are assigned later to PBL_CPPFLAGS, KBUILD_CPPFLAGS and
KBUILD_CFLAGS.
Remove this complexity by assigning the flags directly to
KBUILD_CPPFLAGS. The variable is used during pbl/barebox compile and
during cpp process.
While on it move the KBUILD_IMAGE to the KBUILD_BINARY to bundle the
usage.
Signed-off-by: Marco Felsch <m.felsch@pengutronix.de>
Link: https://lore.barebox.org/20230202132612.691206-1-m.felsch@pengutronix.de
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Diffstat (limited to 'arch/riscv')
| -rw-r--r-- | arch/riscv/Makefile | 18 |
1 files changed, 6 insertions, 12 deletions
diff --git a/arch/riscv/Makefile b/arch/riscv/Makefile index 279db046c0..b4cf5983a2 100644 --- a/arch/riscv/Makefile +++ b/arch/riscv/Makefile @@ -5,21 +5,19 @@ KBUILD_DEFCONFIG := rv64i_defconfig KBUILD_CPPFLAGS += -fno-strict-aliasing ifeq ($(CONFIG_ARCH_RV32I),y) - riscv-cflags-y += -march=rv32im -mabi=ilp32 + KBUILD_CPPFLAGS += -march=rv32im -mabi=ilp32 riscv-ldflags-y += -melf32lriscv else - riscv-cflags-y += -march=rv64im -mabi=lp64 + KBUILD_CPPFLAGS += -march=rv64im -mabi=lp64 riscv-ldflags-y += -melf64lriscv endif -riscv-cflags-y += -Wstrict-prototypes -mcmodel=medany -fpic -riscv-ldflags-y += -pie -static -PBL_CPPFLAGS += $(riscv-cflags-y) -LDFLAGS_pbl += $(riscv-ldflags-y) -cflags-y += $(riscv-cflags-y) +KBUILD_CPPFLAGS += -Wstrict-prototypes -mcmodel=medany -fpic +riscv-ldflags-y += -pie -static +LDFLAGS_pbl += $(riscv-ldflags-y) LDFLAGS_barebox += $(riscv-ldflags-y) ifndef CONFIG_MODULES @@ -29,6 +27,7 @@ LDFLAGS_barebox += -static --gc-sections endif KBUILD_BINARY := barebox.bin +KBUILD_IMAGE := $(KBUILD_BINARY) archprepare: maketools @@ -41,11 +40,6 @@ common-y += arch/riscv/boot/ common-$(CONFIG_OFTREE) += arch/riscv/dts/ -KBUILD_CPPFLAGS += $(cflags-y) -KBUILD_CFLAGS += $(cflags-y) - lds-y := arch/riscv/lib/barebox.lds CLEAN_FILES += arch/riscv/lib/barebox.lds - -KBUILD_IMAGE := $(KBUILD_BINARY) |