microblaze-generic: Switch default machine to kcu105

1. Switch default machine from kc705 to kcu105.
2. Move YAML configs to microblaze-generic file with weak assignments.
3. Add bitstream, bootloader and u-boot-zynq-scr to EXTRA_IMAGEDEPENDS.
4. Use QB_KERNEL_CMDLINE_APPEND to pass bootargs to QEMU.

Signed-off-by: Sandeep Gundlupet Raju <sandeep.gundlupet-raju@amd.com>
Signed-off-by: Mark Hatle <mark.hatle@amd.com>

1 files changed, 46 insertions, 12 deletions

diff --git a/meta-xilinx-core/conf/machine/microblaze-generic.conf b/meta-xilinx-core/conf/machine/microblaze-generic.conf
index 92412681..db38fb03 100644
--- a/meta-xilinx-core/conf/machine/microblaze-generic.conf
+++ b/meta-xilinx-core/conf/machine/microblaze-generic.conf
@@ -1,6 +1,6 @@
 #@TYPE: Machine
 #@NAME: microblaze-generic
-#@DESCRIPTION: Generic microblaze defaults to little-endian v11.0 barrel-shift pattern-compare reorder divide-hard multiple-high support
+#@DESCRIPTION: Machine configuration for the microblaze-generic devices
 
 # Deprecated board config
 USE_BOARD = "${@"conf/machine/include/xilinx-board-pre.inc" if d.getVar("BOARD") or d.getVar("BOARD_VARIANT") else ""}"
@@ -27,32 +27,66 @@ 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"
+
+# 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"
+XSCTH_PROC:pn-fs-boot ?= "microblaze_0"
+
+# Yocto Microblaze u-boot-xlnx variables
+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"
+KERNEL_EXTRA_ARGS += "LOADADDR=${UBOOT_ENTRYPOINT}"
+
+# Microblaze Serial Console settings
+SERIAL_CONSOLES ?= "115200;ttyUL0"
+SERIAL_CONSOLES_CHECK = "${SERIAL_CONSOLES}"
+YAML_SERIAL_CONSOLE_BAUDRATE ?= "115200"
+
 MACHINE_FEATURES = ""
 
 KERNEL_IMAGETYPE ?= "linux.bin.ub"
 KERNEL_IMAGETYPES = ""
 
-SERIAL_CONSOLES ?= "115200;ttyUL0"
-
 MACHINE_ESSENTIAL_EXTRA_RDEPENDS += "device-tree"
 
 IMAGE_BOOT_FILES += " \
                 ${@bb.utils.contains('PREFERRED_PROVIDER_virtual/dtb', 'device-tree', 'system.dtb', '', d)} \
                 "
 
-EXTRA_IMAGEDEPENDS += "libyaml-native python3-cython-native python3-pyyaml-native"
+EXTRA_IMAGEDEPENDS += " \
+    libyaml-native \
+    python3-cython-native \
+    python3-pyyaml-native \
+    virtual/bitstream \
+    virtual/bootloader \
+    virtual/elfrealloc \
+    u-boot-zynq-scr \
+    "
 
-UBOOT_MACHINE ?= "microblaze-generic_defconfig"
-UBOOT_INITIAL_ENV = ""
-BOOTMODE ?= "generic.root"
-
-HDF_MACHINE = "kc705-microblazeel"
 IMAGE_FSTYPES += "cpio.gz"
 
-QB_KERNEL_CMDLINE = "none"
-
+# Microblaze QEMU Configurations
+QB_KERNEL_CMDLINE_APPEND = "console=ttyUL0,115200 root=/dev/ram0 rw"
 QB_OPT_APPEND = ""
-
 QB_NETWORK_DEVICE = "-net nic,netdev=net0,macaddr=@MAC@"
 
 #### No additional settings should be after the Postamble