diff options
author | Sandeep Gundlupet Raju <sandeep.gundlupet-raju@amd.com> | 2022-12-24 22:00:03 -0700 |
---|---|---|
committer | Mark Hatle <mark.hatle@amd.com> | 2023-01-06 10:58:21 -0800 |
commit | 0f49bdb9cece058e5326fbd90344daa5e39e0a9f (patch) | |
tree | 959d88668d20674e17e607c5446c3b9d670afda9 /meta-xilinx-core/conf/machine | |
parent | 603b099acab70632e3c7d6e4c261d7603df2a62b (diff) | |
download | meta-xilinx-0f49bdb9cece058e5326fbd90344daa5e39e0a9f.tar.gz |
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 <sandeep.gundlupet-raju@amd.com>
Signed-off-by: Mark Hatle <mark.hatle@amd.com>
Diffstat (limited to 'meta-xilinx-core/conf/machine')
-rw-r--r-- | meta-xilinx-core/conf/machine/microblaze-generic.conf | 38 |
1 files changed, 21 insertions, 17 deletions
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 | |||
15 | TUNE_FEATURES:tune-microblaze ?= "microblaze v11.0 barrel-shift pattern-compare reorder divide-hard multiply-high" | 15 | TUNE_FEATURES:tune-microblaze ?= "microblaze v11.0 barrel-shift pattern-compare reorder divide-hard multiply-high" |
16 | DEFAULTTUNE ?= "microblaze" | 16 | DEFAULTTUNE ?= "microblaze" |
17 | 17 | ||
18 | require conf/machine/include/soc-tune-include.inc | 18 | # Variables that changes based on hw design or board specific requirement must be |
19 | require conf/machine/include/machine-xilinx-default.inc | 19 | # defined before calling the required inclusion file else pre-expansion value |
20 | require conf/machine/include/machine-xilinx-qemu.inc | 20 | # defined in local.conf without machine override will not be reflected. |
21 | |||
22 | # The default MACHINE_ARCH is dynmic for microblaze, since the architecture is not fixed | ||
23 | # Based on core bitbake.conf | ||
24 | DEF_MACHINE_ARCH = "${@[d.getVar('TUNE_PKGARCH'), d.getVar('MACHINE')][bool(d.getVar('MACHINE'))].replace('-', '_')}" | ||
25 | # Enable a dynamic machine_arch | ||
26 | MB_MACHINE_ARCH = "${@[d.getVar('TUNE_PKGARCH'), d.getVar('TUNE_PKGARCH') + '-generic'][bool(d.getVar('MACHINE'))].replace('-', '_')}" | ||
27 | |||
28 | MACHINE_ARCH = "${@['${MB_MACHINE_ARCH}', '${DEF_MACHINE_ARCH}']['microblaze-generic' != "${MACHINE}"]}" | ||
29 | |||
30 | # microblaze-generic.conf uses kcu105-microblazeel xsa as reference input. | ||
31 | # User can override with custom xsa using HDF_BASE and HDF_PATH variables from | ||
32 | # local.conf. | ||
33 | HDF_MACHINE = "kcu105-microblazeel" | ||
34 | 21 | ||
35 | # Yocto Microblaze FS-Boot variables | 22 | # Yocto Microblaze FS-Boot variables |
36 | YAML_SERIAL_CONSOLE_STDIN:pn-fs-boot ?= "axi_uartlite_0" | 23 | YAML_SERIAL_CONSOLE_STDIN:pn-fs-boot ?= "axi_uartlite_0" |
@@ -54,13 +41,30 @@ YAML_DT_BOARD_FLAGS ?= "{BOARD kcu105}" | |||
54 | # Yocto Microblaze KERNEL Variables | 41 | # Yocto Microblaze KERNEL Variables |
55 | UBOOT_ENTRYPOINT ?= "0x80000000" | 42 | UBOOT_ENTRYPOINT ?= "0x80000000" |
56 | UBOOT_LOADADDRESS ?= "0x80000000" | 43 | UBOOT_LOADADDRESS ?= "0x80000000" |
57 | KERNEL_EXTRA_ARGS += "LOADADDR=${UBOOT_ENTRYPOINT}" | 44 | KERNEL_EXTRA_ARGS += "UIMAGE_LOADADDR=${UBOOT_ENTRYPOINT}" |
58 | 45 | ||
59 | # Microblaze Serial Console settings | 46 | # Microblaze Serial Console settings |
60 | SERIAL_CONSOLES ?= "115200;ttyUL0" | 47 | SERIAL_CONSOLES ?= "115200;ttyUL0" |
61 | SERIAL_CONSOLES_CHECK = "${SERIAL_CONSOLES}" | 48 | SERIAL_CONSOLES_CHECK = "${SERIAL_CONSOLES}" |
62 | YAML_SERIAL_CONSOLE_BAUDRATE ?= "115200" | 49 | YAML_SERIAL_CONSOLE_BAUDRATE ?= "115200" |
63 | 50 | ||
51 | require conf/machine/include/soc-tune-include.inc | ||
52 | require conf/machine/include/machine-xilinx-default.inc | ||
53 | require conf/machine/include/machine-xilinx-qemu.inc | ||
54 | |||
55 | # The default MACHINE_ARCH is dynmic for microblaze, since the architecture is not fixed | ||
56 | # Based on core bitbake.conf | ||
57 | DEF_MACHINE_ARCH = "${@[d.getVar('TUNE_PKGARCH'), d.getVar('MACHINE')][bool(d.getVar('MACHINE'))].replace('-', '_')}" | ||
58 | # Enable a dynamic machine_arch | ||
59 | MB_MACHINE_ARCH = "${@[d.getVar('TUNE_PKGARCH'), d.getVar('TUNE_PKGARCH') + '-generic'][bool(d.getVar('MACHINE'))].replace('-', '_')}" | ||
60 | |||
61 | MACHINE_ARCH = "${@['${MB_MACHINE_ARCH}', '${DEF_MACHINE_ARCH}']['microblaze-generic' != "${MACHINE}"]}" | ||
62 | |||
63 | # microblaze-generic.conf uses kcu105-microblazeel xsa as reference input. | ||
64 | # User can override with custom xsa using HDF_BASE and HDF_PATH variables from | ||
65 | # local.conf. | ||
66 | HDF_MACHINE = "kcu105-microblazeel" | ||
67 | |||
64 | MACHINE_FEATURES = "" | 68 | MACHINE_FEATURES = "" |
65 | 69 | ||
66 | KERNEL_IMAGETYPE ?= "linux.bin.ub" | 70 | KERNEL_IMAGETYPE ?= "linux.bin.ub" |