patrick/zephyr
1
0
Fork 0
Code Issues Pull requests Actions 8 Packages Projects Releases Wiki Activity

boards: x86: Add intel_ prefix to Elkhart Lake boards

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

Signed-off-by: Johan Hedberg <johan.hedberg@intel.com>
This commit is contained in:
Johan Hedberg 2023-08-14 14:39:34 +03:00 committed by Fabio Baltieri
parent 6cccccb646
commit 03905f7e55
24 changed files with 33 additions and 33 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
boards/x86/ehl_crb/CMakeLists.txt → boards/x86/intel_ehl/CMakeLists.txt
View file

@ -1,5 +1,5 @@
# 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}

4
boards/x86/ehl_crb/Kconfig.board → boards/x86/intel_ehl/Kconfig.board
View file

@ -1,13 +1,13 @@
# 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

10
boards/x86/ehl_crb/Kconfig.defconfig → boards/x86/intel_ehl/Kconfig.defconfig
View file

@ -1,11 +1,11 @@
# 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

0
boards/x86/ehl_crb/board.cmake → boards/x86/intel_ehl/board.cmake
View file

4
boards/x86/ehl_crb/doc/index.rst → boards/x86/intel_ehl/doc/index.rst
View file

@ -1,4 +1,4 @@
.. _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::

2
boards/x86/ehl_crb/ehl_crb.dts → boards/x86/intel_ehl/intel_ehl_crb.dts
View file

@ -13,7 +13,7 @@
#include <intel/elkhart_lake.dtsi>
/ {
model = "ehl_crb";
model = "intel_ehl_crb";
compatible = "intel,elkhart_lake_crb";
chosen {

2
boards/x86/ehl_crb/ehl_crb.yaml → boards/x86/intel_ehl/intel_ehl_crb.yaml
View file

@ -1,4 +1,4 @@
identifier: ehl_crb
identifier: intel_ehl_crb
name: Elkhart Lake CRB
type: mcu
arch: x86

2
boards/x86/ehl_crb/ehl_crb_defconfig → boards/x86/intel_ehl/intel_ehl_crb_defconfig
View file

@ -1,7 +1,7 @@
# SPDX-License-Identifier: Apache-2.0
CONFIG_SOC_ELKHART_LAKE=y
CONFIG_BOARD_EHL_CRB=y
CONFIG_BOARD_INTEL_EHL_CRB=y
CONFIG_PIC_DISABLE=y
CONFIG_LOAPIC=y
CONFIG_CONSOLE=y

2
boards/x86/ehl_crb/ehl_crb_sbl.dts → boards/x86/intel_ehl/intel_ehl_crb_sbl.dts
View file

@ -21,7 +21,7 @@
};
/ {
model = "ehl_crb";
model = "intel_ehl_crb";
compatible = "intel,elkhart_lake_crb_sbl";
chosen {

2
boards/x86/ehl_crb/ehl_crb_sbl.yaml → boards/x86/intel_ehl/intel_ehl_crb_sbl.yaml
View file

@ -1,4 +1,4 @@
identifier: ehl_crb_sbl
identifier: intel_ehl_crb_sbl
name: Elkhart Lake CRB with Slim Bootloader
type: mcu
arch: x86

2
boards/x86/ehl_crb/ehl_crb_sbl_defconfig → boards/x86/intel_ehl/intel_ehl_crb_sbl_defconfig
View file

@ -1,7 +1,7 @@
# SPDX-License-Identifier: Apache-2.0
CONFIG_SOC_ELKHART_LAKE=y
CONFIG_BOARD_EHL_CRB_SBL=y
CONFIG_BOARD_INTEL_EHL_CRB_SBL=y
CONFIG_PIC_DISABLE=y
CONFIG_LOAPIC=y
CONFIG_CONSOLE=y

2
samples/drivers/smbus/sample.yaml
View file

@ -4,7 +4,7 @@ sample:
common:
platform_allow:
- qemu_x86_64
- ehl_crb
- intel_ehl_crb
- intel_rpl_s_crb
harness: console
harness_config:

0
samples/drivers/watchdog/boards/ehl_crb.overlay → samples/drivers/watchdog/boards/intel_ehl_crb.overlay
View file

4
samples/subsys/edac/README.rst
View file

@ -12,12 +12,12 @@ Building and Running
********************
This project can be built and executed on as following example for the
:ref:`ehl_crb` board:
:ref:`intel_ehl_crb` board:
.. zephyr-app-commands::
:zephyr-app: samples/subsys/edac
:host-os: unix
:board: ehl_crb
:board: intel_ehl_crb
:goals: run
:compact:

4
samples/subsys/edac/sample.yaml
View file

@ -11,7 +11,7 @@ common:
tests:
sample.subsys.edac:
platform_allow: ehl_crb
platform_allow: intel_ehl_crb
integration_platforms:
- ehl_crb
- intel_ehl_crb
tags: edac

2
samples/subsys/portability/cmsis_rtos_v1/philosophers/src/main.c
View file

@ -73,7 +73,7 @@ osSemaphoreId forks[NUM_PHIL];
/*
* CMSIS limits the stack size, but qemu_x86_64, qemu_xtensa,
* qemu_leon3 and the boards such as up_squared, ehl_crb,
* qemu_leon3 and the boards such as up_squared, intel_ehl_crb,
* acrn_ehl_crb need 1024 to run this.
* For other arch and boards suggested stack size is 512.
*/

0
tests/drivers/gpio/gpio_basic_api/boards/ehl_crb.overlay → tests/drivers/gpio/gpio_basic_api/boards/intel_ehl_crb.overlay
View file

0
tests/drivers/watchdog/wdt_basic_api/boards/ehl_crb.overlay → tests/drivers/watchdog/wdt_basic_api/boards/intel_ehl_crb.overlay
View file

6
tests/kernel/fpu_sharing/float_disable/testcase.yaml
View file

@ -19,7 +19,7 @@ tests:
platform_allow:
- qemu_x86
- qemu_x86_lakemont
- ehl_crb
- intel_ehl_crb
- acrn_ehl_crb
integration_platforms:
- qemu_x86
@ -30,7 +30,7 @@ tests:
platform_allow:
- qemu_x86
- qemu_x86_lakemont
- ehl_crb
- intel_ehl_crb
- acrn_ehl_crb
integration_platforms:
- qemu_x86
@ -44,7 +44,7 @@ tests:
platform_allow:
- qemu_x86
- qemu_x86_lakemont
- ehl_crb
- intel_ehl_crb
- acrn_ehl_crb
integration_platforms:
- qemu_x86

2
tests/kernel/timer/timer_monotonic/testcase.yaml
View file

@ -11,7 +11,7 @@ tests:
- kernel
- timer
- apic_tsc
platform_allow: ehl_crb
platform_allow: intel_ehl_crb
extra_configs:
- CONFIG_APIC_TSC_DEADLINE_TIMER=y
- CONFIG_HPET_TIMER=n

8
tests/posix/common/testcase.yaml
View file

@ -10,7 +10,7 @@ tests:
portability.posix.common:
platform_exclude:
- nsim_sem_mpu_stack_guard
- ehl_crb
- intel_ehl_crb
extra_configs:
- CONFIG_NEWLIB_LIBC=n
integration_platforms:
@ -18,7 +18,7 @@ tests:
portability.posix.common.newlib:
platform_exclude:
- nsim_sem_mpu_stack_guard
- ehl_crb
- intel_ehl_crb
- lpcxpresso55s06
filter: TOOLCHAIN_HAS_NEWLIB == 1
extra_configs:
@ -36,7 +36,7 @@ tests:
portability.posix.common.tls:
platform_exclude:
- nsim_sem_mpu_stack_guard
- ehl_crb
- intel_ehl_crb
filter: CONFIG_ARCH_HAS_THREAD_LOCAL_STORAGE and CONFIG_TOOLCHAIN_SUPPORTS_THREAD_LOCAL_STORAGE
extra_configs:
- CONFIG_NEWLIB_LIBC=n
@ -46,7 +46,7 @@ tests:
portability.posix.common.tls.newlib:
platform_exclude:
- nsim_sem_mpu_stack_guard
- ehl_crb
- intel_ehl_crb
- lpcxpresso55s06
filter: TOOLCHAIN_HAS_NEWLIB == 1 and CONFIG_ARCH_HAS_THREAD_LOCAL_STORAGE and
CONFIG_TOOLCHAIN_SUPPORTS_THREAD_LOCAL_STORAGE

2
tests/subsys/edac/ibecc/README.rst
View file

@ -47,7 +47,7 @@ This project can be built as follows:
.. zephyr-app-commands::
:zephyr-app: tests/subsys/edac/ibecc
:board: ehl_crb
:board: intel_ehl_crb
:goals: build
:compact:

2
tests/subsys/edac/ibecc/testcase.yaml
View file

@ -1,6 +1,6 @@
common:
arch_allow: x86
platform_allow: ehl_crb
platform_allow: intel_ehl_crb
tags:
- edac
- ibecc

2
tests/subsys/edac/ibecc_cov/testcase.yaml
View file

@ -1,6 +1,6 @@
common:
arch_allow: x86
platform_allow: ehl_crb
platform_allow: intel_ehl_crb
tags:
- ibecc
- ibecc_cov