diff options
| author | Mark Hatle <mark.hatle@amd.com> | 2022-11-07 14:38:46 -0800 |
|---|---|---|
| committer | Mark Hatle <mark.hatle@amd.com> | 2022-11-10 15:04:42 -0800 |
| commit | 1a533de34546570a50489c2207cdde0532b9dccf (patch) | |
| tree | 0ed1f22e33177e7db9605ed951231fed43b1260a | |
| parent | 752434ed40576ef869548719d85681820ca7ae43 (diff) | |
| download | meta-xilinx-1a533de34546570a50489c2207cdde0532b9dccf.tar.gz | |
zynqmp-generic: Move default soc variant to cg to match zynqmp-generic
Signed-off-by: Mark Hatle <mark.hatle@amd.com>
| -rw-r--r-- | meta-xilinx-core/conf/machine/include/soc-zynqmp.inc | 4 | ||||
| -rw-r--r-- | meta-xilinx-core/conf/machine/zynqmp-generic.conf | 3 |
2 files changed, 2 insertions, 5 deletions
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" | |||
| 2 | SOC_FAMILY ?= "zynqmp" | 2 | SOC_FAMILY ?= "zynqmp" |
| 3 | 3 | ||
| 4 | # Available SOC_VARIANT's for zynqmp: | 4 | # Available SOC_VARIANT's for zynqmp: |
| 5 | # "cg" - Zynq UltraScale+ CG Devices | 5 | # "cg" - Zynq UltraScale+ CG Devices (default lowest common denominator) |
| 6 | # "eg" - Zynq UltraScale+ EG Devices | 6 | # "eg" - Zynq UltraScale+ EG Devices |
| 7 | # "ev" - Zynq UltraScale+ EV Devices | 7 | # "ev" - Zynq UltraScale+ EV Devices |
| 8 | # "dr" - Zynq UltraScale+ DR Devices | 8 | # "dr" - Zynq UltraScale+ DR Devices |
| 9 | 9 | ||
| 10 | SOC_VARIANT ?= "eg" | 10 | SOC_VARIANT ?= "cg" |
| 11 | 11 | ||
| 12 | require xilinx-soc-family.inc | 12 | require xilinx-soc-family.inc |
| 13 | 13 | ||
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 | |||
| 11 | MACHINEOVERRIDES =. "${@['', 'zynqmp-generic:']['zynqmp-generic' != '${MACHINE}']}" | 11 | MACHINEOVERRIDES =. "${@['', 'zynqmp-generic:']['zynqmp-generic' != '${MACHINE}']}" |
| 12 | #### Regular settings follow | 12 | #### Regular settings follow |
| 13 | 13 | ||
| 14 | # CG is the lowest common demoninator, so use this by default | ||
| 15 | SOC_VARIANT ?= "cg" | ||
| 16 | |||
| 17 | require conf/machine/include/soc-zynqmp.inc | 14 | require conf/machine/include/soc-zynqmp.inc |
| 18 | require conf/machine/include/machine-xilinx-default.inc | 15 | require conf/machine/include/machine-xilinx-default.inc |
| 19 | require conf/machine/include/machine-xilinx-qemu.inc | 16 | require conf/machine/include/machine-xilinx-qemu.inc |
