From patchwork Fri Nov 5 22:17:56 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Giulio Benetti X-Patchwork-Id: 1551584 Return-Path: X-Original-To: incoming-buildroot@patchwork.ozlabs.org Delivered-To: patchwork-incoming-buildroot@bilbo.ozlabs.org Authentication-Results: bilbo.ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=aruba.it header.i=@aruba.it header.a=rsa-sha256 header.s=a1 header.b=WXoXu2Yi; dkim-atps=neutral Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=buildroot.org (client-ip=140.211.166.136; helo=smtp3.osuosl.org; envelope-from=buildroot-bounces@buildroot.org; receiver=) Received: from smtp3.osuosl.org (smtp3.osuosl.org [140.211.166.136]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by bilbo.ozlabs.org (Postfix) with ESMTPS id 4HmFKG2KkVz9sPf for ; Sat, 6 Nov 2021 09:18:58 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by smtp3.osuosl.org (Postfix) with ESMTP id 988B96F949; Fri, 5 Nov 2021 22:18:56 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from smtp3.osuosl.org ([127.0.0.1]) by localhost (smtp3.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 3Klqm8wfycSF; Fri, 5 Nov 2021 22:18:55 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by smtp3.osuosl.org (Postfix) with ESMTP id 59F296F942; Fri, 5 Nov 2021 22:18:54 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from smtp3.osuosl.org (smtp3.osuosl.org [140.211.166.136]) by ash.osuosl.org (Postfix) with ESMTP id 3B1061C1135 for ; Fri, 5 Nov 2021 22:18:08 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by smtp3.osuosl.org (Postfix) with ESMTP id 280076F935 for ; Fri, 5 Nov 2021 22:18:07 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from smtp3.osuosl.org ([127.0.0.1]) by localhost (smtp3.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 4jAeIcNOeSnD for ; Fri, 5 Nov 2021 22:18:05 +0000 (UTC) X-Greylist: from auto-whitelisted by SQLgrey-1.8.0 Received: from smtpcmd15176.aruba.it (smtpcmd15176.aruba.it [62.149.156.176]) by smtp3.osuosl.org (Postfix) with ESMTP id D313C616F4 for ; Fri, 5 Nov 2021 22:18:04 +0000 (UTC) Received: from ubuntu.localdomain ([146.241.216.221]) by Aruba Outgoing Smtp with ESMTPSA id j7X7mGJ7s5cjnj7X9m4SPq; Fri, 05 Nov 2021 23:18:03 +0100 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=aruba.it; s=a1; t=1636150683; bh=yd+HldWTfhciniwjBpPwLdTkiL0Iu6kTQBY9DBwAlt4=; h=From:To:Subject:Date:MIME-Version; b=WXoXu2YidnwJtX7pTvZGw0R2gknoOjD1PYcEUZuWBMacYnPwS6XqFBx86Ru8VA/39 3QHK/XhCtuohj9VZ1wruN2a4fzAp7lrhqHrCU7s8TVdJLYEQLBs4TI9Sio2cTuZOcd 8jZS5UT9dMAJF/lEAjoJD9C27T5UODs2RTKzHewc5+0s03rtBz94qoF+RIDIFDlliV Gp64KX0/P3VHSq9y/d42NGH1JH1FF+gShTddrC9w9TW2C8oeqphMjU+IQEntq3njwr 6ax1bjhutG+w/Fe53Olc0aIG/QbwQUPWGqM0aNTWzFlWQDJyE7USkPKDnkIyRAlgfJ rjiT94GOhdD/w== From: Giulio Benetti To: buildroot@buildroot.org Date: Fri, 5 Nov 2021 23:17:56 +0100 Message-Id: <20211105221800.1451167-2-giulio.benetti@benettiengineering.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20211105221800.1451167-1-giulio.benetti@benettiengineering.com> References: <20211105221800.1451167-1-giulio.benetti@benettiengineering.com> MIME-Version: 1.0 X-CMAE-Envelope: MS4xfPhBM14PQSPVxppgvUBdukMA1xyGm/HGno3E0+W+V+UwhhBYrQGaVwN50r1ncrqUds76tu2r2L70uPW0F2AHwG0vxpliAVA5PIhZ2dSqjsYKaxr2K3cW GSQZCqVmXFhCv2IQGSbgq2ECtZck6tVcxFkZLqubIAjBJ3fJkCa66yJeHAwNaoJXrHJC9FHKBBXO4RFQNmRZ4garLzUWv7rzFcQfFrec33vt1076waUAPlOG XxyVuc+a8IIJiD4AWguLfw7SzDQC8q01Xa36TWgaFnwCHbwqH75GD/z8TfcKn7BkzadPFGg8W/74acNqm0a3wpdkcBoCLXTZj0ebaw1HhEmC0yn1PpuDU2pi lcOEAuRa89lfUoeCwzJZ1CluEWXCLj5zCSoL4nTsYMrR3YNWga3kBsfWWqXo40zvc2w922hbl7CsdnPMYgX9OyJ1l5lzZL7BtlbULe1sFMkIQwz70cXnMfQe Ef36MwUW8lDGTmLtCoEP+otxKuM6z0PBttXH2uk/fQ8lOBb2D1BHWNF+BgVWqXABHYxDPS0hoJ5rIL+fDV35MCp1rOb2fWrTcmvRzw== Subject: [Buildroot] [PATCH v2 1/5] package/sunxi-mali-utgard: rename from sunxi-mali-mainline X-BeenThere: buildroot@buildroot.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Julien Olivain , Peter Seiderer , Julien Corjon , Thomas Petazzoni , Miquel Raynal , Luca Ceresoli , Giulio Benetti , Thomas De Schampheleire Errors-To: buildroot-bounces@buildroot.org Sender: "buildroot" From: Miquel Raynal This package provides Mali libraries for Sunxi Mali Utgard GPUs. The trailing -mainline is historical and was used at a time when there was two packages providing these libraries. The "non-upstream" package has been removed some time ago so before adding new packages bringing support for other ARM Mali GPU versions or implementations, rename sunxi-mali-mainline into sunxi-mali-utgard. Add a legacy entry. Signed-off-by: Miquel Raynal Signed-off-by: Giulio Benetti [Giulio: rebase on master. Rename SUNXI_MALI_MAINLINE_REV to SUNXI_MALI_UTGARD_REV in sunxi-mali-mailine-driver.mk and BR2_PACKAGE_SUNXI_MALI_MAINLINE to BR2_PACKAGE_SUNXI_UTGARD in sunxi-mali-mainline-driver/Config.in to respect bisectability] Tested-by: Luca Ceresoli [Build tested only] Reviewed-by: Luca Ceresoli --- Config.in.legacy | 30 ++++++++++++ DEVELOPERS | 2 +- configs/olimex_a20_olinuxino_lime2_defconfig | 4 +- configs/olimex_a20_olinuxino_lime_defconfig | 4 +- docs/manual/adding-packages-virtual.txt | 2 +- package/Config.in | 2 +- package/glslsandbox-player/Config.in | 4 +- .../glslsandbox-player/glslsandbox-player.mk | 2 +- package/qt5/qt5base/qt5base.mk | 2 +- package/sunxi-mali-mainline-driver/Config.in | 4 +- .../sunxi-mali-mainline-driver.mk | 6 +-- package/sunxi-mali-mainline/Config.in | 42 ---------------- .../sunxi-mali-mainline.mk | 49 ------------------- package/sunxi-mali-utgard/Config.in | 43 ++++++++++++++++ .../egl.pc | 0 .../glesv2.pc | 0 .../sunxi-mali-utgard.hash} | 2 +- .../sunxi-mali-utgard/sunxi-mali-utgard.mk | 49 +++++++++++++++++++ 18 files changed, 139 insertions(+), 108 deletions(-) delete mode 100644 package/sunxi-mali-mainline/Config.in delete mode 100644 package/sunxi-mali-mainline/sunxi-mali-mainline.mk create mode 100644 package/sunxi-mali-utgard/Config.in rename package/{sunxi-mali-mainline => sunxi-mali-utgard}/egl.pc (100%) rename package/{sunxi-mali-mainline => sunxi-mali-utgard}/glesv2.pc (100%) rename package/{sunxi-mali-mainline/sunxi-mali-mainline.hash => sunxi-mali-utgard/sunxi-mali-utgard.hash} (70%) create mode 100644 package/sunxi-mali-utgard/sunxi-mali-utgard.mk diff --git a/Config.in.legacy b/Config.in.legacy index 24d0dc1d51..a209537423 100644 --- a/Config.in.legacy +++ b/Config.in.legacy @@ -144,6 +144,36 @@ endif ############################################################################### +config BR2_PACKAGE_SUNXI_MALI_MAINLINE + bool "sunxi-mali-mainline package was renamed" + select BR2_LEGACY + select BR2_PACKAGE_SUNXI_MALI_UTGARD + help + Since the removal of the sunxi-mali package, the + sunxi-mali-mainline package that coexisted became the only + package to provide Mali blobs. The "-mainline" suffix being + undescriptive nowadays and before adding new packages bringing + Mali support for other SoCs/GPU flavors, it is clearer to + rename it SUNXI_MALI_UTGARD. + +config BR2_PACKAGE_SUNXI_MALI_MAINLINE_R6P2 + bool "sunxi-mali-mainline-r6p2 was renamed" + select BR2_LEGACY + select BR2_PACKAGE_SUNXI_MALI_UTGARD_R6P2 + help + The sunxi-mali-mainline package has been renamed + sunxi-mali-utgard, the suboptions of this package have also + been renamed accordingly. + +config BR2_PACKAGE_SUNXI_MALI_MAINLINE_R8P1 + bool "sunxi-mali-mainline-r8p1 was renamed" + select BR2_LEGACY + select BR2_PACKAGE_SUNXI_MALI_UTGARD_R8P1 + help + The sunxi-mali-mainline package has been renamed + sunxi-mali-utgard, the suboptions of this package have also + been renamed accordingly. + comment "Legacy options removed in 2021.11" config BR2_PACKAGE_MROUTED_RSRR diff --git a/DEVELOPERS b/DEVELOPERS index 9d0e92b564..7eda2cf197 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1065,8 +1065,8 @@ F: package/libnss/ F: package/minicom/ F: package/nfs-utils/ F: package/python-uvloop/ -F: package/sunxi-mali-mainline/ F: package/sunxi-mali-mainline-driver/ +F: package/sunxi-mali-utgard/ F: package/trace-cmd/ F: package/udisks/ F: toolchain/ diff --git a/configs/olimex_a20_olinuxino_lime2_defconfig b/configs/olimex_a20_olinuxino_lime2_defconfig index ed279326bc..319ac48c58 100644 --- a/configs/olimex_a20_olinuxino_lime2_defconfig +++ b/configs/olimex_a20_olinuxino_lime2_defconfig @@ -8,7 +8,7 @@ BR2_ARM_FPU_NEON_VFPV4=y BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_14=y # Toolchain -# glibc is needed for sunxi-mali-mainline-package. +# glibc is needed for sunxi-mali-utgard package. BR2_TOOLCHAIN_BUILDROOT_GLIBC=y # System configuration @@ -32,7 +32,7 @@ BR2_LINUX_KERNEL_INSTALL_TARGET=y # sunxi packages BR2_PACKAGE_SUNXI_TOOLS=y -BR2_PACKAGE_SUNXI_MALI_MAINLINE=y +BR2_PACKAGE_SUNXI_MALI_UTGARD=y BR2_PACKAGE_SUNXI_MALI_MAINLINE_DRIVER=y # Filesystem diff --git a/configs/olimex_a20_olinuxino_lime_defconfig b/configs/olimex_a20_olinuxino_lime_defconfig index cd88a2d19a..4cec5689ca 100644 --- a/configs/olimex_a20_olinuxino_lime_defconfig +++ b/configs/olimex_a20_olinuxino_lime_defconfig @@ -8,7 +8,7 @@ BR2_ARM_FPU_NEON_VFPV4=y BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_14=y # Toolchain -# glibc is needed for sunxi-mali-mainline-package. +# glibc is needed for sunxi-mali-utgard package. BR2_TOOLCHAIN_BUILDROOT_GLIBC=y # System configuration @@ -32,7 +32,7 @@ BR2_LINUX_KERNEL_INSTALL_TARGET=y # sunxi packages BR2_PACKAGE_SUNXI_TOOLS=y -BR2_PACKAGE_SUNXI_MALI_MAINLINE=y +BR2_PACKAGE_SUNXI_MALI_UTGARD=y BR2_PACKAGE_SUNXI_MALI_MAINLINE_DRIVER=y # Filesystem diff --git a/docs/manual/adding-packages-virtual.txt b/docs/manual/adding-packages-virtual.txt index 6326bb5455..722e6e3771 100644 --- a/docs/manual/adding-packages-virtual.txt +++ b/docs/manual/adding-packages-virtual.txt @@ -13,7 +13,7 @@ the provider used in the rootfs. For example, 'OpenGL ES' is an API for 2D and 3D graphics on embedded systems. The implementation of this API is different for the 'Allwinner Tech Sunxi' and the 'Texas Instruments OMAP35xx' platforms. So +libgles+ will be a virtual -package and +sunxi-mali+ and +ti-gfx+ will be the providers. +package and +sunxi-mali-utgard+ and +ti-gfx+ will be the providers. ==== +virtual-package+ tutorial diff --git a/package/Config.in b/package/Config.in index c23755a421..1006161497 100644 --- a/package/Config.in +++ b/package/Config.in @@ -568,8 +568,8 @@ endmenu source "package/statserial/Config.in" source "package/stm32flash/Config.in" source "package/sunxi-cedarx/Config.in" - source "package/sunxi-mali-mainline/Config.in" source "package/sunxi-mali-mainline-driver/Config.in" + source "package/sunxi-mali-utgard/Config.in" source "package/sysstat/Config.in" source "package/targetcli-fb/Config.in" source "package/ti-gfx/Config.in" diff --git a/package/glslsandbox-player/Config.in b/package/glslsandbox-player/Config.in index 02d4c442ed..2d15a7e270 100644 --- a/package/glslsandbox-player/Config.in +++ b/package/glslsandbox-player/Config.in @@ -55,7 +55,7 @@ config BR2_PACKAGE_GLSLSANDBOX_PLAYER_SCRIPTS choice prompt "Native windowing system" - default BR2_PACKAGE_GLSLSANDBOX_PLAYER_MALI if BR2_PACKAGE_SUNXI_MALI_MAINLINE + default BR2_PACKAGE_GLSLSANDBOX_PLAYER_MALI if BR2_PACKAGE_SUNXI_MALI_UTGARD default BR2_PACKAGE_GLSLSANDBOX_PLAYER_MALI_T76X if BR2_PACKAGE_MALI_T76X default BR2_PACKAGE_GLSLSANDBOX_PLAYER_RPI if BR2_PACKAGE_RPI_USERLAND default BR2_PACKAGE_GLSLSANDBOX_PLAYER_SDL2 if BR2_PACKAGE_SDL2_OPENGLES @@ -73,7 +73,7 @@ config BR2_PACKAGE_GLSLSANDBOX_PLAYER_KMS config BR2_PACKAGE_GLSLSANDBOX_PLAYER_MALI bool "Allwinner ARM/Mali Frame Buffer" - depends on BR2_PACKAGE_SUNXI_MALI_MAINLINE + depends on BR2_PACKAGE_SUNXI_MALI_UTGARD config BR2_PACKAGE_GLSLSANDBOX_PLAYER_MALI_T76X bool "ARM/Mali T76x Frame Buffer" diff --git a/package/glslsandbox-player/glslsandbox-player.mk b/package/glslsandbox-player/glslsandbox-player.mk index 1578608a42..c5fbf062b7 100644 --- a/package/glslsandbox-player/glslsandbox-player.mk +++ b/package/glslsandbox-player/glslsandbox-player.mk @@ -42,7 +42,7 @@ ifeq ($(BR2_PACKAGE_GLSLSANDBOX_PLAYER_KMS),y) GLSLSANDBOX_PLAYER_DEPENDENCIES += libdrm GLSLSANDBOX_PLAYER_CONF_OPTS += --with-native-gfx=kms else ifeq ($(BR2_PACKAGE_GLSLSANDBOX_PLAYER_MALI),y) -GLSLSANDBOX_PLAYER_DEPENDENCIES += sunxi-mali-mainline +GLSLSANDBOX_PLAYER_DEPENDENCIES += sunxi-mali-utgard GLSLSANDBOX_PLAYER_CONF_OPTS += --with-native-gfx=mali else ifeq ($(BR2_PACKAGE_GLSLSANDBOX_PLAYER_MALI_T76X),y) GLSLSANDBOX_PLAYER_DEPENDENCIES += mali-t76x diff --git a/package/qt5/qt5base/qt5base.mk b/package/qt5/qt5base/qt5base.mk index 9da3de468a..7c52b7a0fe 100644 --- a/package/qt5/qt5base/qt5base.mk +++ b/package/qt5/qt5base/qt5base.mk @@ -262,7 +262,7 @@ endif ifeq ($(BR2_PACKAGE_IMX_GPU_VIV),y) # use vivante backend QT5BASE_EGLFS_DEVICE = EGLFS_DEVICE_INTEGRATION = eglfs_viv -else ifeq ($(BR2_PACKAGE_SUNXI_MALI_MAINLINE),y) +else ifeq ($(BR2_PACKAGE_SUNXI_MALI_UTGARD),y) # use mali backend QT5BASE_EGLFS_DEVICE = EGLFS_DEVICE_INTEGRATION = eglfs_mali endif diff --git a/package/sunxi-mali-mainline-driver/Config.in b/package/sunxi-mali-mainline-driver/Config.in index 90bc308bc5..236470db53 100644 --- a/package/sunxi-mali-mainline-driver/Config.in +++ b/package/sunxi-mali-mainline-driver/Config.in @@ -1,11 +1,11 @@ comment "sunxi-mali-mainline-driver needs a Linux kernel to be built" - depends on BR2_PACKAGE_SUNXI_MALI_MAINLINE + depends on BR2_PACKAGE_SUNXI_MALI_UTGARD depends on !BR2_LINUX_KERNEL config BR2_PACKAGE_SUNXI_MALI_MAINLINE_DRIVER bool "sunxi-mali-mainline-driver" default y - depends on BR2_PACKAGE_SUNXI_MALI_MAINLINE # runtime + depends on BR2_PACKAGE_SUNXI_MALI_UTGARD # runtime depends on BR2_LINUX_KERNEL select BR2_LINUX_NEEDS_MODULES # not using kernel-module infra help diff --git a/package/sunxi-mali-mainline-driver/sunxi-mali-mainline-driver.mk b/package/sunxi-mali-mainline-driver/sunxi-mali-mainline-driver.mk index feffaa7ae6..6782ca7fc2 100644 --- a/package/sunxi-mali-mainline-driver/sunxi-mali-mainline-driver.mk +++ b/package/sunxi-mali-mainline-driver/sunxi-mali-mainline-driver.mk @@ -15,7 +15,7 @@ SUNXI_MALI_MAINLINE_DRIVER_MAKE_OPTS = \ KDIR=$(LINUX_DIR) define SUNXI_MALI_MAINLINE_DRIVER_USE_APPLY_PATCHES - ln -sf $(SUNXI_MALI_MAINLINE_REV)/series $(@D)/patches + ln -sf $(SUNXI_MALI_UTGARD_REV)/series $(@D)/patches $(SED) 's|quilt push -a|$(TOPDIR)/support/scripts/apply-patches.sh . ../patches|' \ $(@D)/build.sh endef @@ -24,12 +24,12 @@ SUNXI_MALI_MAINLINE_DRIVER_POST_PATCH_HOOKS += SUNXI_MALI_MAINLINE_DRIVER_USE_AP define SUNXI_MALI_MAINLINE_DRIVER_BUILD_CMDS cd $(@D) && $(SUNXI_MALI_MAINLINE_DRIVER_MAKE_OPTS) \ - $(SHELL) ./build.sh -r $(SUNXI_MALI_MAINLINE_REV) -j $(PARALLEL_JOBS) -b + $(SHELL) ./build.sh -r $(SUNXI_MALI_UTGARD_REV) -j $(PARALLEL_JOBS) -b endef define SUNXI_MALI_MAINLINE_DRIVER_INSTALL_TARGET_CMDS cd $(@D) && $(SUNXI_MALI_MAINLINE_DRIVER_MAKE_OPTS) \ - $(SHELL) ./build.sh -r $(SUNXI_MALI_MAINLINE_REV) -j $(PARALLEL_JOBS) -i + $(SHELL) ./build.sh -r $(SUNXI_MALI_UTGARD_REV) -j $(PARALLEL_JOBS) -i endef define SUNXI_MALI_MAINLINE_DRIVER_LINUX_CONFIG_FIXUPS diff --git a/package/sunxi-mali-mainline/Config.in b/package/sunxi-mali-mainline/Config.in deleted file mode 100644 index a2fb95bd79..0000000000 --- a/package/sunxi-mali-mainline/Config.in +++ /dev/null @@ -1,42 +0,0 @@ -config BR2_PACKAGE_SUNXI_MALI_MAINLINE - bool "sunxi-mali-mainline" - depends on BR2_aarch64 || (BR2_ARM_EABIHF && BR2_arm) - depends on BR2_TOOLCHAIN_USES_GLIBC - select BR2_PACKAGE_HAS_LIBEGL - select BR2_PACKAGE_HAS_LIBGLES - help - Install userspace Allwinner OpenGL libraries. - - https://github.com/bootlin/mali-blobs - -if BR2_PACKAGE_SUNXI_MALI_MAINLINE - -config BR2_PACKAGE_PROVIDES_LIBEGL - default "sunxi-mali-mainline" - -config BR2_PACKAGE_PROVIDES_LIBGLES - default "sunxi-mali-mainline" - -choice - prompt "Version" - default BR2_PACKAGE_SUNXI_MALI_MAINLINE_R6P2 - help - Select the version of the userspace module. - -config BR2_PACKAGE_SUNXI_MALI_MAINLINE_R6P2 - bool "r6p2" -config BR2_PACKAGE_SUNXI_MALI_MAINLINE_R8P1 - bool "r8p1" - -endchoice - -config BR2_PACKAGE_SUNXI_MALI_MAINLINE_REVISION - string - default "r6p2" if BR2_PACKAGE_SUNXI_MALI_MAINLINE_R6P2 - default "r8p1" if BR2_PACKAGE_SUNXI_MALI_MAINLINE_R8P1 - -endif - -comment "sunxi-mali needs an EABIhf glibc toolchain" - depends on BR2_arm - depends on !BR2_TOOLCHAIN_USES_GLIBC || !BR2_ARM_EABIHF diff --git a/package/sunxi-mali-mainline/sunxi-mali-mainline.mk b/package/sunxi-mali-mainline/sunxi-mali-mainline.mk deleted file mode 100644 index b46f572311..0000000000 --- a/package/sunxi-mali-mainline/sunxi-mali-mainline.mk +++ /dev/null @@ -1,49 +0,0 @@ -################################################################################ -# -# sunxi-mali-mainline -# -################################################################################ - -SUNXI_MALI_MAINLINE_VERSION = 418f55585e76f375792dbebb3e97532f0c1c556d -SUNXI_MALI_MAINLINE_SITE = $(call github,bootlin,mali-blobs,$(SUNXI_MALI_MAINLINE_VERSION)) -SUNXI_MALI_MAINLINE_INSTALL_STAGING = YES -SUNXI_MALI_MAINLINE_PROVIDES = libegl libgles -SUNXI_MALI_MAINLINE_LICENSE = Allwinner End User Licence Agreement -SUNXI_MALI_MAINLINE_EULA_ORIGINAL = EULA\ for\ Mali\ 400MP\ _AW.pdf -SUNXI_MALI_MAINLINE_EULA_NO_SPACES = EULA_for_Mali_400MP_AW.pdf -SUNXI_MALI_MAINLINE_LICENSE_FILES = $(SUNXI_MALI_MAINLINE_EULA_NO_SPACES) - -SUNXI_MALI_MAINLINE_REV = $(call qstrip,$(BR2_PACKAGE_SUNXI_MALI_MAINLINE_REVISION)) - -ifeq ($(BR2_arm),y) -SUNXI_MALI_MAINLINE_ARCH=arm -else ifeq ($(BR2_aarch64),y) -SUNXI_MALI_MAINLINE_ARCH=arm64 -endif - -define SUNXI_MALI_MAINLINE_INSTALL_STAGING_CMDS - mkdir -p $(STAGING_DIR)/usr/lib $(STAGING_DIR)/usr/include - - cp -rf $(@D)/$(SUNXI_MALI_MAINLINE_REV)/$(SUNXI_MALI_MAINLINE_ARCH)/fbdev/*.so* \ - $(STAGING_DIR)/usr/lib/ - cp -rf $(@D)/include/fbdev/* $(STAGING_DIR)/usr/include/ - - $(INSTALL) -D -m 0644 package/sunxi-mali-mainline/egl.pc \ - $(STAGING_DIR)/usr/lib/pkgconfig/egl.pc - $(INSTALL) -D -m 0644 package/sunxi-mali-mainline/glesv2.pc \ - $(STAGING_DIR)/usr/lib/pkgconfig/glesv2.pc -endef - -define SUNXI_MALI_MAINLINE_INSTALL_TARGET_CMDS - mkdir -p $(TARGET_DIR)/usr/lib - cp -rf $(@D)/$(SUNXI_MALI_MAINLINE_REV)/$(SUNXI_MALI_MAINLINE_ARCH)/fbdev/*.so* \ - $(TARGET_DIR)/usr/lib/ -endef - -define SUNXI_MALI_MAINLINE_FIXUP_LICENSE_FILE - mv $(@D)/$(SUNXI_MALI_MAINLINE_EULA_ORIGINAL) $(@D)/$(SUNXI_MALI_MAINLINE_EULA_NO_SPACES) -endef - -SUNXI_MALI_MAINLINE_POST_PATCH_HOOKS += SUNXI_MALI_MAINLINE_FIXUP_LICENSE_FILE - -$(eval $(generic-package)) diff --git a/package/sunxi-mali-utgard/Config.in b/package/sunxi-mali-utgard/Config.in new file mode 100644 index 0000000000..ff49ea03f1 --- /dev/null +++ b/package/sunxi-mali-utgard/Config.in @@ -0,0 +1,43 @@ +config BR2_PACKAGE_SUNXI_MALI_UTGARD + bool "sunxi-mali-utgard" + depends on BR2_aarch64 || (BR2_ARM_EABIHF && BR2_arm) + depends on BR2_TOOLCHAIN_USES_GLIBC + select BR2_PACKAGE_HAS_LIBEGL + select BR2_PACKAGE_HAS_LIBGLES + help + Install userspace Allwinner OpenGL libraries for Mali + Utgard GPUs. + + https://github.com/bootlin/mali-blobs + +if BR2_PACKAGE_SUNXI_MALI_UTGARD + +config BR2_PACKAGE_PROVIDES_LIBEGL + default "sunxi-mali-utgard" + +config BR2_PACKAGE_PROVIDES_LIBGLES + default "sunxi-mali-utgard" + +choice + prompt "Version" + default BR2_PACKAGE_SUNXI_MALI_UTGARD_R6P2 + help + Select the version of the userspace module. + +config BR2_PACKAGE_SUNXI_MALI_UTGARD_R6P2 + bool "r6p2" +config BR2_PACKAGE_SUNXI_MALI_UTGARD_R8P1 + bool "r8p1" + +endchoice + +config BR2_PACKAGE_SUNXI_MALI_UTGARD_REVISION + string + default "r6p2" if BR2_PACKAGE_SUNXI_MALI_UTGARD_R6P2 + default "r8p1" if BR2_PACKAGE_SUNXI_MALI_UTGARD_R8P1 + +endif + +comment "sunxi-mali-utgard needs an EABIhf glibc toolchain" + depends on BR2_arm + depends on !BR2_TOOLCHAIN_USES_GLIBC || !BR2_ARM_EABIHF diff --git a/package/sunxi-mali-mainline/egl.pc b/package/sunxi-mali-utgard/egl.pc similarity index 100% rename from package/sunxi-mali-mainline/egl.pc rename to package/sunxi-mali-utgard/egl.pc diff --git a/package/sunxi-mali-mainline/glesv2.pc b/package/sunxi-mali-utgard/glesv2.pc similarity index 100% rename from package/sunxi-mali-mainline/glesv2.pc rename to package/sunxi-mali-utgard/glesv2.pc diff --git a/package/sunxi-mali-mainline/sunxi-mali-mainline.hash b/package/sunxi-mali-utgard/sunxi-mali-utgard.hash similarity index 70% rename from package/sunxi-mali-mainline/sunxi-mali-mainline.hash rename to package/sunxi-mali-utgard/sunxi-mali-utgard.hash index 96d8251f16..c86b927ea5 100644 --- a/package/sunxi-mali-mainline/sunxi-mali-mainline.hash +++ b/package/sunxi-mali-utgard/sunxi-mali-utgard.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 b5e7e8f9f2886ed0b273f72ea16ae4868711726fe33e3d80ef24e86269c90fd2 sunxi-mali-mainline-418f55585e76f375792dbebb3e97532f0c1c556d.tar.gz +sha256 b5e7e8f9f2886ed0b273f72ea16ae4868711726fe33e3d80ef24e86269c90fd2 sunxi-mali-utgard-418f55585e76f375792dbebb3e97532f0c1c556d.tar.gz sha256 8a06bcae44a41a886f339b4338422415a786787f113e9ed6456ae117104a0b6a EULA_for_Mali_400MP_AW.pdf diff --git a/package/sunxi-mali-utgard/sunxi-mali-utgard.mk b/package/sunxi-mali-utgard/sunxi-mali-utgard.mk new file mode 100644 index 0000000000..f693667955 --- /dev/null +++ b/package/sunxi-mali-utgard/sunxi-mali-utgard.mk @@ -0,0 +1,49 @@ +################################################################################ +# +# sunxi-mali-utgard +# +################################################################################ + +SUNXI_MALI_UTGARD_VERSION = 418f55585e76f375792dbebb3e97532f0c1c556d +SUNXI_MALI_UTGARD_SITE = $(call github,bootlin,mali-blobs,$(SUNXI_MALI_UTGARD_VERSION)) +SUNXI_MALI_UTGARD_INSTALL_STAGING = YES +SUNXI_MALI_UTGARD_PROVIDES = libegl libgles +SUNXI_MALI_UTGARD_LICENSE = Allwinner End User Licence Agreement +SUNXI_MALI_UTGARD_EULA_ORIGINAL = EULA\ for\ Mali\ 400MP\ _AW.pdf +SUNXI_MALI_UTGARD_EULA_NO_SPACES = EULA_for_Mali_400MP_AW.pdf +SUNXI_MALI_UTGARD_LICENSE_FILES = $(SUNXI_MALI_UTGARD_EULA_NO_SPACES) + +SUNXI_MALI_UTGARD_REV = $(call qstrip,$(BR2_PACKAGE_SUNXI_MALI_UTGARD_REVISION)) + +ifeq ($(BR2_arm),y) +SUNXI_MALI_UTGARD_ARCH=arm +else ifeq ($(BR2_aarch64),y) +SUNXI_MALI_UTGARD_ARCH=arm64 +endif + +define SUNXI_MALI_UTGARD_INSTALL_STAGING_CMDS + mkdir -p $(STAGING_DIR)/usr/lib $(STAGING_DIR)/usr/include + + cp -rf $(@D)/$(SUNXI_MALI_UTGARD_REV)/$(SUNXI_MALI_UTGARD_ARCH)/fbdev/*.so* \ + $(STAGING_DIR)/usr/lib/ + cp -rf $(@D)/include/fbdev/* $(STAGING_DIR)/usr/include/ + + $(INSTALL) -D -m 0644 package/sunxi-mali-utgard/egl.pc \ + $(STAGING_DIR)/usr/lib/pkgconfig/egl.pc + $(INSTALL) -D -m 0644 package/sunxi-mali-utgard/glesv2.pc \ + $(STAGING_DIR)/usr/lib/pkgconfig/glesv2.pc +endef + +define SUNXI_MALI_UTGARD_INSTALL_TARGET_CMDS + mkdir -p $(TARGET_DIR)/usr/lib + cp -rf $(@D)/$(SUNXI_MALI_UTGARD_REV)/$(SUNXI_MALI_UTGARD_ARCH)/fbdev/*.so* \ + $(TARGET_DIR)/usr/lib/ +endef + +define SUNXI_MALI_UTGARD_FIXUP_LICENSE_FILE + mv $(@D)/$(SUNXI_MALI_UTGARD_EULA_ORIGINAL) $(@D)/$(SUNXI_MALI_UTGARD_EULA_NO_SPACES) +endef + +SUNXI_MALI_UTGARD_POST_PATCH_HOOKS += SUNXI_MALI_UTGARD_FIXUP_LICENSE_FILE + +$(eval $(generic-package)) From patchwork Fri Nov 5 22:17:57 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Giulio Benetti X-Patchwork-Id: 1551582 Return-Path: X-Original-To: incoming-buildroot@patchwork.ozlabs.org Delivered-To: patchwork-incoming-buildroot@bilbo.ozlabs.org Authentication-Results: bilbo.ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=aruba.it header.i=@aruba.it header.a=rsa-sha256 header.s=a1 header.b=JzBnlRw1; dkim-atps=neutral Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=buildroot.org (client-ip=140.211.166.136; helo=smtp3.osuosl.org; envelope-from=buildroot-bounces@buildroot.org; receiver=) Received: from smtp3.osuosl.org (smtp3.osuosl.org [140.211.166.136]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by bilbo.ozlabs.org (Postfix) with ESMTPS id 4HmFJq19l6z9sPf for ; Sat, 6 Nov 2021 09:18:35 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by smtp3.osuosl.org (Postfix) with ESMTP id 34030605AE; Fri, 5 Nov 2021 22:18:33 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from smtp3.osuosl.org ([127.0.0.1]) by localhost (smtp3.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id tT89k9u3acDf; Fri, 5 Nov 2021 22:18:31 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by smtp3.osuosl.org (Postfix) with ESMTP id 0818D6F946; Fri, 5 Nov 2021 22:18:31 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from smtp3.osuosl.org (smtp3.osuosl.org [140.211.166.136]) by ash.osuosl.org (Postfix) with ESMTP id 2B5191BF386 for ; Fri, 5 Nov 2021 22:18:07 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by smtp3.osuosl.org (Postfix) with ESMTP id D93936F933 for ; Fri, 5 Nov 2021 22:18:06 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from smtp3.osuosl.org ([127.0.0.1]) by localhost (smtp3.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id dB-bEJsFJ3v7 for ; Fri, 5 Nov 2021 22:18:05 +0000 (UTC) X-Greylist: from auto-whitelisted by SQLgrey-1.8.0 Received: from smtpcmd15176.aruba.it (smtpcmd15176.aruba.it [62.149.156.176]) by smtp3.osuosl.org (Postfix) with ESMTP id 3344F6F935 for ; Fri, 5 Nov 2021 22:18:04 +0000 (UTC) Received: from ubuntu.localdomain ([146.241.216.221]) by Aruba Outgoing Smtp with ESMTPSA id j7X7mGJ7s5cjnj7X9m4SQN; Fri, 05 Nov 2021 23:18:04 +0100 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=aruba.it; s=a1; t=1636150684; bh=070+giUZI4tAbBz4yhET1YxHgg6L5blR9LQ/qGYgdwg=; h=From:To:Subject:Date:MIME-Version; b=JzBnlRw123biz3nrY9waVFXrZ6jUjy7YOhQGXrqCDqWRYTxHd4XqDlGYhCFlRP2lL KALeii5dPnz+I0T9Ai837yFZjUR9bGe+XCQ0yMdw1RoIb9WLZxgylGekr1ozDTaDhs n8RnFLZCGM2pON40iZkCeC8zxU55QuWOZ74s3HfWhjy/CkebashpGHescLzTxs/oY6 Otql12StvwFKR/surV6cZ0cM53WFREcrNkaoVsGie8asU0EWtv7pPYINB3bMtmNqID wqV++7kS1ADK1UnRKbez8GIHz4RvqDJqhZOiFEceQmNhnovpkD4mVYs0XXc9NPAo0k utwF35ouwL/FQ== From: Giulio Benetti To: buildroot@buildroot.org Date: Fri, 5 Nov 2021 23:17:57 +0100 Message-Id: <20211105221800.1451167-3-giulio.benetti@benettiengineering.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20211105221800.1451167-1-giulio.benetti@benettiengineering.com> References: <20211105221800.1451167-1-giulio.benetti@benettiengineering.com> MIME-Version: 1.0 X-CMAE-Envelope: MS4xfOuHqB/AsrfbwSp/Jg8IIzGkqmseWPG9j7e87EzLP2qtofVhdrXaU/SY46oywQAvOrh2c42YkEjMvZxox0WQq7Ww9AIFUbChcMg+EEQwe5jZAA6OTOjU 7ahzxEeitwkGTfdB+sXuaiUSIWCKyN1EBemrt4AHllbvlKa2kxLEmsIJRedUAci9damWZ4eZr6Tt4Ogk+W79oG6rFD/PaCOZ135105af2aa7kY167TuXGeuI 4J9efLuVr8MMK2lZb1qhhQ3pxgB/vhWLh1cb1Oo6JNURI+P2QR1JgD82UbN+h+pbZJCgQJ4slNuX3e2wT9Jx7rlJYOG+dWkk232s3d+rwfMBF6ImstwduXty e/GcHCLhvMjGHjzV1FIld8Nvksk5G4A6M+HKFtZEOZ3CO7+aGls2dowUNN/eh8kNglS1GaA+aeeuxzOd50wzbWr0eo+HtoMEgptWQoVISNzLhemX66HchpjY LCRQgV39JqUMUe+N32jkRJ7Q2lDc9mlNu18BPOLsy8k73teph2JYOyvQi9X29GCwEIQkZSUkZQV70M7GgDWOM9ygNtvIfIBuyY7YGw== Subject: [Buildroot] [PATCH v2 2/5] package/sunxi-mali-utgard-driver: rename from sunxi-mali-mainline-driver X-BeenThere: buildroot@buildroot.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Julien Olivain , Peter Seiderer , Julien Corjon , Thomas Petazzoni , Miquel Raynal , Luca Ceresoli , Giulio Benetti , Thomas De Schampheleire Errors-To: buildroot-bounces@buildroot.org Sender: "buildroot" From: Miquel Raynal This package provides a Mali kernel driver for Sunxi Mali Utgard GPUs. The trailing -mainline is historical and was used at a time when there was two packages providing this driver. The "non-upstream" package has been removed some time ago so before adding new packages bringing support for other ARM Mali GPU versions or implementations, rename sunxi-mali-mainline-driver into sunxi-mali-utgard-driver. Add a legacy entry. Signed-off-by: Miquel Raynal Signed-off-by: Giulio Benetti [Giulio: rebase on master. Add legacy entry instead of substituting the blob's one] Reviewed-by: Luca Ceresoli --- Config.in.legacy | 12 ++++++ DEVELOPERS | 2 +- configs/olimex_a20_olinuxino_lime2_defconfig | 2 +- configs/olimex_a20_olinuxino_lime_defconfig | 2 +- package/Config.in | 2 +- .../sunxi-mali-mainline-driver.mk | 41 ------------------- .../Config.in | 16 ++++---- .../sunxi-mali-utgard-driver.hash} | 2 +- .../sunxi-mali-utgard-driver.mk | 41 +++++++++++++++++++ 9 files changed, 66 insertions(+), 54 deletions(-) delete mode 100644 package/sunxi-mali-mainline-driver/sunxi-mali-mainline-driver.mk rename package/{sunxi-mali-mainline-driver => sunxi-mali-utgard-driver}/Config.in (67%) rename package/{sunxi-mali-mainline-driver/sunxi-mali-mainline-driver.hash => sunxi-mali-utgard-driver/sunxi-mali-utgard-driver.hash} (66%) create mode 100644 package/sunxi-mali-utgard-driver/sunxi-mali-utgard-driver.mk diff --git a/Config.in.legacy b/Config.in.legacy index a209537423..1aac28382a 100644 --- a/Config.in.legacy +++ b/Config.in.legacy @@ -144,6 +144,18 @@ endif ############################################################################### +config BR2_PACKAGE_SUNXI_MALI_MAINLINE_DRIVER + bool "sunxi-mali-mainline-driver package was renamed" + select BR2_LEGACY + select BR2_PACKAGE_SUNXI_MALI_UTGARD_DRIVER + help + Since the removal of the sunxi-mali-driver package, the + sunxi-mali-mainline-driver package that coexisted became the + only package to provide the Sunxi Mali driver. The "-mainline" + suffix being undescriptive nowadays and before adding new + packages bringing Mali support for other SoCs/GPU flavors, it + is clearer to rename it SUNXI_MALI_UTGARD_DRIVER. + config BR2_PACKAGE_SUNXI_MALI_MAINLINE bool "sunxi-mali-mainline package was renamed" select BR2_LEGACY diff --git a/DEVELOPERS b/DEVELOPERS index 7eda2cf197..59bcf1ddc9 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1065,8 +1065,8 @@ F: package/libnss/ F: package/minicom/ F: package/nfs-utils/ F: package/python-uvloop/ -F: package/sunxi-mali-mainline-driver/ F: package/sunxi-mali-utgard/ +F: package/sunxi-mali-utgard-driver/ F: package/trace-cmd/ F: package/udisks/ F: toolchain/ diff --git a/configs/olimex_a20_olinuxino_lime2_defconfig b/configs/olimex_a20_olinuxino_lime2_defconfig index 319ac48c58..64a66de5c8 100644 --- a/configs/olimex_a20_olinuxino_lime2_defconfig +++ b/configs/olimex_a20_olinuxino_lime2_defconfig @@ -33,7 +33,7 @@ BR2_LINUX_KERNEL_INSTALL_TARGET=y # sunxi packages BR2_PACKAGE_SUNXI_TOOLS=y BR2_PACKAGE_SUNXI_MALI_UTGARD=y -BR2_PACKAGE_SUNXI_MALI_MAINLINE_DRIVER=y +BR2_PACKAGE_SUNXI_MALI_UTGARD_DRIVER=y # Filesystem BR2_TARGET_ROOTFS_EXT2=y diff --git a/configs/olimex_a20_olinuxino_lime_defconfig b/configs/olimex_a20_olinuxino_lime_defconfig index 4cec5689ca..17da786a8c 100644 --- a/configs/olimex_a20_olinuxino_lime_defconfig +++ b/configs/olimex_a20_olinuxino_lime_defconfig @@ -33,7 +33,7 @@ BR2_LINUX_KERNEL_INSTALL_TARGET=y # sunxi packages BR2_PACKAGE_SUNXI_TOOLS=y BR2_PACKAGE_SUNXI_MALI_UTGARD=y -BR2_PACKAGE_SUNXI_MALI_MAINLINE_DRIVER=y +BR2_PACKAGE_SUNXI_MALI_UTGARD_DRIVER=y # Filesystem BR2_TARGET_ROOTFS_EXT2=y diff --git a/package/Config.in b/package/Config.in index 1006161497..9201376dcf 100644 --- a/package/Config.in +++ b/package/Config.in @@ -568,8 +568,8 @@ endmenu source "package/statserial/Config.in" source "package/stm32flash/Config.in" source "package/sunxi-cedarx/Config.in" - source "package/sunxi-mali-mainline-driver/Config.in" source "package/sunxi-mali-utgard/Config.in" + source "package/sunxi-mali-utgard-driver/Config.in" source "package/sysstat/Config.in" source "package/targetcli-fb/Config.in" source "package/ti-gfx/Config.in" diff --git a/package/sunxi-mali-mainline-driver/sunxi-mali-mainline-driver.mk b/package/sunxi-mali-mainline-driver/sunxi-mali-mainline-driver.mk deleted file mode 100644 index 6782ca7fc2..0000000000 --- a/package/sunxi-mali-mainline-driver/sunxi-mali-mainline-driver.mk +++ /dev/null @@ -1,41 +0,0 @@ -################################################################################ -# -# sunxi-mali-mainline-driver -# -################################################################################ - -SUNXI_MALI_MAINLINE_DRIVER_VERSION = e4a91c95096bb31450b556fcb13f3c4ba79f60b4 -SUNXI_MALI_MAINLINE_DRIVER_SITE = $(call github,mripard,sunxi-mali,$(SUNXI_MALI_MAINLINE_DRIVER_VERSION)) -SUNXI_MALI_MAINLINE_DRIVER_DEPENDENCIES = linux -SUNXI_MALI_MAINLINE_DRIVER_LICENSE = GPL-2.0 -SUNXI_MALI_MAINLINE_DRIVER_LICENSE_FILES = LICENSE - -SUNXI_MALI_MAINLINE_DRIVER_MAKE_OPTS = \ - $(LINUX_MAKE_FLAGS) \ - KDIR=$(LINUX_DIR) - -define SUNXI_MALI_MAINLINE_DRIVER_USE_APPLY_PATCHES - ln -sf $(SUNXI_MALI_UTGARD_REV)/series $(@D)/patches - $(SED) 's|quilt push -a|$(TOPDIR)/support/scripts/apply-patches.sh . ../patches|' \ - $(@D)/build.sh -endef - -SUNXI_MALI_MAINLINE_DRIVER_POST_PATCH_HOOKS += SUNXI_MALI_MAINLINE_DRIVER_USE_APPLY_PATCHES - -define SUNXI_MALI_MAINLINE_DRIVER_BUILD_CMDS - cd $(@D) && $(SUNXI_MALI_MAINLINE_DRIVER_MAKE_OPTS) \ - $(SHELL) ./build.sh -r $(SUNXI_MALI_UTGARD_REV) -j $(PARALLEL_JOBS) -b -endef - -define SUNXI_MALI_MAINLINE_DRIVER_INSTALL_TARGET_CMDS - cd $(@D) && $(SUNXI_MALI_MAINLINE_DRIVER_MAKE_OPTS) \ - $(SHELL) ./build.sh -r $(SUNXI_MALI_UTGARD_REV) -j $(PARALLEL_JOBS) -i -endef - -define SUNXI_MALI_MAINLINE_DRIVER_LINUX_CONFIG_FIXUPS - $(call KCONFIG_ENABLE_OPT,CONFIG_CMA) - $(call KCONFIG_ENABLE_OPT,CONFIG_DMA_CMA) - $(call KCONFIG_ENABLE_OPT,CONFIG_DRM_FBDEV_LEAK_PHYS_SMEM) -endef - -$(eval $(generic-package)) diff --git a/package/sunxi-mali-mainline-driver/Config.in b/package/sunxi-mali-utgard-driver/Config.in similarity index 67% rename from package/sunxi-mali-mainline-driver/Config.in rename to package/sunxi-mali-utgard-driver/Config.in index 236470db53..244283f44d 100644 --- a/package/sunxi-mali-mainline-driver/Config.in +++ b/package/sunxi-mali-utgard-driver/Config.in @@ -1,22 +1,22 @@ -comment "sunxi-mali-mainline-driver needs a Linux kernel to be built" +comment "sunxi-mali-utgard-driver needs a Linux kernel to be built" depends on BR2_PACKAGE_SUNXI_MALI_UTGARD depends on !BR2_LINUX_KERNEL -config BR2_PACKAGE_SUNXI_MALI_MAINLINE_DRIVER - bool "sunxi-mali-mainline-driver" +config BR2_PACKAGE_SUNXI_MALI_UTGARD_DRIVER + bool "sunxi-mali-utgard-driver" default y depends on BR2_PACKAGE_SUNXI_MALI_UTGARD # runtime depends on BR2_LINUX_KERNEL select BR2_LINUX_NEEDS_MODULES # not using kernel-module infra help This package builds and installs the Linux kernel driver for - the Mali GPU on Allwinner platforms, compatible with recent - Linux kernels (>= 4.4). Note that it should be installed - together with the corresponding userspace OpenGL libraries, - which are provided as binaries only at: + the Mali Utgard GPU on Allwinner platforms, compatible with + recent Linux kernels (>= 4.4). Note that it should be + installed together with the corresponding userspace OpenGL + libraries, which are provided as binaries only at: https://github.com/bootlin/mali-blobs - sunxi-mali-mainline-driver requires a Linux kernel >= 4.4 + sunxi-mali-utgard-driver requires a Linux kernel >= 4.4 with the following options enabled: - CONFIG_CMA diff --git a/package/sunxi-mali-mainline-driver/sunxi-mali-mainline-driver.hash b/package/sunxi-mali-utgard-driver/sunxi-mali-utgard-driver.hash similarity index 66% rename from package/sunxi-mali-mainline-driver/sunxi-mali-mainline-driver.hash rename to package/sunxi-mali-utgard-driver/sunxi-mali-utgard-driver.hash index f08e80f114..4b276fecb7 100644 --- a/package/sunxi-mali-mainline-driver/sunxi-mali-mainline-driver.hash +++ b/package/sunxi-mali-utgard-driver/sunxi-mali-utgard-driver.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 0197271dbf503e866dd4873091f61bb3de1f2c3031701aac1ba205d1e2f267ac sunxi-mali-mainline-driver-e4a91c95096bb31450b556fcb13f3c4ba79f60b4.tar.gz +sha256 0197271dbf503e866dd4873091f61bb3de1f2c3031701aac1ba205d1e2f267ac sunxi-mali-utgard-driver-e4a91c95096bb31450b556fcb13f3c4ba79f60b4.tar.gz sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE diff --git a/package/sunxi-mali-utgard-driver/sunxi-mali-utgard-driver.mk b/package/sunxi-mali-utgard-driver/sunxi-mali-utgard-driver.mk new file mode 100644 index 0000000000..5f9090f492 --- /dev/null +++ b/package/sunxi-mali-utgard-driver/sunxi-mali-utgard-driver.mk @@ -0,0 +1,41 @@ +################################################################################ +# +# sunxi-mali-utgard-driver +# +################################################################################ + +SUNXI_MALI_UTGARD_DRIVER_VERSION = e4a91c95096bb31450b556fcb13f3c4ba79f60b4 +SUNXI_MALI_UTGARD_DRIVER_SITE = $(call github,mripard,sunxi-mali,$(SUNXI_MALI_UTGARD_DRIVER_VERSION)) +SUNXI_MALI_UTGARD_DRIVER_DEPENDENCIES = linux +SUNXI_MALI_UTGARD_DRIVER_LICENSE = GPL-2.0 +SUNXI_MALI_UTGARD_DRIVER_LICENSE_FILES = LICENSE + +SUNXI_MALI_UTGARD_DRIVER_MAKE_OPTS = \ + $(LINUX_MAKE_FLAGS) \ + KDIR=$(LINUX_DIR) + +define SUNXI_MALI_UTGARD_DRIVER_USE_APPLY_PATCHES + ln -sf $(SUNXI_MALI_UTGARD_REV)/series $(@D)/patches + $(SED) 's|quilt push -a|$(TOPDIR)/support/scripts/apply-patches.sh . ../patches|' \ + $(@D)/build.sh +endef + +SUNXI_MALI_UTGARD_DRIVER_POST_PATCH_HOOKS += SUNXI_MALI_UTGARD_DRIVER_USE_APPLY_PATCHES + +define SUNXI_MALI_UTGARD_DRIVER_BUILD_CMDS + cd $(@D) && $(SUNXI_MALI_UTGARD_DRIVER_MAKE_OPTS) \ + $(SHELL) ./build.sh -r $(SUNXI_MALI_UTGARD_REV) -j $(PARALLEL_JOBS) -b +endef + +define SUNXI_MALI_UTGARD_DRIVER_INSTALL_TARGET_CMDS + cd $(@D) && $(SUNXI_MALI_UTGARD_DRIVER_MAKE_OPTS) \ + $(SHELL) ./build.sh -r $(SUNXI_MALI_UTGARD_REV) -j $(PARALLEL_JOBS) -i +endef + +define SUNXI_MALI_UTGARD_DRIVER_LINUX_CONFIG_FIXUPS + $(call KCONFIG_ENABLE_OPT,CONFIG_CMA) + $(call KCONFIG_ENABLE_OPT,CONFIG_DMA_CMA) + $(call KCONFIG_ENABLE_OPT,CONFIG_DRM_FBDEV_LEAK_PHYS_SMEM) +endef + +$(eval $(generic-package)) From patchwork Fri Nov 5 22:17:58 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Giulio Benetti X-Patchwork-Id: 1551581 Return-Path: X-Original-To: incoming-buildroot@patchwork.ozlabs.org Delivered-To: patchwork-incoming-buildroot@bilbo.ozlabs.org Authentication-Results: bilbo.ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=aruba.it header.i=@aruba.it header.a=rsa-sha256 header.s=a1 header.b=bzWYS9D6; dkim-atps=neutral Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=buildroot.org (client-ip=140.211.166.136; helo=smtp3.osuosl.org; envelope-from=buildroot-bounces@buildroot.org; receiver=) Received: from smtp3.osuosl.org (smtp3.osuosl.org [140.211.166.136]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by bilbo.ozlabs.org (Postfix) with ESMTPS id 4HmFJb6dqQz9sPf for ; Sat, 6 Nov 2021 09:18:23 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by smtp3.osuosl.org (Postfix) with ESMTP id 232C36F933; Fri, 5 Nov 2021 22:18:21 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from smtp3.osuosl.org ([127.0.0.1]) by localhost (smtp3.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id n9jvVPvFmSmh; Fri, 5 Nov 2021 22:18:20 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by smtp3.osuosl.org (Postfix) with ESMTP id 971FA616F4; Fri, 5 Nov 2021 22:18:19 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from smtp2.osuosl.org (smtp2.osuosl.org [140.211.166.133]) by ash.osuosl.org (Postfix) with ESMTP id 8B5791C1135 for ; Fri, 5 Nov 2021 22:18:06 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by smtp2.osuosl.org (Postfix) with ESMTP id 86C474023F for ; Fri, 5 Nov 2021 22:18:06 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Authentication-Results: smtp2.osuosl.org (amavisd-new); dkim=pass (2048-bit key) header.d=aruba.it Received: from smtp2.osuosl.org ([127.0.0.1]) by localhost (smtp2.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id cUEX5yVLB4XR for ; Fri, 5 Nov 2021 22:18:05 +0000 (UTC) X-Greylist: from auto-whitelisted by SQLgrey-1.8.0 Received: from smtpcmd15176.aruba.it (smtpcmd15176.aruba.it [62.149.156.176]) by smtp2.osuosl.org (Postfix) with ESMTP id 7CC6C4021E for ; Fri, 5 Nov 2021 22:18:05 +0000 (UTC) Received: from ubuntu.localdomain ([146.241.216.221]) by Aruba Outgoing Smtp with ESMTPSA id j7X7mGJ7s5cjnj7XAm4SQo; Fri, 05 Nov 2021 23:18:04 +0100 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=aruba.it; s=a1; t=1636150684; bh=13aVh6EtMwpasFgraATAX9OdjrId2icrnevxd8KUWjs=; h=From:To:Subject:Date:MIME-Version; b=bzWYS9D6sbZrzo7ebyd0Zv3NCCpaAcZE8j7nEOlURzdpo8mDEf5DbJ7PbOom0Sq72 RWolCAHI2Gz3dXd4mS5Qnp0kEE/FfzKq7BUahW2lzzkmZh0NuNMOX17r1YbEso3Rsl f8n2MosfGXWnicQU0mAgXperTvtlu8Sc0fKw4uqLmB0Bp8dwW4DPIguyee9iOo/mSZ tlGMg2V/wkW5r51XxO3S3UTkfYWB5JIyTmyrvjRId0/K9e8mx3Ff41PeMB2uwoq9Kp ll1TCF/BNzNWRoP7MZSTO6ci5ImdFhM+NG5JpRmlzrLemopb0Q83nqsIVWXeDqgEHB W/r9rDOCZpzlA== From: Giulio Benetti To: buildroot@buildroot.org Date: Fri, 5 Nov 2021 23:17:58 +0100 Message-Id: <20211105221800.1451167-4-giulio.benetti@benettiengineering.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20211105221800.1451167-1-giulio.benetti@benettiengineering.com> References: <20211105221800.1451167-1-giulio.benetti@benettiengineering.com> MIME-Version: 1.0 X-CMAE-Envelope: MS4xfOuHqB/AsrfbwSp/Jg8IIzGkqmseWPG9j7e87EzLP2qtofVhdrXaU/SY46oywQAvOrh2c42YkEjMvZxox0WQq7Ww9AIFUbChcMg+EEQwe5jZAA6OTOjU 7ahzxEeitwkGTfdB+sXuaiUSIWCKyN1EBenDiB2/sjGC/4S9YIzGm4fhCoL8kHKN6NJGh/o6M5evrje7/CSfUUAzL2T1Ifuvo2wWks4vFvsENKP9yVPCDNsL oIY9tAESptIeZc5mts8B7CiXW37jCN3Y8jAuG3tPfxX0UEPdt9k2mdCaVi5+bgA2aQ5hY6x07qDb1f0zmQROzIK4ePU4aibF/SzjOBTeSpobTs80dY26IPjT YYSx6LAbUCPcVCAvj1LL1GxO6LL/sp1O8LLlGMCodtOZArYPgXtMDn+ffHaaPPIoWqnY4k9MbQezz4zixytq4K8GgXqotlRhi4P923hQFiQTx3iLHgS1FITk hCZNIQ0wNerQ7aA+Xtkl0MvPQvPjRqGxKEvxu0Nx8SPcyUnmpa+x73BuMA8= Subject: [Buildroot] [PATCH v2 3/5] board/olimex/a20_olinuxino: add linux-disable-lima.fragment X-BeenThere: buildroot@buildroot.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Julien Olivain , Peter Seiderer , Julien Corjon , Thomas Petazzoni , Luca Ceresoli , Giulio Benetti , Thomas De Schampheleire Errors-To: buildroot-bounces@buildroot.org Sender: "buildroot" This Linux defconfig fragment is needed to disable Lima driver in favour of Mali(if enabled). This because Lima is enabled by default in Linux's sunxi_defconfig and if we enable Mali driver in Buildroot it will fail to load. So let's set CONFIG_DRM_LIMA=n. Of course this fragment is only used by Buildroot defconfigs that enable Mali driver. Signed-off-by: Giulio Benetti --- board/olimex/a20_olinuxino/linux-disable-lima.fragment | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 board/olimex/a20_olinuxino/linux-disable-lima.fragment diff --git a/board/olimex/a20_olinuxino/linux-disable-lima.fragment b/board/olimex/a20_olinuxino/linux-disable-lima.fragment new file mode 100644 index 0000000000..a992902dda --- /dev/null +++ b/board/olimex/a20_olinuxino/linux-disable-lima.fragment @@ -0,0 +1,2 @@ +# Disable LIMA in favour of Mali +CONFIG_DRM_LIMA=n From patchwork Fri Nov 5 22:17:59 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Giulio Benetti X-Patchwork-Id: 1551583 Return-Path: X-Original-To: incoming-buildroot@patchwork.ozlabs.org Delivered-To: patchwork-incoming-buildroot@bilbo.ozlabs.org Authentication-Results: bilbo.ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=aruba.it header.i=@aruba.it header.a=rsa-sha256 header.s=a1 header.b=lzxLNl5i; dkim-atps=neutral Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=buildroot.org (client-ip=2605:bc80:3010::138; helo=smtp1.osuosl.org; envelope-from=buildroot-bounces@buildroot.org; receiver=) Received: from smtp1.osuosl.org (smtp1.osuosl.org [IPv6:2605:bc80:3010::138]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by bilbo.ozlabs.org (Postfix) with ESMTPS id 4HmFK33K7sz9sPf for ; Sat, 6 Nov 2021 09:18:47 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by smtp1.osuosl.org (Postfix) with ESMTP id 8805880E62; Fri, 5 Nov 2021 22:18:44 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from smtp1.osuosl.org ([127.0.0.1]) by localhost (smtp1.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id YD2tFCJ-LPsX; Fri, 5 Nov 2021 22:18:43 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by smtp1.osuosl.org (Postfix) with ESMTP id E7BD880D8E; Fri, 5 Nov 2021 22:18:42 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from smtp4.osuosl.org (smtp4.osuosl.org [140.211.166.137]) by ash.osuosl.org (Postfix) with ESMTP id 38BA41BF386 for ; Fri, 5 Nov 2021 22:18:08 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by smtp4.osuosl.org (Postfix) with ESMTP id 1F0264039C for ; Fri, 5 Nov 2021 22:18:08 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Authentication-Results: smtp4.osuosl.org (amavisd-new); dkim=pass (2048-bit key) header.d=aruba.it Received: from smtp4.osuosl.org ([127.0.0.1]) by localhost (smtp4.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id A7-r8064kQ_T for ; Fri, 5 Nov 2021 22:18:07 +0000 (UTC) X-Greylist: from auto-whitelisted by SQLgrey-1.8.0 Received: from smtpcmd15176.aruba.it (smtpcmd15176.aruba.it [62.149.156.176]) by smtp4.osuosl.org (Postfix) with ESMTP id 45B0640260 for ; Fri, 5 Nov 2021 22:18:06 +0000 (UTC) Received: from ubuntu.localdomain ([146.241.216.221]) by Aruba Outgoing Smtp with ESMTPSA id j7X7mGJ7s5cjnj7XAm4SR9; Fri, 05 Nov 2021 23:18:05 +0100 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=aruba.it; s=a1; t=1636150685; bh=Jkl04rw28rwXNFUJd9rSuvSkRG93FPLDkFpBn1ZCq98=; h=From:To:Subject:Date:MIME-Version; b=lzxLNl5iEhLNvhOUnBk4EEE8RY8XLl8qCslK3ZZDkBRf6AM1fGugZ6Xv9VnpKMBeX SNbhXZDEh1UIsIHcQg/g08FlWzqoyHJ2t9xLOgLio/A8bFLU94FGJxCkDO5/iwtJ2M pag46F4NPJDngor43tCvJSHl47AW79HpXSo9vpEDjkvvSDnIivbsMNPH3eri5ZMGLj zXMOsiINC0Yk2jsNIhXEIkzyxc3lmfgDmwt7y8YdyGj4fkOb/kAh2jLX9CIaS7eU9w ThqxNL4CqBJ9UMAT0qxRVk27Nr5+/Ojo+zBRF6PzureJD/5NGShEFo0uHWKqaVSwyf 9n8TV/zex8rhg== From: Giulio Benetti To: buildroot@buildroot.org Date: Fri, 5 Nov 2021 23:17:59 +0100 Message-Id: <20211105221800.1451167-5-giulio.benetti@benettiengineering.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20211105221800.1451167-1-giulio.benetti@benettiengineering.com> References: <20211105221800.1451167-1-giulio.benetti@benettiengineering.com> MIME-Version: 1.0 X-CMAE-Envelope: MS4xfArbBkITVtNvQdF/CqwS08sspeAuSQbVwEYuT+/UKl7A8Rb+2YaahvaERGEhj9Kd4u6BjXFjk8DfvkcOdXjzdOHxMUbGf0nc1jIt9zCw82q0YNekHVsG aG4c/Vr6U60Lka84eMyKPdFYSI+H2CChqsmH80Ex9ILx1VSJ7SGlcid8nkvbjtEY2AVgCzLYXMrLmsaFe3owNTw7EFErfKMGbwy9lK2xtBSrkZ9RmSAHsAG4 qpktdBNyCP4/YnYlic6KitHeQSyjfv3Hziro1uzmUYKsQeeWIVEE5ZVtR9DReDAT6agXgwEB36Dz0VdIKYOoQLjLTsOu8CCw8sgH1tvTStjzdk5AWqf+uFN6 qg3EXOqpFT1Ch6HjF+P5B4FqxF2DMt5R8Gi3XfAJ6O0goYMmoFSez1k0MgHHXWko/TF4L5hk5ZR6plbJJCpmPi/OKyTBtv+YLkOUmP99mk9KqQnkxMT5AMU2 4b77/auMlz3QBr2zv5xZ5AyHaSTUeaZr+xFVOsCX0HxGxpCpZYhadj87mks= Subject: [Buildroot] [PATCH v2 4/5] configs/olimex_a20_olinuxino_lime2_defconfig: use linux-disable-lima.fragment X-BeenThere: buildroot@buildroot.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Julien Olivain , Peter Seiderer , Julien Corjon , Thomas Petazzoni , Luca Ceresoli , Giulio Benetti , Thomas De Schampheleire Errors-To: buildroot-bounces@buildroot.org Sender: "buildroot" This defconfig enables sunxi-mali-mainline-driver so we need to disable Lima in Linux to prevent Mali to not load. Signed-off-by: Giulio Benetti --- configs/olimex_a20_olinuxino_lime2_defconfig | 1 + 1 file changed, 1 insertion(+) diff --git a/configs/olimex_a20_olinuxino_lime2_defconfig b/configs/olimex_a20_olinuxino_lime2_defconfig index 64a66de5c8..b46cf37433 100644 --- a/configs/olimex_a20_olinuxino_lime2_defconfig +++ b/configs/olimex_a20_olinuxino_lime2_defconfig @@ -26,6 +26,7 @@ BR2_LINUX_KERNEL_CUSTOM_VERSION=y BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.14.13" BR2_LINUX_KERNEL_USE_DEFCONFIG=y BR2_LINUX_KERNEL_DEFCONFIG="sunxi" +BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="board/olimex/a20_olinuxino/linux-disable-lima.fragment" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="sun7i-a20-olinuxino-lime2" BR2_LINUX_KERNEL_INSTALL_TARGET=y From patchwork Fri Nov 5 22:18:00 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Giulio Benetti X-Patchwork-Id: 1551585 Return-Path: X-Original-To: incoming-buildroot@patchwork.ozlabs.org Delivered-To: patchwork-incoming-buildroot@bilbo.ozlabs.org Authentication-Results: bilbo.ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=aruba.it header.i=@aruba.it header.a=rsa-sha256 header.s=a1 header.b=mkmKlq8K; dkim-atps=neutral Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=buildroot.org (client-ip=2605:bc80:3010::136; helo=smtp3.osuosl.org; envelope-from=buildroot-bounces@buildroot.org; receiver=) Received: from smtp3.osuosl.org (smtp3.osuosl.org [IPv6:2605:bc80:3010::136]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by bilbo.ozlabs.org (Postfix) with ESMTPS id 4HmFKV4F3Yz9sPf for ; Sat, 6 Nov 2021 09:19:10 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by smtp3.osuosl.org (Postfix) with ESMTP id 1CE266FD04; Fri, 5 Nov 2021 22:19:08 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from smtp3.osuosl.org ([127.0.0.1]) by localhost (smtp3.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id iCJ3b389wuWk; Fri, 5 Nov 2021 22:19:07 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by smtp3.osuosl.org (Postfix) with ESMTP id 583416FD00; Fri, 5 Nov 2021 22:19:06 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from smtp4.osuosl.org (smtp4.osuosl.org [140.211.166.137]) by ash.osuosl.org (Postfix) with ESMTP id 0583F1BF386 for ; Fri, 5 Nov 2021 22:18:09 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by smtp4.osuosl.org (Postfix) with ESMTP id 019B24039C for ; Fri, 5 Nov 2021 22:18:09 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Authentication-Results: smtp4.osuosl.org (amavisd-new); dkim=pass (2048-bit key) header.d=aruba.it Received: from smtp4.osuosl.org ([127.0.0.1]) by localhost (smtp4.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id TYDtGyga96h5 for ; Fri, 5 Nov 2021 22:18:08 +0000 (UTC) X-Greylist: from auto-whitelisted by SQLgrey-1.8.0 Received: from smtpcmd15176.aruba.it (smtpcmd15176.aruba.it [62.149.156.176]) by smtp4.osuosl.org (Postfix) with ESMTP id 210A040433 for ; Fri, 5 Nov 2021 22:18:07 +0000 (UTC) Received: from ubuntu.localdomain ([146.241.216.221]) by Aruba Outgoing Smtp with ESMTPSA id j7X7mGJ7s5cjnj7XBm4SRc; Fri, 05 Nov 2021 23:18:05 +0100 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=aruba.it; s=a1; t=1636150685; bh=qJa2G4TFGr9u8+PtD5I0IvCxtdArdOmZsc6F6GO0SJ0=; h=From:To:Subject:Date:MIME-Version; b=mkmKlq8KV6blmgIYRK3CyDAPnt4TGdj0Nb/QlFF5mIQdU+z0FwHisGyinLQJJNDbP nmwU2fA7zn+KE3kNwn78f2zjUt/QxCWU6fS0JBnQVbb2azpdk9DG+AIWwgkLijcx0M GvIUit193gFO9+5PSNmedlrPnM1fHZVm5PxiBj/XCrr1nPb6jwGv5mIVkxP80t5XN+ WJk7l+zDtQ8m+x17FgsM7YeG2/lM9zFuTqeXsJtPkV/khOuxgfhRahWiRoEH6GXJs6 jrIeEljY+sNrSWtG2mvDF/9cPGI6h0iQfaVnB/Jr9eV3WYRDhjwPGFf9VEkVpVDq1l geFJFr1DZTffg== From: Giulio Benetti To: buildroot@buildroot.org Date: Fri, 5 Nov 2021 23:18:00 +0100 Message-Id: <20211105221800.1451167-6-giulio.benetti@benettiengineering.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20211105221800.1451167-1-giulio.benetti@benettiengineering.com> References: <20211105221800.1451167-1-giulio.benetti@benettiengineering.com> MIME-Version: 1.0 X-CMAE-Envelope: MS4xfArbBkITVtNvQdF/CqwS08sspeAuSQbVwEYuT+/UKl7A8Rb+2YaahvaERGEhj9Kd4u6BjXFjk8DfvkcOdXjzdOHxMUbGf0nc1jIt9zCw82q0YNekHVsG aG4c/Vr6U60Lka84eMyKPdFYSI+H2CChqsmH80Ex9ILx1VSJ7SGlcid8nkvbjtEY2AVgCzLYXMrLmsaFe3owNTw7EFErfKMGbwy9lK2xtBSrkZ9RmSAHsAG4 qpktdBNyCP4/YnYlic6KitHeQSyjfv3Hziro1uzmUYKsQeeWIVEE5ZVtR9DReDAT6agXgwEB36Dz0VdIKYOoQLjLTsOu8CCw8sgH1tvTStjzdk5AWqf+uFN6 qg3EXOqpFT1Ch6HjF+P5B4FqxF2DMt5R8Gi3XfAJ6O0goYMmoFSez1k0MgHHXWko/TF4L5hk5ZR6plbJJCpmPi/OKyTBtv+YLkOUmP99mk9KqQnkxMT5AMU2 4b77/auMlz3QBr2zv5xZ5AyHaSTUeaZr+xFVOsCX0HxGxpCpZYhadj87mks= Subject: [Buildroot] [PATCH v2 5/5] configs/olimex_a20_olinuxino_lime_defconfig: use linux-disable-lima.fragment X-BeenThere: buildroot@buildroot.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Julien Olivain , Peter Seiderer , Julien Corjon , Thomas Petazzoni , Luca Ceresoli , Giulio Benetti , Thomas De Schampheleire Errors-To: buildroot-bounces@buildroot.org Sender: "buildroot" This defconfig enables sunxi-mali-mainline-driver so we need to disable Lima in Linux to prevent Mali to not load. Signed-off-by: Giulio Benetti --- configs/olimex_a20_olinuxino_lime_defconfig | 1 + 1 file changed, 1 insertion(+) diff --git a/configs/olimex_a20_olinuxino_lime_defconfig b/configs/olimex_a20_olinuxino_lime_defconfig index 17da786a8c..698137e46c 100644 --- a/configs/olimex_a20_olinuxino_lime_defconfig +++ b/configs/olimex_a20_olinuxino_lime_defconfig @@ -26,6 +26,7 @@ BR2_LINUX_KERNEL_CUSTOM_VERSION=y BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.14.13" BR2_LINUX_KERNEL_USE_DEFCONFIG=y BR2_LINUX_KERNEL_DEFCONFIG="sunxi" +BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="board/olimex/a20_olinuxino/linux-disable-lima.fragment" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="sun7i-a20-olinuxino-lime" BR2_LINUX_KERNEL_INSTALL_TARGET=y