From patchwork Thu Nov 14 12:42:11 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Carlos Santos X-Patchwork-Id: 1194813 Return-Path: X-Original-To: incoming-buildroot@patchwork.ozlabs.org Delivered-To: patchwork-incoming-buildroot@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=busybox.net (client-ip=140.211.166.137; helo=fraxinus.osuosl.org; envelope-from=buildroot-bounces@busybox.net; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="STyn6e4C"; dkim-atps=neutral Received: from fraxinus.osuosl.org (smtp4.osuosl.org [140.211.166.137]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 47DLjY1HjXz9sPF for ; Thu, 14 Nov 2019 23:42:40 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id 15637884A1; Thu, 14 Nov 2019 12:42:37 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from fraxinus.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id Q9LxRVeCqcoC; Thu, 14 Nov 2019 12:42:36 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by fraxinus.osuosl.org (Postfix) with ESMTP id 5BF0F884A6; Thu, 14 Nov 2019 12:42:36 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from silver.osuosl.org (smtp3.osuosl.org [140.211.166.136]) by ash.osuosl.org (Postfix) with ESMTP id A34271BF5A3 for ; Thu, 14 Nov 2019 12:42:34 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id 9FE402547E for ; Thu, 14 Nov 2019 12:42:34 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from silver.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 8-Yp7EHBEEcB for ; Thu, 14 Nov 2019 12:42:33 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-qv1-f46.google.com (mail-qv1-f46.google.com [209.85.219.46]) by silver.osuosl.org (Postfix) with ESMTPS id 795CE2544B for ; Thu, 14 Nov 2019 12:42:33 +0000 (UTC) Received: by mail-qv1-f46.google.com with SMTP id g12so2235224qvy.12 for ; Thu, 14 Nov 2019 04:42:33 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=Hju1J4Es966UhO+EDwR0ACm0C9NI5RfmaRbAoUE7Ha8=; b=STyn6e4Cuf2eHhquqmxLcS2RgjJHbGcqZk/OLPpSX6lzntZxNlHpMc1vfkQB+SQEOe NvqRBHQZrnuccVRxzc85ny0wBx2ld3atcGViDPItH6bMq54tEAeQrRETiAnf+qmTVDQn qwwyq51eokab13QXxG2BXrrVMrhWxGY/n9Zd9v+CHheRx2pl0aeSCiLjakNJJdGPuc+6 RsTQ3BqF7rj//Rq8xT2MKQjo4+CNNmTzt+GaagjFNz/pIMW2UUZzm3GQBI9dHklD8GRj 6GdbJvf4iZa/l+lhPiNbmWRJnjxu24v56i7JNqDIOT6omrGvbH10nJ9fgnpx3HqGpHPd Ypbw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=Hju1J4Es966UhO+EDwR0ACm0C9NI5RfmaRbAoUE7Ha8=; b=cRH9TKw0Tjve1rgZvOsjlC7MDKshzEWUahN8018rQy6xZUGtsWYOajufrgUjpVwnkY 30KwwT5ednqTGzsPQVLk71PJjuTCKurz2ZMt4nGpZh+Gb4NveplbmwJBvbYy7ReLsi8z spSKtsTzTeZzzoUlVbAyL0ht3gfrnzYv2JogBAxXv69tI5Sg4qWaKm/1D64MDc1ijqmq njQxc1aApQ97Vg32zQsNMaDL/9EUwiIqe2TIAnLJb0C6BUAdStY0imQDUUg3mQfjOAbU 1urekMvyLtoP5Vojx5/37KRUvkgIQ8L/69WJQB1BRwjI0HSD0CgRYoDOJLESmYL0kJCO HRBQ== X-Gm-Message-State: APjAAAXCS35Xr0zSlocZkFVV+WmnO4705VQekm6ISLg2bktrEKr8rN5J BMEe/9Ef6qEwFXx6Oj4y/y0x6E3m X-Google-Smtp-Source: APXvYqwaUf1vUaWOMTb18rOiuYkZ2hjSSbjA0g9eF0clcDXVAqds8nhSPpO82FfRH/BbNhtemgr88w== X-Received: by 2002:ad4:4310:: with SMTP id c16mr7940857qvs.238.1573735352100; Thu, 14 Nov 2019 04:42:32 -0800 (PST) Received: from casantos.remote.csb (177.204.233.88.dynamic.adsl.gvt.net.br. [177.204.233.88]) by smtp.gmail.com with ESMTPSA id 97sm682805qtb.11.2019.11.14.04.42.30 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 14 Nov 2019 04:42:31 -0800 (PST) From: unixmania@gmail.com To: buildroot@buildroot.org Date: Thu, 14 Nov 2019 09:42:11 -0300 Message-Id: <20191114124215.12985-2-unixmania@gmail.com> X-Mailer: git-send-email 2.18.1 In-Reply-To: <20191114124215.12985-1-unixmania@gmail.com> References: <20191114124215.12985-1-unixmania@gmail.com> Subject: [Buildroot] [PATCH/next v2 1/5] package/ti-sgx-libgbm: new package X-BeenThere: buildroot@busybox.net 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: Lothar Felten MIME-Version: 1.0 Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" From: Lothar Felten A custom ti version of libgbm for SGX graphics accelerator, required by the binary libraries of the ti-sgx-um package. Signed-off-by: Lothar Felten Signed-off-by: Carlos Santos --- Changes v1->v2 - Fix SDK version (comment in ti-sgx-libgbm.mk) - Remove duplicate package in package/ti-sgx/ti-sgx-libgbm package/ti-sgx-libgbm package/ti-sgx --- package/Config.in | 1 + .../0001_fix_sysmacro_include.patch | 12 ++++++ package/ti-sgx-libgbm/Config.in | 5 +++ package/ti-sgx-libgbm/ti-sgx-libgbm.hash | 2 + package/ti-sgx-libgbm/ti-sgx-libgbm.mk | 41 +++++++++++++++++++ 5 files changed, 61 insertions(+) create mode 100644 package/ti-sgx-libgbm/0001_fix_sysmacro_include.patch create mode 100644 package/ti-sgx-libgbm/Config.in create mode 100644 package/ti-sgx-libgbm/ti-sgx-libgbm.hash create mode 100644 package/ti-sgx-libgbm/ti-sgx-libgbm.mk diff --git a/package/Config.in b/package/Config.in index f72c77b416..0a0499421c 100644 --- a/package/Config.in +++ b/package/Config.in @@ -541,6 +541,7 @@ endmenu source "package/ti-sgx-demos/Config.in" source "package/ti-sgx-km/Config.in" source "package/ti-sgx-um/Config.in" + source "package/ti-sgx-libgbm/Config.in" source "package/ti-uim/Config.in" source "package/ti-utils/Config.in" source "package/triggerhappy/Config.in" diff --git a/package/ti-sgx-libgbm/0001_fix_sysmacro_include.patch b/package/ti-sgx-libgbm/0001_fix_sysmacro_include.patch new file mode 100644 index 0000000000..8b671cdcca --- /dev/null +++ b/package/ti-sgx-libgbm/0001_fix_sysmacro_include.patch @@ -0,0 +1,12 @@ +diff --git a/gbm.c b/gbm.c +index c046b1a..a8660c8 100644 +--- a/gbm.c ++++ b/gbm.c +@@ -36,6 +36,7 @@ + + #include + #include ++#include + #include + #include + diff --git a/package/ti-sgx-libgbm/Config.in b/package/ti-sgx-libgbm/Config.in new file mode 100644 index 0000000000..24427c8112 --- /dev/null +++ b/package/ti-sgx-libgbm/Config.in @@ -0,0 +1,5 @@ +config BR2_PACKAGE_TI_SGX_LIBGBM + bool "libgbm, ti variant" + help + TI SGX libgbm variant + diff --git a/package/ti-sgx-libgbm/ti-sgx-libgbm.hash b/package/ti-sgx-libgbm/ti-sgx-libgbm.hash new file mode 100644 index 0000000000..d316a84e45 --- /dev/null +++ b/package/ti-sgx-libgbm/ti-sgx-libgbm.hash @@ -0,0 +1,2 @@ +# Locally computed: +sha256 7be13eed8c357da8060f3db52de48ad8e76bf4784e8b2979f19ddc3bb725ca45 ti-sgx-libgbm-f316cf4b98ca3f4a1ca92a48ddd8aa559894a45c.tar.gz diff --git a/package/ti-sgx-libgbm/ti-sgx-libgbm.mk b/package/ti-sgx-libgbm/ti-sgx-libgbm.mk new file mode 100644 index 0000000000..9c7bd43881 --- /dev/null +++ b/package/ti-sgx-libgbm/ti-sgx-libgbm.mk @@ -0,0 +1,41 @@ +################################################################################ +# +# ti-sgx-libgbm +# +################################################################################ + +# This correpsonds to SDK 06.00.00.07 +TI_SGX_LIBGBM_VERSION = f316cf4b98ca3f4a1ca92a48ddd8aa559894a45c +TI_SGX_LIBGBM_SITE = git://git.ti.com/glsdk/libgbm.git +TI_SGX_LIBGBM_LICENSE = MIT License +TI_SGX_LIBGBM_LICENSE_FILES = gbm.h +TI_SGX_LIBGBM_INSTALL_STAGING = YES + +TI_SGX_LIBGBM_DEPENDENCIES = libdrm udev + +# This package uses autoconf, but not automake, so we need to call +# their special autogen.sh script, and have custom target and staging +# installation commands. + +define TI_SGX_LIBGBM_RUN_AUTOGEN + cd $(@D) && PATH=$(BR_PATH) ./autogen.sh +endef +TI_SGX_LIBGBM_PRE_CONFIGURE_HOOKS += TI_SGX_LIBGBM_RUN_AUTOGEN + +define TI_SGX_LIBGBM_INSTALL_TARGET_CMDS + $(TARGET_CONFIGURE_OPTS) $(MAKE) -C $(@D) \ + PREFIX=/usr \ + STRIP=/bin/true \ + DESTDIR=$(TARGET_DIR) \ + install +endef + +define TI_SGX_LIBGBM_INSTALL_STAGING_CMDS + $(TARGET_CONFIGURE_OPTS) $(MAKE) -C $(@D) \ + PREFIX=/usr \ + STRIP=/bin/true \ + DESTDIR=$(STAGING_DIR) \ + install +endef + +$(eval $(autotools-package)) From patchwork Thu Nov 14 12:42:12 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Carlos Santos X-Patchwork-Id: 1194814 Return-Path: X-Original-To: incoming-buildroot@patchwork.ozlabs.org Delivered-To: patchwork-incoming-buildroot@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=busybox.net (client-ip=140.211.166.138; helo=whitealder.osuosl.org; envelope-from=buildroot-bounces@busybox.net; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="ZxAPXAWm"; dkim-atps=neutral Received: from whitealder.osuosl.org (smtp1.osuosl.org [140.211.166.138]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 47DLjf2Jd4z9sPJ for ; Thu, 14 Nov 2019 23:42:45 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 94918895B2; Thu, 14 Nov 2019 12:42:42 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from whitealder.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id jZ8fEUAZn4GA; Thu, 14 Nov 2019 12:42:39 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by whitealder.osuosl.org (Postfix) with ESMTP id 796C78957D; Thu, 14 Nov 2019 12:42:39 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from hemlock.osuosl.org (smtp2.osuosl.org [140.211.166.133]) by ash.osuosl.org (Postfix) with ESMTP id D17FC1BF5A3 for ; Thu, 14 Nov 2019 12:42:37 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id CE32789EC2 for ; Thu, 14 Nov 2019 12:42:37 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from hemlock.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id DRGl+1D8QlUX for ; Thu, 14 Nov 2019 12:42:36 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-qv1-f52.google.com (mail-qv1-f52.google.com [209.85.219.52]) by hemlock.osuosl.org (Postfix) with ESMTPS id 4B2FE89EA5 for ; Thu, 14 Nov 2019 12:42:36 +0000 (UTC) Received: by mail-qv1-f52.google.com with SMTP id cg2so2240290qvb.10 for ; Thu, 14 Nov 2019 04:42:36 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=xoaNC3Hm7Q9E94djKfLyP59A35qSVZ/ZZ/TO6qGprXQ=; b=ZxAPXAWmR5w6wvu5HgWTN9n30sspbaF9fXRVDA+EwqmTlGIJodo4eXb6aScZgu6zzq 2uvIAUF4rw4guyYrhc05rrfrM9qQDBkHjn25p+VUbXpPfau4PO+rqZMVj6ssMlB6/D+0 uvY7tlCrXoWsmJ0A9JtLOUGV1VI5RtVUcibDS0tZtOjajPfC2mtYqkMkJZo7+alvdZpw 3zU/GoLgVnzd+MgnD+/kZOxknw0ZN2uEZMe65mMtAA+IqxwNboHLjKE3UGARa2H9x9wX X7f5cKoZjfV581pzBC20dR2i44xtziZpSPbv6j2sYXZyPmhP9BxNxopPvli8wUyG4UFi OM2A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=xoaNC3Hm7Q9E94djKfLyP59A35qSVZ/ZZ/TO6qGprXQ=; b=bBzJMt4UAqZdSN1dWVRaqyBe8saFUM8ZPPgvWf2tFfeHL15s9h73DL0aRTtJnYAs2g qB4m2Fx2IwW7QzXyCCisOx/b/Z1YegPqkKHsc1xEW+BgV6xpiMlZU+7Apq6OiCzYPdPB uLu6mf36t92cOP2VDeb0xgagsi5w0R8nXTCOZp91HKKWClRnvQARYF3thpXAQiKG1BuN vNhoZYjyT2ax0VKDk60Z74a7h57sY0lu1naTojWHL0AaoLlsfGXBwbUPPfbFp2Nh9UgB fPgJstnzur9n8AdFQ2/hGcS4k/QrAHezOadPxXCSKagmt540vqj8YHSqA39mbZP7tfsZ AfRw== X-Gm-Message-State: APjAAAUELnzXMuoIupgLxgD6gXl2v2d2FBA+ZnE9eVlT/Ik7A9T7egFF I4FTqoutP8kP9IgeMq95kFxR6Due X-Google-Smtp-Source: APXvYqxmGUzV5QsBS9ggYzXwvQkqe+fAUqJ5tOnka7cgHIgDRWDrfSj/XDLYP6LaPtNuFFkSaanXtg== X-Received: by 2002:a0c:e9c4:: with SMTP id q4mr7997242qvo.61.1573735354608; Thu, 14 Nov 2019 04:42:34 -0800 (PST) Received: from casantos.remote.csb (177.204.233.88.dynamic.adsl.gvt.net.br. [177.204.233.88]) by smtp.gmail.com with ESMTPSA id 97sm682805qtb.11.2019.11.14.04.42.32 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 14 Nov 2019 04:42:34 -0800 (PST) From: unixmania@gmail.com To: buildroot@buildroot.org Date: Thu, 14 Nov 2019 09:42:12 -0300 Message-Id: <20191114124215.12985-3-unixmania@gmail.com> X-Mailer: git-send-email 2.18.1 In-Reply-To: <20191114124215.12985-1-unixmania@gmail.com> References: <20191114124215.12985-1-unixmania@gmail.com> MIME-Version: 1.0 Subject: [Buildroot] [PATCH/next v2 2/5] package/ti-sgx-{km, um, demos}: bump to latest TI version X-BeenThere: buildroot@busybox.net 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: Lothar Felten Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" From: Lothar Felten ti-sgx-um - Bump the version that matches TI SDK 06.00.00.07 plus one pull request that updates the EGL/GLES headers required to build qt5base. - Rewrite the init script, following the current template and using the pvrsrvctl command (pvrsrvinit does not exit anymore). - Remove powervr.ini, no longer used in the TI SDK. - Select and add a dependency on wayland, or else packages that link to libEGL (e.g. cairo) fail to link due to a missing libwayland-server. ti-sgx-demos - Bump the version that matches TI SDK 06.00.00.07 plus one pull request (matching ti-sgx-um). ti-sgx-km - Bump the version that matches TI SDK 06.00.00.07. The buildroot package only supports the target am335x. Support for other boards can be added by adding menu entries to select the correct target product. Signed-off-by: Lothar Felten Signed-off-by: Carlos Santos --- Changes v1->v2: - Do not install the init script provided by TI. - Bump ti-sgx-um for EGL/GLES headers for qt5base, or else it breaks: qeglfskmsgbmintegration.cpp: In member function ‘virtual void* QEglFSKmsGbmIntegration::createDisplay(EGLNativeDisplayType)’: qeglfskmsgbmintegration.cpp:85:60: error: invalid conversion from ‘EGLNativeDisplayType’ {aka ‘int’} to ‘void*’ [-fpermissive] display = getPlatformDisplay(EGL_PLATFORM_GBM_KHR, nativeDisplay, nullptr); - Bump ti-sgx-demos to match ti-sgx-um - Select/depend on wayland (or else packages depending on ti-sgx-um fail to build due to missing libwayland-server). - Update the init script - Update commit message --- package/ti-sgx-demos/ti-sgx-demos.hash | 2 +- package/ti-sgx-demos/ti-sgx-demos.mk | 6 +- package/ti-sgx-km/Config.in | 37 +---------- package/ti-sgx-km/ti-sgx-km.hash | 2 +- package/ti-sgx-km/ti-sgx-km.mk | 22 ++----- ...-Makefile-do-not-install-init-script.patch | 39 +++++++++++ package/ti-sgx-um/Config.in | 3 + package/ti-sgx-um/S80ti-sgx | 64 +++++++++++++++---- package/ti-sgx-um/powervr.ini | 6 -- package/ti-sgx-um/ti-sgx-um.hash | 2 +- package/ti-sgx-um/ti-sgx-um.mk | 19 +++--- 11 files changed, 117 insertions(+), 85 deletions(-) create mode 100644 package/ti-sgx-um/0001-Makefile-do-not-install-init-script.patch delete mode 100644 package/ti-sgx-um/powervr.ini diff --git a/package/ti-sgx-demos/ti-sgx-demos.hash b/package/ti-sgx-demos/ti-sgx-demos.hash index 43acf9102a..2ad0546895 100644 --- a/package/ti-sgx-demos/ti-sgx-demos.hash +++ b/package/ti-sgx-demos/ti-sgx-demos.hash @@ -1,2 +1,2 @@ # Locally computed: -sha256 9d1d4da2c2b35303e239f99eb4003b8b206078a682aa083d5fb831ee4197f3bf ti-sgx-demos-f24650bc8243b25c23d6a0a502ed79fc472ac424.tar.gz +sha256 1324115da376bc8108923c596a3c4d8df24a968395461df11e0b715764a942d4 ti-sgx-demos-bb8b74cdd1323e76697b3eb2258f863b15fee287.tar.gz diff --git a/package/ti-sgx-demos/ti-sgx-demos.mk b/package/ti-sgx-demos/ti-sgx-demos.mk index 80af79b983..862483516c 100644 --- a/package/ti-sgx-demos/ti-sgx-demos.mk +++ b/package/ti-sgx-demos/ti-sgx-demos.mk @@ -4,14 +4,14 @@ # ################################################################################ -# This correpsonds to SDK 02.00.00.00 -TI_SGX_DEMOS_VERSION = f24650bc8243b25c23d6a0a502ed79fc472ac424 +# This correpsonds to SDK 06.00.00.07 plus one pull request +TI_SGX_DEMOS_VERSION = bb8b74cdd1323e76697b3eb2258f863b15fee287 TI_SGX_DEMOS_SITE = git://git.ti.com/graphics/img-pvr-sdk.git TI_SGX_DEMOS_LICENSE = Imagination Technologies License Agreement TI_SGX_DEMOS_LICENSE_FILES = LegalNotice.txt define TI_SGX_DEMOS_INSTALL_TARGET_CMDS - cp -dpfr $(@D)/targetfs/Examples/Advanced/OGLES* \ + cp -dpfr $(@D)/targetfs/arm/Examples/Advanced/Wayland/OGLES* \ $(TARGET_DIR)/usr/bin/ endef diff --git a/package/ti-sgx-km/Config.in b/package/ti-sgx-km/Config.in index 348efdeb82..1e49a538fc 100644 --- a/package/ti-sgx-km/Config.in +++ b/package/ti-sgx-km/Config.in @@ -8,7 +8,7 @@ config BR2_PACKAGE_TI_SGX_KM select BR2_LINUX_NEEDS_MODULES help Kernel modules for TI CPUs with SGX GPU. - This package supports AM335x, AM437x, AM4430 and AM5430. + This package supports AM335x only. It builds the kernel module and the user space binaries. For older CPUs or kernels use the ti-gfx package. @@ -16,38 +16,3 @@ config BR2_PACKAGE_TI_SGX_KM http://git.ti.com/graphics/omap5-sgx-ddk-linux -if BR2_PACKAGE_TI_SGX_KM - -choice - prompt "Target" - default BR2_PACKAGE_TI_SGX_KM_AM335X if BR2_PACKAGE_TI_SGX_AM335X # legacy - default BR2_PACKAGE_TI_SGX_KM_AM437X if BR2_PACKAGE_TI_SGX_AM437X # legacy - default BR2_PACKAGE_TI_SGX_KM_AM4430 if BR2_PACKAGE_TI_SGX_AM4430 # legacy - default BR2_PACKAGE_TI_SGX_KM_AM5430 if BR2_PACKAGE_TI_SGX_AM5430 # legacy - default BR2_PACKAGE_TI_SGX_KM_AM335X - help - Select the SOC for which you would like to install drivers. - -config BR2_PACKAGE_TI_SGX_KM_AM335X - bool "AM335x" - help - AM335x CPU - -config BR2_PACKAGE_TI_SGX_KM_AM437X - bool "AM437x" - help - AM437x CPU - -config BR2_PACKAGE_TI_SGX_KM_AM4430 - bool "AM4430" - help - AM4430 CPU - -config BR2_PACKAGE_TI_SGX_KM_AM5430 - bool "AM5430" - help - AM5430 CPU - -endchoice - -endif diff --git a/package/ti-sgx-km/ti-sgx-km.hash b/package/ti-sgx-km/ti-sgx-km.hash index 7f7e0acd4d..2bb5e55f6e 100644 --- a/package/ti-sgx-km/ti-sgx-km.hash +++ b/package/ti-sgx-km/ti-sgx-km.hash @@ -1,2 +1,2 @@ # Locally computed: -sha256 47728ff8fc48827116cc042efa777a22a83dd4bd17c494e2a53b8c204ca59624 ti-sgx-km-2b7523d07a13ab704a24a7664749551f4a13ed32.tar.gz +sha256 f1505f38f9e82f958673bb1755e65090bdbc513a68d41640561d9d491bc4b0e3 ti-sgx-km-4519ed3b83d1d72207ddc2874c7eb5e5a7f20d8d.tar.gz diff --git a/package/ti-sgx-km/ti-sgx-km.mk b/package/ti-sgx-km/ti-sgx-km.mk index 0e1bc33902..6e1f3fa40e 100644 --- a/package/ti-sgx-km/ti-sgx-km.mk +++ b/package/ti-sgx-km/ti-sgx-km.mk @@ -4,8 +4,8 @@ # ################################################################################ -# This correpsonds to SDK 02.00.00.00 -TI_SGX_KM_VERSION = 2b7523d07a13ab704a24a7664749551f4a13ed32 +# This correpsonds to SDK 06.00.00.07 +TI_SGX_KM_VERSION = 4519ed3b83d1d72207ddc2874c7eb5e5a7f20d8d TI_SGX_KM_SITE = git://git.ti.com/graphics/omap5-sgx-ddk-linux.git TI_SGX_KM_LICENSE = GPL-2.0 TI_SGX_KM_LICENSE_FILES = GPL-COPYING @@ -15,19 +15,11 @@ TI_SGX_KM_DEPENDENCIES = linux TI_SGX_KM_MAKE_OPTS = \ $(LINUX_MAKE_FLAGS) \ KERNELDIR=$(LINUX_DIR) \ - PVR_NULLDRM=1 - -ifeq ($(BR2_PACKAGE_TI_SGX_KM_AM335X),y) -TI_SGX_KM_PLATFORM_NAME = omap335x -else ifeq ($(BR2_PACKAGE_TI_SGX_KM_AM437X),y) -TI_SGX_KM_PLATFORM_NAME = omap437x -else ifeq ($(BR2_PACKAGE_TI_SGX_KM_AM4430),y) -TI_SGX_KM_PLATFORM_NAME = omap4430 -else ifeq ($(BR2_PACKAGE_TI_SGX_KM_5430),y) -TI_SGX_KM_PLATFORM_NAME = omap5430 -endif - -TI_SGX_KM_SUBDIR = eurasia_km/eurasiacon/build/linux2/$(TI_SGX_KM_PLATFORM_NAME)_linux + TARGET_PRODUCT=$(TI_SGX_KM_PLATFORM_NAME) + +TI_SGX_KM_PLATFORM_NAME = ti335x + +TI_SGX_KM_SUBDIR = eurasia_km/eurasiacon/build/linux2/omap_linux define TI_SGX_KM_BUILD_CMDS $(TARGET_MAKE_ENV) $(MAKE) $(TI_SGX_KM_MAKE_OPTS) \ diff --git a/package/ti-sgx-um/0001-Makefile-do-not-install-init-script.patch b/package/ti-sgx-um/0001-Makefile-do-not-install-init-script.patch new file mode 100644 index 0000000000..7509d4ef9d --- /dev/null +++ b/package/ti-sgx-um/0001-Makefile-do-not-install-init-script.patch @@ -0,0 +1,39 @@ +From afb92e4b1cd05388f519868215d0e8a4672ebb0e Mon Sep 17 00:00:00 2001 +From: Carlos Santos +Date: Sun, 10 Nov 2019 22:44:44 -0300 +Subject: [PATCH] Makefile: do not install init script + +Use a custom one, made for Buildroot, instead. + +Signed-off-by: Carlos Santos +--- + Makefile | 3 --- + 1 file changed, 3 deletions(-) + +diff --git a/Makefile b/Makefile +index 649111a..19016f3 100755 +--- a/Makefile ++++ b/Makefile +@@ -3,7 +3,6 @@ TARGET_PRODUCT ?= jacinto6evm + SRCDIR = ./targetfs/${TARGET_PRODUCT} + + prefix = /usr +-etcdir = /etc + bindir = ${prefix}/bin + incdir = ${prefix}/include + libdir = ${prefix}/lib +@@ -11,11 +10,9 @@ libdir = ${prefix}/lib + all: + + install: +- mkdir -p ${DESTDIR}${etcdir} + mkdir -p ${DESTDIR}${bindir} + mkdir -p ${DESTDIR}${incdir} + mkdir -p ${DESTDIR}${libdir} +- cp -ar ${SRCDIR}/etc/* ${DESTDIR}${etcdir} + cp -ar ${SRCDIR}/bin/* ${DESTDIR}${bindir} + cp -ar ${SRCDIR}/include/* ${DESTDIR}${incdir} + cp -ar ${SRCDIR}/lib/* ${DESTDIR}${libdir} +-- +2.18.1 + diff --git a/package/ti-sgx-um/Config.in b/package/ti-sgx-um/Config.in index 8e1e4fb270..3710ac0e07 100644 --- a/package/ti-sgx-um/Config.in +++ b/package/ti-sgx-um/Config.in @@ -15,6 +15,9 @@ config BR2_PACKAGE_TI_SGX_UM select BR2_PACKAGE_HAS_LIBEGL select BR2_PACKAGE_HAS_LIBGLES select BR2_PACKAGE_HAS_POWERVR + select BR2_PACKAGE_TI_SGX_LIBGBM + select BR2_PACKAGE_LIBFFI + select BR2_PACKAGE_WAYLAND help Graphics libraries for TI CPUs with SGX5xx GPU. This package supports AM335x, AM437x, AM4430 and AM5430. diff --git a/package/ti-sgx-um/S80ti-sgx b/package/ti-sgx-um/S80ti-sgx index 8cae52fd6e..2630a0576a 100644 --- a/package/ti-sgx-um/S80ti-sgx +++ b/package/ti-sgx-um/S80ti-sgx @@ -1,14 +1,56 @@ #!/bin/sh + +pvrsrvkm_ko="/lib/modules/$(/bin/uname -r)/extra/pvrsrvkm.ko" + +pvr_loaded() { + /sbin/lsmod | /bin/grep -q '^\' +} + +pvr_load() { + /sbin/insmod "$pvrsrvkm_ko" > /dev/null 2>&1 +} + +start() { + printf 'Loading pvrsrvkm module: ' + pvr_loaded || pvr_load + status=$? + if [ "$status" -eq 0 ]; then + printf 'Starting PowerVR services: ' + /usr/bin/pvrsrvctl --start --no-module > /dev/null 2>&1 + status=$? + fi + if [ "$status" -eq 0 ]; then + echo "OK" + else + echo "FAIL" + fi + return "$status" +} + +stop() { + printf 'Starting PowerVR services: ' + /usr/bin/pvrsrvctl --stop > /dev/null 2>&1 + status=$? + if [ "$status" -eq 0 ]; then + echo "OK" + else + echo "FAIL" + fi + return "$status" +} + +restart() { + stop + sleep 1 + start +} + case "$1" in - start) - printf "Initializing SGX graphics driver " - /usr/bin/pvrsrvinit - [ $? = 0 ] && echo "OK" || echo "FAIL" - ;; - stop) - ;; - *) - echo "Usage: $0 {start|stop}" - exit 1 - ;; + start|stop|restart) + "$1";; + reload) + restart;; + *) + echo "Usage: $0 {start|stop|restart|reload}" + exit 1 esac diff --git a/package/ti-sgx-um/powervr.ini b/package/ti-sgx-um/powervr.ini deleted file mode 100644 index fc92d45d50..0000000000 --- a/package/ti-sgx-um/powervr.ini +++ /dev/null @@ -1,6 +0,0 @@ -[default] -#defaul library without double buffering: -WindowSystem=libpvrDRMWSEGL_FRONT.so -#alternative library, slower but with double buffering -#WindowSystem=libpvrDRMWSEGL.so -DisableHWTQTextureUpload=1 diff --git a/package/ti-sgx-um/ti-sgx-um.hash b/package/ti-sgx-um/ti-sgx-um.hash index a6a0566469..d543350757 100644 --- a/package/ti-sgx-um/ti-sgx-um.hash +++ b/package/ti-sgx-um/ti-sgx-um.hash @@ -1,2 +1,2 @@ # Locally computed: -sha256 c17f23d255cff8fe72fc3f5cae3d7550e387af07d036954b4f08e573379406d0 ti-sgx-um-e15f1543bab4de9e8927a2c4934addf3fd16ffcb.tar.gz +sha256 cb1373a6335af3d3741c6b11cf217afc8bdbe182642229df359c38e3ccfc5866 ti-sgx-um-2a2e5bb090ced870d73ed4edbc54793e952cc6d8.tar.gz diff --git a/package/ti-sgx-um/ti-sgx-um.mk b/package/ti-sgx-um/ti-sgx-um.mk index d5c50a0166..242f58270e 100644 --- a/package/ti-sgx-um/ti-sgx-um.mk +++ b/package/ti-sgx-um/ti-sgx-um.mk @@ -4,28 +4,25 @@ # ################################################################################ -# This correpsonds to SDK 02.00.00.00 -TI_SGX_UM_VERSION = e15f1543bab4de9e8927a2c4934addf3fd16ffcb +# This correpsonds to SDK 06.00.00.07 plus one pull request +TI_SGX_UM_VERSION = 2a2e5bb090ced870d73ed4edbc54793e952cc6d8 TI_SGX_UM_SITE = git://git.ti.com/graphics/omap5-sgx-ddk-um-linux.git TI_SGX_UM_LICENSE = TI TSPA License TI_SGX_UM_LICENSE_FILES = OMAP5-Linux-Graphics-DDK-UM-Manifest.doc TI_SGX_UM_INSTALL_STAGING = YES +TI_SGX_UM_TARGET=ti335x # ti-sgx-um is a egl/gles provider only if libdrm is installed -TI_SGX_UM_DEPENDENCIES = libdrm +TI_SGX_UM_DEPENDENCIES = libdrm wayland define TI_SGX_UM_INSTALL_STAGING_CMDS - $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) DISCIMAGE=$(STAGING_DIR) install + $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) DISCIMAGE=$(STAGING_DIR) \ + TARGET_PRODUCT=$(TI_SGX_UM_TARGET) install endef define TI_SGX_UM_INSTALL_TARGET_CMDS - $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) DISCIMAGE=$(TARGET_DIR) install -endef - -# libs use the following file for configuration -define TI_SGX_UM_INSTALL_CONF - $(INSTALL) -D -m 0644 package/ti-sgx-um/powervr.ini \ - $(TARGET_DIR)/etc/powervr.ini + $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) DISCIMAGE=$(TARGET_DIR) \ + TARGET_PRODUCT=$(TI_SGX_UM_TARGET) install endef TI_SGX_UM_POST_INSTALL_TARGET_HOOKS += TI_SGX_UM_INSTALL_CONF From patchwork Thu Nov 14 12:42:13 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Carlos Santos X-Patchwork-Id: 1194816 Return-Path: X-Original-To: incoming-buildroot@patchwork.ozlabs.org Delivered-To: patchwork-incoming-buildroot@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=busybox.net (client-ip=140.211.166.138; helo=whitealder.osuosl.org; envelope-from=buildroot-bounces@busybox.net; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="efaR7U1n"; dkim-atps=neutral Received: from whitealder.osuosl.org (smtp1.osuosl.org [140.211.166.138]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 47DLjn1xKjz9s7T for ; Thu, 14 Nov 2019 23:42:53 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 01E808957D; Thu, 14 Nov 2019 12:42:49 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from whitealder.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 6xzglz8cF-EV; Thu, 14 Nov 2019 12:42:44 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by whitealder.osuosl.org (Postfix) with ESMTP id D001B895A3; Thu, 14 Nov 2019 12:42:41 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from fraxinus.osuosl.org (smtp4.osuosl.org [140.211.166.137]) by ash.osuosl.org (Postfix) with ESMTP id 395DD1BF5A3 for ; Thu, 14 Nov 2019 12:42:39 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id 36052884DE for ; Thu, 14 Nov 2019 12:42:39 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from fraxinus.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id Lo82AAzHHhiq for ; Thu, 14 Nov 2019 12:42:38 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-qk1-f175.google.com (mail-qk1-f175.google.com [209.85.222.175]) by fraxinus.osuosl.org (Postfix) with ESMTPS id 991FF884A7 for ; Thu, 14 Nov 2019 12:42:38 +0000 (UTC) Received: by mail-qk1-f175.google.com with SMTP id q70so4779812qke.12 for ; Thu, 14 Nov 2019 04:42:38 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=BdsvOqV9dzFVq6SDvKXmYpx6HGieRb51UurgMwwmWyw=; b=efaR7U1n1ReSlkGSIdc+aiiZV4532osYxiTCqatPgO+c7igTiX+qxgOMHMB7PlxspW 48//LoavaDteY8l34K7oFq1cS94F9OY41yIOjHkaVm5m2yN6BWw0LJOz9tCHdB8fC2pa 7vntAYTg+ZCdLfyijxF3i6J5BUZFwY2WDtO/9a714z9HO5gQLYoW8ikZpc+DwpinMeli 73zkqBI78QLrpvirQRIL+UM7ybS1HYpb/FFqeTKZaZ9kurgh/JhsxP1jjyaDiHap9FVf 1nvPTcxoAXTD0SIXPAUudDbJq8Hx0ZZLx1Y/gpo4z5Dnhgp3os8YyTxUPT2ClqvmKaI8 Ivfw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=BdsvOqV9dzFVq6SDvKXmYpx6HGieRb51UurgMwwmWyw=; b=VLVYzMIhy+o+AA0aOXDiVnBjnM18NENC6Zcjde3tetfThuup93CxK4uRTIfr7HbdBO IMCK1hP3RciNCtIqoRLgphqGprEdXu3EbLk5sPvZDKqlaxXTCNvOsyKRbrtYu4ss1g28 /BvyZuZLPSgEoSK5wrw5ldFa6DHepg2WTeVjwdTzAy0NuWXyybqw6UxRXb5LTkGQo7eN vlg3PWX/L2C4i8CtFb2rb/RJrMqhHvPCnCo8CHdFME+nWRuYeM9fe5KFy1Gyj/SJii+q 6+P73z6f3EYFQnCvrm8kF8uU3mChw/Q/+TxfMgZptUreOFiGu3LAh0C9EvLshCz4FQ4a Cs2g== X-Gm-Message-State: APjAAAVeDbfilxl42SIY38L90VKeHnr1AAJ6qBXIjcs0MmSutcp4MW6Z tj561UkY5gSfv44qkkPbfQoZu0bi X-Google-Smtp-Source: APXvYqwfGoFCue3LX7lkVCTIuZ+8dNY72gMphLwMv2i6tYeeGE4tPJeOubYy48z6KRWQrszHXhR/OQ== X-Received: by 2002:a37:9c85:: with SMTP id f127mr7389198qke.186.1573735357440; Thu, 14 Nov 2019 04:42:37 -0800 (PST) Received: from casantos.remote.csb (177.204.233.88.dynamic.adsl.gvt.net.br. [177.204.233.88]) by smtp.gmail.com with ESMTPSA id 97sm682805qtb.11.2019.11.14.04.42.34 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 14 Nov 2019 04:42:36 -0800 (PST) From: unixmania@gmail.com To: buildroot@buildroot.org Date: Thu, 14 Nov 2019 09:42:13 -0300 Message-Id: <20191114124215.12985-4-unixmania@gmail.com> X-Mailer: git-send-email 2.18.1 In-Reply-To: <20191114124215.12985-1-unixmania@gmail.com> References: <20191114124215.12985-1-unixmania@gmail.com> Subject: [Buildroot] [PATCH/next v2 3/5] package/qt5/qt5base: support ti-sgx-libgbm X-BeenThere: buildroot@busybox.net 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: Lothar Felten MIME-Version: 1.0 Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" From: Lothar Felten qt5 configure options: add ti-sgx-libgbm as GBM backend Signed-off-by: Lothar Felten --- package/qt5/qt5base/qt5base.mk | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/package/qt5/qt5base/qt5base.mk b/package/qt5/qt5base/qt5base.mk index 15c9650391..6b89358521 100644 --- a/package/qt5/qt5base/qt5base.mk +++ b/package/qt5/qt5base/qt5base.mk @@ -74,10 +74,13 @@ else QT5BASE_CONFIGURE_OPTS += -no-kms endif -# Uses libgbm from mesa3d +# Uses libgbm from mesa3d or ti-sgx-libgbm ifeq ($(BR2_PACKAGE_MESA3D_OPENGL_EGL),y) QT5BASE_CONFIGURE_OPTS += -gbm QT5BASE_DEPENDENCIES += mesa3d +else ifeq ($(BR2_PACKAGE_TI_SGX_LIBGBM),y) +QT5BASE_CONFIGURE_OPTS += -gbm +QT5BASE_DEPENDENCIES += ti-sgx-libgbm else QT5BASE_CONFIGURE_OPTS += -no-gbm endif From patchwork Thu Nov 14 12:42:14 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Carlos Santos X-Patchwork-Id: 1194815 Return-Path: X-Original-To: incoming-buildroot@patchwork.ozlabs.org Delivered-To: patchwork-incoming-buildroot@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=busybox.net (client-ip=140.211.166.136; helo=silver.osuosl.org; envelope-from=buildroot-bounces@busybox.net; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="U7j8sTwd"; dkim-atps=neutral Received: from silver.osuosl.org (smtp3.osuosl.org [140.211.166.136]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 47DLjj2HLmz9s7T for ; Thu, 14 Nov 2019 23:42:49 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id 03C4F25D76; Thu, 14 Nov 2019 12:42:46 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from silver.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id uMJfsWeX6mk8; Thu, 14 Nov 2019 12:42:44 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by silver.osuosl.org (Postfix) with ESMTP id 21EE02547E; Thu, 14 Nov 2019 12:42:44 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from silver.osuosl.org (smtp3.osuosl.org [140.211.166.136]) by ash.osuosl.org (Postfix) with ESMTP id DF08A1BF5A3 for ; Thu, 14 Nov 2019 12:42:41 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id D8C952547E for ; Thu, 14 Nov 2019 12:42:41 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from silver.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id kb2OSQtgMka1 for ; Thu, 14 Nov 2019 12:42:41 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-qk1-f171.google.com (mail-qk1-f171.google.com [209.85.222.171]) by silver.osuosl.org (Postfix) with ESMTPS id D8CA32544B for ; Thu, 14 Nov 2019 12:42:40 +0000 (UTC) Received: by mail-qk1-f171.google.com with SMTP id 205so4830807qkk.1 for ; Thu, 14 Nov 2019 04:42:40 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=njz6URWKV37IMCGNDeBLgscqRp/9rLhZRTEmY50TnAU=; b=U7j8sTwdgXz2sR/s6+cxYS+WqqJ4KHjo8ho4vFdwIrZOE3TjUIMxuynUO+xLvVdA1e U+Ae46DADMxULMdjQMLFhIbpTD2fr0TFvaQOFnBzp4W2+KZN8iZiKBZpiA9ECz+8luWs DUqg5j2DSoQGw/h92QQKEO9EV0ra2WC8GLtHmFb6/VI1p3bLEBiM9VAdAHUSfovgI6QA nV8GF9mbXYtWNXQ1WJuIafMZR7ZeYxT4Uv+phTqVkMwl8Dvff4MWf7sqr1YlknaUR1co 9iYVGv6+bInvHp3Y00qYs40qFmvjx2hWbRZwBlAD7CJ7lkQE96qaAlvh3BPvnqH8DCv2 7F1w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=njz6URWKV37IMCGNDeBLgscqRp/9rLhZRTEmY50TnAU=; b=lP6Og8Qvr9DeqO8qhKJRPvugoWt3boSznNC0lihI5Vvic0zCDK3+Tmg0zQ1d/tuT/c WFZLvffvZwpqSNHbdH/XtYV1vp8dm3rD97GYduqGQFzB01x6n7Ds8M8v1S/EMCf3HkOr pO7E349Zw1awWKx4cCqfUD9hXxiMHJSlN8NUI7OJNFjnf322ClIhPHfM+BE7F5xnG5Dn /By74nAsIE2Pgr9O1ql9pbxc8hqVocm/BNjA9Z/BO7bgqFb/G5wGMxYbUxTBHHnyYlXU bSh4HMD18gu42QxjgS8S2r6ihhrpo4+NP8+w3OPOE8e/nh8F5w+HzsFMmg1wpKCcwpJ4 fTUQ== X-Gm-Message-State: APjAAAWaHSMcVMj4JBy1NEDuVBUlxPjS9j2R7sdoEPc0KY0DtpKhq8Sz tKqxwyRDjgPiLpwlGwWGWB8kDEfI X-Google-Smtp-Source: APXvYqzpilbgPxOpOBC+LIPTgn/9SJDmalX/uiKh7SvMXwhPxKZrRbEgf30ftObl1fSqsEzbvA8/zA== X-Received: by 2002:a05:620a:133b:: with SMTP id p27mr6724443qkj.363.1573735359650; Thu, 14 Nov 2019 04:42:39 -0800 (PST) Received: from casantos.remote.csb (177.204.233.88.dynamic.adsl.gvt.net.br. [177.204.233.88]) by smtp.gmail.com with ESMTPSA id 97sm682805qtb.11.2019.11.14.04.42.37 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 14 Nov 2019 04:42:39 -0800 (PST) From: unixmania@gmail.com To: buildroot@buildroot.org Date: Thu, 14 Nov 2019 09:42:14 -0300 Message-Id: <20191114124215.12985-5-unixmania@gmail.com> X-Mailer: git-send-email 2.18.1 In-Reply-To: <20191114124215.12985-1-unixmania@gmail.com> References: <20191114124215.12985-1-unixmania@gmail.com> Subject: [Buildroot] [PATCH/next v2 4/5] configs/beaglebone_qt5: bump kernel and U-Boot, add weston X-BeenThere: buildroot@busybox.net 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: Lothar Felten MIME-Version: 1.0 Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" From: Lothar Felten - Use the same kernel repository and version as configs/beaglebone - Rename kernel fragment file - Update U-Boot to 2019.07 - Select weston and qt5wayland - Select host-uboot-tools with FIT support, required to create the images. Signed-off-by: Lothar Felten Signed-off-by: Carlos Santos --- Changes v1->v2: - Switch kernel source URL to BeagleBoard repository - Select host-uboot-tools - Update commit message --- ...ux-4.1-sgx.fragment => linux-sgx.fragment} | 1 + configs/beaglebone_qt5_defconfig | 23 +++++++++++-------- 2 files changed, 14 insertions(+), 10 deletions(-) rename board/beaglebone/{linux-4.1-sgx.fragment => linux-sgx.fragment} (92%) diff --git a/board/beaglebone/linux-4.1-sgx.fragment b/board/beaglebone/linux-sgx.fragment similarity index 92% rename from board/beaglebone/linux-4.1-sgx.fragment rename to board/beaglebone/linux-sgx.fragment index c0d2e7b28a..58d46f588b 100644 --- a/board/beaglebone/linux-4.1-sgx.fragment +++ b/board/beaglebone/linux-sgx.fragment @@ -10,3 +10,4 @@ CONFIG_DRM_OMAP_WB_M2M=y CONFIG_DRM_TILCDC=y CONFIG_DRM_I2C_NXP_TDA998X=y CONFIG_DRM=y +CONFIG_DRM_LEGACY=y diff --git a/configs/beaglebone_qt5_defconfig b/configs/beaglebone_qt5_defconfig index fb61bf54df..4a558c9ad4 100644 --- a/configs/beaglebone_qt5_defconfig +++ b/configs/beaglebone_qt5_defconfig @@ -1,36 +1,37 @@ BR2_arm=y BR2_cortex_a8=y BR2_GLOBAL_PATCH_DIR="board/beaglebone/patches" -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_1=y BR2_TOOLCHAIN_BUILDROOT_GLIBC=y -BR2_GCC_VERSION_5_X=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_19=y BR2_TOOLCHAIN_BUILDROOT_CXX=y BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_EUDEV=y -BR2_TARGET_GENERIC_GETTY_PORT="ttyO0" BR2_ROOTFS_POST_IMAGE_SCRIPT="board/beaglebone/post-image.sh" BR2_LINUX_KERNEL=y -BR2_LINUX_KERNEL_CUSTOM_GIT=y -BR2_LINUX_KERNEL_CUSTOM_REPO_URL="git://git.ti.com/processor-sdk/processor-sdk-linux.git" -BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="52c4aa7cdb93d61f8008f380135beaf7b8fa6593" +BR2_LINUX_KERNEL_CUSTOM_TARBALL=y +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,beagleboard,linux,4.19.79-ti-r30)/linux-4.19.79-ti-r30.tar.gz" BR2_LINUX_KERNEL_DEFCONFIG="omap2plus" -BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="board/beaglebone/linux-4.1-sgx.fragment" +BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="board/beaglebone/linux-sgx.fragment" BR2_LINUX_KERNEL_DTS_SUPPORT=y -BR2_LINUX_KERNEL_INTREE_DTS_NAME="am335x-evm am335x-bone am335x-boneblack am335x-evmsk" +BR2_LINUX_KERNEL_INTREE_DTS_NAME="am335x-evm am335x-bone am335x-boneblack am335x-bonegreen am335x-evmsk am335x-boneblue" BR2_PACKAGE_FBV=y BR2_PACKAGE_QT5=y BR2_PACKAGE_QT5BASE_EXAMPLES=y BR2_PACKAGE_QT5BASE_EGLFS=y +BR2_PACKAGE_QT5BASE_DEFAULT_QPA="wayland" BR2_PACKAGE_QT5QUICKCONTROLS=y +BR2_PACKAGE_QT5WAYLAND=y +BR2_PACKAGE_QT5WAYLAND_COMPOSITOR=y +BR2_PACKAGE_WESTON=y BR2_PACKAGE_TI_SGX_DEMOS=y BR2_PACKAGE_TI_SGX_KM=y BR2_PACKAGE_TI_SGX_UM=y BR2_TARGET_ROOTFS_EXT2=y BR2_TARGET_ROOTFS_EXT2_4=y -BR2_TARGET_ROOTFS_EXT2_SIZE="124M" +BR2_TARGET_ROOTFS_EXT2_SIZE="250M" BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y BR2_TARGET_UBOOT_CUSTOM_VERSION=y -BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2016.09.01" +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2019.07" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="am335x_evm" BR2_TARGET_UBOOT_NEEDS_DTC=y # BR2_TARGET_UBOOT_FORMAT_BIN is not set @@ -42,3 +43,5 @@ BR2_TARGET_UBOOT_SPL_NAME="MLO" BR2_PACKAGE_HOST_DOSFSTOOLS=y BR2_PACKAGE_HOST_GENIMAGE=y BR2_PACKAGE_HOST_MTOOLS=y +BR2_PACKAGE_HOST_UBOOT_TOOLS=y +BR2_PACKAGE_HOST_UBOOT_TOOLS_FIT_SUPPORT=y From patchwork Thu Nov 14 12:42:15 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Carlos Santos X-Patchwork-Id: 1194817 Return-Path: X-Original-To: incoming-buildroot@patchwork.ozlabs.org Delivered-To: patchwork-incoming-buildroot@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=busybox.net (client-ip=140.211.166.136; helo=silver.osuosl.org; envelope-from=buildroot-bounces@busybox.net; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="PXSbPXcz"; dkim-atps=neutral Received: from silver.osuosl.org (smtp3.osuosl.org [140.211.166.136]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 47DLjz57ldz9sP6 for ; Thu, 14 Nov 2019 23:43:01 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id AE7A525AD0; Thu, 14 Nov 2019 12:42:58 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from silver.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id MvNrezPwQTDB; Thu, 14 Nov 2019 12:42:51 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by silver.osuosl.org (Postfix) with ESMTP id 3C70125488; Thu, 14 Nov 2019 12:42:51 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from whitealder.osuosl.org (smtp1.osuosl.org [140.211.166.138]) by ash.osuosl.org (Postfix) with ESMTP id 5BEEB1BF97F for ; Thu, 14 Nov 2019 12:42:49 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 52AB689597 for ; Thu, 14 Nov 2019 12:42:49 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from whitealder.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 2hLWIAJYuMlW for ; Thu, 14 Nov 2019 12:42:44 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-qt1-f196.google.com (mail-qt1-f196.google.com [209.85.160.196]) by whitealder.osuosl.org (Postfix) with ESMTPS id DCAB4895C6 for ; Thu, 14 Nov 2019 12:42:43 +0000 (UTC) Received: by mail-qt1-f196.google.com with SMTP id r20so6538778qtp.13 for ; Thu, 14 Nov 2019 04:42:43 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=UzTRk5lPPfc/wAi0cSb+uks946mQPgRoLIrV4rX0ABY=; b=PXSbPXczExaBigPffctpkOOxsx/l2k4Pl0ldIe+VdpdmnbrUrV1WrxEcgd3M2IUDTP vU0nygQKn3QNl0xJkzP0ANcS/Wpi7trA63pO1YSRXvodDmlY5cQKhSnTCuUi85vfOhIR V9j/n7m6qqxDHu1q4HrkUxMHgTyOekNvga+HIcBRTp8UPgeXP4tAUzQ6g2Vkm1ZzyNQm nsSi0KVCpx03hLRQJ3hWth36gvIfXmXrp2vOSH9qrtOW07hwgLbs1ZPxsMG1lpoZK7Qi dLlP9MHIRBS0aghjxl/CNrxivSW2dgSwTsCW96DBnplvfulPPnyqHhtl4WpcKTeFr4cL slMQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=UzTRk5lPPfc/wAi0cSb+uks946mQPgRoLIrV4rX0ABY=; b=aPtPPQyYYbqO9RJTlf0DiNuorxfyY8OqtGQTw1d66XjRWOzUFKJ6pg9T28N0vzKkb2 Vl7oN2KHSVYCewChXL5AgTqukmP2E2yZsQJ8Moo9gBCcQq5RxGuw2+uMgzH95xlQscHQ re2MNW8UwOcUijzubcr905ymHetoLja6pmo+SRoAzxzqRvyoJG+5DneuUnXOP3L/Ol1h dgYMtZmHNtR1o8W8KWIPkMgo8mWExOeYibFpJZq6H3ERjjMRaW/hyhg1dTaonM9QEpjQ ccaxLBXN29nBUECB66M1mckwhcVSq0q67WamUDZmxavPZxVpn8rFkSaJWXdSmBdpZ8Sv fV/Q== X-Gm-Message-State: APjAAAUMEdGbroTRCtdbxSb/uyPiHOmBvLVjrMaEj+IK0j9vXNuClhY8 egw1SoffGWi5NsxV6VMGOWHkg/Ub X-Google-Smtp-Source: APXvYqwEVeqsopK5TvaU09j9jNw1HH/xpxI627BsDBWcuPgu0q+vEwCy1bRBxEWc3z17yryQpgkyqA== X-Received: by 2002:ac8:7454:: with SMTP id h20mr8060205qtr.146.1573735362497; Thu, 14 Nov 2019 04:42:42 -0800 (PST) Received: from casantos.remote.csb (177.204.233.88.dynamic.adsl.gvt.net.br. [177.204.233.88]) by smtp.gmail.com with ESMTPSA id 97sm682805qtb.11.2019.11.14.04.42.39 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 14 Nov 2019 04:42:41 -0800 (PST) From: unixmania@gmail.com To: buildroot@buildroot.org Date: Thu, 14 Nov 2019 09:42:15 -0300 Message-Id: <20191114124215.12985-6-unixmania@gmail.com> X-Mailer: git-send-email 2.18.1 In-Reply-To: <20191114124215.12985-1-unixmania@gmail.com> References: <20191114124215.12985-1-unixmania@gmail.com> Subject: [Buildroot] [PATCH/next v2 5/5] configs/beaglebone_qt5: don't use custom post-image script X-BeenThere: buildroot@busybox.net 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: Carlos Santos MIME-Version: 1.0 Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" From: Carlos Santos Use support/scripts/genimage.sh, instead, which prevents duplicating TARGET_DIR under ${BUILD_DIR}/genimage.tmp/root. Use a post-build script to copy uEnv.txt to BINARIES_DIR, as made for beaglebone. Drop the post-image script. Signed-off-by: Carlos Santos --- board/beaglebone/post-image.sh | 29 ----------------------------- configs/beaglebone_qt5_defconfig | 4 +++- 2 files changed, 3 insertions(+), 30 deletions(-) delete mode 100755 board/beaglebone/post-image.sh diff --git a/board/beaglebone/post-image.sh b/board/beaglebone/post-image.sh deleted file mode 100755 index 68fe0896c6..0000000000 --- a/board/beaglebone/post-image.sh +++ /dev/null @@ -1,29 +0,0 @@ -#!/bin/sh -# post-image.sh for CircuitCo BeagleBone and TI am335x-evm -# 2014, Marcin Jabrzyk -# 2016, Lothar Felten - -BOARD_DIR="$(dirname $0)" - -# copy the uEnv.txt to the output/images directory -cp board/beaglebone/uEnv.txt $BINARIES_DIR/uEnv.txt - -# the 4.1 kernel does not provide a dtb for beaglebone green, so we -# use a different genimage config if am335x-bonegreen.dtb is not -# built: -if [ -e ${BINARIES_DIR}/am335x-bonegreen.dtb ] ; then - GENIMAGE_CFG="${BOARD_DIR}/genimage.cfg" -else - GENIMAGE_CFG="${BOARD_DIR}/genimage_linux41.cfg" -fi - -GENIMAGE_TMP="${BUILD_DIR}/genimage.tmp" - -rm -rf "${GENIMAGE_TMP}" - -genimage \ - --rootpath "${TARGET_DIR}" \ - --tmppath "${GENIMAGE_TMP}" \ - --inputpath "${BINARIES_DIR}" \ - --outputpath "${BINARIES_DIR}" \ - --config "${GENIMAGE_CFG}" diff --git a/configs/beaglebone_qt5_defconfig b/configs/beaglebone_qt5_defconfig index 4a558c9ad4..99355e855c 100644 --- a/configs/beaglebone_qt5_defconfig +++ b/configs/beaglebone_qt5_defconfig @@ -5,7 +5,9 @@ BR2_TOOLCHAIN_BUILDROOT_GLIBC=y BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_19=y BR2_TOOLCHAIN_BUILDROOT_CXX=y BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_EUDEV=y -BR2_ROOTFS_POST_IMAGE_SCRIPT="board/beaglebone/post-image.sh" +BR2_ROOTFS_POST_BUILD_SCRIPT="board/beaglebone/post-build.sh" +BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" +BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/beaglebone/genimage.cfg" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_TARBALL=y BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,beagleboard,linux,4.19.79-ti-r30)/linux-4.19.79-ti-r30.tar.gz"