From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by yocto-www.yoctoproject.org (Postfix, from userid 118) id CB5E3E011BF; Mon, 25 Jun 2018 12:34:14 -0700 (PDT) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on yocto-www.yoctoproject.org X-Spam-Level: X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,RCVD_IN_DNSWL_NONE autolearn=ham version=3.3.1 X-Spam-HAM-Report: * -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at http://www.dnswl.org/, no * trust * [209.85.216.195 listed in list.dnswl.org] * -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1% * [score: 0.0000] Received: from mail-qt0-f195.google.com (mail-qt0-f195.google.com [209.85.216.195]) by yocto-www.yoctoproject.org (Postfix) with ESMTP id 610F0E0122C for ; Mon, 25 Jun 2018 12:33:46 -0700 (PDT) Received: by mail-qt0-f195.google.com with SMTP id x23-v6so2860143qto.7 for ; Mon, 25 Jun 2018 12:33:46 -0700 (PDT) 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:organization; bh=wb4hLFO7lkVwOyLy9zVAx611k9Znprxndq2ihLMDh9s=; b=h9ViGIgU/xbI22R9YoDwtstAusP95yi9l2Ljr+LR73ZJeE8sHJJkPYOyF96FtatC2Q OMF5BVxQye78Q2uJTN1ecZMvgMj8RwI+QhdVhyNsnAQnawy8JFQCCMfJz/hKsJk006ob 0HxKUKwTmL9GuIa5ei8FiMqgYfclhKwb98uSBKzj2OvqaVwIQIUz067EM4jppsqwTTH1 0uoLsMaaGt/dBc9Fi7T9NuVWb02Ioc+T1e1ZoMKctgvFZcth0XxVhIVVVTTJKT4Wae2A cM73S8u0WPzE/igiVjzvGnsIpC8LKlq63j3qH3cEYqOLRJWNTdu2nqGbjQp2iAZoF4sy B1Zw== X-Gm-Message-State: APt69E0UxwTxv++7sk4oaS8OpjOXWa40CJGCF9aNswMv/DQZNSt67p5h gIs89psZX8Qkx8e3PDZEhDkMCg== X-Google-Smtp-Source: ADUXVKIkYwJ6n6WoqG6AcEvmIo5L+al+rgYEpjxFZ+zgtTBIQbE2hCkUQvDGZOo6UvhJCIm8R7rD2A== X-Received: by 2002:ac8:2c23:: with SMTP id d32-v6mr12058482qta.54.1529955225621; Mon, 25 Jun 2018 12:33:45 -0700 (PDT) Received: from localhost.localdomain ([177.194.218.61]) by smtp.gmail.com with ESMTPSA id p13-v6sm817146qki.12.2018.06.25.12.33.42 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Mon, 25 Jun 2018 12:33:44 -0700 (PDT) Received: by localhost.localdomain (sSMTP sendmail emulation); Mon, 25 Jun 2018 16:33:40 -0300 From: Otavio Salvador To: meta-freescale Mailing List Date: Mon, 25 Jun 2018 16:30:31 -0300 Message-Id: <20180625193032.9248-31-otavio@ossystems.com.br> X-Mailer: git-send-email 2.18.0 In-Reply-To: <20180625193032.9248-1-otavio@ossystems.com.br> References: <20180625193032.9248-1-otavio@ossystems.com.br> Organization: O.S. Systems Software LTDA. Cc: Otavio Salvador Subject: [PATCH 31/32] imx-base.inc: Add imxgpu to MACHINEOVERRIDES_EXTENDER X-BeenThere: meta-freescale@yoctoproject.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Usage and development list for the meta-fsl-* layers List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 25 Jun 2018 19:34:21 -0000 From: Tom Hochstein Add imxgpu to simplify the conditional for imxgpu2d OR imxgpu3d. Note that i.MX 8MQ has no 2D, so the previous idiom of using imxgpu2d to mean any GPU is no longer correct. Signed-off-by: Tom Hochstein Signed-off-by: Otavio Salvador --- conf/machine/include/imx-base.inc | 32 +++++++++++++++---------------- 1 file changed, 15 insertions(+), 17 deletions(-) diff --git a/conf/machine/include/imx-base.inc b/conf/machine/include/imx-base.inc index 6ba5014d..56c2817a 100644 --- a/conf/machine/include/imx-base.inc +++ b/conf/machine/include/imx-base.inc @@ -59,17 +59,17 @@ DEFAULTTUNE_vf ?= "cortexa5thf-neon" INHERIT += "machine-overrides-extender" MACHINEOVERRIDES_EXTENDER_mx25 = "use-mainline-bsp" -MACHINEOVERRIDES_EXTENDER_mx6q = "imxipu:imxvpu:imxgpu2d:imxdpublit:imxgpu3d" -MACHINEOVERRIDES_EXTENDER_mx6dl = "imxpxp:imxipu:imxvpu:imxgpu2d:imxdpublit:imxgpu3d:imxepdc" -MACHINEOVERRIDES_EXTENDER_mx6sx = "imxpxp:imxgpu2d:imxdpublit:imxgpu3d" -MACHINEOVERRIDES_EXTENDER_mx6sl = "imxpxp:imxgpu2d:imxdpublit:imxepdc" +MACHINEOVERRIDES_EXTENDER_mx6q = "imxipu:imxvpu:imxgpu:imxgpu2d:imxdpublit:imxgpu3d" +MACHINEOVERRIDES_EXTENDER_mx6dl = "imxpxp:imxipu:imxvpu:imxgpu:imxgpu2d:imxdpublit:imxgpu3d:imxepdc" +MACHINEOVERRIDES_EXTENDER_mx6sx = "imxpxp:imxgpu:imxgpu2d:imxdpublit:imxgpu3d" +MACHINEOVERRIDES_EXTENDER_mx6sl = "imxpxp:imxgpu:imxgpu2d:imxdpublit:imxepdc" MACHINEOVERRIDES_EXTENDER_mx6sll = "imxpxp:imxepdc" MACHINEOVERRIDES_EXTENDER_mx6ul = "imxpxp" MACHINEOVERRIDES_EXTENDER_mx6ull = "imxpxp:imxepdc" MACHINEOVERRIDES_EXTENDER_mx7d = "imxpxp:imxepdc" -MACHINEOVERRIDES_EXTENDER_mx7ulp = "imxpxp:imxgpu2d:imxdpublit:imxgpu3d" -MACHINEOVERRIDES_EXTENDER_mx8mq = "imxvpu:imxdpu:imxgpu3d" -MACHINEOVERRIDES_EXTENDER_mx8mm = "imxvpu:imxgpu2d:imxdpu:imxgpu3d" +MACHINEOVERRIDES_EXTENDER_mx7ulp = "imxpxp:imxgpu:imxgpu2d:imxdpublit:imxgpu3d" +MACHINEOVERRIDES_EXTENDER_mx8mq = "imxvpu:imxgpu:imxdpu:imxgpu3d" +MACHINEOVERRIDES_EXTENDER_mx8mm = "imxvpu:imxgpu:imxgpu2d:imxdpu:imxgpu3d" MACHINEOVERRIDES_EXTENDER_FILTER_OUT_use-mainline-bsp = " \ mx6 \ @@ -116,13 +116,10 @@ MACHINE_SOCARCH_FILTER_append_imxvpu = " \ imx-vpuwrap \ libimxvpuapi \ " -MACHINE_SOCARCH_FILTER_append_imxgpu2d = " \ +MACHINE_SOCARCH_FILTER_append_imxgpu = " \ virtual/egl \ virtual/mesa \ virtual/libg2d \ - virtual/libgl \ - virtual/libgles1 \ - virtual/libgles2 \ virtual/libopenvg \ cairo \ gstreamer1.0-plugins-bad \ @@ -130,6 +127,11 @@ MACHINE_SOCARCH_FILTER_append_imxgpu2d = " \ pango \ weston \ " +MACHINE_SOCARCH_FILTER_append_imxgpu3d = " \ + virtual/libgl \ + virtual/libgles1 \ + virtual/libgles2 \ +" MACHINE_SOCARCH_FILTER_append_use-mainline-bsp = " \ virtual/egl \ virtual/libopenvg \ @@ -198,12 +200,8 @@ MACHINE_GSTREAMER_1_0_PLUGIN_mx6ull ?= "gstreamer1.0-plugins-imx-meta" MACHINE_GSTREAMER_1_0_PLUGIN_mx7d ?= "gstreamer1.0-plugins-imx-meta" # Determines if the SoC has support for Vivante kernel driver -SOC_HAS_VIVANTE_KERNEL_DRIVER_SUPPORT = "0" -SOC_HAS_VIVANTE_KERNEL_DRIVER_SUPPORT_mx6q = "1" -SOC_HAS_VIVANTE_KERNEL_DRIVER_SUPPORT_mx6dl = "1" -SOC_HAS_VIVANTE_KERNEL_DRIVER_SUPPORT_mx6sx = "1" -SOC_HAS_VIVANTE_KERNEL_DRIVER_SUPPORT_mx6sl = "1" -SOC_HAS_VIVANTE_KERNEL_DRIVER_SUPPORT_mx7ulp = "1" +SOC_HAS_VIVANTE_KERNEL_DRIVER_SUPPORT = "0" +SOC_HAS_VIVANTE_KERNEL_DRIVER_SUPPORT_imxgpu = "1" # Handle Vivante kernel driver setting: # 0 - machine does not have Vivante GPU driver support -- 2.18.0