summaryrefslogtreecommitdiffstats
path: root/meta-xilinx-core/conf
diff options
context:
space:
mode:
authorMark Hatle <mark.hatle@amd.com>2024-08-17 15:09:17 -0600
committerMark Hatle <mark.hatle@amd.com>2024-09-13 07:13:30 -0600
commit8e79e44a070c51a19ce815ec3f7069f9538276cc (patch)
tree0f30f701e60d38384c10006123f2dd024a560490 /meta-xilinx-core/conf
parentd61b27238a4b5bc0b2c22b0152f3be193a171405 (diff)
downloadmeta-xilinx-8e79e44a070c51a19ce815ec3f7069f9538276cc.tar.gz
meta-xilinx-core: Move generic machines to be firmware-less
Generic machines no longer depend on firmware (ESW) components. Thus they will now build a full Linux system, where possible, without XSCT or SDT modes. It is up to the specific machine.conf files to enable the correct build flow and that will enable the necessary firmware dependencies for the SoC. This also means HDF_MACHINES is no longer required. Signed-off-by: Mark Hatle <mark.hatle@amd.com>
Diffstat (limited to 'meta-xilinx-core/conf')
-rw-r--r--meta-xilinx-core/conf/machine/include/machine-xilinx-default.inc2
-rw-r--r--meta-xilinx-core/conf/machine/microblaze-generic.conf21
-rw-r--r--meta-xilinx-core/conf/machine/versal-generic.conf16
-rw-r--r--meta-xilinx-core/conf/machine/versal-net-generic.conf16
-rw-r--r--meta-xilinx-core/conf/machine/zynq-generic.conf17
-rw-r--r--meta-xilinx-core/conf/machine/zynqmp-generic.conf21
6 files changed, 0 insertions, 93 deletions
diff --git a/meta-xilinx-core/conf/machine/include/machine-xilinx-default.inc b/meta-xilinx-core/conf/machine/include/machine-xilinx-default.inc
index e7ef39a3..cf890a51 100644
--- a/meta-xilinx-core/conf/machine/include/machine-xilinx-default.inc
+++ b/meta-xilinx-core/conf/machine/include/machine-xilinx-default.inc
@@ -1,5 +1,3 @@
1# HDF_MACHINE should be set _AFTER_ this has been loaded
2HDF_MACHINE_PRIOR := "${HDF_MACHINE}"
3INHERIT += "xilinx-vars" 1INHERIT += "xilinx-vars"
4INHERIT += "xilinx-deprecated" 2INHERIT += "xilinx-deprecated"
5 3
diff --git a/meta-xilinx-core/conf/machine/microblaze-generic.conf b/meta-xilinx-core/conf/machine/microblaze-generic.conf
index 7beb6a7e..39059511 100644
--- a/meta-xilinx-core/conf/machine/microblaze-generic.conf
+++ b/meta-xilinx-core/conf/machine/microblaze-generic.conf
@@ -14,21 +14,6 @@ DEFAULTTUNE ?= "microblaze"
14# defined before calling the required inclusion file else pre-expansion value 14# defined before calling the required inclusion file else pre-expansion value
15# defined in local.conf without machine override will not be reflected. 15# defined in local.conf without machine override will not be reflected.
16 16
17# Yocto Microblaze device-tree variables
18YAML_CONSOLE_DEVICE_CONFIG:pn-device-tree ?= "axi_uartlite_0"
19YAML_MAIN_MEMORY_CONFIG:pn-device-tree ?= "DDR4_0"
20DT_PADDING_SIZE:pn-device-tree ?= "0x1000"
21DTC_FLAGS:pn-device-tree ?= ""
22XSCTH_PROC:pn-device-tree ?= "microblaze_0"
23YAML_DT_BOARD_FLAGS ?= "{BOARD kcu105}"
24
25# Yocto Microblaze FS-Boot variables
26YAML_SERIAL_CONSOLE_STDIN:pn-fs-boot ?= "axi_uartlite_0"
27YAML_SERIAL_CONSOLE_STDOUT:pn-fs-boot ?= "axi_uartlite_0"
28YAML_MAIN_MEMORY_CONFIG:pn-fs-boot ?= "DDR4_0"
29YAML_FLASH_MEMORY_CONFIG:pn-fs-boot ?= "axi_quad_spi_0"
30XSCTH_PROC:pn-fs-boot ?= "microblaze_0"
31
32# Yocto Microblaze u-boot-xlnx variables 17# Yocto Microblaze u-boot-xlnx variables
33UBOOT_MACHINE ?= "microblaze-generic_defconfig" 18UBOOT_MACHINE ?= "microblaze-generic_defconfig"
34UBOOT_INITIAL_ENV = "" 19UBOOT_INITIAL_ENV = ""
@@ -41,7 +26,6 @@ KERNEL_EXTRA_ARGS += "UIMAGE_LOADADDR=${UBOOT_ENTRYPOINT}"
41 26
42# Microblaze Serial Console settings 27# Microblaze Serial Console settings
43SERIAL_CONSOLES ?= "115200;ttyUL0" 28SERIAL_CONSOLES ?= "115200;ttyUL0"
44YAML_SERIAL_CONSOLE_BAUDRATE ?= "115200"
45 29
46require conf/machine/include/soc-tune-include.inc 30require conf/machine/include/soc-tune-include.inc
47require conf/machine/include/machine-xilinx-default.inc 31require conf/machine/include/machine-xilinx-default.inc
@@ -55,11 +39,6 @@ MB_MACHINE_ARCH = "${@[d.getVar('TUNE_PKGARCH'), d.getVar('TUNE_PKGARCH') + '-ge
55 39
56MACHINE_ARCH = "${@['${MB_MACHINE_ARCH}', '${DEF_MACHINE_ARCH}']['microblaze-generic' != "${MACHINE}"]}" 40MACHINE_ARCH = "${@['${MB_MACHINE_ARCH}', '${DEF_MACHINE_ARCH}']['microblaze-generic' != "${MACHINE}"]}"
57 41
58# microblaze-generic.conf uses kcu105-microblazeel xsa as reference input.
59# User can override with custom xsa using HDF_BASE and HDF_PATH variables from
60# local.conf.
61HDF_MACHINE = "kcu105-microblazeel"
62
63MACHINE_FEATURES = "" 42MACHINE_FEATURES = ""
64 43
65KERNEL_IMAGETYPE ?= "linux.bin.ub" 44KERNEL_IMAGETYPE ?= "linux.bin.ub"
diff --git a/meta-xilinx-core/conf/machine/versal-generic.conf b/meta-xilinx-core/conf/machine/versal-generic.conf
index 67c145c4..70f5bbd3 100644
--- a/meta-xilinx-core/conf/machine/versal-generic.conf
+++ b/meta-xilinx-core/conf/machine/versal-generic.conf
@@ -10,12 +10,6 @@ MACHINEOVERRIDES =. "${@['', 'versal-generic:']['versal-generic' != '${MACHINE}'
10# defined before calling the required inclusion file else pre-expansion value 10# defined before calling the required inclusion file else pre-expansion value
11# defined in local.conf without machine override will not be reflected. 11# defined in local.conf without machine override will not be reflected.
12 12
13# Yocto Versal device-tree variables
14YAML_CONSOLE_DEVICE_CONFIG:pn-device-tree ?= "CIPS_0_pspmc_0_psv_sbsauart_0"
15DT_PADDING_SIZE:pn-device-tree ?= "0x1000"
16DTC_FLAGS:pn-device-tree ?= "-@"
17YAML_DT_BOARD_FLAGS ?= "{BOARD versal-vck190-reva-x-ebm-01-reva}"
18
19# Yocto Versal u-boot-xlnx variables 13# Yocto Versal u-boot-xlnx variables
20UBOOT_MACHINE ?= "xilinx_versal_virt_defconfig" 14UBOOT_MACHINE ?= "xilinx_versal_virt_defconfig"
21BOOTMODE ?= "generic.root" 15BOOTMODE ?= "generic.root"
@@ -23,27 +17,17 @@ BOOTMODE ?= "generic.root"
23# Yocto Versal arm-trusted-firmware(TF-A) variables 17# Yocto Versal arm-trusted-firmware(TF-A) variables
24TFA_BL33_LOAD ?= "0x8000000" 18TFA_BL33_LOAD ?= "0x8000000"
25 19
26# Yocto Versal PLM variables
27YAML_SERIAL_CONSOLE_STDIN:pn-plm-firmware ?= "CIPS_0_pspmc_0_psv_sbsauart_0"
28YAML_SERIAL_CONSOLE_STDOUT:pn-plm-firmware ?= "CIPS_0_pspmc_0_psv_sbsauart_0"
29
30# Yocto Versal KERNEL Variables 20# Yocto Versal KERNEL Variables
31UBOOT_ENTRYPOINT ?= "0x200000" 21UBOOT_ENTRYPOINT ?= "0x200000"
32UBOOT_LOADADDRESS ?= "0x200000" 22UBOOT_LOADADDRESS ?= "0x200000"
33 23
34# Versal Serial Console 24# Versal Serial Console
35SERIAL_CONSOLES ?= "115200;ttyAMA0" 25SERIAL_CONSOLES ?= "115200;ttyAMA0"
36YAML_SERIAL_CONSOLE_BAUDRATE ?= "115200"
37 26
38require conf/machine/include/soc-versal.inc 27require conf/machine/include/soc-versal.inc
39require conf/machine/include/machine-xilinx-default.inc 28require conf/machine/include/machine-xilinx-default.inc
40require conf/machine/include/machine-xilinx-qemu.inc 29require conf/machine/include/machine-xilinx-qemu.inc
41 30
42# versal-generic.conf uses vck190-versal xsa as reference input.
43# User can override with custom xsa using HDF_BASE and HDF_PATH variables from
44# local.conf.
45HDF_MACHINE = "vck190-versal"
46
47MACHINE_FEATURES += "rtc ext2 ext3 vfat usbhost" 31MACHINE_FEATURES += "rtc ext2 ext3 vfat usbhost"
48 32
49# Default SD image build onfiguration, use qemu-sd to pad 33# Default SD image build onfiguration, use qemu-sd to pad
diff --git a/meta-xilinx-core/conf/machine/versal-net-generic.conf b/meta-xilinx-core/conf/machine/versal-net-generic.conf
index 849a5a1f..7ea5a00f 100644
--- a/meta-xilinx-core/conf/machine/versal-net-generic.conf
+++ b/meta-xilinx-core/conf/machine/versal-net-generic.conf
@@ -10,12 +10,6 @@ MACHINEOVERRIDES =. "${@['', 'versal-net-generic:']['versal-net-generic' != '${M
10# defined before calling the required inclusion file else pre-expansion value 10# defined before calling the required inclusion file else pre-expansion value
11# defined in local.conf without machine override will not be reflected. 11# defined in local.conf without machine override will not be reflected.
12 12
13# Yocto Versal device-tree variables
14YAML_CONSOLE_DEVICE_CONFIG:pn-device-tree ?= "psx_wizard_0_psxl_0_psx_sbsauart_0"
15DT_PADDING_SIZE:pn-device-tree ?= "0x1000"
16DTC_FLAGS:pn-device-tree ?= "-@"
17YAML_DT_BOARD_FLAGS ?= "{BOARD versal-net-vn-p-b2197-00-reva}"
18
19# Yocto Versal u-boot-xlnx variables 13# Yocto Versal u-boot-xlnx variables
20UBOOT_MACHINE ?= "xilinx_versal_net_virt_defconfig" 14UBOOT_MACHINE ?= "xilinx_versal_net_virt_defconfig"
21BOOTMODE ?= "generic.root" 15BOOTMODE ?= "generic.root"
@@ -23,27 +17,17 @@ BOOTMODE ?= "generic.root"
23# Yocto Versal arm-trusted-firmware(TF-A) variables 17# Yocto Versal arm-trusted-firmware(TF-A) variables
24TFA_BL33_LOAD ?= "0x8000000" 18TFA_BL33_LOAD ?= "0x8000000"
25 19
26# Yocto Versal PLM variables
27YAML_SERIAL_CONSOLE_STDIN:pn-plm-firmware ?= "psx_wizard_0_psxl_0_psx_sbsauart_0"
28YAML_SERIAL_CONSOLE_STDOUT:pn-plm-firmware ?= "psx_wizard_0_psxl_0_psx_sbsauart_0"
29
30# Yocto Versal KERNEL Variables 20# Yocto Versal KERNEL Variables
31UBOOT_ENTRYPOINT ?= "0x200000" 21UBOOT_ENTRYPOINT ?= "0x200000"
32UBOOT_LOADADDRESS ?= "0x200000" 22UBOOT_LOADADDRESS ?= "0x200000"
33 23
34# Versal Serial Console 24# Versal Serial Console
35SERIAL_CONSOLES ?= "115200;ttyAMA0 115200;ttyAMA1" 25SERIAL_CONSOLES ?= "115200;ttyAMA0 115200;ttyAMA1"
36YAML_SERIAL_CONSOLE_BAUDRATE ?= "115200"
37 26
38require conf/machine/include/soc-versal-net.inc 27require conf/machine/include/soc-versal-net.inc
39require conf/machine/include/machine-xilinx-default.inc 28require conf/machine/include/machine-xilinx-default.inc
40require conf/machine/include/machine-xilinx-qemu.inc 29require conf/machine/include/machine-xilinx-qemu.inc
41 30
42# versal-net-generic.conf uses a qemu only xsa as reference input.
43# User can override with custom xsa using HDF_BASE and HDF_PATH variables from
44# local.conf.
45HDF_MACHINE = "versal-net-generic"
46
47MACHINE_FEATURES += "rtc ext2 ext3 vfat usbhost" 31MACHINE_FEATURES += "rtc ext2 ext3 vfat usbhost"
48 32
49# Default SD image build onfiguration, use qemu-sd to pad 33# Default SD image build onfiguration, use qemu-sd to pad
diff --git a/meta-xilinx-core/conf/machine/zynq-generic.conf b/meta-xilinx-core/conf/machine/zynq-generic.conf
index f7eef778..8442e4e3 100644
--- a/meta-xilinx-core/conf/machine/zynq-generic.conf
+++ b/meta-xilinx-core/conf/machine/zynq-generic.conf
@@ -10,21 +10,10 @@ MACHINEOVERRIDES =. "${@['', 'zynq-generic:']['zynq-generic' != '${MACHINE}']}"
10# defined before calling the required inclusion file else pre-expansion value 10# defined before calling the required inclusion file else pre-expansion value
11# defined in local.conf without machine override will not be reflected. 11# defined in local.conf without machine override will not be reflected.
12 12
13# Yocto Zynq-7000 device-tree variables
14YAML_CONSOLE_DEVICE_CONFIG:pn-device-tree ?= "ps7_uart_1"
15YAML_MAIN_MEMORY_CONFIG:pn-device-tree ?= "PS7_DDR_0"
16DT_PADDING_SIZE:pn-device-tree ?= "0x1000"
17DTC_FLAGS:pn-device-tree ?= "-@"
18YAML_DT_BOARD_FLAGS ?= "{BOARD zc702}"
19
20# Yocto Zynq-7000 u-boot-xlnx variables 13# Yocto Zynq-7000 u-boot-xlnx variables
21UBOOT_MACHINE ?= "xilinx_zynq_virt_defconfig" 14UBOOT_MACHINE ?= "xilinx_zynq_virt_defconfig"
22BOOTMODE ?= "generic.root" 15BOOTMODE ?= "generic.root"
23 16
24# Yocto Zynq-7000 FSBL variables
25YAML_SERIAL_CONSOLE_STDIN:pn-fsbl-firmware ?= "ps7_uart_1"
26YAML_SERIAL_CONSOLE_STDOUT:pn-fsbl-firmware ?= "ps7_uart_1"
27
28# Yocto KERNEL Variables 17# Yocto KERNEL Variables
29UBOOT_ENTRYPOINT ?= "0x200000" 18UBOOT_ENTRYPOINT ?= "0x200000"
30UBOOT_LOADADDRESS ?= "0x200000" 19UBOOT_LOADADDRESS ?= "0x200000"
@@ -32,17 +21,11 @@ KERNEL_EXTRA_ARGS += "UIMAGE_LOADADDR=${UBOOT_ENTRYPOINT}"
32 21
33# Zynq-7000 Serial Console settings 22# Zynq-7000 Serial Console settings
34SERIAL_CONSOLES ?= "115200;ttyPS0" 23SERIAL_CONSOLES ?= "115200;ttyPS0"
35YAML_SERIAL_CONSOLE_BAUDRATE ?= "115200"
36 24
37require conf/machine/include/soc-zynq.inc 25require conf/machine/include/soc-zynq.inc
38require conf/machine/include/machine-xilinx-default.inc 26require conf/machine/include/machine-xilinx-default.inc
39require conf/machine/include/machine-xilinx-qemu.inc 27require conf/machine/include/machine-xilinx-qemu.inc
40 28
41# zynq-generic.conf uses zc702-zynq7 xsa as reference input.
42# User can override with custom xsa using HDF_BASE and HDF_PATH variables from
43# local.conf.
44HDF_MACHINE = "zc702-zynq7"
45
46MACHINE_FEATURES += "rtc ext2 ext3 vfat usbhost usbgadget" 29MACHINE_FEATURES += "rtc ext2 ext3 vfat usbhost usbgadget"
47 30
48EXTRA_IMAGEDEPENDS += " \ 31EXTRA_IMAGEDEPENDS += " \
diff --git a/meta-xilinx-core/conf/machine/zynqmp-generic.conf b/meta-xilinx-core/conf/machine/zynqmp-generic.conf
index a64e7348..6aa24af8 100644
--- a/meta-xilinx-core/conf/machine/zynqmp-generic.conf
+++ b/meta-xilinx-core/conf/machine/zynqmp-generic.conf
@@ -10,13 +10,6 @@ MACHINEOVERRIDES =. "${@['', 'zynqmp-generic:']['zynqmp-generic' != '${MACHINE}'
10# defined before calling the required inclusion file else pre-expansion value 10# defined before calling the required inclusion file else pre-expansion value
11# defined in local.conf without machine override will not be reflected. 11# defined in local.conf without machine override will not be reflected.
12 12
13# Yocto device-tree variables
14YAML_CONSOLE_DEVICE_CONFIG:pn-device-tree ?= "psu_uart_0"
15YAML_MAIN_MEMORY_CONFIG:pn-device-tree ?= "PSU_DDR_0"
16DT_PADDING_SIZE:pn-device-tree ?= "0x1000"
17DTC_FLAGS:pn-device-tree ?= "-@"
18YAML_DT_BOARD_FLAGS ?= "{BOARD zcu102-rev1.0}"
19
20# Yocto ZynqMP u-boot-xlnx variables 13# Yocto ZynqMP u-boot-xlnx variables
21UBOOT_MACHINE ?= "xilinx_zynqmp_virt_defconfig" 14UBOOT_MACHINE ?= "xilinx_zynqmp_virt_defconfig"
22BOOTMODE ?= "generic.root" 15BOOTMODE ?= "generic.root"
@@ -30,31 +23,17 @@ SPL_BINARY ?= ""
30# Yocto ZynqMP arm-trusted-firmware(TF-A) variables 23# Yocto ZynqMP arm-trusted-firmware(TF-A) variables
31TFA_BL33_LOAD ?= "0x8000000" 24TFA_BL33_LOAD ?= "0x8000000"
32 25
33# Yocto ZynqMP PMUFW variables
34YAML_SERIAL_CONSOLE_STDIN:pn-pmu-firmware ?= "psu_uart_0"
35YAML_SERIAL_CONSOLE_STDOUT:pn-pmu-firmware ?= "psu_uart_0"
36
37# Yocto ZynqMP FSBL variables
38YAML_SERIAL_CONSOLE_STDIN:pn-fsbl-firmware ?= "psu_uart_0"
39YAML_SERIAL_CONSOLE_STDOUT:pn-fsbl-firmware ?= "psu_uart_0"
40
41# Yocto ZynqMP KERNEL Variables 26# Yocto ZynqMP KERNEL Variables
42UBOOT_ENTRYPOINT ?= "0x200000" 27UBOOT_ENTRYPOINT ?= "0x200000"
43UBOOT_LOADADDRESS ?= "0x200000" 28UBOOT_LOADADDRESS ?= "0x200000"
44 29
45# ZynqMP Serial Console 30# ZynqMP Serial Console
46SERIAL_CONSOLES ?= "115200;ttyPS0 115200;ttyPS1" 31SERIAL_CONSOLES ?= "115200;ttyPS0 115200;ttyPS1"
47YAML_SERIAL_CONSOLE_BAUDRATE ?= "115200"
48 32
49require conf/machine/include/soc-zynqmp.inc 33require conf/machine/include/soc-zynqmp.inc
50require conf/machine/include/machine-xilinx-default.inc 34require conf/machine/include/machine-xilinx-default.inc
51require conf/machine/include/machine-xilinx-qemu.inc 35require conf/machine/include/machine-xilinx-qemu.inc
52 36
53# zynqmp-generic.conf uses zcu102-zynqmp xsa as reference input.
54# User can override with custom xsa using HDF_BASE and HDF_PATH variables from
55# local.conf.
56HDF_MACHINE = "zcu102-zynqmp"
57
58# Machine features must result in a superset 37# Machine features must result in a superset
59# Basic features: 38# Basic features:
60MACHINE_FEATURES += "rtc ext2 ext3 vfat usbhost usbgadget wifi bluetooth" 39MACHINE_FEATURES += "rtc ext2 ext3 vfat usbhost usbgadget wifi bluetooth"
generated by cgit v1.2.3-54-g00ecf (git 2.39.0) at 2025-07-25 23:04:09 +0000