diff options
author | Mark Hatle <mark.hatle@xilinx.com> | 2021-12-18 13:44:31 -0800 |
---|---|---|
committer | Mark Hatle <mark.hatle@xilinx.com> | 2022-01-14 15:37:05 -0800 |
commit | 4501eaa3c6eac161ec0aaec87d7b648361552912 (patch) | |
tree | 8381251a42bd8540cec83437d5a0f9a2a81c2227 /meta-xilinx-bsp/conf/machine | |
parent | ea877a0bc9f9f779da663901ed2290e35902a54f (diff) | |
download | meta-xilinx-4501eaa3c6eac161ec0aaec87d7b648361552912.tar.gz |
Deprecate BOARD and BOARD_VARIANT support
If the BOARD and/or BOARD_VARIANT is set, continue to allow this to
work, however warn the user it is deprecated.
Signed-off-by: Mark Hatle <mark.hatle@xilinx.com>
Diffstat (limited to 'meta-xilinx-bsp/conf/machine')
-rw-r--r-- | meta-xilinx-bsp/conf/machine/ultra96-zynqmp.conf | 4 | ||||
-rw-r--r-- | meta-xilinx-bsp/conf/machine/vck-sc-zynqmp.conf | 7 |
2 files changed, 6 insertions, 5 deletions
diff --git a/meta-xilinx-bsp/conf/machine/ultra96-zynqmp.conf b/meta-xilinx-bsp/conf/machine/ultra96-zynqmp.conf index e78fede1..f724bbe3 100644 --- a/meta-xilinx-bsp/conf/machine/ultra96-zynqmp.conf +++ b/meta-xilinx-bsp/conf/machine/ultra96-zynqmp.conf | |||
@@ -3,8 +3,8 @@ | |||
3 | #@DESCRIPTION: Machine support for Ultra96 Evaluation Board. | 3 | #@DESCRIPTION: Machine support for Ultra96 Evaluation Board. |
4 | # | 4 | # |
5 | 5 | ||
6 | require conf/machine/zynqmp-generic.conf | ||
7 | |||
8 | MACHINE = "zynqmp-generic" | 6 | MACHINE = "zynqmp-generic" |
9 | BOARD = "ultra96" | 7 | BOARD = "ultra96" |
10 | SOC_VARIANT = 'eg' | 8 | SOC_VARIANT = 'eg' |
9 | |||
10 | require conf/machine/zynqmp-generic.conf | ||
diff --git a/meta-xilinx-bsp/conf/machine/vck-sc-zynqmp.conf b/meta-xilinx-bsp/conf/machine/vck-sc-zynqmp.conf index 1bda4cd1..2c88be62 100644 --- a/meta-xilinx-bsp/conf/machine/vck-sc-zynqmp.conf +++ b/meta-xilinx-bsp/conf/machine/vck-sc-zynqmp.conf | |||
@@ -3,8 +3,10 @@ | |||
3 | ##@DESCRIPTION: Machine support for vck190 system controller. | 3 | ##@DESCRIPTION: Machine support for vck190 system controller. |
4 | 4 | ||
5 | 5 | ||
6 | require conf/machine/include/soc-zynqmp.inc | 6 | MACHINE = "zynqmp-generic" |
7 | require conf/machine/include/machine-xilinx-default.inc | 7 | BOARD = "vck-sc" |
8 | |||
9 | require conf/machine/zynqmp-generic.conf | ||
8 | 10 | ||
9 | MACHINE_FEATURES = "rtc ext2 ext3 vfat usbhost" | 11 | MACHINE_FEATURES = "rtc ext2 ext3 vfat usbhost" |
10 | 12 | ||
@@ -25,4 +27,3 @@ IMAGE_BOOT_FILES += " \ | |||
25 | atf-uboot.ub \ | 27 | atf-uboot.ub \ |
26 | boot.scr \ | 28 | boot.scr \ |
27 | " | 29 | " |
28 | BOARD = "vck-sc" | ||