Skip to content

Commit

Permalink
boards: x86: Add intel_ prefix to Intel Raptor Lake boards
Browse files Browse the repository at this point in the history
This is following the same convention that was recently introduced to Alder
Lake boards (intel_adl). Additionally, an "S" suffix is added to the
boards, since what's currently supported is in fact the Raptor Lake S
variant.

(cherry picked from commit 2b757f1)

Original-Signed-off-by: Johan Hedberg <johan.hedberg@intel.com>
GitOrigin-RevId: 2b757f1
Change-Id: Ifdbf8be2485a136acd271d5c3144a5424cdc0ecf
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/third_party/zephyr/+/4776633
Commit-Queue: Al Semjonovs <asemjonovs@google.com>
Tested-by: ChromeOS Prod (Robot) <chromeos-ci-prod@chromeos-bot.iam.gserviceaccount.com>
Reviewed-by: Al Semjonovs <asemjonovs@google.com>
Tested-by: Al Semjonovs <asemjonovs@google.com>
  • Loading branch information
Johan Hedberg authored and Chromeos LUCI committed Aug 14, 2023
1 parent a53e8fb commit 0174c4a
Show file tree
Hide file tree
Showing 13 changed files with 18 additions and 18 deletions.
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# Create an EFI image
if(CONFIG_BOARD_RPL_CRB AND CONFIG_BUILD_OUTPUT_EFI)
if(CONFIG_BOARD_INTEL_RPL_S_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}
Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
# Copyright (c) 2022 Intel Corporation
# SPDX-License-Identifier: Apache-2.0

config BOARD_RPL_CRB
bool "Raptor Lake CRB"
config BOARD_INTEL_RPL_S_CRB
bool "Raptor Lake S CRB"
depends on SOC_RAPTOR_LAKE
select X86_64
select HAS_COVERAGE_SUPPORT
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
# Copyright (c) 2022 Intel Corporation
# SPDX-License-Identifier: Apache-2.0

if BOARD_RPL_CRB
if BOARD_INTEL_RPL_S_CRB

config BOARD
default "rpl_crb"
default "intel_rpl_s_crb"

config BUILD_OUTPUT_STRIPPED
default y
Expand Down Expand Up @@ -34,4 +34,4 @@ config SHELL_STACK_SIZE
default 320000
endif

endif # BOARD_RPL_CRB
endif # BOARD_INTEL_RPL_S_CRB
File renamed without changes.
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
.. _rpl_crb:
.. _intel_rpl_s_crb:

Raptor Lake CRB
################
Raptor Lake S CRB
#################

Overview
********
Expand Down Expand Up @@ -40,20 +40,20 @@ Build Zephyr application
========================

#. Build a Zephyr application; for instance, to build the ``hello_world``
application on Raptor Lake CRB:
application on Raptor Lake S CRB:

.. zephyr-app-commands::
:zephyr-app: samples/hello_world
:board: rpl_crb
:board: intel_rpl_s_crb
:goals: build

.. note::

A Zephyr EFI image file named :file:`zephyr.efi` is automatically
created in the build directory after the application is built.

Booting the Raptor Lake CRB Board using UEFI
============================================
Booting the Raptor Lake S CRB Board using UEFI
==============================================

.. include:: ../../common/efi_boot.rst

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
#include <intel/raptor_lake.dtsi>

/ {
model = "rpl_crb";
model = "intel_rpl_s_crb";
compatible = "intel,raptor-lake-crb";

chosen {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
identifier: rpl_crb
name: Raptor Lake CRB
identifier: intel_rpl_s_crb
name: Raptor Lake S CRB
type: mcu
arch: x86
toolchain:
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# SPDX-License-Identifier: Apache-2.0

CONFIG_SOC_RAPTOR_LAKE=y
CONFIG_BOARD_RPL_CRB=y
CONFIG_BOARD_INTEL_RPL_S_CRB=y
CONFIG_PIC_DISABLE=y
CONFIG_LOAPIC=y
CONFIG_CONSOLE=y
Expand Down
2 changes: 1 addition & 1 deletion samples/drivers/smbus/sample.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ common:
platform_allow:
- qemu_x86_64
- ehl_crb
- rpl_crb
- intel_rpl_s_crb
harness: console
harness_config:
type: one_line
Expand Down

0 comments on commit 0174c4a

Please sign in to comment.