From patchwork Mon Feb  3 08:47:04 2020
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
X-Patchwork-Submitter: Marek Vasut <marex@denx.de>
X-Patchwork-Id: 235798
List-Id: U-Boot discussion <u-boot.lists.denx.de>
From: marex at denx.de (Marek Vasut)
Date: Mon, 3 Feb 2020 09:47:04 +0100
Subject: [PULL] u-boot-socfpga/master
In-Reply-To: <d0a5b720-d08f-4e59-dac1-13c0e6e246f3@denx.de>
References: <c4faaceb-2b56-58fa-79d5-1dad9fa6cddb@denx.de>
 <20200202202628.GI13379@bill-the-cat>
 <d0a5b720-d08f-4e59-dac1-13c0e6e246f3@denx.de>
Message-ID: <9c70aca7-8745-75d7-e91d-5e0917f71682@denx.de>

On 2/3/20 9:24 AM, Marek Vasut wrote:
> On 2/2/20 9:26 PM, Tom Rini wrote:
>> On Sun, Feb 02, 2020 at 06:18:53PM +0100, Marek Vasut wrote:
>>
>>> The following changes since commit 80e99adbe47d1c8590f9b971ac52257fdc51a5ec:
>>>
>>>   Merge tag 'uniphier-v2020.04-2' of
>>> https://gitlab.denx.de/u-boot/custodians/u-boot-uniphier (2020-01-31
>>> 13:26:28 -0500)
>>>
>>> are available in the Git repository at:
>>>
>>>   git://git.denx.de/u-boot-socfpga.git master
>>>
>>> for you to fetch changes up to 56c24875d92adcf214d97f5798e11c1b7b5e27fa:
>>>
>>>   ddr: altera: Add DDR2 support to Gen5 driver (2020-02-02 18:18:05 +0100)
>>>
>>
>> A see a ton of failures:
>>    aarch64:  +   socfpga_agilex

OK, this one I see, let's add this patch

diff --git a/include/configs/socfpga_soc64_common.h
b/include/configs/socfpga_soc64_common.h
index da81137e84..87c73457a0 100644
--- a/include/configs/socfpga_soc64_common.h
+++ b/include/configs/socfpga_soc64_common.h
@@ -150,10 +150,7 @@ unsigned int cm_get_qspi_controller_clk_hz(void);
 /*
  * L4 Watchdog
  */
-#ifdef CONFIG_SPL_BUILD
-#undef CONFIG_WATCHDOG
-#define CONFIG_HW_WATCHDOG
-#else
+#ifndef CONFIG_SPL_BUILD
 #undef CONFIG_HW_WATCHDOG
 #undef CONFIG_DESIGNWARE_WATCHDOG
 #endif