--- a/Makefile
+++ b/Makefile
-@@ -1344,8 +1344,10 @@ endif
+@@ -1525,8 +1525,10 @@ endif
ifneq ($(CONFIG_ARCH_SUNXI),)
ifeq ($(CONFIG_ARM64),)
$(call if_changed,cat)
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
-@@ -842,7 +842,6 @@ config ARCH_SOCFPGA
+@@ -945,7 +945,6 @@ config ARCH_SOCFPGA
config ARCH_SUNXI
bool "Support sunxi (Allwinner) SoCs"