diff options
author | Sandeep Gundlupet Raju <sandeep.gundlupet-raju@amd.com> | 2023-01-18 10:14:15 -0700 |
---|---|---|
committer | Mark Hatle <mark.hatle@amd.com> | 2023-01-19 10:04:01 -0600 |
commit | 697ce8050bd255e6c99499cd9604e230f8521d60 (patch) | |
tree | 2eb312b266c2fded8e0f651b5e3d8ec82c540aea /meta-xilinx-vendor/conf/machine | |
parent | 3a9c474548b05e72406b423e1bba0040aa79704b (diff) | |
download | meta-xilinx-697ce8050bd255e6c99499cd9604e230f8521d60.tar.gz |
ultra96-zynqmp: Fix serial issue for qemu boot
runqemu assumes psu_uart_0 is used but in Ultra96 psu_uart_1 is the
primary uart device, So set psu_uart_0 as null to fix qemu boot
issue.
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-vendor/conf/machine')
-rw-r--r-- | meta-xilinx-vendor/conf/machine/ultra96-zynqmp.conf | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/meta-xilinx-vendor/conf/machine/ultra96-zynqmp.conf b/meta-xilinx-vendor/conf/machine/ultra96-zynqmp.conf index 49fd8ba9..0da0476c 100644 --- a/meta-xilinx-vendor/conf/machine/ultra96-zynqmp.conf +++ b/meta-xilinx-vendor/conf/machine/ultra96-zynqmp.conf | |||
@@ -36,6 +36,8 @@ UBOOT_ENTRYPOINT ?= "0x200000" | |||
36 | UBOOT_LOADADDRESS ?= "0x200000" | 36 | UBOOT_LOADADDRESS ?= "0x200000" |
37 | 37 | ||
38 | # ultra96-zynqmp Serial Console | 38 | # ultra96-zynqmp Serial Console |
39 | # In Ultra96 uart1 is the primary uart device but DTG set the serial0 alias | ||
40 | # to uart1, hence we are using ttyPS0 for Ultra96. | ||
39 | SERIAL_CONSOLES ?= "115200;ttyPS0" | 41 | SERIAL_CONSOLES ?= "115200;ttyPS0" |
40 | YAML_SERIAL_CONSOLE_BAUDRATE ?= "115200" | 42 | YAML_SERIAL_CONSOLE_BAUDRATE ?= "115200" |
41 | 43 | ||
@@ -49,9 +51,14 @@ require conf/machine/zynqmp-eg-generic.conf | |||
49 | # from local.conf. | 51 | # from local.conf. |
50 | HDF_MACHINE = "ultra96-zynqmp" | 52 | HDF_MACHINE = "ultra96-zynqmp" |
51 | 53 | ||
52 | # Ultra96 has 2GB memory only but default zynqmp-generic has QB_MEM set to 4G, Hence set to 2G | 54 | # Ultra96 has 2GB memory only but default zynqmp-generic has QB_MEM set to 4G, |
55 | # Hence set QB_MEM to 2GB. | ||
53 | QB_MEM = "-m 2G" | 56 | QB_MEM = "-m 2G" |
54 | 57 | ||
58 | # runqemu assumes psu_uart_0 is used but in Ultra96 psu_uart_1 is the primary | ||
59 | # uart device, So set psu_uart_0 as null. | ||
60 | QB_OPT_APPEND += " -serial null" | ||
61 | |||
55 | # KERNEL_DEVICETREE is disabled as we use board device tree from DTG to match | 62 | # KERNEL_DEVICETREE is disabled as we use board device tree from DTG to match |
56 | # the xsa. User can enable explicitly if required from local.conf. | 63 | # the xsa. User can enable explicitly if required from local.conf. |
57 | # KERNEL_DEVICETREE = "xilinx/zynqmp-zcu100-revC.dtb" | 64 | # KERNEL_DEVICETREE = "xilinx/zynqmp-zcu100-revC.dtb" |