From patchwork Wed Jun 19 08:47:08 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Igor Opaniuk X-Patchwork-Id: 1118554 X-Patchwork-Delegate: agust@denx.de Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=lists.denx.de (client-ip=81.169.180.215; helo=lists.denx.de; envelope-from=u-boot-bounces@lists.denx.de; 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="eo1ZOR63"; dkim-atps=neutral Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 45TJXM3zY6z9sN6 for ; Wed, 19 Jun 2019 18:49:07 +1000 (AEST) Received: by lists.denx.de (Postfix, from userid 105) id 41839C21E34; Wed, 19 Jun 2019 08:47:59 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on lists.denx.de X-Spam-Level: X-Spam-Status: No, score=0.0 required=5.0 tests=FREEMAIL_FROM, RCVD_IN_MSPIKE_H2, T_DKIM_INVALID autolearn=unavailable autolearn_force=no version=3.4.0 Received: from lists.denx.de (localhost [IPv6:::1]) by lists.denx.de (Postfix) with ESMTP id 2386CC21D72; Wed, 19 Jun 2019 08:47:26 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id 66746C21E2C; Wed, 19 Jun 2019 08:47:20 +0000 (UTC) Received: from mail-wm1-f68.google.com (mail-wm1-f68.google.com [209.85.128.68]) by lists.denx.de (Postfix) with ESMTPS id 3E02CC21E1B for ; Wed, 19 Jun 2019 08:47:17 +0000 (UTC) Received: by mail-wm1-f68.google.com with SMTP id c66so824522wmf.0 for ; Wed, 19 Jun 2019 01:47:17 -0700 (PDT) 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=rDby15+5kWd7VRumMDoT9sWqpIU8cleR+raBPZ6DtQQ=; b=eo1ZOR63prvVNqpyCnfSj45vT4QXf8c94TTDINKgrLGzePkY0ez3H/QPKVliy4YHQO UCyS8g55gROwIjgb9hfAJGYSqOGrsmBZISAatyax5UdnFpUs3kmzaAoT4VOw8ZdtZHXz BPm5QThOz72pEVrZ8icsPYJvAOCsVr1ZDq50kf+Z+cej2n/7eLsEhjDfY0rHVz3LI9wV MVAP3ym9jiVYWcBkbhHNG97h+A2reRbBaevc4z7gR2/Lzuaflo9/QVJL7d9F/SByioNC OBt38w499qZ7nDQagUigBsJlYgOpjI6f4uH9Nd7FYKHESVkH+mhXi57CPc663wlVB4EV 3bag== 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=rDby15+5kWd7VRumMDoT9sWqpIU8cleR+raBPZ6DtQQ=; b=erQAhOb+WuPxtUEZXhTFEPtPXYPafkICr/4EPk/+vlVRV5lP35V+mZI+fD3WImsmKu Ktgrj1ySLvIJ3oc95XeQ7NxVp2TdtMm16Pz7qCIZFptaFxB7rrmdyOZC4liVz6kz+6wu skXu+s/+odCbjWCxX1HaOi+lDRFGrHS+2dzn6APUL/izMtI81xUApukrSF8bsYoCe99g hTXI2NHjX3qtfUIDMpypnN7rHt3skEvutYD1PB6AClkQ/m/Fwja6hy5ScThwmheQiebS uqlHoSTh3/XedVCFS6hKc6aczfZ6mnIH4b16U7tiL0QAj8H0WYUDVYszBzhQJt1327+0 XR3g== X-Gm-Message-State: APjAAAXCUZZwlAxkcQZz03FZMy5CeqoL4rd3/0+LlEDH3QF77aMOA3IT y6pM3zMNup++RoddKOFPgUNFwT9l X-Google-Smtp-Source: APXvYqxNt1XTzbcno94NDXI6dYbfrybeRPCpqWM+rngu3ExuBoC/13COM1nEupYeefUeeE/yPaMb2A== X-Received: by 2002:a1c:e0c4:: with SMTP id x187mr6908137wmg.177.1560934036610; Wed, 19 Jun 2019 01:47:16 -0700 (PDT) Received: from localhost ([194.105.145.90]) by smtp.gmail.com with ESMTPSA id t6sm831141wmb.29.2019.06.19.01.47.15 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Wed, 19 Jun 2019 01:47:16 -0700 (PDT) From: Igor Opaniuk To: u-boot@lists.denx.de Date: Wed, 19 Jun 2019 11:47:08 +0300 Message-Id: <20190619084710.19074-5-igor.opaniuk@gmail.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20190619084710.19074-1-igor.opaniuk@gmail.com> References: <20190619084710.19074-1-igor.opaniuk@gmail.com> Cc: max.krummenacher@toradex.com, marcel.ziswiler@toradex.com, uboot-imx@nxp.com Subject: [U-Boot] [PATCH 4/6] colibri-imx6ull: support building with DM_VIDEO=y X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.18 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" From: Igor Opaniuk 1. This fixes linking issues when building with DM_VIDEO enabled mxsfb driver. 2. Provide proper defines for both VIDEO=y and DM_VIDEO=y. Signed-off-by: Igor Opaniuk Reviewed-by: Oleksandr Suvorov --- arch/arm/mach-imx/mx6/soc.c | 2 +- include/configs/colibri-imx6ull.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/arch/arm/mach-imx/mx6/soc.c b/arch/arm/mach-imx/mx6/soc.c index e80f1d484b..86a9eeba0c 100644 --- a/arch/arm/mach-imx/mx6/soc.c +++ b/arch/arm/mach-imx/mx6/soc.c @@ -549,7 +549,7 @@ const struct boot_mode soc_boot_modes[] = { void reset_misc(void) { #ifndef CONFIG_SPL_BUILD -#ifdef CONFIG_VIDEO_MXS +#if defined(CONFIG_VIDEO_MXS) && !defined(CONFIG_DM_VIDEO) lcdif_power_down(); #endif #endif diff --git a/include/configs/colibri-imx6ull.h b/include/configs/colibri-imx6ull.h index 21d9a3da01..1c6acf0081 100644 --- a/include/configs/colibri-imx6ull.h +++ b/include/configs/colibri-imx6ull.h @@ -170,7 +170,7 @@ #define CONFIG_SYS_DFU_DATA_BUF_SIZE SZ_16M #define DFU_DEFAULT_POLL_TIMEOUT 300 -#ifdef CONFIG_VIDEO +#if defined(CONFIG_VIDEO) || defined(CONFIG_DM_VIDEO) #define CONFIG_VIDEO_MXS #define MXS_LCDIF_BASE MX6UL_LCDIF1_BASE_ADDR #define CONFIG_VIDEO_LOGO