From c15f307504448022c76b0f48a428fca1d1e6663d Mon Sep 17 00:00:00 2001
From: Joseph Chen <chenjh@rock-chips.com>
Date: Wed, 4 Mar 2020 17:40:22 +0800
Subject: [PATCH] arm: Kconfig: default select SKIP_RELOCATE_UBOOT if !ARM64

Remove select from rockchip Kconfig.

Some 32-bit platforms needs relocation to support non-compressed
kernel image.

Signed-off-by: Joseph Chen <chenjh@rock-chips.com>
Change-Id: I0b60b79d7c67c5bd8439bd55bb277522c74a8bdd
---
 arch/arm/Kconfig | 1 -
 common/Kconfig   | 1 +
 2 files changed, 1 insertion(+), 1 deletion(-)

diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index 0ef6ad4710..a091bd7a57 100644
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -1144,7 +1144,6 @@ config ARCH_ROCKCHIP
 	select CMD_ROCKUSB if USB_GADGET_DOWNLOAD
 	select ENABLE_ARM_SOC_BOOT0_HOOK
 	select SYS_NS16550
-	select SKIP_RELOCATE_UBOOT if !ARM64
 	select SPI
 	select DEBUG_UART_BOARD_INIT
 	imply CMD_FASTBOOT
diff --git a/common/Kconfig b/common/Kconfig
index d5c1a88d7c..1a005b1722 100644
--- a/common/Kconfig
+++ b/common/Kconfig
@@ -651,6 +651,7 @@ config ANDROID_BOOT_IMAGE_HASH
 
 config SKIP_RELOCATE_UBOOT
 	bool "Skip U-Boot relocation"
+	default y if !ARM64
 	help
 	  This enable support for skipping U-Boot relocation.