From 0f49bdb9cece058e5326fbd90344daa5e39e0a9f Mon Sep 17 00:00:00 2001 From: Sandeep Gundlupet Raju Date: Sat, 24 Dec 2022 22:00:03 -0700 Subject: microblaze-generic: Update machine conf file using gen-machineconf tool 1. Update machine conf file using gen-machineconf tool by parsing kcu105 xsa. 2. Move variables which changes based on xsa before required inclusion file to handle pre-expansion values. 3. Use UIMAGE_LOADADDR in KERNEL_EXTRA_ARGS instead of LOADADDR. Signed-off-by: Sandeep Gundlupet Raju Signed-off-by: Mark Hatle --- .../conf/machine/microblaze-generic.conf | 38 ++++++++++++---------- 1 file changed, 21 insertions(+), 17 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 890bb317..deccb44b 100644 --- a/meta-xilinx-core/conf/machine/microblaze-generic.conf +++ b/meta-xilinx-core/conf/machine/microblaze-generic.conf @@ -15,22 +15,9 @@ MACHINEOVERRIDES =. "${@['', 'microblaze-generic:']['microblaze-generic' != '${M TUNE_FEATURES:tune-microblaze ?= "microblaze v11.0 barrel-shift pattern-compare reorder divide-hard multiply-high" DEFAULTTUNE ?= "microblaze" -require conf/machine/include/soc-tune-include.inc -require conf/machine/include/machine-xilinx-default.inc -require conf/machine/include/machine-xilinx-qemu.inc - -# The default MACHINE_ARCH is dynmic for microblaze, since the architecture is not fixed -# Based on core bitbake.conf -DEF_MACHINE_ARCH = "${@[d.getVar('TUNE_PKGARCH'), d.getVar('MACHINE')][bool(d.getVar('MACHINE'))].replace('-', '_')}" -# Enable a dynamic machine_arch -MB_MACHINE_ARCH = "${@[d.getVar('TUNE_PKGARCH'), d.getVar('TUNE_PKGARCH') + '-generic'][bool(d.getVar('MACHINE'))].replace('-', '_')}" - -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" +# Variables that changes based on hw design or board specific requirement must be +# defined before calling the required inclusion file else pre-expansion value +# defined in local.conf without machine override will not be reflected. # Yocto Microblaze FS-Boot variables YAML_SERIAL_CONSOLE_STDIN:pn-fs-boot ?= "axi_uartlite_0" @@ -54,13 +41,30 @@ YAML_DT_BOARD_FLAGS ?= "{BOARD kcu105}" # Yocto Microblaze KERNEL Variables UBOOT_ENTRYPOINT ?= "0x80000000" UBOOT_LOADADDRESS ?= "0x80000000" -KERNEL_EXTRA_ARGS += "LOADADDR=${UBOOT_ENTRYPOINT}" +KERNEL_EXTRA_ARGS += "UIMAGE_LOADADDR=${UBOOT_ENTRYPOINT}" # Microblaze Serial Console settings SERIAL_CONSOLES ?= "115200;ttyUL0" SERIAL_CONSOLES_CHECK = "${SERIAL_CONSOLES}" YAML_SERIAL_CONSOLE_BAUDRATE ?= "115200" +require conf/machine/include/soc-tune-include.inc +require conf/machine/include/machine-xilinx-default.inc +require conf/machine/include/machine-xilinx-qemu.inc + +# The default MACHINE_ARCH is dynmic for microblaze, since the architecture is not fixed +# Based on core bitbake.conf +DEF_MACHINE_ARCH = "${@[d.getVar('TUNE_PKGARCH'), d.getVar('MACHINE')][bool(d.getVar('MACHINE'))].replace('-', '_')}" +# Enable a dynamic machine_arch +MB_MACHINE_ARCH = "${@[d.getVar('TUNE_PKGARCH'), d.getVar('TUNE_PKGARCH') + '-generic'][bool(d.getVar('MACHINE'))].replace('-', '_')}" + +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" -- cgit v1.2.3-54-g00ecf