Commit 03905f7e authored by Johan Hedberg's avatar Johan Hedberg Committed by Fabio Baltieri
Browse files

boards: x86: Add intel_ prefix to Elkhart Lake boards 

This follows the same convention that has already been adopted by Intel
Alder Lake and Raptor Lake boards.

Signed-off-by: default avatarJohan Hedberg <johan.hedberg@intel.com>
parent 6cccccb6

boards/x86/ehl_crb/CMakeLists.txt→boards/x86/intel_ehl/CMakeLists.txt

+1 −1
Changes for boards/x86/intel_ehl/CMakeLists.txt: 1 added line, 1 removed line.
Original line number Diff line number Diff line 
# Create an EFI image

if(CONFIG_BOARD_EHL_CRB AND CONFIG_BUILD_OUTPUT_EFI)

if(CONFIG_BOARD_INTEL_EHL_CRB AND CONFIG_BUILD_OUTPUT_EFI)

set_property(GLOBAL APPEND PROPERTY extra_post_build_commands

  COMMAND ${PYTHON_EXECUTABLE} ${PROJECT_SOURCE_DIR}/arch/x86/zefi/zefi.py

  -c ${CMAKE_C_COMPILER}

boards/x86/ehl_crb/Kconfig.board→boards/x86/intel_ehl/Kconfig.board

+2 −2
Changes for boards/x86/intel_ehl/Kconfig.board: 2 added lines, 2 removed lines.
Original line number Diff line number Diff line 
# Copyright (c) 2020 Intel Corporation

# SPDX-License-Identifier: Apache-2.0



config BOARD_EHL_CRB

config BOARD_INTEL_EHL_CRB

	bool "Elkhart Lake CRB"

	depends on SOC_ELKHART_LAKE

	select X86_64

	select HAS_COVERAGE_SUPPORT



config BOARD_EHL_CRB_SBL

config BOARD_INTEL_EHL_CRB_SBL

	bool "Elkhart Lake CRB (with Slim Bootloader)"

	depends on SOC_ELKHART_LAKE

	select X86_64

boards/x86/ehl_crb/Kconfig.defconfig→boards/x86/intel_ehl/Kconfig.defconfig

+5 −5
Changes for boards/x86/intel_ehl/Kconfig.defconfig: 5 added lines, 5 removed lines.
Original line number Diff line number Diff line 
# Copyright (c) 2020 Intel Corporation

# SPDX-License-Identifier: Apache-2.0



if BOARD_EHL_CRB || BOARD_EHL_CRB_SBL

if BOARD_INTEL_EHL_CRB || BOARD_INTEL_EHL_CRB_SBL



config BOARD

	default "ehl_crb_sbl" if BOARD_EHL_CRB_SBL

	default "ehl_crb"

	default "intel_ehl_crb_sbl" if BOARD_INTEL_EHL_CRB_SBL

	default "intel_ehl_crb"



config BUILD_OUTPUT_STRIPPED

	default y
@@ -13,7 +13,7 @@ config BUILD_OUTPUT_STRIPPED 
config MP_MAX_NUM_CPUS

	default 2



if BOARD_EHL_CRB_SBL

if BOARD_INTEL_EHL_CRB_SBL

config SHELL_BACKEND_SERIAL_INTERRUPT_DRIVEN

	depends on SHELL_BACKEND_SERIAL

	default n
@@ -34,4 +34,4 @@ config APIC_TIMER_TSC_N 
	default 249

endif



endif # BOARD_EHL_CRB || BOARD_EHL_CRB_SBL
 
endif # BOARD_INTEL_EHL_CRB || BOARD_INTEL_EHL_CRB_SBL

boards/x86/ehl_crb/doc/index.rst→boards/x86/intel_ehl/doc/index.rst

+2 −2
Changes for boards/x86/intel_ehl/doc/index.rst: 2 added lines, 2 removed lines.
Original line number Diff line number Diff line 
.. _ehl_crb:

.. _intel_ehl_crb:



Elkhart Lake CRB

################
@@ -44,7 +44,7 @@ Build Zephyr application 


   .. zephyr-app-commands::

      :zephyr-app: samples/hello_world

      :board: ehl_crb

      :board: intel_ehl_crb

      :goals: build



   .. note::

CRA Git | Maintained and supported by SUSTech CRA and CCSE