From: Roland Hieber <rhi@pengutronix.de>
To: distrokit@pengutronix.de
Cc: Roland Hieber <rhi@pengutronix.de>
Subject: [DistroKit] [PATCH v2 04/10] mips, mipsel: kernel-*: sync with template
Date: Thu, 8 Aug 2024 14:28:40 +0200 [thread overview]
Message-ID: <20240808122846.2022136-4-rhi@pengutronix.de> (raw)
In-Reply-To: <20240808122846.2022136-1-rhi@pengutronix.de>
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 <rhi@pengutronix.de>
---
.../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
next prev parent reply other threads:[~2024-08-08 12:28 UTC|newest]
Thread overview: 20+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-07-31 9:14 [DistroKit] [PATCH 1/2] mipsel: sync kernelconfig Roland Hieber
2024-07-31 9:14 ` [DistroKit] [PATCH 2/2] mipsel: remove forked host-qemu rule Roland Hieber
2024-07-31 11:42 ` [DistroKit] [PATCH 1/2] mipsel: sync kernelconfig Robert Schwebel
2024-07-31 12:07 ` Alexander Dahl
2024-07-31 12:10 ` Michael Olbrich
2024-07-31 12:23 ` Roland Hieber
2024-07-31 12:33 ` Robert Schwebel
2024-08-08 12:28 ` [DistroKit] [PATCH v2 01/10] mipsel: remove forked host-qemu rule Roland Hieber
2024-08-08 12:28 ` [DistroKit] [PATCH v2 02/10] mipsel: sync kernelconfig Roland Hieber
2024-08-08 12:28 ` [DistroKit] [PATCH v2 03/10] mips, mipsel: remove forked kernel rule Roland Hieber
2024-08-08 12:28 ` Roland Hieber [this message]
2024-08-08 12:28 ` [DistroKit] [PATCH v2 05/10] mips, mipsel: kernel-*: use ptx/image-install and fix 'clean' stage Roland Hieber
2024-08-08 12:28 ` [DistroKit] [PATCH v2 06/10] mips, mipsel: kernel-*: select KERNEL Roland Hieber
2024-08-08 13:41 ` Michael Olbrich
2024-08-13 13:23 ` Roland Hieber
2024-08-08 12:28 ` [DistroKit] [PATCH v2 07/10] mips, mipsel: migrate barebox-common recipe to barebox Roland Hieber
2024-08-08 12:28 ` [DistroKit] [PATCH v2 08/10] mips, mipsel: barebox-*: sync with template Roland Hieber
2024-08-08 12:28 ` [DistroKit] [PATCH v2 09/10] mips, mipsel: barebox-*: use ptx/image-install Roland Hieber
2024-08-08 12:28 ` [DistroKit] [PATCH v2 10/10] mips, mipsel: barebox-*: set LICENSE_FILES Roland Hieber
2024-08-08 12:32 ` [DistroKit] [PATCH v2 01/10] mipsel: remove forked host-qemu rule Roland Hieber
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20240808122846.2022136-4-rhi@pengutronix.de \
--to=rhi@pengutronix.de \
--cc=distrokit@pengutronix.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox