From 2bd28301b72bf6df8aacc83eac7bb220bc73872d Mon Sep 17 00:00:00 2001 From: Oliver Smith Date: Sun, 28 Jul 2024 17:29:24 +0200 Subject: [PATCH] linux-postmarketos-rockchip: enable libcamera opts (MR 5391) --- device/community/linux-postmarketos-rockchip/APKBUILD | 4 ++-- .../config-postmarketos-rockchip.aarch64 | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/device/community/linux-postmarketos-rockchip/APKBUILD b/device/community/linux-postmarketos-rockchip/APKBUILD index f91d5cb6a..01163ae0d 100644 --- a/device/community/linux-postmarketos-rockchip/APKBUILD +++ b/device/community/linux-postmarketos-rockchip/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Quade Curry pkgname=linux-postmarketos-rockchip pkgver=6.6.34 -pkgrel=0 +pkgrel=1 pkgdesc="Mainline kernel for rockchip devices" arch="aarch64" _carch="arm64" @@ -72,5 +72,5 @@ package() { sha512sums=" eaa792be65c4cdfd37b84d4dadd22086c8507c1f78d538255cff03595e1caee0f88b521c398b6bc9ab3632010133cff5c7b14200413d54cf0a38bea79c2fd29f linux-6.6.34.tar.xz -64117d03325b7059ff032dca3d5990cefb3ce1c0f74590e6deba37f53b757cd8e10b273c53b6b7d54e55385b4d891c3e7d2d0ff9976520e81157a323243d0242 config-postmarketos-rockchip.aarch64 +d07876065dac96a4f87f4853f0a61264cd41ea7248eb5c7beca04726f7d0b52add9718a20115546d8b9f891c4ca0d1bde98a37ed8c798ea3797a3bdfe98de64b config-postmarketos-rockchip.aarch64 " diff --git a/device/community/linux-postmarketos-rockchip/config-postmarketos-rockchip.aarch64 b/device/community/linux-postmarketos-rockchip/config-postmarketos-rockchip.aarch64 index 7aa80a158..c86cd8f7f 100644 --- a/device/community/linux-postmarketos-rockchip/config-postmarketos-rockchip.aarch64 +++ b/device/community/linux-postmarketos-rockchip/config-postmarketos-rockchip.aarch64 @@ -2,7 +2,7 @@ # Automatically generated file; DO NOT EDIT. # Linux/arm64 6.6.34 Kernel Configuration # -CONFIG_CC_VERSION_TEXT="gcc (Alpine 13.2.1_git20240309) 13.2.1 20240309" +CONFIG_CC_VERSION_TEXT="aarch64-alpine-linux-musl-gcc (Alpine 13.2.1_git20240309) 13.2.1 20240309" CONFIG_CC_IS_GCC=y CONFIG_GCC_VERSION=130201 CONFIG_CLANG_VERSION=0 @@ -11,8 +11,6 @@ CONFIG_AS_VERSION=24200 CONFIG_LD_IS_BFD=y CONFIG_LD_VERSION=24200 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_GCC_ASM_GOTO_OUTPUT_WORKAROUND=y @@ -6186,8 +6184,10 @@ CONFIG_SYNC_FILE=y # CONFIG_DMABUF_MOVE_NOTIFY is not set # CONFIG_DMABUF_DEBUG is not set # CONFIG_DMABUF_SELFTESTS is not set -# CONFIG_DMABUF_HEAPS is not set +CONFIG_DMABUF_HEAPS=y # CONFIG_DMABUF_SYSFS_STATS is not set +# CONFIG_DMABUF_HEAPS_SYSTEM is not set +CONFIG_DMABUF_HEAPS_CMA=y # end of DMABUF options CONFIG_UIO=m