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>

diff --git a/drivers/serial/arm_dcc.c b/drivers/serial/arm_dcc.c
index dfcb6fd698122d4f38174f4d75dff465c57043f5..a402a123b6d66c81d2689e960b54fb5e8b9f4265 100644 (file)
--- 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 cb202d5555616849db543c7c782eeaa06e9da01f..44f2967fc6b3261596f0cb932ad11b31ba705964 100644 (file)
--- 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 ebd2b326ade0ef87264cdd9801ae4647c178a6ad..2b4e976aa1fefe547b88a20ba7707451b00eb232 100644 (file)
--- 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 8882a5a409703458f6dec262700770aa5cb97782..9c443db9f52d0f005d6a20fc48c3fa10501daaed 100644 (file)
--- 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 12840b883decf091aae89126633dbc343bfdb698..47132c1db1d25b7c1ca7f965d594435b5844286e 100644 (file)
--- 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 593c6a11d7420662d75a80162f08d316546ca2d9..49ee926b0c945c318b4975c041e443e93c982585 100644 (file)
--- 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 43486457a45d52b0e017149461f302389c62e024..03539a41b49f36f53543f203c562f85a71346008 100644 (file)
--- 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 d683d12e95b9fe53bf05459ca7a4d74e75b76c42..f4b7f305bf7544b0883675367f5d4c85c2eecdd1 100644 (file)
--- 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 }