1 files changed, 12 insertions, 8 deletions

diff --git a/meta-xilinx-bsp/conf/machine/vcu118-microblazeel.conf b/meta-xilinx-bsp/conf/machine/vcu118-microblazeel.conf
index ada52ceb..bfd60336 100644
--- a/meta-xilinx-bsp/conf/machine/vcu118-microblazeel.conf
+++ b/meta-xilinx-bsp/conf/machine/vcu118-microblazeel.conf
@@ -10,13 +10,6 @@ MACHINEOVERRIDES =. "${@['', 'vcu118-microblazeel:']['vcu118-microblazeel' !='${
 # defined before calling the required inclusion file else pre-expansion value
 # defined in microblazeel-generic.conf will be set.
 
-# Yocto VCU118 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 VCU118 device-tree variables
 YAML_CONSOLE_DEVICE_CONFIG:pn-device-tree ?= "axi_uartlite_0"
 YAML_MAIN_MEMORY_CONFIG:pn-device-tree ?= "DDR4_0"
@@ -25,10 +18,21 @@ DTC_FLAGS:pn-device-tree ?= ""
 XSCTH_PROC:pn-device-tree ?= "microblaze_0"
 YAML_DT_BOARD_FLAGS ?= "{BOARD vcu118-rev2.0}"
 
+# Yocto 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 KERNEL Variables
 UBOOT_ENTRYPOINT  ?= "0x80000000"
 UBOOT_LOADADDRESS ?= "0x80000000"
 
+# vcu118-microblazeel Serial Console
+SERIAL_CONSOLES ?= "115200;ttyUL0"
+YAML_SERIAL_CONSOLE_BAUDRATE ?= "115200"
+
 # Set DDR Base address for u-boot-xlnx-scr variables
 DDR_BASEADDR ?= "0x80000000"
 SKIP_APPEND_BASEADDR ?= "0"
@@ -43,4 +47,4 @@ HDF_MACHINE = "vcu118-microblazeel"
 
 #### No additional settings should be after the Postamble
 #### Postamble
-PACKAGE_EXTRA_ARCHS:append = "${@['', 'vcu118_microblazeel']['vcu118-microblazeel' != '${MACHINE}']}"
+PACKAGE_EXTRA_ARCHS:append = "${@['', ' vcu118_microblazeel']['vcu118-microblazeel' != '${MACHINE}']}"