michaelh/zephyr
1
0
Fork 0
Code Releases Activity

arch/x86: rename X64 references to Intel64

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

Signed-off-by: Charles E. Youse <charles.youse@intel.com>
This commit is contained in:
Charles E. Youse 2019-06-25 09:36:17 -07:00 • committed by Andrew Boie
commit 6cf904cc0d
7 changed files with 7 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

2
arch/x86/CMakeLists.txt
View file

@ -2,7 +2,7 @@
# SPDX-License-Identifier: Apache-2.0 # SPDX-License-Identifier: Apache-2.0
if(CONFIG_X86_LONGMODE) if(CONFIG_X86_LONGMODE)
include(x64.cmake) include(intel64.cmake)
else() else()
include(ia32.cmake) include(ia32.cmake)
endif() endif()

8
arch/x86/Kconfig
View file

@ -1,10 +1,8 @@
# Kconfig - x86 general configuration options # Kconfig - x86 general configuration options
# #
# Copyright (c) 2014-2015 Wind River Systems, Inc. # Copyright (c) 2014-2015 Wind River Systems, Inc.
#
# SPDX-License-Identifier: Apache-2.0 # SPDX-License-Identifier: Apache-2.0
#
menu "X86 Architecture Options" menu "X86 Architecture Options"
depends on X86 depends on X86
@ -39,7 +37,7 @@ config CPU_APOLLO_LAKE
This option signifies the use of a CPU from the Apollo Lake family. 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 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. 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.ia32"
source "arch/x86/core/Kconfig.x64" source "arch/x86/core/Kconfig.intel64"
endmenu endmenu

2
arch/x86/core/CMakeLists.txt
View file

@ -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) zephyr_library_sources_ifdef(CONFIG_X86_VERY_EARLY_CONSOLE early_serial.c)
if(CONFIG_X86_LONGMODE) if(CONFIG_X86_LONGMODE)
include(x64.cmake) include(intel64.cmake)
else() else()
include(ia32.cmake) include(ia32.cmake)
endif() endif()

1
arch/x86/core/Kconfig.ia32
View file

@ -2,7 +2,6 @@
# #
# Copyright (c) 2019 Intel Corp. # Copyright (c) 2019 Intel Corp.
# SPDX-License-Identifier: Apache-2.0 # SPDX-License-Identifier: Apache-2.0
#
if !X86_LONGMODE if !X86_LONGMODE

3
arch/x86/core/Kconfig.x64 → arch/x86/core/Kconfig.intel64
View file

@ -1,8 +1,7 @@
# Kconfig.x64 - X64-specific X86 subarchitecture options # Kconfig.intel64 - Intel64-specific X86 subarchitecture options
# #
# Copyright (c) 2019 Intel Corp. # Copyright (c) 2019 Intel Corp.
# SPDX-License-Identifier: Apache-2.0 # SPDX-License-Identifier: Apache-2.0
#
if X86_LONGMODE if X86_LONGMODE

0
arch/x86/core/x64.cmake → arch/x86/core/intel64.cmake
View file

2
arch/x86/x64.cmake → arch/x86/intel64.cmake
View file

@ -1,4 +1,4 @@
# Copyright (c) 2019 Intel Corp. # Copyright (c) 2019 Intel Corp.
# SPDX-License-Identifier: Apache-2.0 # SPDX-License-Identifier: Apache-2.0
message(FATAL_ERROR "nice try, no x64 support yet") message(FATAL_ERROR "nice try, no Intel64 support yet")