diff options
| author | Jaewon Lee <jaewon.lee@xilinx.com> | 2020-12-01 16:11:42 -0800 |
|---|---|---|
| committer | Sai Hari Chandana Kalluri <chandana.kalluri@xilinx.com> | 2020-12-22 13:59:05 -0800 |
| commit | 56c975575c6a41af84c94fd14fcddc234f7576de (patch) | |
| tree | eb6a334f71b43b48fc4ff29b711354563f2476e1 | |
| parent | 742c57ce0122da9ac86b0f8f3a4531cace7b8738 (diff) | |
| download | meta-xilinx-56c975575c6a41af84c94fd14fcddc234f7576de.tar.gz | |
Adding BOARD and BOARD_VARIANT level hierarchy
Going to generic machine confs, we can no longer use machine overrides
for specific machine changes.
Adding BOARD and BOARD_VARIANT level hierarchy for packaging for
zynqmp/zynq/versal generic machines confs.
BOARD and BOARD_VARIANT must be set accordingly to use these hierarchy
levels properly
Signed-off-by: Jaewon Lee <jaewon.lee@xilinx.com>
| -rw-r--r-- | meta-xilinx-bsp/conf/machine/versal-generic.conf | 1 | ||||
| -rw-r--r-- | meta-xilinx-bsp/conf/machine/zynq-generic.conf | 1 | ||||
| -rw-r--r-- | meta-xilinx-bsp/conf/machine/zynqmp-generic.conf | 1 |
3 files changed, 3 insertions, 0 deletions
diff --git a/meta-xilinx-bsp/conf/machine/versal-generic.conf b/meta-xilinx-bsp/conf/machine/versal-generic.conf index a1a894ec..ba362793 100644 --- a/meta-xilinx-bsp/conf/machine/versal-generic.conf +++ b/meta-xilinx-bsp/conf/machine/versal-generic.conf | |||
| @@ -5,6 +5,7 @@ | |||
| 5 | require conf/machine/include/soc-versal.inc | 5 | require conf/machine/include/soc-versal.inc |
| 6 | require conf/machine/include/machine-xilinx-default.inc | 6 | require conf/machine/include/machine-xilinx-default.inc |
| 7 | require conf/machine/include/machine-xilinx-qemu.inc | 7 | require conf/machine/include/machine-xilinx-qemu.inc |
| 8 | require conf/machine/include/xilinx-board.inc | ||
| 8 | 9 | ||
| 9 | MACHINE_FEATURES = "rtc ext2 ext3 vfat usbhost" | 10 | MACHINE_FEATURES = "rtc ext2 ext3 vfat usbhost" |
| 10 | 11 | ||
diff --git a/meta-xilinx-bsp/conf/machine/zynq-generic.conf b/meta-xilinx-bsp/conf/machine/zynq-generic.conf index 0f38e32b..be0f701c 100644 --- a/meta-xilinx-bsp/conf/machine/zynq-generic.conf +++ b/meta-xilinx-bsp/conf/machine/zynq-generic.conf | |||
| @@ -5,6 +5,7 @@ | |||
| 5 | require conf/machine/include/soc-zynq.inc | 5 | require conf/machine/include/soc-zynq.inc |
| 6 | require conf/machine/include/machine-xilinx-default.inc | 6 | require conf/machine/include/machine-xilinx-default.inc |
| 7 | require conf/machine/include/machine-xilinx-qemu.inc | 7 | require conf/machine/include/machine-xilinx-qemu.inc |
| 8 | require conf/machine/include/xilinx-board.inc | ||
| 8 | 9 | ||
| 9 | MACHINE_FEATURES = "rtc ext2 ext3 vfat usbhost usbgadget" | 10 | MACHINE_FEATURES = "rtc ext2 ext3 vfat usbhost usbgadget" |
| 10 | 11 | ||
diff --git a/meta-xilinx-bsp/conf/machine/zynqmp-generic.conf b/meta-xilinx-bsp/conf/machine/zynqmp-generic.conf index 7e8316f5..ae5e8584 100644 --- a/meta-xilinx-bsp/conf/machine/zynqmp-generic.conf +++ b/meta-xilinx-bsp/conf/machine/zynqmp-generic.conf | |||
| @@ -8,6 +8,7 @@ SOC_VARIANT ?= "cg" | |||
| 8 | require conf/machine/include/soc-zynqmp.inc | 8 | require conf/machine/include/soc-zynqmp.inc |
| 9 | require conf/machine/include/machine-xilinx-default.inc | 9 | require conf/machine/include/machine-xilinx-default.inc |
| 10 | require conf/machine/include/machine-xilinx-qemu.inc | 10 | require conf/machine/include/machine-xilinx-qemu.inc |
| 11 | require conf/machine/include/xilinx-board.inc | ||
| 11 | 12 | ||
| 12 | MACHINE_FEATURES = "rtc ext2 ext3 vfat usbhost" | 13 | MACHINE_FEATURES = "rtc ext2 ext3 vfat usbhost" |
| 13 | 14 | ||