From ca01be9fda6e842753f9aab78bc4430cbdf665f5 Mon Sep 17 00:00:00 2001 From: Sandeep Gundlupet Raju Date: Tue, 18 Jul 2023 16:13:42 -0600 Subject: microblaze-generic: Update machine conf file using gen-machineconf tool 1. Update machine conf file using gen-machineconf tool by parsing latest kcu105 xsa and reorder the variables to match the gen-machineconf tool output. 2. Add axi-quad-spi as kcu105 reference xsa has this ip enabled. Signed-off-by: Sandeep Gundlupet Raju Signed-off-by: Mark Hatle --- .../conf/machine/microblaze-generic.conf | 21 +++++++++++---------- 1 file changed, 11 insertions(+), 10 deletions(-) (limited to 'meta-xilinx-core/conf/machine') diff --git a/meta-xilinx-core/conf/machine/microblaze-generic.conf b/meta-xilinx-core/conf/machine/microblaze-generic.conf index ac785a17..5bf87344 100644 --- a/meta-xilinx-core/conf/machine/microblaze-generic.conf +++ b/meta-xilinx-core/conf/machine/microblaze-generic.conf @@ -19,10 +19,19 @@ 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 @@ -30,14 +39,6 @@ UBOOT_MACHINE ?= "microblaze-generic_defconfig" UBOOT_INITIAL_ENV = "" BOOTMODE ?= "generic.root" -# 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 KERNEL Variables UBOOT_ENTRYPOINT ?= "0x80000000" UBOOT_LOADADDRESS ?= "0x80000000" @@ -72,8 +73,8 @@ KERNEL_IMAGETYPES = "" MACHINE_ESSENTIAL_EXTRA_RDEPENDS += "${PREFERRED_PROVIDER_virtual/dtb}" IMAGE_BOOT_FILES += " \ - ${@bb.utils.contains('PREFERRED_PROVIDER_virtual/dtb', 'device-tree', 'system.dtb', '', d)} \ - " + ${@bb.utils.contains('PREFERRED_PROVIDER_virtual/dtb', 'device-tree', 'system.dtb', '', d)} \ + " EXTRA_IMAGEDEPENDS += " \ libyaml-native \ -- cgit v1.2.3-54-g00ecf