From 81d0b4a9f431b2b2ca71edca91febedde98994a3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Petr=20=C5=A0tetiar?= Date: Thu, 23 Dec 2021 11:37:55 +0100 Subject: kernel: bump 4.14 to 4.14.259 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit All patches refreshed automagically without conflicts, but upstream in commit 48c2461f28fe ("ARM: 8800/1: use choice for kernel unwinders") added new config options UNWINDER_ARM and UNWINDER_FRAME_POINTER so we need to adjust default configs as well. Run tested on ipq40xx/glinet-b1300 and mvebu/turris-omnia. Signed-off-by: Petr Štetiar Acked-by: Hauke Mehrtens --- target/linux/imx6/config-4.14 | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'target/linux/imx6/config-4.14') diff --git a/target/linux/imx6/config-4.14 b/target/linux/imx6/config-4.14 index 313f657a80..ddbf217376 100644 --- a/target/linux/imx6/config-4.14 +++ b/target/linux/imx6/config-4.14 @@ -49,6 +49,7 @@ CONFIG_ARM_PATCH_IDIV=y CONFIG_ARM_PATCH_PHYS_VIRT=y CONFIG_ARM_THUMB=y # CONFIG_ARM_THUMBEE is not set +CONFIG_ARM_UNWIND=y CONFIG_ARM_VIRT_EXT=y CONFIG_ASN1=y CONFIG_ASSOCIATIVE_ARRAY=y @@ -193,7 +194,6 @@ CONFIG_F2FS_STAT_FS=y CONFIG_FEC=y CONFIG_FIXED_PHY=y CONFIG_FIX_EARLYCON_MEM=y -CONFIG_FRAME_POINTER=y CONFIG_FSL_GUTS=y CONFIG_FS_ENCRYPTION=y CONFIG_FS_MBCACHE=y @@ -494,6 +494,7 @@ CONFIG_UBIFS_FS_ADVANCED_COMPR=y CONFIG_UBIFS_FS_LZO=y CONFIG_UBIFS_FS_ZLIB=y CONFIG_UNCOMPRESS_INCLUDE="debug/uncompress.h" +CONFIG_UNWINDER_ARM=y CONFIG_USB=y CONFIG_USB_CHIPIDEA=y CONFIG_USB_CHIPIDEA_HOST=y -- cgit v1.2.3