From 8e79e44a070c51a19ce815ec3f7069f9538276cc Mon Sep 17 00:00:00 2001 From: Mark Hatle Date: Sat, 17 Aug 2024 15:09:17 -0600 Subject: 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 --- .../conf/machine/include/machine-xilinx-default.inc | 2 -- .../conf/machine/microblaze-generic.conf | 21 --------------------- meta-xilinx-core/conf/machine/versal-generic.conf | 16 ---------------- .../conf/machine/versal-net-generic.conf | 16 ---------------- meta-xilinx-core/conf/machine/zynq-generic.conf | 17 ----------------- meta-xilinx-core/conf/machine/zynqmp-generic.conf | 21 --------------------- 6 files changed, 93 deletions(-) (limited to 'meta-xilinx-core/conf') 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 @@ -# HDF_MACHINE should be set _AFTER_ this has been loaded -HDF_MACHINE_PRIOR := "${HDF_MACHINE}" INHERIT += "xilinx-vars" INHERIT += "xilinx-deprecated" 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" # defined before calling the required inclusion file else pre-expansion value # defined in local.conf without machine override will not be reflected. -# Yocto Microblaze device-tree variables -YAML_CONSOLE_DEVICE_CONFIG:pn-device-tree ?= "axi_uartlite_0" -YAML_MAIN_MEMORY_CONFIG:pn-device-tree ?= "DDR4_0" -DT_PADDING_SIZE:pn-device-tree ?= "0x1000" -DTC_FLAGS:pn-device-tree ?= "" -XSCTH_PROC:pn-device-tree ?= "microblaze_0" -YAML_DT_BOARD_FLAGS ?= "{BOARD kcu105}" - -# Yocto Microblaze FS-Boot variables -YAML_SERIAL_CONSOLE_STDIN:pn-fs-boot ?= "axi_uartlite_0" -YAML_SERIAL_CONSOLE_STDOUT:pn-fs-boot ?= "axi_uartlite_0" -YAML_MAIN_MEMORY_CONFIG:pn-fs-boot ?= "DDR4_0" -YAML_FLASH_MEMORY_CONFIG:pn-fs-boot ?= "axi_quad_spi_0" -XSCTH_PROC:pn-fs-boot ?= "microblaze_0" - # Yocto Microblaze u-boot-xlnx variables UBOOT_MACHINE ?= "microblaze-generic_defconfig" UBOOT_INITIAL_ENV = "" @@ -41,7 +26,6 @@ KERNEL_EXTRA_ARGS += "UIMAGE_LOADADDR=${UBOOT_ENTRYPOINT}" # Microblaze Serial Console settings SERIAL_CONSOLES ?= "115200;ttyUL0" -YAML_SERIAL_CONSOLE_BAUDRATE ?= "115200" require conf/machine/include/soc-tune-include.inc require conf/machine/include/machine-xilinx-default.inc @@ -55,11 +39,6 @@ MB_MACHINE_ARCH = "${@[d.getVar('TUNE_PKGARCH'), d.getVar('TUNE_PKGARCH') + '-ge MACHINE_ARCH = "${@['${MB_MACHINE_ARCH}', '${DEF_MACHINE_ARCH}']['microblaze-generic' != "${MACHINE}"]}" -# microblaze-generic.conf uses kcu105-microblazeel xsa as reference input. -# User can override with custom xsa using HDF_BASE and HDF_PATH variables from -# local.conf. -HDF_MACHINE = "kcu105-microblazeel" - MACHINE_FEATURES = "" KERNEL_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}' # defined before calling the required inclusion file else pre-expansion value # defined in local.conf without machine override will not be reflected. -# Yocto Versal device-tree variables -YAML_CONSOLE_DEVICE_CONFIG:pn-device-tree ?= "CIPS_0_pspmc_0_psv_sbsauart_0" -DT_PADDING_SIZE:pn-device-tree ?= "0x1000" -DTC_FLAGS:pn-device-tree ?= "-@" -YAML_DT_BOARD_FLAGS ?= "{BOARD versal-vck190-reva-x-ebm-01-reva}" - # Yocto Versal u-boot-xlnx variables UBOOT_MACHINE ?= "xilinx_versal_virt_defconfig" BOOTMODE ?= "generic.root" @@ -23,27 +17,17 @@ BOOTMODE ?= "generic.root" # Yocto Versal arm-trusted-firmware(TF-A) variables TFA_BL33_LOAD ?= "0x8000000" -# Yocto Versal PLM variables -YAML_SERIAL_CONSOLE_STDIN:pn-plm-firmware ?= "CIPS_0_pspmc_0_psv_sbsauart_0" -YAML_SERIAL_CONSOLE_STDOUT:pn-plm-firmware ?= "CIPS_0_pspmc_0_psv_sbsauart_0" - # Yocto Versal KERNEL Variables UBOOT_ENTRYPOINT ?= "0x200000" UBOOT_LOADADDRESS ?= "0x200000" # Versal Serial Console SERIAL_CONSOLES ?= "115200;ttyAMA0" -YAML_SERIAL_CONSOLE_BAUDRATE ?= "115200" require conf/machine/include/soc-versal.inc require conf/machine/include/machine-xilinx-default.inc require conf/machine/include/machine-xilinx-qemu.inc -# versal-generic.conf uses vck190-versal xsa as reference input. -# User can override with custom xsa using HDF_BASE and HDF_PATH variables from -# local.conf. -HDF_MACHINE = "vck190-versal" - MACHINE_FEATURES += "rtc ext2 ext3 vfat usbhost" # 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 # defined before calling the required inclusion file else pre-expansion value # defined in local.conf without machine override will not be reflected. -# Yocto Versal device-tree variables -YAML_CONSOLE_DEVICE_CONFIG:pn-device-tree ?= "psx_wizard_0_psxl_0_psx_sbsauart_0" -DT_PADDING_SIZE:pn-device-tree ?= "0x1000" -DTC_FLAGS:pn-device-tree ?= "-@" -YAML_DT_BOARD_FLAGS ?= "{BOARD versal-net-vn-p-b2197-00-reva}" - # Yocto Versal u-boot-xlnx variables UBOOT_MACHINE ?= "xilinx_versal_net_virt_defconfig" BOOTMODE ?= "generic.root" @@ -23,27 +17,17 @@ BOOTMODE ?= "generic.root" # Yocto Versal arm-trusted-firmware(TF-A) variables TFA_BL33_LOAD ?= "0x8000000" -# Yocto Versal PLM variables -YAML_SERIAL_CONSOLE_STDIN:pn-plm-firmware ?= "psx_wizard_0_psxl_0_psx_sbsauart_0" -YAML_SERIAL_CONSOLE_STDOUT:pn-plm-firmware ?= "psx_wizard_0_psxl_0_psx_sbsauart_0" - # Yocto Versal KERNEL Variables UBOOT_ENTRYPOINT ?= "0x200000" UBOOT_LOADADDRESS ?= "0x200000" # Versal Serial Console SERIAL_CONSOLES ?= "115200;ttyAMA0 115200;ttyAMA1" -YAML_SERIAL_CONSOLE_BAUDRATE ?= "115200" require conf/machine/include/soc-versal-net.inc require conf/machine/include/machine-xilinx-default.inc require conf/machine/include/machine-xilinx-qemu.inc -# versal-net-generic.conf uses a qemu only xsa as reference input. -# User can override with custom xsa using HDF_BASE and HDF_PATH variables from -# local.conf. -HDF_MACHINE = "versal-net-generic" - MACHINE_FEATURES += "rtc ext2 ext3 vfat usbhost" # 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}']}" # defined before calling the required inclusion file else pre-expansion value # defined in local.conf without machine override will not be reflected. -# Yocto Zynq-7000 device-tree variables -YAML_CONSOLE_DEVICE_CONFIG:pn-device-tree ?= "ps7_uart_1" -YAML_MAIN_MEMORY_CONFIG:pn-device-tree ?= "PS7_DDR_0" -DT_PADDING_SIZE:pn-device-tree ?= "0x1000" -DTC_FLAGS:pn-device-tree ?= "-@" -YAML_DT_BOARD_FLAGS ?= "{BOARD zc702}" - # Yocto Zynq-7000 u-boot-xlnx variables UBOOT_MACHINE ?= "xilinx_zynq_virt_defconfig" BOOTMODE ?= "generic.root" -# Yocto Zynq-7000 FSBL variables -YAML_SERIAL_CONSOLE_STDIN:pn-fsbl-firmware ?= "ps7_uart_1" -YAML_SERIAL_CONSOLE_STDOUT:pn-fsbl-firmware ?= "ps7_uart_1" - # Yocto KERNEL Variables UBOOT_ENTRYPOINT ?= "0x200000" UBOOT_LOADADDRESS ?= "0x200000" @@ -32,17 +21,11 @@ KERNEL_EXTRA_ARGS += "UIMAGE_LOADADDR=${UBOOT_ENTRYPOINT}" # Zynq-7000 Serial Console settings SERIAL_CONSOLES ?= "115200;ttyPS0" -YAML_SERIAL_CONSOLE_BAUDRATE ?= "115200" require conf/machine/include/soc-zynq.inc require conf/machine/include/machine-xilinx-default.inc require conf/machine/include/machine-xilinx-qemu.inc -# zynq-generic.conf uses zc702-zynq7 xsa as reference input. -# User can override with custom xsa using HDF_BASE and HDF_PATH variables from -# local.conf. -HDF_MACHINE = "zc702-zynq7" - MACHINE_FEATURES += "rtc ext2 ext3 vfat usbhost usbgadget" EXTRA_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}' # defined before calling the required inclusion file else pre-expansion value # defined in local.conf without machine override will not be reflected. -# Yocto device-tree variables -YAML_CONSOLE_DEVICE_CONFIG:pn-device-tree ?= "psu_uart_0" -YAML_MAIN_MEMORY_CONFIG:pn-device-tree ?= "PSU_DDR_0" -DT_PADDING_SIZE:pn-device-tree ?= "0x1000" -DTC_FLAGS:pn-device-tree ?= "-@" -YAML_DT_BOARD_FLAGS ?= "{BOARD zcu102-rev1.0}" - # Yocto ZynqMP u-boot-xlnx variables UBOOT_MACHINE ?= "xilinx_zynqmp_virt_defconfig" BOOTMODE ?= "generic.root" @@ -30,31 +23,17 @@ SPL_BINARY ?= "" # Yocto ZynqMP arm-trusted-firmware(TF-A) variables TFA_BL33_LOAD ?= "0x8000000" -# Yocto ZynqMP PMUFW variables -YAML_SERIAL_CONSOLE_STDIN:pn-pmu-firmware ?= "psu_uart_0" -YAML_SERIAL_CONSOLE_STDOUT:pn-pmu-firmware ?= "psu_uart_0" - -# Yocto ZynqMP FSBL variables -YAML_SERIAL_CONSOLE_STDIN:pn-fsbl-firmware ?= "psu_uart_0" -YAML_SERIAL_CONSOLE_STDOUT:pn-fsbl-firmware ?= "psu_uart_0" - # Yocto ZynqMP KERNEL Variables UBOOT_ENTRYPOINT ?= "0x200000" UBOOT_LOADADDRESS ?= "0x200000" # ZynqMP Serial Console SERIAL_CONSOLES ?= "115200;ttyPS0 115200;ttyPS1" -YAML_SERIAL_CONSOLE_BAUDRATE ?= "115200" require conf/machine/include/soc-zynqmp.inc require conf/machine/include/machine-xilinx-default.inc require conf/machine/include/machine-xilinx-qemu.inc -# zynqmp-generic.conf uses zcu102-zynqmp xsa as reference input. -# User can override with custom xsa using HDF_BASE and HDF_PATH variables from -# local.conf. -HDF_MACHINE = "zcu102-zynqmp" - # Machine features must result in a superset # Basic features: MACHINE_FEATURES += "rtc ext2 ext3 vfat usbhost usbgadget wifi bluetooth" -- cgit v1.2.3-54-g00ecf