dev/serial: Add Zynq UART kernel I/O support

Replace the BSP_CONSOLE_MINOR BSP option for the Xilinx Zynq BSPs with the new
BSP option ZYNQ_UART_KERNEL_IO_BASE_ADDR.  Move the kernel I/O support to a
shared file.

8 files changed, 26 insertions, 32 deletions

diff --git a/spec/build/bsps/aarch64/xilinx-zynqmp/grp.yml b/spec/build/bsps/aarch64/xilinx-zynqmp/grp.yml
index a00490a826..00b1060be6 100644
--- a/spec/build/bsps/aarch64/xilinx-zynqmp/grp.yml
+++ b/spec/build/bsps/aarch64/xilinx-zynqmp/grp.yml
@@ -39,8 +39,6 @@ links:
 - role: build-dependency
   uid: optclkuart
 - role: build-dependency
-  uid: ../../optconminor
-- role: build-dependency
   uid: ../../obj
 - role: build-dependency
   uid: ../../objirq
diff --git a/spec/build/bsps/arm/xilinx-zynq/grp.yml b/spec/build/bsps/arm/xilinx-zynq/grp.yml
index eeffea0e63..529fdb320f 100644
--- a/spec/build/bsps/arm/xilinx-zynq/grp.yml
+++ b/spec/build/bsps/arm/xilinx-zynq/grp.yml
@@ -35,8 +35,6 @@ links:
 - role: build-dependency
   uid: optconirq
 - role: build-dependency
-  uid: ../../optconminor
-- role: build-dependency
   uid: optint0len
 - role: build-dependency
   uid: optint0ori
diff --git a/spec/build/bsps/arm/xilinx-zynq/obj.yml b/spec/build/bsps/arm/xilinx-zynq/obj.yml
index 505c2afcc4..bc7259c10a 100644
--- a/spec/build/bsps/arm/xilinx-zynq/obj.yml
+++ b/spec/build/bsps/arm/xilinx-zynq/obj.yml
@@ -26,9 +26,7 @@ source:
 - bsps/arm/shared/cp15/arm-cp15-set-exception-handler.c
 - bsps/arm/shared/cp15/arm-cp15-set-ttb-entries.c
 - bsps/arm/shared/start/bsp-start-memcpy.S
-- bsps/arm/xilinx-zynq/console/console-config.c
 - bsps/arm/xilinx-zynq/console/console-init.c
-- bsps/arm/xilinx-zynq/console/debug-console.c
 - bsps/shared/dev/i2c/cadence-i2c.c
 - bsps/arm/xilinx-zynq/start/bspreset.c
 - bsps/arm/xilinx-zynq/start/bspstart.c
diff --git a/spec/build/bsps/arm/xilinx-zynqmp-rpu/grp.yml b/spec/build/bsps/arm/xilinx-zynqmp-rpu/grp.yml
index b886948d47..df576368d5 100644
--- a/spec/build/bsps/arm/xilinx-zynqmp-rpu/grp.yml
+++ b/spec/build/bsps/arm/xilinx-zynqmp-rpu/grp.yml
@@ -25,8 +25,6 @@ links:
 - role: build-dependency
   uid: optconirq
 - role: build-dependency
-  uid: ../../optconminor
-- role: build-dependency
   uid: optint0len
 - role: build-dependency
   uid: optint0ori
diff --git a/spec/build/bsps/arm/xilinx-zynqmp/bspxilinxzynqmp.yml b/spec/build/bsps/arm/xilinx-zynqmp/bspxilinxzynqmp.yml
index 53c5b4d7d2..d947123247 100644
--- a/spec/build/bsps/arm/xilinx-zynqmp/bspxilinxzynqmp.yml
+++ b/spec/build/bsps/arm/xilinx-zynqmp/bspxilinxzynqmp.yml
@@ -43,8 +43,6 @@ links:
 - role: build-dependency
   uid: optconirq
 - role: build-dependency
-  uid: ../../optconminor
-- role: build-dependency
   uid: optint0len
 - role: build-dependency
   uid: optint0ori
diff --git a/spec/build/bsps/objdevserialzynq.yml b/spec/build/bsps/objdevserialzynq.yml
index aef5f33060..a187ebfc10 100644
--- a/spec/build/bsps/objdevserialzynq.yml
+++ b/spec/build/bsps/objdevserialzynq.yml
@@ -14,8 +14,11 @@ install:
   - bsps/include/dev/serial/zynq-uart.h
   - bsps/include/dev/serial/zynq-uart-zynq.h
   - bsps/include/dev/serial/zynq-uart-zynqmp.h
-links: []
+links:
+- role: build-dependency
+  uid: optzynquartkernbase
 source:
+- bsps/shared/dev/serial/zynq-uart-kernel-io.c
 - bsps/shared/dev/serial/zynq-uart-polled.c
 - bsps/shared/dev/serial/zynq-uart.c
 type: build
diff --git a/spec/build/bsps/optconminor.yml b/spec/build/bsps/optconminor.yml
deleted file mode 100644
index 9bb84e0c9e..0000000000
--- a/spec/build/bsps/optconminor.yml
+++ /dev/null
@@ -1,21 +0,0 @@
-SPDX-License-Identifier: CC-BY-SA-4.0 OR BSD-2-Clause
-actions:
-- get-integer: null
-- define: null
-build-type: option
-copyrights:
-- Copyright (C) 2020 embedded brains GmbH & Co. KG
-default:
-- enabled-by:
-  - bsps/aarch64/xilinx-zynqmp
-  - arm/xilinx_zynq_microzed
-  value: 0
-- enabled-by: true
-  value: 1
-description: |
-  minor number of console device
-enabled-by: true
-format: '{}'
-links: []
-name: BSP_CONSOLE_MINOR
-type: build
diff --git a/spec/build/bsps/optzynquartkernbase.yml b/spec/build/bsps/optzynquartkernbase.yml
new file mode 100644
index 0000000000..8aba1c224f
--- /dev/null
+++ b/spec/build/bsps/optzynquartkernbase.yml
@@ -0,0 +1,22 @@
+SPDX-License-Identifier: CC-BY-SA-4.0 OR BSD-2-Clause
+actions:
+- get-string: null
+- define-unquoted: null
+build-type: option
+copyrights:
+- Copyright (C) 2024 embedded brains GmbH & Co. KG
+default:
+- enabled-by:
+  - bsps/aarch64/xilinx-zynqmp
+  - arm/xilinx_zynq_microzed
+  value: ZYNQ_UART_0_BASE_ADDR
+- enabled-by: true
+  value: ZYNQ_UART_1_BASE_ADDR
+description: |
+  This option defines the Xilinx Zynq UART base address used by the kernel I/O
+  device.
+enabled-by: true
+format: '{}'
+links: []
+name: ZYNQ_UART_KERNEL_IO_BASE_ADDR
+type: build