Merge tag 'u-boot-atmel-fixes-2020.07-a' of https://gitlab.denx.de/u-boot/custodians...

[oweals/u-boot.git] / arch / arm / mach-uniphier / sbc / sbc.c

diff --git a/arch/arm/mach-uniphier/sbc/sbc.c b/arch/arm/mach-uniphier/sbc/sbc.c
index 6cf8cf2af80f013495b46bd3f7ce6641cfaa4e99..2100f49a0888a2cf48701ac109228c46335e7e03 100644 (file)
--- a/arch/arm/mach-uniphier/sbc/sbc.c
+++ b/arch/arm/mach-uniphier/sbc/sbc.c
@@ -5,7 +5,6 @@
  *   Author: Masahiro Yamada <yamada.masahiro@socionext.com>
  */
 
-#include <common.h>
 #include <linux/io.h>
 #include <asm/global_data.h>
 
@@ -64,7 +63,7 @@ static void __uniphier_sbc_init(int savepin)
                writel(SBCTRL2_ADMULTIPLX_MEM_VALUE, SBCTRL12);
        }
 
-       if (boot_is_swapped()) {
+       if (uniphier_sbc_boot_is_swapped()) {
                /*
                 * Boot Swap On: boot from external NOR/SRAM
                 * 0x42000000-0x43ffffff is a mirror of 0x40000000-0x41ffffff.