From mboxrd@z Thu Jan 1 00:00:00 1970 Delivery-date: Tue, 13 Aug 2024 15:21:08 +0200 Received: from metis.whiteo.stw.pengutronix.de ([2a0a:edc0:2:b01:1d::104]) by lore.white.stw.pengutronix.de with esmtps (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.96) (envelope-from ) id 1sdrSW-009CxA-1Y for lore@lore.pengutronix.de; Tue, 13 Aug 2024 15:21:08 +0200 Received: from localhost ([127.0.0.1] helo=metis.whiteo.stw.pengutronix.de) by metis.whiteo.stw.pengutronix.de with esmtp (Exim 4.92) (envelope-from ) id 1sdrSV-0007kS-L6; Tue, 13 Aug 2024 15:21:07 +0200 Received: from drehscheibe.grey.stw.pengutronix.de ([2a0a:edc0:0:c01:1d::a2]) by metis.whiteo.stw.pengutronix.de with esmtps (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1sdrSI-0007Tk-Ft; Tue, 13 Aug 2024 15:20:54 +0200 Received: from [2a0a:edc0:0:1101:1d::ac] (helo=dude04.red.stw.pengutronix.de) by drehscheibe.grey.stw.pengutronix.de with esmtps (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.94.2) (envelope-from ) id 1sdrSH-0008L4-Ri; Tue, 13 Aug 2024 15:20:53 +0200 Received: from rhi by dude04.red.stw.pengutronix.de with local (Exim 4.96) (envelope-from ) id 1sdrSH-00GQQC-2a; Tue, 13 Aug 2024 15:20:53 +0200 From: Roland Hieber To: distrokit@pengutronix.de Date: Tue, 13 Aug 2024 15:20:44 +0200 Message-Id: <20240813132050.3914043-4-rhi@pengutronix.de> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20240813132050.3914043-1-rhi@pengutronix.de> References: <20240801113819.3981009-1-a.fatoum@pengutronix.de> <20240813132050.3914043-1-rhi@pengutronix.de> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [DistroKit] [PATCH v3 3/9] mips, mipsel: kernel-*: sync with template X-BeenThere: distrokit@pengutronix.de X-Mailman-Version: 2.1.29 Precedence: list List-Id: DistroKit Mailinglist List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Roland Hieber Sender: "DistroKit" X-SA-Exim-Connect-IP: 127.0.0.1 X-SA-Exim-Mail-From: distrokit-bounces@pengutronix.de X-SA-Exim-Scanned: No (on metis.whiteo.stw.pengutronix.de); SAEximRunCond expanded to false Update the template-generated kernel rules by porting the following PTXdist commits: * ceb09a1f5e56 (2021-11-29, "template: kernel: avoid config changes based on availability of pahole") * c49ffe4cd093 (2022-04-28, "kernel/kernel template: really allow subdirectories in KERNEL*_DTS") * 208fe87261b8 (2022-04-28, "kernel template: make sure bc is available") * 7205e52a301c (2023-09-12, "kernel: add make target for the installed device trees") While at it, align the package variables. Link: https://git.pengutronix.de/cgit/ptxdist/commit/?h=ceb09a1f5e56 Link: https://git.pengutronix.de/cgit/ptxdist/commit/?h=c49ffe4cd093 Link: https://git.pengutronix.de/cgit/ptxdist/commit/?h=208fe87261b8 Link: https://git.pengutronix.de/cgit/ptxdist/commit/?h=7205e52a301c Signed-off-by: Roland Hieber --- .../platform-mips/platforms/kernel-ar9331.in | 1 + .../platform-mips/platforms/kernel-malta.in | 1 + .../platform-mips/rules/kernel-ar9331.make | 34 ++++++++------- configs/platform-mips/rules/kernel-malta.make | 42 ++++++++++--------- configs/platform-mipsel/kernelconfig-malta | 2 +- .../platform-mipsel/kernelconfig-malta.diff | 1 - .../platform-mipsel/platforms/kernel-malta.in | 1 + .../platform-mipsel/rules/kernel-malta.make | 37 +++++++++------- 8 files changed, 67 insertions(+), 52 deletions(-) diff --git a/configs/platform-mips/platforms/kernel-ar9331.in b/configs/platform-mips/platforms/kernel-ar9331.in index 51a28f94aee5..e7dd81f3e410 100644 --- a/configs/platform-mips/platforms/kernel-ar9331.in +++ b/configs/platform-mips/platforms/kernel-ar9331.in @@ -4,6 +4,7 @@ config KERNEL_AR9331 tristate prompt "Linux kernel (ar9331)" select HOST_LIBKMOD + select HOST_SYSTEM_BC #select HOST_U_BOOT_TOOLS help FIXME diff --git a/configs/platform-mips/platforms/kernel-malta.in b/configs/platform-mips/platforms/kernel-malta.in index 8dcd50c8bde9..069ccceba301 100644 --- a/configs/platform-mips/platforms/kernel-malta.in +++ b/configs/platform-mips/platforms/kernel-malta.in @@ -4,6 +4,7 @@ config KERNEL_MALTA tristate prompt "Linux kernel (malta)" select HOST_LIBKMOD + select HOST_SYSTEM_BC #select HOST_U_BOOT_TOOLS help FIXME diff --git a/configs/platform-mips/rules/kernel-ar9331.make b/configs/platform-mips/rules/kernel-ar9331.make index 1ed0fa4f006d..0b3a3a1c3d33 100644 --- a/configs/platform-mips/rules/kernel-ar9331.make +++ b/configs/platform-mips/rules/kernel-ar9331.make @@ -14,23 +14,23 @@ PACKAGES-$(PTXCONF_KERNEL_AR9331) += kernel-ar9331 # # Paths and names # -KERNEL_AR9331_VERSION := $(call ptx/config-version, PTXCONF_KERNEL) -KERNEL_AR9331_MD5 := $(call ptx/config-md5, PTXCONF_KERNEL) -KERNEL_AR9331 := linux-ar9331-$(KERNEL_AR9331_VERSION) -KERNEL_AR9331_SUFFIX := tar.xz -KERNEL_AR9331_URL := $(call kernel-url, KERNEL_AR9331) -KERNEL_AR9331_PATCHES := linux-$(KERNEL_AR9331_VERSION) -KERNEL_AR9331_SOURCE := $(SRCDIR)/$(KERNEL_AR9331_PATCHES).$(KERNEL_AR9331_SUFFIX) -KERNEL_AR9331_DIR := $(BUILDDIR)/$(KERNEL_AR9331) -KERNEL_AR9331_BUILD_DIR := $(KERNEL_AR9331_DIR)-build -KERNEL_AR9331_CONFIG := $(call ptx/in-platformconfigdir, kernelconfig-ar9331) +KERNEL_AR9331_VERSION := $(call ptx/config-version, PTXCONF_KERNEL) +KERNEL_AR9331_MD5 := $(call ptx/config-md5, PTXCONF_KERNEL) +KERNEL_AR9331 := linux-ar9331-$(KERNEL_AR9331_VERSION) +KERNEL_AR9331_SUFFIX := tar.xz +KERNEL_AR9331_URL := $(call kernel-url, KERNEL_AR9331) +KERNEL_AR9331_PATCHES := linux-$(KERNEL_AR9331_VERSION) +KERNEL_AR9331_SOURCE := $(SRCDIR)/$(KERNEL_AR9331_PATCHES).$(KERNEL_AR9331_SUFFIX) +KERNEL_AR9331_DIR := $(BUILDDIR)/$(KERNEL_AR9331) +KERNEL_AR9331_BUILD_DIR := $(KERNEL_AR9331_DIR)-build +KERNEL_AR9331_CONFIG := $(call ptx/in-platformconfigdir, kernelconfig-ar9331) KERNEL_AR9331_REF_CONFIG := $(call ptx/in-platformconfigdir, kernelconfig) -KERNEL_AR9331_DTS_PATH := ${PTXDIST_PLATFORMCONFIG_SUBDIR}/dts:${KERNEL_AR9331_DIR}/arch/${GENERIC_KERNEL_ARCH}/boot/dts/qca -KERNEL_AR9331_DTS := ar9331_dpt_module.dts -KERNEL_AR9331_DTB_FILES := $(addsuffix .dtb,$(basename $(KERNEL_AR9331_DTS))) -KERNEL_AR9331_LICENSE := GPL-2.0-only +KERNEL_AR9331_DTS_PATH := ${PTXDIST_PLATFORMCONFIG_SUBDIR}/dts:${KERNEL_AR9331_DIR}/arch/${GENERIC_KERNEL_ARCH}/boot/dts +KERNEL_AR9331_DTS := qca/ar9331_dpt_module.dts +KERNEL_AR9331_DTB_FILES := $(addsuffix .dtb,$(basename $(notdir $(KERNEL_AR9331_DTS)))) +KERNEL_AR9331_LICENSE := GPL-2.0-only KERNEL_AR9331_LICENSE_FILES := -KERNEL_AR9331_BUILD_OOT := KEEP +KERNEL_AR9331_BUILD_OOT := KEEP # track changes to devices-trees in the BSP $(call world/dts-cfghash-file, KERNEL_AR9331) @@ -107,6 +107,10 @@ $(STATEDIR)/kernel-ar9331.install: # Target-Install # ---------------------------------------------------------------------------- +ifneq ($(KERNEL_AR9331_DTB_FILES),) +$(addprefix $(IMAGEDIR)/,$(KERNEL_AR9331_DTB_FILES)): $(STATEDIR)/kernel-ar9331.targetinstall +endif + $(STATEDIR)/kernel-ar9331.targetinstall: @$(call targetinfo) diff --git a/configs/platform-mips/rules/kernel-malta.make b/configs/platform-mips/rules/kernel-malta.make index e6116de830e2..8dc3ce79f5c2 100644 --- a/configs/platform-mips/rules/kernel-malta.make +++ b/configs/platform-mips/rules/kernel-malta.make @@ -14,23 +14,23 @@ PACKAGES-$(PTXCONF_KERNEL_MALTA) += kernel-malta # # Paths and names # -KERNEL_MALTA_VERSION := $(call ptx/config-version, PTXCONF_KERNEL) -KERNEL_MALTA_MD5 := $(call ptx/config-md5, PTXCONF_KERNEL) -KERNEL_MALTA := linux-malta-$(KERNEL_MALTA_VERSION) -KERNEL_MALTA_SUFFIX := tar.xz -KERNEL_MALTA_URL := $(call kernel-url, KERNEL_MALTA) -KERNEL_MALTA_PATCHES := linux-$(KERNEL_MALTA_VERSION) -KERNEL_MALTA_SOURCE := $(SRCDIR)/$(KERNEL_MALTA_PATCHES).$(KERNEL_MALTA_SUFFIX) -KERNEL_MALTA_DIR := $(BUILDDIR)/$(KERNEL_MALTA) -KERNEL_MALTA_BUILD_DIR := $(KERNEL_MALTA_DIR)-build -KERNEL_MALTA_CONFIG := $(call ptx/in-platformconfigdir, kernelconfig-malta) -KERNEL_MALTA_REF_CONFIG := $(call ptx/in-platformconfigdir, kernelconfig) -KERNEL_MALTA_DTS_PATH := ${PTXDIST_PLATFORMCONFIG_SUBDIR}/dts:${KERNEL_MALTA_DIR}/arch/${GENERIC_KERNEL_ARCH}/boot/dts/mti -KERNEL_MALTA_DTS := malta.dts -KERNEL_MALTA_DTB_FILES := $(addsuffix .dtb,$(basename $(KERNEL_MALTA_DTS))) -KERNEL_MALTA_LICENSE := GPL-2.0-only +KERNEL_MALTA_VERSION := $(call ptx/config-version, PTXCONF_KERNEL) +KERNEL_MALTA_MD5 := $(call ptx/config-md5, PTXCONF_KERNEL) +KERNEL_MALTA := linux-malta-$(KERNEL_MALTA_VERSION) +KERNEL_MALTA_SUFFIX := tar.xz +KERNEL_MALTA_URL := $(call kernel-url, KERNEL_MALTA) +KERNEL_MALTA_PATCHES := linux-$(KERNEL_MALTA_VERSION) +KERNEL_MALTA_SOURCE := $(SRCDIR)/$(KERNEL_MALTA_PATCHES).$(KERNEL_MALTA_SUFFIX) +KERNEL_MALTA_DIR := $(BUILDDIR)/$(KERNEL_MALTA) +KERNEL_MALTA_BUILD_DIR := $(KERNEL_MALTA_DIR)-build +KERNEL_MALTA_CONFIG := $(call ptx/in-platformconfigdir, kernelconfig-malta) +KERNEL_MALTA_REF_CONFIG := $(call ptx/in-platformconfigdir, kernelconfig) +KERNEL_MALTA_DTS_PATH := ${PTXDIST_PLATFORMCONFIG_SUBDIR}/dts:${KERNEL_MALTA_DIR}/arch/${GENERIC_KERNEL_ARCH}/boot/dts +KERNEL_MALTA_DTS := mti/malta.dts +KERNEL_MALTA_DTB_FILES := $(addsuffix .dtb,$(basename $(notdir $(KERNEL_MALTA_DTS)))) +KERNEL_MALTA_LICENSE := GPL-2.0-only KERNEL_MALTA_LICENSE_FILES := -KERNEL_MALTA_BUILD_OOT := KEEP +KERNEL_MALTA_BUILD_OOT := KEEP # track changes to devices-trees in the BSP $(call world/dts-cfghash-file, KERNEL_MALTA) @@ -43,7 +43,7 @@ $(call world/dts-cfghash-file, KERNEL_MALTA) KERNEL_MALTA_WRAPPER_BLACKLIST := \ $(PTXDIST_LOWLEVEL_WRAPPER_BLACKLIST) -KERNEL_MALTA_PATH := PATH=$(CROSS_PATH) +KERNEL_MALTA_PATH := PATH=$(CROSS_PATH) KERNEL_MALTA_SHARED_OPT := \ -C $(KERNEL_MALTA_DIR) \ O=$(KERNEL_MALTA_BUILD_DIR) \ @@ -67,8 +67,8 @@ KERNEL_MALTA_CONF_OPT := \ #KERNEL_MALTA_CONF_OPT += \ # KERNELVERSION=$(KERNEL_MALTA_VERSION) -KERNEL_MALTA_IMAGES := vmlinuz -KERNEL_MALTA_IMAGES := $(addprefix $(KERNEL_MALTA_BUILD_DIR)/,$(KERNEL_MALTA_IMAGES)) +KERNEL_MALTA_IMAGES := vmlinuz +KERNEL_MALTA_IMAGES := $(addprefix $(KERNEL_MALTA_BUILD_DIR)/,$(KERNEL_MALTA_IMAGES)) ifdef PTXCONF_KERNEL_MALTA $(KERNEL_MALTA_CONFIG): @@ -107,6 +107,10 @@ $(STATEDIR)/kernel-malta.install: # Target-Install # ---------------------------------------------------------------------------- +ifneq ($(KERNEL_MALTA_DTB_FILES),) +$(addprefix $(IMAGEDIR)/,$(KERNEL_MALTA_DTB_FILES)): $(STATEDIR)/kernel-malta.targetinstall +endif + $(STATEDIR)/kernel-malta.targetinstall: @$(call targetinfo) diff --git a/configs/platform-mipsel/kernelconfig-malta b/configs/platform-mipsel/kernelconfig-malta index 6f73c6047892..5fdfd84df5ff 100644 --- a/configs/platform-mipsel/kernelconfig-malta +++ b/configs/platform-mipsel/kernelconfig-malta @@ -17,7 +17,7 @@ CONFIG_CC_HAS_ASM_GOTO_OUTPUT=y CONFIG_CC_HAS_ASM_GOTO_TIED_OUTPUT=y CONFIG_CC_HAS_ASM_INLINE=y CONFIG_CC_HAS_NO_PROFILE_FN_ATTR=y -CONFIG_PAHOLE_VERSION=124 +CONFIG_PAHOLE_VERSION=0 CONFIG_IRQ_WORK=y CONFIG_BUILDTIME_TABLE_SORT=y diff --git a/configs/platform-mipsel/kernelconfig-malta.diff b/configs/platform-mipsel/kernelconfig-malta.diff index 8e5b3352dedb..15b80d0fafd8 100644 --- a/configs/platform-mipsel/kernelconfig-malta.diff +++ b/configs/platform-mipsel/kernelconfig-malta.diff @@ -1109,7 +1109,6 @@ CONFIG_OF_MDIO=m CONFIG_PAGE_POOL_STATS=y CONFIG_PAGE_SIZE_16KB=y # CONFIG_PAGE_SIZE_4KB is not set -CONFIG_PAHOLE_VERSION=124 # CONFIG_PANIC_ON_OOPS is not set CONFIG_PANIC_ON_OOPS_VALUE=0 CONFIG_PANIC_TIMEOUT=0 diff --git a/configs/platform-mipsel/platforms/kernel-malta.in b/configs/platform-mipsel/platforms/kernel-malta.in index 8dcd50c8bde9..069ccceba301 100644 --- a/configs/platform-mipsel/platforms/kernel-malta.in +++ b/configs/platform-mipsel/platforms/kernel-malta.in @@ -4,6 +4,7 @@ config KERNEL_MALTA tristate prompt "Linux kernel (malta)" select HOST_LIBKMOD + select HOST_SYSTEM_BC #select HOST_U_BOOT_TOOLS help FIXME diff --git a/configs/platform-mipsel/rules/kernel-malta.make b/configs/platform-mipsel/rules/kernel-malta.make index 89f1e06c529a..8dc3ce79f5c2 100644 --- a/configs/platform-mipsel/rules/kernel-malta.make +++ b/configs/platform-mipsel/rules/kernel-malta.make @@ -14,23 +14,23 @@ PACKAGES-$(PTXCONF_KERNEL_MALTA) += kernel-malta # # Paths and names # -KERNEL_MALTA_VERSION := $(call ptx/config-version, PTXCONF_KERNEL) -KERNEL_MALTA_MD5 := $(call ptx/config-md5, PTXCONF_KERNEL) -KERNEL_MALTA := linux-malta-$(KERNEL_MALTA_VERSION) -KERNEL_MALTA_SUFFIX := tar.xz -KERNEL_MALTA_URL := $(call kernel-url, KERNEL_MALTA) -KERNEL_MALTA_PATCHES := linux-$(KERNEL_MALTA_VERSION) -KERNEL_MALTA_SOURCE := $(SRCDIR)/$(KERNEL_MALTA_PATCHES).$(KERNEL_MALTA_SUFFIX) -KERNEL_MALTA_DIR := $(BUILDDIR)/$(KERNEL_MALTA) -KERNEL_MALTA_BUILD_DIR := $(KERNEL_MALTA_DIR)-build -KERNEL_MALTA_CONFIG := $(call ptx/in-platformconfigdir, kernelconfig-malta) -KERNEL_MALTA_REF_CONFIG := $(call ptx/in-platformconfigdir, kernelconfig) -KERNEL_MALTA_DTS_PATH := ${PTXDIST_PLATFORMCONFIG_SUBDIR}/dts:${KERNEL_MALTA_DIR}/arch/${GENERIC_KERNEL_ARCH}/boot/dts/mti -KERNEL_MALTA_DTS := malta.dts -KERNEL_MALTA_DTB_FILES := $(addsuffix .dtb,$(basename $(KERNEL_MALTA_DTS))) -KERNEL_MALTA_LICENSE := GPL-2.0-only +KERNEL_MALTA_VERSION := $(call ptx/config-version, PTXCONF_KERNEL) +KERNEL_MALTA_MD5 := $(call ptx/config-md5, PTXCONF_KERNEL) +KERNEL_MALTA := linux-malta-$(KERNEL_MALTA_VERSION) +KERNEL_MALTA_SUFFIX := tar.xz +KERNEL_MALTA_URL := $(call kernel-url, KERNEL_MALTA) +KERNEL_MALTA_PATCHES := linux-$(KERNEL_MALTA_VERSION) +KERNEL_MALTA_SOURCE := $(SRCDIR)/$(KERNEL_MALTA_PATCHES).$(KERNEL_MALTA_SUFFIX) +KERNEL_MALTA_DIR := $(BUILDDIR)/$(KERNEL_MALTA) +KERNEL_MALTA_BUILD_DIR := $(KERNEL_MALTA_DIR)-build +KERNEL_MALTA_CONFIG := $(call ptx/in-platformconfigdir, kernelconfig-malta) +KERNEL_MALTA_REF_CONFIG := $(call ptx/in-platformconfigdir, kernelconfig) +KERNEL_MALTA_DTS_PATH := ${PTXDIST_PLATFORMCONFIG_SUBDIR}/dts:${KERNEL_MALTA_DIR}/arch/${GENERIC_KERNEL_ARCH}/boot/dts +KERNEL_MALTA_DTS := mti/malta.dts +KERNEL_MALTA_DTB_FILES := $(addsuffix .dtb,$(basename $(notdir $(KERNEL_MALTA_DTS)))) +KERNEL_MALTA_LICENSE := GPL-2.0-only KERNEL_MALTA_LICENSE_FILES := -KERNEL_MALTA_BUILD_OOT := KEEP +KERNEL_MALTA_BUILD_OOT := KEEP # track changes to devices-trees in the BSP $(call world/dts-cfghash-file, KERNEL_MALTA) @@ -47,6 +47,7 @@ KERNEL_MALTA_PATH := PATH=$(CROSS_PATH) KERNEL_MALTA_SHARED_OPT := \ -C $(KERNEL_MALTA_DIR) \ O=$(KERNEL_MALTA_BUILD_DIR) \ + PAHOLE=false \ $(call kernel-opts, KERNEL_MALTA) # no gcc plugins; avoid config changes depending on the host compiler @@ -106,6 +107,10 @@ $(STATEDIR)/kernel-malta.install: # Target-Install # ---------------------------------------------------------------------------- +ifneq ($(KERNEL_MALTA_DTB_FILES),) +$(addprefix $(IMAGEDIR)/,$(KERNEL_MALTA_DTB_FILES)): $(STATEDIR)/kernel-malta.targetinstall +endif + $(STATEDIR)/kernel-malta.targetinstall: @$(call targetinfo) -- 2.39.2