From 6cf904cc0dbeb769e71108441be495c1d496868f Mon Sep 17 00:00:00 2001
From: "Charles E. Youse" <charles.youse@intel.com>
Date: Tue, 25 Jun 2019 09:36:17 -0700
Subject: [PATCH] arch/x86: rename X64 references to Intel64

Intel's X86-64 implementation is officially "Intel64", so follow suit.

Signed-off-by: Charles E. Youse <charles.youse@intel.com>
---
 arch/x86/CMakeLists.txt                        | 2 +-
 arch/x86/Kconfig                               | 8 +++-----
 arch/x86/core/CMakeLists.txt                   | 2 +-
 arch/x86/core/Kconfig.ia32                     | 1 -
 arch/x86/core/{Kconfig.x64 => Kconfig.intel64} | 3 +--
 arch/x86/core/{x64.cmake => intel64.cmake}     | 0
 arch/x86/{x64.cmake => intel64.cmake}          | 2 +-
 7 files changed, 7 insertions(+), 11 deletions(-)
 rename arch/x86/core/{Kconfig.x64 => Kconfig.intel64} (63%)
 rename arch/x86/core/{x64.cmake => intel64.cmake} (100%)
 rename arch/x86/{x64.cmake => intel64.cmake} (56%)

diff --git a/arch/x86/CMakeLists.txt b/arch/x86/CMakeLists.txt
index 2db084a1ad4..db6fc3cd65d 100644
--- a/arch/x86/CMakeLists.txt
+++ b/arch/x86/CMakeLists.txt
@@ -2,7 +2,7 @@
 # SPDX-License-Identifier: Apache-2.0
 
 if(CONFIG_X86_LONGMODE)
-  include(x64.cmake)
+  include(intel64.cmake)
 else()
   include(ia32.cmake)
 endif()
diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig
index 84639a0929e..29d11bacc27 100644
--- a/arch/x86/Kconfig
+++ b/arch/x86/Kconfig
@@ -1,10 +1,8 @@
 # Kconfig - x86 general configuration options
-
 #
 # Copyright (c) 2014-2015 Wind River Systems, Inc.
-#
 # SPDX-License-Identifier: Apache-2.0
-#
+
 menu "X86 Architecture Options"
 	depends on X86
 
@@ -39,7 +37,7 @@ config CPU_APOLLO_LAKE
 	  This option signifies the use of a CPU from the Apollo Lake family.
 
 #
-# Configuration common to both IA32 and X64 sub-architectures.
+# Configuration common to both IA32 and Intel64 sub-architectures.
 #
 
 config X86_LONGMODE
@@ -120,6 +118,6 @@ config X86_VERY_EARLY_CONSOLE
 	  tree. This mini-driver assumes I/O to the UART is done via ports.
 
 source "arch/x86/core/Kconfig.ia32"
-source "arch/x86/core/Kconfig.x64"
+source "arch/x86/core/Kconfig.intel64"
 
 endmenu
diff --git a/arch/x86/core/CMakeLists.txt b/arch/x86/core/CMakeLists.txt
index f4fa9ae86d0..ce448db8b32 100644
--- a/arch/x86/core/CMakeLists.txt
+++ b/arch/x86/core/CMakeLists.txt
@@ -15,7 +15,7 @@ zephyr_library_sources_ifdef(CONFIG_X86_MULTIBOOT multiboot.c)
 zephyr_library_sources_ifdef(CONFIG_X86_VERY_EARLY_CONSOLE early_serial.c)
 
 if(CONFIG_X86_LONGMODE)
-  include(x64.cmake)
+  include(intel64.cmake)
 else()
   include(ia32.cmake)
 endif()
diff --git a/arch/x86/core/Kconfig.ia32 b/arch/x86/core/Kconfig.ia32
index 5ee88ec4eb4..2b46e1f3ce8 100644
--- a/arch/x86/core/Kconfig.ia32
+++ b/arch/x86/core/Kconfig.ia32
@@ -2,7 +2,6 @@
 #
 # Copyright (c) 2019 Intel Corp.
 # SPDX-License-Identifier: Apache-2.0
-#
 
 if !X86_LONGMODE
 
diff --git a/arch/x86/core/Kconfig.x64 b/arch/x86/core/Kconfig.intel64
similarity index 63%
rename from arch/x86/core/Kconfig.x64
rename to arch/x86/core/Kconfig.intel64
index 67998517477..382fb3f3104 100644
--- a/arch/x86/core/Kconfig.x64
+++ b/arch/x86/core/Kconfig.intel64
@@ -1,8 +1,7 @@
-# Kconfig.x64 - X64-specific X86 subarchitecture options
+# Kconfig.intel64 - Intel64-specific X86 subarchitecture options
 #
 # Copyright (c) 2019 Intel Corp.
 # SPDX-License-Identifier: Apache-2.0
-#
 
 if X86_LONGMODE
 
diff --git a/arch/x86/core/x64.cmake b/arch/x86/core/intel64.cmake
similarity index 100%
rename from arch/x86/core/x64.cmake
rename to arch/x86/core/intel64.cmake
diff --git a/arch/x86/x64.cmake b/arch/x86/intel64.cmake
similarity index 56%
rename from arch/x86/x64.cmake
rename to arch/x86/intel64.cmake
index e22dae63d8f..bc6d571e12c 100644
--- a/arch/x86/x64.cmake
+++ b/arch/x86/intel64.cmake
@@ -1,4 +1,4 @@
 # Copyright (c) 2019 Intel Corp.
 # SPDX-License-Identifier: Apache-2.0
 
-message(FATAL_ERROR "nice try, no x64 support yet")
+message(FATAL_ERROR "nice try, no Intel64 support yet")