From 875cd3fe7e2bcf2682f9562e14b522e8ca1c4b68 Mon Sep 17 00:00:00 2001 From: Robert Eckelmann Date: Tue, 21 Jan 2025 21:17:51 +0900 Subject: [PATCH] linux-google-nyan: switch to -Os and enable xz compression for modules as reported in #3477, the current kernel configuration causes an oversized image, which cannot be installed. Tests on actual HW welcome closes #3477 Signed-off-by: Robert Eckelmann Part-of: https://gitlab.postmarketos.org/postmarketOS/pmaports/-/merge_requests/6765 --- device/testing/linux-google-nyan/APKBUILD | 2 +- .../config-google-nyan.armv7 | 35 ++++++++++--------- 2 files changed, 20 insertions(+), 17 deletions(-) diff --git a/device/testing/linux-google-nyan/APKBUILD b/device/testing/linux-google-nyan/APKBUILD index e589f211f..184f79bac 100644 --- a/device/testing/linux-google-nyan/APKBUILD +++ b/device/testing/linux-google-nyan/APKBUILD @@ -70,7 +70,7 @@ package() { sha512sums=" 91a6ec0d1e371cad5703bc65016fd930a5da74ca4d862eecdab08846b455b42a6845531322af65d8805210d88dd74c327ca6de1166ed250aa546918e5412c470 linux-6.6.17.tar.xz -34d60ccd84077f4784db482969dda2a602e6576ed0621306258666135c6e91629f800f957d3658ba2c4450dd2970ae904727308d6c1c1b7774e67402fde63ea4 config-google-nyan.armv7 +37358cf29e75ccc1395f19355e00231c643f9c0c4a68843725f269766bf79c919fa0bfe4e6c27759db1b461308b2bc58457fdfedcefeb22aec36740696f8d4e7 config-google-nyan.armv7 4e46d412d6a342044ad348e19cb75b8b90d57fe345eaa341e1c960f73f0c1ef3dd09196eccc3c413e199ac366eb512770e96b60d6a3ad44ec80a930d732d0fd4 0001-ARM-dts-tegra-nyan-add-mmc-aliases.patch f62ce358aed7273320f0163fbaf7425b4800945ac3cdb6a57062b0087c5b2799131d0a48fa1580bff33a4ae33c1ee9ae2c5771887b8b460be2596c7605234a0f 0002-ARM-tegra-nyan-fix-mic-jack-detection.patch a43ecb9f410d2c3168ada6c4788174154627fe6568e9048def2b6ea827b0c7b676f148352e39f6985172bcb85b4d0f77376ec7f94ba33716671f99fe20923504 0003-Revert-spi-Reintroduce-spi_set_cs_timing.patch diff --git a/device/testing/linux-google-nyan/config-google-nyan.armv7 b/device/testing/linux-google-nyan/config-google-nyan.armv7 index dc45f9dc6..e86af1dc0 100644 --- a/device/testing/linux-google-nyan/config-google-nyan.armv7 +++ b/device/testing/linux-google-nyan/config-google-nyan.armv7 @@ -2,17 +2,20 @@ # Automatically generated file; DO NOT EDIT. # Linux/arm 6.6.17 Kernel Configuration # -CONFIG_CC_VERSION_TEXT="armv7-alpine-linux-musleabihf-gcc (Alpine 14.2.0) 14.2.0" +CONFIG_CC_VERSION_TEXT="gcc (Alpine 14.2.0) 14.2.0" CONFIG_CC_IS_GCC=y CONFIG_GCC_VERSION=140200 CONFIG_CLANG_VERSION=0 CONFIG_AS_IS_GNU=y -CONFIG_AS_VERSION=24200 +CONFIG_AS_VERSION=24301 CONFIG_LD_IS_BFD=y -CONFIG_LD_VERSION=24200 +CONFIG_LD_VERSION=24301 CONFIG_LLD_VERSION=0 +CONFIG_CC_CAN_LINK=y +CONFIG_CC_CAN_LINK_STATIC=y CONFIG_CC_HAS_ASM_GOTO_OUTPUT=y CONFIG_CC_HAS_ASM_GOTO_TIED_OUTPUT=y +CONFIG_TOOLS_SUPPORT_RELR=y CONFIG_CC_HAS_ASM_INLINE=y CONFIG_CC_HAS_NO_PROFILE_FN_ATTR=y CONFIG_PAHOLE_VERSION=0 @@ -201,8 +204,8 @@ CONFIG_RD_LZ4=y CONFIG_RD_ZSTD=y # CONFIG_BOOT_CONFIG is not set CONFIG_INITRAMFS_PRESERVE_MTIME=y -CONFIG_CC_OPTIMIZE_FOR_PERFORMANCE=y -# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set +# CONFIG_CC_OPTIMIZE_FOR_PERFORMANCE is not set +CONFIG_CC_OPTIMIZE_FOR_SIZE=y CONFIG_LD_ORPHAN_WARN=y CONFIG_LD_ORPHAN_WARN_LEVEL="warn" CONFIG_SYSCTL=y @@ -478,7 +481,6 @@ CONFIG_ALIGNMENT_TRAP=y # CONFIG_PARAVIRT is not set # CONFIG_PARAVIRT_TIME_ACCOUNTING is not set # CONFIG_XEN is not set -CONFIG_CC_HAVE_STACKPROTECTOR_TLS=y CONFIG_STACKPROTECTOR_PER_TASK=y # end of Kernel Features @@ -605,8 +607,6 @@ CONFIG_ARM_CPU_SUSPEND=y CONFIG_ARCH_HIBERNATION_POSSIBLE=y # end of Power management options -CONFIG_AS_VFP_VMRS_FPINST=y - # # General architecture-dependent options # @@ -695,6 +695,7 @@ CONFIG_ARCH_HAS_GCOV_PROFILE_ALL=y CONFIG_HAVE_GCC_PLUGINS=y CONFIG_GCC_PLUGINS=y # CONFIG_GCC_PLUGIN_LATENT_ENTROPY is not set +CONFIG_GCC_PLUGIN_ARM_SSP_PER_TASK=y CONFIG_FUNCTION_ALIGNMENT=0 # end of General architecture-dependent options @@ -709,10 +710,11 @@ CONFIG_MODULE_UNLOAD=y # CONFIG_MODVERSIONS is not set # CONFIG_MODULE_SRCVERSION_ALL is not set # CONFIG_MODULE_SIG is not set -CONFIG_MODULE_COMPRESS_NONE=y +# CONFIG_MODULE_COMPRESS_NONE is not set # CONFIG_MODULE_COMPRESS_GZIP is not set -# CONFIG_MODULE_COMPRESS_XZ is not set +CONFIG_MODULE_COMPRESS_XZ=y # CONFIG_MODULE_COMPRESS_ZSTD is not set +CONFIG_MODULE_DECOMPRESS=y # CONFIG_MODULE_ALLOW_MISSING_NAMESPACE_IMPORTS is not set CONFIG_MODPROBE_PATH="/sbin/modprobe" # CONFIG_TRIM_UNUSED_KSYMS is not set @@ -1941,7 +1943,7 @@ CONFIG_ZRAM_DEF_COMP="lzo-rle" # CONFIG_ZRAM_WRITEBACK is not set # CONFIG_ZRAM_MEMORY_TRACKING is not set # CONFIG_ZRAM_MULTI_COMP is not set -CONFIG_BLK_DEV_LOOP=y +CONFIG_BLK_DEV_LOOP=m CONFIG_BLK_DEV_LOOP_MIN_COUNT=8 # CONFIG_BLK_DEV_DRBD is not set CONFIG_BLK_DEV_NBD=m @@ -1964,18 +1966,18 @@ CONFIG_VIRTIO_BLK=m # # Misc devices # -CONFIG_AD525X_DPOT=y -CONFIG_AD525X_DPOT_I2C=y +CONFIG_AD525X_DPOT=m +CONFIG_AD525X_DPOT_I2C=m # CONFIG_AD525X_DPOT_SPI is not set # CONFIG_DUMMY_IRQ is not set # CONFIG_PHANTOM is not set # CONFIG_TIFM_CORE is not set -CONFIG_ICS932S401=y +CONFIG_ICS932S401=m # CONFIG_ENCLOSURE_SERVICES is not set # CONFIG_HI6421V600_IRQ is not set # CONFIG_HP_ILO is not set -CONFIG_APDS9802ALS=y -CONFIG_ISL29003=y +CONFIG_APDS9802ALS=m +CONFIG_ISL29003=m # CONFIG_ISL29020 is not set # CONFIG_SENSORS_TSL2550 is not set # CONFIG_SENSORS_BH1770 is not set @@ -8040,6 +8042,7 @@ CONFIG_ARCH_HAS_DEBUG_VIRTUAL=y CONFIG_HAVE_ARCH_KASAN=y CONFIG_HAVE_ARCH_KASAN_VMALLOC=y CONFIG_CC_HAS_KASAN_GENERIC=y +CONFIG_CC_HAS_KASAN_SW_TAGS=y CONFIG_CC_HAS_WORKING_NOSANITIZE_ADDRESS=y # CONFIG_KASAN is not set CONFIG_HAVE_ARCH_KFENCE=y