diff --git a/device/testing/linux-google-nyan/APKBUILD b/device/testing/linux-google-nyan/APKBUILD index 384461c94..5bce5ba33 100644 --- a/device/testing/linux-google-nyan/APKBUILD +++ b/device/testing/linux-google-nyan/APKBUILD @@ -2,7 +2,7 @@ # Co-Maintainer: Segfault pkgname=linux-google-nyan pkgver=6.6.17 -pkgrel=6 +pkgrel=7 pkgdesc="Mainline kernel fork for Google Nyan Chromebooks" arch="armv7" _carch="arm" @@ -70,7 +70,7 @@ package() { sha512sums=" 91a6ec0d1e371cad5703bc65016fd930a5da74ca4d862eecdab08846b455b42a6845531322af65d8805210d88dd74c327ca6de1166ed250aa546918e5412c470 linux-6.6.17.tar.xz -739ca0604344267ab82fc5d80287ca20e1048e4e0e192d3dec385d605e1f1c23338b870466352b9cdabdcbe179bd5facf9f44cf89ee868733e902435563647a4 config-google-nyan.armv7 +18bb48c07971cae859bd51195dd1df01bcb703170e316329da2c1c8459d1ea730fb5e5125aba7a414315e9f095795567b1c2aa51a0ff66c36d213ee6abd02915 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 ad8a6ae98..55151a64a 100644 --- a/device/testing/linux-google-nyan/config-google-nyan.armv7 +++ b/device/testing/linux-google-nyan/config-google-nyan.armv7 @@ -2,20 +2,17 @@ # Automatically generated file; DO NOT EDIT. # Linux/arm 6.6.17 Kernel Configuration # -CONFIG_CC_VERSION_TEXT="gcc (Alpine 14.2.0) 14.2.0" +CONFIG_CC_VERSION_TEXT="armv7-alpine-linux-musleabihf-gcc (Alpine 14.3.0) 14.3.0" CONFIG_CC_IS_GCC=y -CONFIG_GCC_VERSION=140200 +CONFIG_GCC_VERSION=140300 CONFIG_CLANG_VERSION=0 CONFIG_AS_IS_GNU=y -CONFIG_AS_VERSION=24301 +CONFIG_AS_VERSION=24400 CONFIG_LD_IS_BFD=y -CONFIG_LD_VERSION=24301 +CONFIG_LD_VERSION=24400 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 @@ -481,6 +478,7 @@ 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 @@ -607,6 +605,8 @@ 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,7 +695,6 @@ 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 @@ -5475,6 +5474,7 @@ CONFIG_HID_PICOLCD_LCD=y CONFIG_HID_PICOLCD_LEDS=y CONFIG_HID_PLANTRONICS=m CONFIG_HID_PLAYSTATION=m +# CONFIG_PLAYSTATION_FF is not set CONFIG_HID_PXRC=m CONFIG_HID_RAZER=m CONFIG_HID_PRIMAX=m @@ -6168,7 +6168,7 @@ CONFIG_TI_EDMA=y # CONFIG_SYNC_FILE=y # CONFIG_SW_SYNC is not set -# CONFIG_UDMABUF is not set +CONFIG_UDMABUF=y # CONFIG_DMABUF_MOVE_NOTIFY is not set # CONFIG_DMABUF_DEBUG is not set # CONFIG_DMABUF_SELFTESTS is not set @@ -8041,7 +8041,6 @@ 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