Merge branch 'master' of git://git.denx.de/u-boot-sunxi

trini: Disable CONFIG_SPL_USE_ARCH_MEMSET on orangepi_2

Signed-off-by: Tom Rini <trini@konsulko.com>

diff --cc arch/arm/cpu/arm920t/interrupts.c
index 0e04d3668b685a0cf4152f2f04354a3a59f969fe,0e04d3668b685a0cf4152f2f04354a3a59f969fe..0000000000000000000000000000000000000000
deleted file mode 100644,100644
--- 1/arch/arm/cpu/arm920t/interrupts.c
--- 2/arch/arm/cpu/arm920t/interrupts.c
+++ /dev/null
@@@ -1,27 -1,27 +1,0 @@@
--/*
-- * (C) Copyright 2002
-- * Sysgo Real-Time Solutions, GmbH <www.elinos.com>
-- * Marius Groeger <mgroeger@sysgo.de>
-- *
-- * (C) Copyright 2002
-- * Sysgo Real-Time Solutions, GmbH <www.elinos.com>
-- * Alex Zuepke <azu@sysgo.de>
-- *
-- * (C) Copyright 2002
-- * Gary Jennejohn, DENX Software Engineering, <garyj@denx.de>
-- *
-- * SPDX-License-Identifier:   GPL-2.0+
-- */
--
--#include <common.h>
--#include <asm/proc-armv/ptrace.h>
--
--#if defined (CONFIG_ARCH_INTEGRATOR)
--void do_irq (struct pt_regs *pt_regs)
--{
--      /* ASSUMED to be a timer interrupt  */
--      /* Just clear it - count handled in */
--      /* integratorap.c                   */
--      *(volatile ulong *)(CONFIG_SYS_TIMERBASE + 0x0C) = 0;
--}
--#endif

diff --cc arch/arm/cpu/arm920t/s3c24x0/interrupts.c
index 036e3b906c3a1a4f6c36fd828220938984f3db4a,036e3b906c3a1a4f6c36fd828220938984f3db4a..0000000000000000000000000000000000000000
deleted file mode 100644,100644
--- 1/arch/arm/cpu/arm920t/s3c24x0/interrupts.c
--- 2/arch/arm/cpu/arm920t/s3c24x0/interrupts.c
+++ /dev/null
@@@ -1,26 -1,26 +1,0 @@@
--/*
-- * (C) Copyright 2002
-- * Sysgo Real-Time Solutions, GmbH <www.elinos.com>
-- * Marius Groeger <mgroeger@sysgo.de>
-- *
-- * (C) Copyright 2002
-- * Sysgo Real-Time Solutions, GmbH <www.elinos.com>
-- * Alex Zuepke <azu@sysgo.de>
-- *
-- * (C) Copyright 2002
-- * Gary Jennejohn, DENX Software Engineering, <gj@denx.de>
-- *
-- * SPDX-License-Identifier:   GPL-2.0+
-- */
--
--#include <common.h>
--
--#include <asm/arch/s3c24x0_cpu.h>
--#include <asm/proc-armv/ptrace.h>
--
--void do_irq (struct pt_regs *pt_regs)
--{
--      struct s3c24x0_interrupt *irq = s3c24x0_get_base_interrupt();
--      u_int32_t intpnd = readl(&irq->INTPND);
--
--}

diff --cc arch/arm/dts/Makefile
Simple merge

diff --cc configs/orangepi_2_defconfig
index e14cb9d80e6a7f62146e76b41a226b23c1d57450,e14cb9d80e6a7f62146e76b41a226b23c1d57450..201771ee8ffd49a5a8edd7c06ca1598df8cd2e8a
--- 1/configs/orangepi_2_defconfig
--- 2/configs/orangepi_2_defconfig
+++ b/configs/orangepi_2_defconfig
@@@ -1,4 -1,4 +1,5 @@@
  CONFIG_ARM=y
++# CONFIG_SPL_USE_ARCH_MEMSET is not set
  CONFIG_ARCH_SUNXI=y
  CONFIG_MACH_SUN8I_H3=y
  CONFIG_DRAM_CLK=672

diff --cc scripts/config_whitelist.txt
Simple merge