From patchwork Tue Sep 4 01:06:14 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chris X-Patchwork-Id: 965648 X-Patchwork-Delegate: jagannadh.teki@gmail.com 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="K+toUliK"; dkim-atps=neutral Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 4247wJ0HsCz9ryn for ; Tue, 4 Sep 2018 11:07:11 +1000 (AEST) Received: by lists.denx.de (Postfix, from userid 105) id 74A2EC21EE8; Tue, 4 Sep 2018 01:06:46 +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_H3, RCVD_IN_MSPIKE_WL, 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 A3907C21C4A; Tue, 4 Sep 2018 01:06:26 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id 778A0C21C4A; Tue, 4 Sep 2018 01:06:24 +0000 (UTC) Received: from mail-it0-f44.google.com (mail-it0-f44.google.com [209.85.214.44]) by lists.denx.de (Postfix) with ESMTPS id EABFAC21E44 for ; Tue, 4 Sep 2018 01:06:23 +0000 (UTC) Received: by mail-it0-f44.google.com with SMTP id p79-v6so2893804itp.3 for ; Mon, 03 Sep 2018 18:06:23 -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=Qfyk5yp5gif9dV6I2RAIXPQmKCEjRuYouXPc85PBh3Y=; b=K+toUliKPalzlataH45yp94okWkNnofiyIXmh0GzeCQxEDjS3Y25fmNJXb3oJjsjC4 gGtPBYS65i7FLAJlI3MtZmCmrDsmTyEQbZQMTZbppZC8LL9SHTBo7s8oBHLW6Cmti5NM MAOKxzimvNMesPMoVibJBiQJzLRLcy10vc0UewZeeBrUOwIa2LXoseQS/GhtsDlHBGAQ OuVwgEBcmcUo4EocPi+GH+1tkGWBWGrBL28h3rjwquxYsOMhWZtnPa2G6eNjCk910WdE 8ana/qWlGa+P/wDL1RsIE/haU/pXdlDrR1S0nq8/pBeeSsj4CD7u26IZp8qQexj5jpy+ vCBw== 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=Qfyk5yp5gif9dV6I2RAIXPQmKCEjRuYouXPc85PBh3Y=; b=K7vYLmWNCOr5I/VcABBGxg17dFgb/cP2jQhtBHoRCCbaMVMeRgS7fMhzD2hYy893VN flNUH6ZIKEqZn3lr1HQQk1oYnUNZ4BSi5p5qYhAEC+ZcE94zLnHmn++7LYfYGcaeW0bO RdwMydyXlEp1p2tOtmsl6PJKeZpDkevc8mBHn0MOtykBEiqlwRaiSIcLBKUTMdeChpN3 foYjseMaRecschTGgjnD02Lx7poAN6TMMi04c918bbZM1423uAIgpSiqV+Ulib81SYeG OO3827tesFyaw+PC2jflWfC6ts8JFOZp8Ms8ssT/X01U/jpofld/4qnMBhYReb4HlGFx e1aQ== X-Gm-Message-State: APzg51BEs/9eBDzLdVDqLnHrhNHoRrP/8jFKPgv/HTI8wjjS8D9wNYbp sWi0TcrEUUumVnb6etk8h+U9VGKoAgA= X-Google-Smtp-Source: ANB0VdYQSqF9G4hW8GoMGXQ5wB9qgnKM6b70hnvQjmHh1FOxRjDMVDP+pd1gYZZQxdZ6b5to/3iPqQ== X-Received: by 2002:a24:d485:: with SMTP id x127-v6mr6301960itg.82.1536023182405; Mon, 03 Sep 2018 18:06:22 -0700 (PDT) Received: from Maximus-IX-Hero.lede-router.local ([2601:446:4200:d870::c33]) by smtp.gmail.com with ESMTPSA id g205-v6sm7538623iof.69.2018.09.03.18.06.21 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 03 Sep 2018 18:06:21 -0700 (PDT) From: Chris Blake To: u-boot@lists.denx.de Date: Mon, 3 Sep 2018 20:06:14 -0500 Message-Id: <1536023175-10682-2-git-send-email-chrisrblake93@gmail.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1536023175-10682-1-git-send-email-chrisrblake93@gmail.com> References: <1536023175-10682-1-git-send-email-chrisrblake93@gmail.com> Cc: Chris Blake Subject: [U-Boot] [PATCH 1/2] watchdog: Fix SPL builds when watchdog is enabled 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" Without this fix, u-boot fails to comple as it tries to load watchdog.h during an SPL build. This breaks support for things such as the sunxi arch. Signed-off-by: Chris Blake --- include/watchdog.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/include/watchdog.h b/include/watchdog.h index 14073cf..555f058 100644 --- a/include/watchdog.h +++ b/include/watchdog.h @@ -20,7 +20,7 @@ int init_func_watchdog_reset(void); #endif -#if defined(CONFIG_WATCHDOG) || defined(CONFIG_HW_WATCHDOG) +#if (defined(CONFIG_WATCHDOG) || defined(CONFIG_HW_WATCHDOG)) && !defined(CONFIG_SPL_BUILD) #define INIT_FUNC_WATCHDOG_INIT init_func_watchdog_init, #define INIT_FUNC_WATCHDOG_RESET init_func_watchdog_reset, #else @@ -47,7 +47,7 @@ int init_func_watchdog_reset(void); /* * Maybe a software watchdog? */ - #if defined(CONFIG_WATCHDOG) + #if defined(CONFIG_WATCHDOG) && !defined(CONFIG_SPL_BUILD) #if defined(__ASSEMBLY__) #define WATCHDOG_RESET bl watchdog_reset #else