From mboxrd@z Thu Jan 1 00:00:00 1970 Delivery-date: Thu, 02 Feb 2023 14:27:44 +0100 Received: from metis.ext.pengutronix.de ([2001:67c:670:201:290:27ff:fe1d:cc33]) by lore.white.stw.pengutronix.de with esmtps (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.94.2) (envelope-from ) id 1pNZcv-00BQXB-Ls for lore@lore.pengutronix.de; Thu, 02 Feb 2023 14:27:44 +0100 Received: from bombadil.infradead.org ([2607:7c80:54:3::133]) by metis.ext.pengutronix.de with esmtps (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1pNZct-0002vt-47 for lore@pengutronix.de; Thu, 02 Feb 2023 14:27:43 +0100 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender:List-Subscribe:List-Help :List-Post:List-Archive:List-Unsubscribe:List-Id:Content-Transfer-Encoding: MIME-Version:Message-Id:Date:Subject:To:From:Reply-To:Cc:Content-Type: Content-ID:Content-Description:Resent-Date:Resent-From:Resent-Sender: Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To:References:List-Owner; bh=IzwdbGWEXzniJfN3eoZgow56DCu3Yk5mAl8j6EtBvQY=; b=pUjbCkYlEAKIiHdyVKt9fePcPk 6mDI4zz4iqZOvBBldaSOpJ6NhsOgZOpm8uDBUZppUhEhjC1ssZHc59m5eeipQL+Tn+R03+8LjXwzS EAHaKIAxBrZbbwZ4QWyPrzf+5br9DISJ3c01d7afbdE/oPVcIggqUYJZIDIw3epkeUNGF3pdvr/kM cKKzLK5WVMSYzIhfk4TFi+eWF0fPn1DHxM3HjKkQJF/iKgCILmEgIxtTFlsc5v9CYXgYX98XjId94 vr5gcC7/yFc8jH3D+St4fFc4MPClC8DLEdY4+EvHs2m7IiQXwMELtDFqe1HCwVMA4S69P0az6cxLL r/vouS8w==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1pNZba-00G0Nu-6M; Thu, 02 Feb 2023 13:26:22 +0000 Received: from metis.ext.pengutronix.de ([2001:67c:670:201:290:27ff:fe1d:cc33]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1pNZbW-00G0Mh-4f for barebox@lists.infradead.org; Thu, 02 Feb 2023 13:26:19 +0000 Received: from drehscheibe.grey.stw.pengutronix.de ([2a0a:edc0:0:c01:1d::a2]) by metis.ext.pengutronix.de with esmtps (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1pNZbS-0002h5-Gs for barebox@lists.infradead.org; Thu, 02 Feb 2023 14:26:14 +0100 Received: from [2a0a:edc0:0:1101:1d::28] (helo=dude02.red.stw.pengutronix.de) by drehscheibe.grey.stw.pengutronix.de with esmtp (Exim 4.94.2) (envelope-from ) id 1pNZbQ-002BTG-M2 for barebox@lists.infradead.org; Thu, 02 Feb 2023 14:26:13 +0100 Received: from mfe by dude02.red.stw.pengutronix.de with local (Exim 4.94.2) (envelope-from ) id 1pNZbR-002uPz-63 for barebox@lists.infradead.org; Thu, 02 Feb 2023 14:26:13 +0100 From: Marco Felsch To: barebox@lists.infradead.org Date: Thu, 2 Feb 2023 14:26:10 +0100 Message-Id: <20230202132612.691206-1-m.felsch@pengutronix.de> X-Mailer: git-send-email 2.30.2 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20230202_052618_204023_9BBD5DC5 X-CRM114-Status: UNSURE ( 7.89 ) X-CRM114-Notice: Please train this message. X-BeenThere: barebox@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "barebox" X-SA-Exim-Connect-IP: 2607:7c80:54:3::133 X-SA-Exim-Mail-From: barebox-bounces+lore=pengutronix.de@lists.infradead.org X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on metis.ext.pengutronix.de X-Spam-Level: X-Spam-Status: No, score=-4.7 required=4.0 tests=AWL,BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,RCVD_IN_DNSWL_MED,SPF_HELO_NONE,SPF_NONE, URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 Subject: [PATCH 1/3] RISC-V: Makefile: cleanup layout X-SA-Exim-Version: 4.2.1 (built Wed, 08 May 2019 21:11:16 +0000) X-SA-Exim-Scanned: Yes (on metis.ext.pengutronix.de) 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 --- arch/riscv/Makefile | 18 ++++++------------ 1 file 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) -- 2.39.1