From mboxrd@z Thu Jan 1 00:00:00 1970 Delivery-date: Thu, 08 Aug 2024 14:28:55 +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 1sc2GF-007UZh-1D for lore@lore.pengutronix.de; Thu, 08 Aug 2024 14:28:55 +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 1sc2GE-00063y-HC; Thu, 08 Aug 2024 14:28:54 +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 1sc2G8-0005yE-A4; Thu, 08 Aug 2024 14:28:48 +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 1sc2G7-005QKM-P7; Thu, 08 Aug 2024 14:28:47 +0200 Received: from rhi by dude04.red.stw.pengutronix.de with local (Exim 4.96) (envelope-from ) id 1sc2G7-008U5R-2L; Thu, 08 Aug 2024 14:28:47 +0200 From: Roland Hieber To: distrokit@pengutronix.de Date: Thu, 8 Aug 2024 14:28:38 +0200 Message-Id: <20240808122846.2022136-2-rhi@pengutronix.de> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20240808122846.2022136-1-rhi@pengutronix.de> References: <20240731091435.2983175-1-rhi@pengutronix.de> <20240808122846.2022136-1-rhi@pengutronix.de> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [DistroKit] [PATCH v2 02/10] mipsel: sync kernelconfig 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 Part of the changes stem from the toolchain update (commit 282b31d940f79ed01352, 2024-04-22, Ladislav Michl: "mipsel: update to OSELAS.Toolchain 2023.07.1"), other parts in the kernel-malta config were just out of sync with the main kernelconfig. Use default values for all prompted options. The changes in the PAHOLE version stem from the fact that our kernel rules are outdated, which we'll fix in later commits. Nevertheless, keep the kernelconfigs in sync so as not to break bisectability. Signed-off-by: Roland Hieber --- configs/platform-mipsel/kernelconfig | 2 +- configs/platform-mipsel/kernelconfig-malta | 15 ++++++++++---- .../platform-mipsel/kernelconfig-malta.diff | 20 ++++++++++--------- 3 files changed, 23 insertions(+), 14 deletions(-) diff --git a/configs/platform-mipsel/kernelconfig b/configs/platform-mipsel/kernelconfig index 499b7b6c1d17..176969bb7c9b 100644 --- a/configs/platform-mipsel/kernelconfig +++ b/configs/platform-mipsel/kernelconfig @@ -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=0 +CONFIG_PAHOLE_VERSION=124 CONFIG_IRQ_WORK=y CONFIG_BUILDTIME_TABLE_SORT=y diff --git a/configs/platform-mipsel/kernelconfig-malta b/configs/platform-mipsel/kernelconfig-malta index 35d3219ab371..6f73c6047892 100644 --- a/configs/platform-mipsel/kernelconfig-malta +++ b/configs/platform-mipsel/kernelconfig-malta @@ -2,9 +2,9 @@ # Automatically generated file; DO NOT EDIT. # Linux/mips 6.4.10 Kernel Configuration # -CONFIG_CC_VERSION_TEXT="mipsel-softfloat-linux-gnu-gcc (OSELAS.Toolchain-2023.07.0 13-20230624) 13.1.1 20230624" +CONFIG_CC_VERSION_TEXT="mipsel-softfloat-linux-gnu-gcc (OSELAS.Toolchain-2023.07.1 13-20231118) 13.2.1 20231118" CONFIG_CC_IS_GCC=y -CONFIG_GCC_VERSION=130101 +CONFIG_GCC_VERSION=130201 CONFIG_CLANG_VERSION=0 CONFIG_AS_IS_GNU=y CONFIG_AS_VERSION=24000 @@ -1450,6 +1450,7 @@ CONFIG_BLK_DEV=y # CONFIG_BLK_DEV_NULL_BLK is not set # CONFIG_BLK_DEV_FD is not set # CONFIG_BLK_DEV_PCIESSD_MTIP32XX is not set +# CONFIG_ZRAM is not set CONFIG_BLK_DEV_LOOP=m CONFIG_BLK_DEV_LOOP_MIN_COUNT=8 # CONFIG_BLK_DEV_DRBD is not set @@ -3500,11 +3501,11 @@ CONFIG_CRYPTO_CRC32C=y # Compression # CONFIG_CRYPTO_DEFLATE=m -# CONFIG_CRYPTO_LZO is not set +CONFIG_CRYPTO_LZO=y # CONFIG_CRYPTO_842 is not set # CONFIG_CRYPTO_LZ4 is not set # CONFIG_CRYPTO_LZ4HC is not set -# CONFIG_CRYPTO_ZSTD is not set +CONFIG_CRYPTO_ZSTD=y # end of Compression # @@ -3621,9 +3622,15 @@ CONFIG_CRC32_SLICEBY8=y # CONFIG_CRC7 is not set CONFIG_LIBCRC32C=m # CONFIG_CRC8 is not set +CONFIG_XXHASH=y # CONFIG_RANDOM32_SELFTEST is not set CONFIG_ZLIB_INFLATE=m CONFIG_ZLIB_DEFLATE=m +CONFIG_LZO_COMPRESS=y +CONFIG_LZO_DECOMPRESS=y +CONFIG_ZSTD_COMMON=y +CONFIG_ZSTD_COMPRESS=y +CONFIG_ZSTD_DECOMPRESS=y # CONFIG_XZ_DEC is not set CONFIG_GENERIC_ALLOCATOR=y CONFIG_TEXTSEARCH=y diff --git a/configs/platform-mipsel/kernelconfig-malta.diff b/configs/platform-mipsel/kernelconfig-malta.diff index 941646631905..ec0a67f42e54 100644 --- a/configs/platform-mipsel/kernelconfig-malta.diff +++ b/configs/platform-mipsel/kernelconfig-malta.diff @@ -1,4 +1,4 @@ -bb72d3559ad286bbed584fb7dce43ed7 +f4618f2656cf4f48bc6b8561c7b86726 # CONFIG_8139CP is not set # CONFIG_8139TOO is not set # CONFIG_ACENIC is not set @@ -84,10 +84,10 @@ CONFIG_BLK_DEV_BSG=y CONFIG_BLK_DEV_BSGLIB=y CONFIG_BLK_DEV_BSG_COMMON=y CONFIG_BLK_DEV_DM=m -# CONFIG_BLK_DEV_FD is not set CONFIG_BLK_DEV_LOOP=m CONFIG_BLK_DEV_MD=m # CONFIG_BLK_DEV_NVME is not set +# CONFIG_BLK_DEV_PCIESSD_MTIP32XX is not set CONFIG_BLK_DEV_SD=y # CONFIG_BLK_DEV_SR is not set CONFIG_BLK_MQ_PCI=y @@ -160,7 +160,6 @@ CONFIG_CRC32_SLICEBY8=y # CONFIG_CRC_CCITT is not set CONFIG_CRC_ITU_T=m CONFIG_CROSS_MEMORY_ATTACH=y -CONFIG_CRYPTO_ACOMP2=y CONFIG_CRYPTO_AEAD2=y CONFIG_CRYPTO_AEAD=m CONFIG_CRYPTO_AES=m @@ -207,7 +206,6 @@ CONFIG_CRYPTO_ESSIV=m CONFIG_CRYPTO_FCRYPT=m CONFIG_CRYPTO_GCM=m CONFIG_CRYPTO_GHASH=m -CONFIG_CRYPTO_HASH_INFO=y CONFIG_CRYPTO_HMAC=y CONFIG_CRYPTO_HW=y CONFIG_CRYPTO_JITTERENTROPY=m @@ -830,11 +828,7 @@ CONFIG_MTD_OOPS=m # CONFIG_MTD_PHYSMAP_VERSATILE is undefined # CONFIG_MTD_PMC551 is not set CONFIG_MTD_UBI=m -CONFIG_MTD_UBI_BEB_LIMIT=20 -# CONFIG_MTD_UBI_BLOCK is not set -# CONFIG_MTD_UBI_FASTMAP is not set CONFIG_MTD_UBI_GLUEBI=m -CONFIG_MTD_UBI_WL_THRESHOLD=4096 CONFIG_MULTIPLEXER=y # CONFIG_MUX_ADG792A is not set # CONFIG_MUX_MMIO is not set @@ -1523,7 +1517,6 @@ CONFIG_SERIO_SERPORT=y # CONFIG_SFP is undefined CONFIG_SGETMASK_SYSCALL=y # CONFIG_SGI_PARTITION is undefined -CONFIG_SGL_ALLOC=y CONFIG_SG_POOL=y # CONFIG_SIS190 is not set # CONFIG_SIS900 is not set @@ -1602,6 +1595,15 @@ CONFIG_TEXTSEARCH_KMP=m # CONFIG_TPS65010 is undefined CONFIG_TUN=m # CONFIG_TXGBE is not set +# CONFIG_UBIFS_ATIME_SUPPORT is undefined +# CONFIG_UBIFS_FS is undefined +# CONFIG_UBIFS_FS_ADVANCED_COMPR is undefined +# CONFIG_UBIFS_FS_AUTHENTICATION is undefined +# CONFIG_UBIFS_FS_LZO is undefined +# CONFIG_UBIFS_FS_SECURITY is undefined +# CONFIG_UBIFS_FS_XATTR is undefined +# CONFIG_UBIFS_FS_ZLIB is undefined +# CONFIG_UBIFS_FS_ZSTD is undefined # CONFIG_UEVENT_HELPER is not set # CONFIG_UEVENT_HELPER_PATH is undefined # CONFIG_UFS_FS is undefined -- 2.39.2