From 6328f95ea01626be337d1eb524715000839b6b7d Mon Sep 17 00:00:00 2001
From: Tom Rini <trini@konsulko.com>
Date: Fri, 17 Dec 2021 18:08:39 -0500
Subject: [PATCH] serial: arm_dcc: Use CONFIG_ARM64 not CONFIG_CPU_ARMV8

The only place we use CONFIG_CPU_ARMV8 was in the arm_dcc serial driver.
Switch this to CONFIG_ARM64 today, and if in the future we need finer
granularity tuning here, a new CONFIG_SERIAL option needs to be
introduced.

Signed-off-by: Tom Rini <trini@konsulko.com>
---
 drivers/serial/arm_dcc.c        | 2 +-
 include/configs/meson64.h       | 1 -
 include/configs/mt8183.h        | 1 -
 include/configs/mt8512.h        | 2 --
 include/configs/mt8516.h        | 1 -
 include/configs/mt8518.h        | 2 --
 include/configs/xilinx_versal.h | 2 --
 include/configs/xilinx_zynqmp.h | 2 --
 8 files changed, 1 insertion(+), 12 deletions(-)

diff --git a/drivers/serial/arm_dcc.c b/drivers/serial/arm_dcc.c
index dfcb6fd698..a402a123b6 100644
--- a/drivers/serial/arm_dcc.c
+++ b/drivers/serial/arm_dcc.c
@@ -51,7 +51,7 @@
 #define status_dcc(x)	\
 		__asm__ volatile ("mrc p14, 0, %0, c14, c0, 0\n" : "=r" (x))
 
-#elif defined(CONFIG_CPU_ARMV8)
+#elif defined(CONFIG_ARM64)
 /*
  * ARMV8
  */
diff --git a/include/configs/meson64.h b/include/configs/meson64.h
index cb202d5555..44f2967fc6 100644
--- a/include/configs/meson64.h
+++ b/include/configs/meson64.h
@@ -29,7 +29,6 @@
 #define STDIN_CFG "serial"
 #endif
 
-#define CONFIG_CPU_ARMV8
 #define CONFIG_REMAKE_ELF
 #define CONFIG_SYS_MAXARGS		32
 #define CONFIG_SYS_CBSIZE		1024
diff --git a/include/configs/mt8183.h b/include/configs/mt8183.h
index ebd2b326ad..2b4e976aa1 100644
--- a/include/configs/mt8183.h
+++ b/include/configs/mt8183.h
@@ -11,7 +11,6 @@
 
 #include <linux/sizes.h>
 
-#define CONFIG_CPU_ARMV8
 #define COUNTER_FREQUENCY		13000000
 
 #define CONFIG_SYS_NS16550_SERIAL
diff --git a/include/configs/mt8512.h b/include/configs/mt8512.h
index 8882a5a409..9c443db9f5 100644
--- a/include/configs/mt8512.h
+++ b/include/configs/mt8512.h
@@ -13,8 +13,6 @@
 
 #define CONFIG_SYS_NONCACHED_MEMORY		SZ_1M
 
-#define CONFIG_CPU_ARMV8
-
 #define COUNTER_FREQUENCY			13000000
 
 #define CONFIG_SYS_BOOTM_LEN			SZ_64M
diff --git a/include/configs/mt8516.h b/include/configs/mt8516.h
index 12840b883d..47132c1db1 100644
--- a/include/configs/mt8516.h
+++ b/include/configs/mt8516.h
@@ -11,7 +11,6 @@
 
 #include <linux/sizes.h>
 
-#define CONFIG_CPU_ARMV8
 #define COUNTER_FREQUENCY		13000000
 
 #define CONFIG_SYS_NS16550_SERIAL
diff --git a/include/configs/mt8518.h b/include/configs/mt8518.h
index 593c6a11d7..49ee926b0c 100644
--- a/include/configs/mt8518.h
+++ b/include/configs/mt8518.h
@@ -13,8 +13,6 @@
 
 #define CONFIG_SYS_NONCACHED_MEMORY		SZ_1M
 
-#define CONFIG_CPU_ARMV8
-
 #define COUNTER_FREQUENCY			13000000
 
 /* DRAM definition */
diff --git a/include/configs/xilinx_versal.h b/include/configs/xilinx_versal.h
index 43486457a4..03539a41b4 100644
--- a/include/configs/xilinx_versal.h
+++ b/include/configs/xilinx_versal.h
@@ -26,8 +26,6 @@
 #endif
 
 /* Serial setup */
-#define CONFIG_CPU_ARMV8
-
 #define CONFIG_SYS_BAUDRATE_TABLE \
 	{ 4800, 9600, 19200, 38400, 57600, 115200 }
 
diff --git a/include/configs/xilinx_zynqmp.h b/include/configs/xilinx_zynqmp.h
index d683d12e95..f4b7f305bf 100644
--- a/include/configs/xilinx_zynqmp.h
+++ b/include/configs/xilinx_zynqmp.h
@@ -26,8 +26,6 @@
 #endif
 
 /* Serial setup */
-#define CONFIG_CPU_ARMV8
-
 #define CONFIG_SYS_BAUDRATE_TABLE \
 	{ 4800, 9600, 19200, 38400, 57600, 115200 }
 
-- 
2.39.5