<meta http-equiv="Content-Type" content="text/html; charset=utf-8"><div dir="ltr"><div>Looks good to me. The overall effect of this is no functional change. Thanks for the cleanup!</div><div><br></div><div>Kinsey<br></div></div><br><div class="gmail_quote"><div dir="ltr" class="gmail_attr">On Mon, Mar 11, 2024 at 8:25 AM Sebastian Huber <<a href="mailto:sebastian.huber@embedded-brains.de">sebastian.huber@embedded-brains.de</a>> wrote:<br></div><blockquote class="gmail_quote" style="margin:0px 0px 0px 0.8ex;border-left:1px solid rgb(204,204,204);padding-left:1ex">The base addresses and IRQ numbers for UART 0 and 1 were interchanged.<br>
Fix this and set BSP_CONSOLE_MINOR to 0 for this BSP family.<br>
---<br>
bsps/aarch64/xilinx-zynqmp/console/console.c | 4 ++--<br>
bsps/aarch64/xilinx-zynqmp/include/bsp/irq.h | 4 ++--<br>
spec/build/bsps/optconminor.yml | 1 +<br>
3 files changed, 5 insertions(+), 4 deletions(-)<br>
<br>
diff --git a/bsps/aarch64/xilinx-zynqmp/console/console.c b/bsps/aarch64/xilinx-zynqmp/console/console.c<br>
index 0b62893e67..9ce0b1da63 100644<br>
--- a/bsps/aarch64/xilinx-zynqmp/console/console.c<br>
+++ b/bsps/aarch64/xilinx-zynqmp/console/console.c<br>
@@ -187,11 +187,11 @@ RTEMS_SYSINIT_ITEM(<br>
static zynq_uart_context zynqmp_uart_instances[2] = {<br>
{<br>
.base = RTEMS_TERMIOS_DEVICE_CONTEXT_INITIALIZER( "Zynq UART 0" ),<br>
- .regs = (volatile struct zynq_uart *) 0xff010000,<br>
+ .regs = (volatile struct zynq_uart *) 0xff000000,<br>
.irq = ZYNQMP_IRQ_UART_0<br>
}, {<br>
.base = RTEMS_TERMIOS_DEVICE_CONTEXT_INITIALIZER( "Zynq UART 1" ),<br>
- .regs = (volatile struct zynq_uart *) 0xff000000,<br>
+ .regs = (volatile struct zynq_uart *) 0xff010000,<br>
.irq = ZYNQMP_IRQ_UART_1<br>
}<br>
};<br>
diff --git a/bsps/aarch64/xilinx-zynqmp/include/bsp/irq.h b/bsps/aarch64/xilinx-zynqmp/include/bsp/irq.h<br>
index 2cbe99f863..024fd0d89a 100644<br>
--- a/bsps/aarch64/xilinx-zynqmp/include/bsp/irq.h<br>
+++ b/bsps/aarch64/xilinx-zynqmp/include/bsp/irq.h<br>
@@ -56,8 +56,8 @@ extern "C" {<br>
#define ZYNQMP_IRQ_QSPI 47<br>
#define ZYNQMP_IRQ_I2C_0 49<br>
#define ZYNQMP_IRQ_I2C_1 50<br>
-#define ZYNQMP_IRQ_UART_0 54<br>
-#define ZYNQMP_IRQ_UART_1 53<br>
+#define ZYNQMP_IRQ_UART_0 53<br>
+#define ZYNQMP_IRQ_UART_1 54<br>
#define ZYNQMP_IRQ_ETHERNET_0 89<br>
#define ZYNQMP_IRQ_ETHERNET_1 91<br>
#define ZYNQMP_IRQ_ETHERNET_2 93<br>
diff --git a/spec/build/bsps/optconminor.yml b/spec/build/bsps/optconminor.yml<br>
index 514b3fa032..3f17f05fe7 100644<br>
--- a/spec/build/bsps/optconminor.yml<br>
+++ b/spec/build/bsps/optconminor.yml<br>
@@ -7,6 +7,7 @@ copyrights:<br>
- Copyright (C) 2020 embedded brains GmbH & Co. KG<br>
default:<br>
- enabled-by:<br>
+ - aarch64/bsps/xilinx-zynqmp<br>
- arm/xilinx_zynq_microzed<br>
value: 0<br>
- enabled-by: true<br>
-- <br>
2.35.3<br>
<br>
_______________________________________________<br>
devel mailing list<br>
<a href="mailto:devel@rtems.org" target="_blank">devel@rtems.org</a><br>
<a href="http://lists.rtems.org/mailman/listinfo/devel" rel="noreferrer" target="_blank">http://lists.rtems.org/mailman/listinfo/devel</a><br>
</blockquote></div>