| Message ID | 20231102064138.3020088-1-naveen.kumar.saini@intel.com |
|---|---|
| State | New |
| Headers | show |
| Series | [meta-zephyr] intel-x86-64.conf: add intel_ prefix to x86 board names | expand |
On Thu, Nov 02, 2023 at 02:41:38PM +0800, Naveen Saini wrote: > Use newly added naming convention (intel_). > > https://github.com/zephyrproject-rtos/zephyr/commit/03905f7e55d24788e0a38d1641dcadf529fce85d > https://github.com/zephyrproject-rtos/zephyr/commit/2b757f1eca3e27f2405362a99d77fc9fc2b17619 > > Signed-off-by: Naveen Saini <naveen.kumar.saini@intel.com> This resolves the intel-x86-64 build issue. See https://gitlab.com/jonmason00/meta-zephyr/-/pipelines/1058925479 > --- > meta-zephyr-bsp/conf/machine/intel-x86-64.conf | 6 +++--- > 1 file changed, 3 insertions(+), 3 deletions(-) > > diff --git a/meta-zephyr-bsp/conf/machine/intel-x86-64.conf b/meta-zephyr-bsp/conf/machine/intel-x86-64.conf > index 74e8f6e..5112f28 100644 > --- a/meta-zephyr-bsp/conf/machine/intel-x86-64.conf > +++ b/meta-zephyr-bsp/conf/machine/intel-x86-64.conf > @@ -1,6 +1,6 @@ > #@TYPE: Machine > #@NAME: intel-x86-64 > -#@DESCRIPTION: common MACHINE for 64-bit x86 boards. User must set ${ZEPHYR_BOARD}. By default is set to 'ech_crb' board. > +#@DESCRIPTION: common MACHINE for 64-bit x86 boards. User must set ${ZEPHYR_BOARD}. By default is set to 'intel_ehl_crb' board. > > require conf/machine/include/tune-corei7-common.inc > > @@ -10,5 +10,5 @@ ARCH:intel-x86-64 = "x86" > # ZEPHYR_BOARD ?= "acrn" > # ZEPHYR_BOARD ?= "acrn_ehl_crb" > # ZEPHYR_BOARD ?= "up_squared" > -# ZEPHYR_BOARD ?= "ehl_crb_sbl" > -ZEPHYR_BOARD ?= "ehl_crb" > +# ZEPHYR_BOARD ?= "intel_ehl_crb_sbl" > +ZEPHYR_BOARD ?= "intel_ehl_crb" > -- > 2.34.1 > >
diff --git a/meta-zephyr-bsp/conf/machine/intel-x86-64.conf b/meta-zephyr-bsp/conf/machine/intel-x86-64.conf index 74e8f6e..5112f28 100644 --- a/meta-zephyr-bsp/conf/machine/intel-x86-64.conf +++ b/meta-zephyr-bsp/conf/machine/intel-x86-64.conf @@ -1,6 +1,6 @@ #@TYPE: Machine #@NAME: intel-x86-64 -#@DESCRIPTION: common MACHINE for 64-bit x86 boards. User must set ${ZEPHYR_BOARD}. By default is set to 'ech_crb' board. +#@DESCRIPTION: common MACHINE for 64-bit x86 boards. User must set ${ZEPHYR_BOARD}. By default is set to 'intel_ehl_crb' board. require conf/machine/include/tune-corei7-common.inc @@ -10,5 +10,5 @@ ARCH:intel-x86-64 = "x86" # ZEPHYR_BOARD ?= "acrn" # ZEPHYR_BOARD ?= "acrn_ehl_crb" # ZEPHYR_BOARD ?= "up_squared" -# ZEPHYR_BOARD ?= "ehl_crb_sbl" -ZEPHYR_BOARD ?= "ehl_crb" +# ZEPHYR_BOARD ?= "intel_ehl_crb_sbl" +ZEPHYR_BOARD ?= "intel_ehl_crb"
Use newly added naming convention (intel_). https://github.com/zephyrproject-rtos/zephyr/commit/03905f7e55d24788e0a38d1641dcadf529fce85d https://github.com/zephyrproject-rtos/zephyr/commit/2b757f1eca3e27f2405362a99d77fc9fc2b17619 Signed-off-by: Naveen Saini <naveen.kumar.saini@intel.com> --- meta-zephyr-bsp/conf/machine/intel-x86-64.conf | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)