From 1a533de34546570a50489c2207cdde0532b9dccf Mon Sep 17 00:00:00 2001 From: Mark Hatle Date: Mon, 7 Nov 2022 14:38:46 -0800 Subject: zynqmp-generic: Move default soc variant to cg to match zynqmp-generic Signed-off-by: Mark Hatle --- meta-xilinx-core/conf/machine/include/soc-zynqmp.inc | 4 ++-- meta-xilinx-core/conf/machine/zynqmp-generic.conf | 3 --- 2 files changed, 2 insertions(+), 5 deletions(-) (limited to 'meta-xilinx-core/conf/machine') diff --git a/meta-xilinx-core/conf/machine/include/soc-zynqmp.inc b/meta-xilinx-core/conf/machine/include/soc-zynqmp.inc index d67fa95d..44daa1f9 100644 --- a/meta-xilinx-core/conf/machine/include/soc-zynqmp.inc +++ b/meta-xilinx-core/conf/machine/include/soc-zynqmp.inc @@ -2,12 +2,12 @@ DEFAULTTUNE ?= "cortexa72-cortexa53" SOC_FAMILY ?= "zynqmp" # Available SOC_VARIANT's for zynqmp: -# "cg" - Zynq UltraScale+ CG Devices +# "cg" - Zynq UltraScale+ CG Devices (default lowest common denominator) # "eg" - Zynq UltraScale+ EG Devices # "ev" - Zynq UltraScale+ EV Devices # "dr" - Zynq UltraScale+ DR Devices -SOC_VARIANT ?= "eg" +SOC_VARIANT ?= "cg" require xilinx-soc-family.inc diff --git a/meta-xilinx-core/conf/machine/zynqmp-generic.conf b/meta-xilinx-core/conf/machine/zynqmp-generic.conf index 32de4d50..c375d8e5 100644 --- a/meta-xilinx-core/conf/machine/zynqmp-generic.conf +++ b/meta-xilinx-core/conf/machine/zynqmp-generic.conf @@ -11,9 +11,6 @@ unset USE_BOARD MACHINEOVERRIDES =. "${@['', 'zynqmp-generic:']['zynqmp-generic' != '${MACHINE}']}" #### Regular settings follow -# CG is the lowest common demoninator, so use this by default -SOC_VARIANT ?= "cg" - require conf/machine/include/soc-zynqmp.inc require conf/machine/include/machine-xilinx-default.inc require conf/machine/include/machine-xilinx-qemu.inc -- cgit v1.2.3-54-g00ecf