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>
This commit is contained in:
parent
714e37fb78
commit
6cf904cc0d
7 changed files with 7 additions and 11 deletions
|
@ -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()
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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()
|
||||
|
|
|
@ -2,7 +2,6 @@
|
|||
#
|
||||
# Copyright (c) 2019 Intel Corp.
|
||||
# SPDX-License-Identifier: Apache-2.0
|
||||
#
|
||||
|
||||
if !X86_LONGMODE
|
||||
|
||||
|
|
|
@ -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
|
||||
|
|
@ -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")
|
Loading…
Add table
Add a link
Reference in a new issue