<div dir="ltr">Hi Kinsey,<div><br></div><div>Thanks for the suggestions. I'll break it up into several commits as you suggested. Shall I break it down as follows?<br><br><div>- Build spec changes</div><div>- Formatting changes</div><div>- Macro renamings</div><div><br></div><div>Regards,</div></div><div>Utkarsh</div></div><br><div class="gmail_quote"><div dir="ltr" class="gmail_attr">On Mon, Aug 7, 2023 at 8:49 PM Kinsey Moore <<a href="mailto:kinsey.moore@oarcorp.com">kinsey.moore@oarcorp.com</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"><div dir="ltr"><div>I would say that the content here is easily worth several patches. You've got header rearrangements and other formatting changes mixed in with macro renamings, build system changes, and other things. One comment below on the .gitignore. You've also got inconsistencies in usage of (C) vs (c).<br></div><br><div class="gmail_quote"><div dir="ltr" class="gmail_attr">On Sun, Aug 6, 2023 at 11:49 PM Utkarsh Verma <<a href="mailto:utkarsh@bitbanged.com" target="_blank">utkarsh@bitbanged.com</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">From: Utkarsh Verma <<a href="mailto:utkarshverma@protonmail.com" target="_blank">utkarshverma@protonmail.com</a>><br>
<br>
Refactor the code base for better organization to facilitate future<br>
patches.<br>
---<br>
.gitignore | 4 +<br>
bsps/aarch64/raspberrypi/console/console.c | 42 +-<br>
bsps/aarch64/raspberrypi/include/bsp.h | 33 +-<br>
.../aarch64/raspberrypi/include/bsp/bcm2711.h | 98 ++++<br>
bsps/aarch64/raspberrypi/include/bsp/irq.h | 94 ++--<br>
.../raspberrypi/include/bsp/raspberrypi.h | 471 ------------------<br>
.../include/bsp/start/bspstartmmu.h | 8 +<br>
bsps/aarch64/raspberrypi/start/bspstart.c | 18 +-<br>
.../aarch64/raspberrypi/start/bspstarthooks.c | 26 +-<br>
bsps/aarch64/raspberrypi/start/bspstartmmu.c | 66 +--<br>
spec/build/bsps/aarch64/raspberrypi/abi.yml | 37 +-<br>
spec/build/bsps/aarch64/raspberrypi/bsp4b.yml | 23 +<br>
.../aarch64/raspberrypi/bspraspberrypi4.yml | 72 ---<br>
spec/build/bsps/aarch64/raspberrypi/grp.yml | 49 ++<br>
spec/build/bsps/aarch64/raspberrypi/grp4b.yml | 26 +<br>
.../{linkercmds.yml => linkcmds.yml} | 25 +-<br>
spec/build/bsps/aarch64/raspberrypi/obj.yml | 50 ++<br>
.../aarch64/raspberrypi/objconsolepl011.yml | 24 +<br>
.../aarch64/raspberrypi/optclockpl011freq.yml | 23 +<br>
.../aarch64/raspberrypi/optconsolebaud.yml | 23 +<br>
20 files changed, 487 insertions(+), 725 deletions(-)<br>
create mode 100644 bsps/aarch64/raspberrypi/include/bsp/bcm2711.h<br>
delete mode 100644 bsps/aarch64/raspberrypi/include/bsp/raspberrypi.h<br>
create mode 100644 bsps/aarch64/raspberrypi/include/bsp/start/bspstartmmu.h<br>
create mode 100644 spec/build/bsps/aarch64/raspberrypi/bsp4b.yml<br>
delete mode 100644 spec/build/bsps/aarch64/raspberrypi/bspraspberrypi4.yml<br>
create mode 100644 spec/build/bsps/aarch64/raspberrypi/grp.yml<br>
create mode 100644 spec/build/bsps/aarch64/raspberrypi/grp4b.yml<br>
rename spec/build/bsps/aarch64/raspberrypi/{linkercmds.yml => linkcmds.yml} (90%)<br>
create mode 100644 spec/build/bsps/aarch64/raspberrypi/obj.yml<br>
create mode 100644 spec/build/bsps/aarch64/raspberrypi/objconsolepl011.yml<br>
create mode 100644 spec/build/bsps/aarch64/raspberrypi/optclockpl011freq.yml<br>
create mode 100644 spec/build/bsps/aarch64/raspberrypi/optconsolebaud.yml<br>
<br>
diff --git a/.gitignore b/.gitignore<br>
index 8b28b186e1..d0144f6737 100644<br>
--- a/.gitignore<br>
+++ b/.gitignore<br>
@@ -12,3 +12,7 @@ Makefile.in<br>
/testsuites/build/build<br>
/testsuites/build/wscript<br>
.waf*<br>
+.clangd<br>
+.clang-format<br>
+compile_commands.json<br>
+.cache/<br></blockquote><div><br></div><div>While the clang and cache entries here are probably reasonable to go upstream, I don't think "compile_commands.json" is.</div><div><br></div><div> <br></div><blockquote class="gmail_quote" style="margin:0px 0px 0px 0.8ex;border-left:1px solid rgb(204,204,204);padding-left:1ex">
diff --git a/bsps/aarch64/raspberrypi/console/console.c b/bsps/aarch64/raspberrypi/console/console.c<br>
index 73bb0036ff..4aba0ec73e 100644<br>
--- a/bsps/aarch64/raspberrypi/console/console.c<br>
+++ b/bsps/aarch64/raspberrypi/console/console.c<br>
@@ -3,13 +3,14 @@<br>
/**<br>
* @file<br>
*<br>
- * @ingroup RTEMSBSPsAArch64Raspberrypi4<br>
+ * @ingroup RTEMSBSPsAArch64RaspberryPi<br>
*<br>
* @brief Console Configuration<br>
*/<br>
<br>
/*<br>
- * Copyright (C) 2022 Mohd Noor Aman<br>
+ * Copyright (c) 2022 Mohd Noor Aman<br>
+ * Copyright (c) 2023 Utkarsh Verma<br>
*<br>
*<br>
* Redistribution and use in source and binary forms, with or without<br>
@@ -34,36 +35,33 @@<br>
* POSSIBILITY OF SUCH DAMAGE.<br>
*/<br>
<br>
-#include <rtems/bspIo.h><br>
-<br>
-#include <bsp.h><br>
-#include <dev/serial/arm-pl011.h><br>
#include <bsp/console-termios.h><br>
-<br>
#include <bspopts.h><br>
+#include <dev/serial/arm-pl011.h><br>
+#include <rtems/bspIo.h><br>
<br>
-arm_pl011_context raspberrypi_4_context = {<br>
- .base = RTEMS_TERMIOS_DEVICE_CONTEXT_INITIALIZER("PL011"),<br>
- .regs = (volatile pl011 *) BSP_RPI4_PL011_BASE,<br>
- .initial_baud = 115200<br>
+#include "bsp.h"<br>
+<br>
+arm_pl011_context uart0 = {<br>
+ .base = RTEMS_TERMIOS_DEVICE_CONTEXT_INITIALIZER("PL011"),<br>
+ .regs = (volatile pl011 *)BSP_UART0_BASE,<br>
+ .initial_baud = BSP_CONSOLE_BAUD,<br>
};<br>
<br>
const console_device console_device_table[] = {<br>
- {<br>
- .device_file = "/dev/ttyS0",<br>
- .probe = console_device_probe_default,<br>
- .handler = &arm_pl011_fns,<br>
- .context = &raspberrypi_4_context.base<br>
- }<br>
+ {<br>
+ .device_file = "/dev/ttyAMA0",<br>
+ .probe = console_device_probe_default,<br>
+ .handler = &arm_pl011_fns,<br>
+ .context = &uart0.base,<br>
+ },<br>
};<br>
<br>
const size_t console_device_count = RTEMS_ARRAY_SIZE(console_device_table);<br>
<br>
-static void output_char( char c )<br>
-{<br>
- arm_pl011_write_polled(&raspberrypi_4_context.base, c);<br>
+static void output_char(char c) {<br>
+ arm_pl011_write_polled(&uart0.base, c);<br>
}<br>
<br>
-BSP_output_char_function_type BSP_output_char = output_char;<br>
-<br>
+BSP_output_char_function_type BSP_output_char = output_char;<br>
BSP_polling_getchar_function_type BSP_poll_char = NULL;<br>
diff --git a/bsps/aarch64/raspberrypi/include/bsp.h b/bsps/aarch64/raspberrypi/include/bsp.h<br>
index 4fa81edd40..0c2b4c98eb 100644<br>
--- a/bsps/aarch64/raspberrypi/include/bsp.h<br>
+++ b/bsps/aarch64/raspberrypi/include/bsp.h<br>
@@ -3,13 +3,14 @@<br>
/**<br>
* @file<br>
*<br>
- * @ingroup RTEMSBSPsAArch64Raspberrypi4<br>
+ * @ingroup RTEMSBSPsAArch64RaspberryPi<br>
*<br>
* @brief Core BSP definitions<br>
*/<br>
<br>
/*<br>
* Copyright (C) 2022 Mohd Noor Aman<br>
+ * Copyright (C) 2023 Utkarsh Verma<br>
*<br>
*<br>
* Redistribution and use in source and binary forms, with or without<br>
@@ -34,8 +35,8 @@<br>
* POSSIBILITY OF SUCH DAMAGE.<br>
*/<br>
<br>
-#ifndef LIBBSP_AARCH64_RASPBERRYPI_4_BSP_H<br>
-#define LIBBSP_AARCH64_RASPBERRYPI_4_BSP_H<br>
+#ifndef LIBBSP_AARCH64_RASPBERRYPI_BSP_H<br>
+#define LIBBSP_AARCH64_RASPBERRYPI_BSP_H<br>
<br>
/**<br>
* @addtogroup RTEMSBSPsAArch64<br>
@@ -48,26 +49,18 @@<br>
#ifndef ASM<br>
<br>
#include <bsp/default-initial-extension.h><br>
-#include <bsp/start.h><br>
<br>
-#include <rtems.h><br>
+#if RTEMS_BSP == raspberrypi4b<br>
+#include "bsp/bcm2711.h"<br>
<br>
-/*Raspberry pi MMU initialization */<br>
-BSP_START_TEXT_SECTION void raspberrypi_4_setup_mmu_and_cache(void);<br>
+#define BSP_GIC_BASE BCM2711_GIC_BASE<br>
+#define BSP_GIC_SIZE BCM2711_GIC_SIZE<br>
+#define BSP_ARM_GIC_CPUIF_BASE BCM2711_GIC_CPUIF_BASE<br>
+#define BSP_ARM_GIC_DIST_BASE BCM2711_GIC_DIST_BASE<br>
<br>
-#ifdef __cplusplus<br>
-extern "C" {<br>
-#endif /* __cplusplus */<br>
-<br>
-#define BSP_ARM_GIC_CPUIF_BASE 0xFF842000<br>
-#define BSP_ARM_GIC_DIST_BASE 0xFF841000<br>
-<br>
-#define BSP_RPI4_PL011_BASE 0xFE201000<br>
-#define BSP_RPI4_PL011_LENGTH 0x200<br>
-<br>
-#ifdef __cplusplus<br>
-}<br>
-#endif /* __cplusplus */<br>
+#define BSP_UART0_BASE BCM2711_UART0_BASE<br>
+#define BSP_UART0_SIZE BCM2711_UART0_SIZE<br>
+#endif /* raspberrypi4b */<br>
<br>
#endif /* ASM */<br>
<br>
diff --git a/bsps/aarch64/raspberrypi/include/bsp/bcm2711.h b/bsps/aarch64/raspberrypi/include/bsp/bcm2711.h<br>
new file mode 100644<br>
index 0000000000..885dad8af9<br>
--- /dev/null<br>
+++ b/bsps/aarch64/raspberrypi/include/bsp/bcm2711.h<br>
@@ -0,0 +1,98 @@<br>
+/* SPDX-License-Identifier: BSD-2-Clause */<br>
+<br>
+/**<br>
+ * @file<br>
+ *<br>
+ * @ingroup RTEMSBSPsAArch64RaspberryPi<br>
+ *<br>
+ * @brief Register definitions<br>
+ */<br>
+<br>
+/*<br>
+ * Copyright (C) 2022 Mohd Noor Aman<br>
+ * Copyright (C) 2023 Utkarsh Verma<br>
+ *<br>
+ *<br>
+ * Redistribution and use in source and binary forms, with or without<br>
+ * modification, are permitted provided that the following conditions<br>
+ * are met:<br>
+ * 1. Redistributions of source code must retain the above copyright<br>
+ * notice, this list of conditions and the following disclaimer.<br>
+ * 2. Redistributions in binary form must reproduce the above copyright<br>
+ * notice, this list of conditions and the following disclaimer in the<br>
+ * documentation and/or other materials provided with the distribution.<br>
+ *<br>
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"<br>
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE<br>
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE<br>
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE<br>
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR<br>
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF<br>
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS<br>
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN<br>
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)<br>
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE<br>
+ * POSSIBILITY OF SUCH DAMAGE.<br>
+ */<br>
+<br>
+#ifndef LIBBSP_AARCH64_RASPBERRYPI_BSP_BCM2711_H<br>
+#define LIBBSP_AARCH64_RASPBERRYPI_BSP_BCM2711_H<br>
+<br>
+#include <stdint.h><br>
+<br>
+#define BCM2711_REG(addr) (*(uint32_t*)(addr))<br>
+<br>
+/*<br>
+ * NOTE:<br>
+ * Raspberry Pi 4B boots into low peripheral mode by default.<br>
+ * The addresses are specified in the BCM2711 peripherals datashseet in Fig 1.<br>
+ */<br>
+#define BCM2711_PERIPHERAL_BASE 0xfc000000LL<br>
+#define BCM2711_PERIPHERAL_SIZE 0x3800000<br>
+<br>
+/* Mailbox */<br>
+#define BCM2711_MBOX_BASE (BCM2711_PERIPHERAL_BASE + 0x200B880)<br>
+<br>
+/* GPIO */<br>
+#define BCM2711_GPIO_BASE (BCM2711_PERIPHERAL_BASE + 0x2200000)<br>
+#define BCM2711_GPIO_SIZE 0xf4<br>
+<br>
+/* AUX */<br>
+#define BCM2711_AUX_BASE (BCM2711_PERIPHERAL_BASE + 0x2215000)<br>
+#define BCM2711_AUX_SIZE 0x100<br>
+<br>
+/* AUX: Mini UART */<br>
+#define BCM2711_AUX_MU_BASE (BCM2711_AUX_BASE + 0x40)<br>
+#define BCM2711_AUX_MU_SIZE 0x40<br>
+<br>
+#define BCM2711_UART1_BASE BCM2711_AUX_MU_BASE<br>
+#define BCM2711_UART1_SIZE BCM2711_AUX_MU_SIZE<br>
+<br>
+/* PL011 UARTs */<br>
+#define BCM2711_PL011_BASE (BCM2711_PERIPHERAL_BASE + 0x2201000)<br>
+#define BCM2711_PL011_SIZE 0xc00<br>
+#define BCM2711_PL011_DEVICE_SIZE 0x200<br>
+<br>
+#define BCM2711_UART0_BASE (BCM2711_PL011_BASE + 0x000)<br>
+#define BCM2711_UART0_SIZE BCM2711_PL011_DEVICE_SIZE<br>
+#define BCM2711_UART2_BASE (BCM2711_PL011_BASE + 0x400)<br>
+#define BCM2711_UART2_SIZE BCM2711_PL011_DEVICE_SIZE<br>
+#define BCM2711_UART3_BASE (BCM2711_PL011_BASE + 0x600)<br>
+#define BCM2711_UART3_SIZE BCM2711_PL011_DEVICE_SIZE<br>
+#define BCM2711_UART4_BASE (BCM2711_PL011_BASE + 0x800)<br>
+#define BCM2711_UART4_SIZE BCM2711_PL011_DEVICE_SIZE<br>
+#define BCM2711_UART5_BASE (BCM2711_PL011_BASE + 0xa00)<br>
+#define BCM2711_UART5_SIZE BCM2711_PL011_DEVICE_SIZE<br>
+<br>
+/* ARM Local */<br>
+#define BCM2711_ARM_LOCAL_BASE 0xff800000LL<br>
+#define BCM2711_ARM_LOCAL_SIZE 0x800000<br>
+<br>
+/* Generic interrupt controller */<br>
+#define BCM2711_GIC_BASE (BCM2711_ARM_LOCAL_BASE + 0x40000)<br>
+#define BCM2711_GIC_SIZE 0x8000<br>
+<br>
+#define BCM2711_GIC_DIST_BASE (BCM2711_GIC_BASE + 0x1000)<br>
+#define BCM2711_GIC_CPUIF_BASE (BCM2711_GIC_BASE + 0x2000)<br>
+<br>
+#endif /* LIBBSP_AARCH64_RASPBERRYPI_BCM2711_H */<br>
diff --git a/bsps/aarch64/raspberrypi/include/bsp/irq.h b/bsps/aarch64/raspberrypi/include/bsp/irq.h<br>
index effec1b040..1e84cd3ea2 100644<br>
--- a/bsps/aarch64/raspberrypi/include/bsp/irq.h<br>
+++ b/bsps/aarch64/raspberrypi/include/bsp/irq.h<br>
@@ -7,8 +7,8 @@<br>
*/<br>
<br>
/**<br>
- * Copyright (c) 2013 Alan Cudmore<br>
- * Copyright (c) 2022 Mohd Noor Aman<br>
+ * Copyright (C) 2013 Alan Cudmore<br>
+ * Copyright (C) 2022 Mohd Noor Aman<br>
*<br>
* The license and distribution terms for this file may be<br>
* found in the file LICENSE in this distribution or at<br>
@@ -17,15 +17,15 @@<br>
*<br>
*/<br>
<br>
-#ifndef LIBBSP_ARM_RASPBERRYPI_IRQ_H<br>
-#define LIBBSP_ARM_RASPBERRYPI_IRQ_H<br>
+#ifndef LIBBSP_AARCH64_RASPBERRYPI_BSP_IRQ_H<br>
+#define LIBBSP_AARCH64_RASPBERRYPI_BSP_IRQ_H<br>
<br>
#ifndef ASM<br>
<br>
+#include <dev/irq/arm-gic-irq.h><br>
#include <rtems.h><br>
-#include <rtems/irq.h><br>
#include <rtems/irq-extension.h><br>
-#include <dev/irq/arm-gic-irq.h><br>
+#include <rtems/irq.h><br>
<br>
#if defined(RTEMS_SMP)<br>
#include <rtems/score/processormask.h><br>
@@ -39,31 +39,31 @@<br>
* @brief Interrupt support.<br>
*/<br>
<br>
-#define BCM2835_INTC_TOTAL_IRQ (64 + 8)<br>
-<br>
-#define BCM2835_IRQ_SET1_MIN 0<br>
-#define BCM2835_IRQ_SET2_MIN 32<br>
-<br>
-#define BCM2835_IRQ_ID_GPU_TIMER_M0 0<br>
-#define BCM2835_IRQ_ID_GPU_TIMER_M1 1<br>
-#define BCM2835_IRQ_ID_GPU_TIMER_M2 2<br>
-#define BCM2835_IRQ_ID_GPU_TIMER_M3 3<br>
-<br>
-#define BCM2835_IRQ_ID_USB 9<br>
-#define BCM2835_IRQ_ID_AUX 29<br>
-#define BCM2835_IRQ_ID_SPI_SLAVE 43<br>
-#define BCM2835_IRQ_ID_PWA0 45<br>
-#define BCM2835_IRQ_ID_PWA1 46<br>
-#define BCM2835_IRQ_ID_SMI 48<br>
-#define BCM2835_IRQ_ID_GPIO_0 49<br>
-#define BCM2835_IRQ_ID_GPIO_1 50<br>
-#define BCM2835_IRQ_ID_GPIO_2 51<br>
-#define BCM2835_IRQ_ID_GPIO_3 52<br>
-#define BCM2835_IRQ_ID_I2C 53<br>
-#define BCM2835_IRQ_ID_SPI 54<br>
-#define BCM2835_IRQ_ID_PCM 55<br>
-#define BCM2835_IRQ_ID_UART 57<br>
-#define BCM2835_IRQ_ID_SD 62<br>
+#define BCM2835_INTC_TOTAL_IRQ (64 + 8)<br>
+<br>
+#define BCM2835_IRQ_SET1_MIN 0<br>
+#define BCM2835_IRQ_SET2_MIN 32<br>
+<br>
+#define BCM2835_IRQ_ID_GPU_TIMER_M0 0<br>
+#define BCM2835_IRQ_ID_GPU_TIMER_M1 1<br>
+#define BCM2835_IRQ_ID_GPU_TIMER_M2 2<br>
+#define BCM2835_IRQ_ID_GPU_TIMER_M3 3<br>
+<br>
+#define BCM2835_IRQ_ID_USB 9<br>
+#define BCM2835_IRQ_ID_AUX 29<br>
+#define BCM2835_IRQ_ID_SPI_SLAVE 43<br>
+#define BCM2835_IRQ_ID_PWA0 45<br>
+#define BCM2835_IRQ_ID_PWA1 46<br>
+#define BCM2835_IRQ_ID_SMI 48<br>
+#define BCM2835_IRQ_ID_GPIO_0 49<br>
+#define BCM2835_IRQ_ID_GPIO_1 50<br>
+#define BCM2835_IRQ_ID_GPIO_2 51<br>
+#define BCM2835_IRQ_ID_GPIO_3 52<br>
+#define BCM2835_IRQ_ID_I2C 53<br>
+#define BCM2835_IRQ_ID_SPI 54<br>
+#define BCM2835_IRQ_ID_PCM 55<br>
+#define BCM2835_IRQ_ID_UART 57<br>
+#define BCM2835_IRQ_ID_SD 62<br>
<br>
#define BCM2835_IRQ_ID_BASIC_BASE_ID 64<br>
#define BCM2835_IRQ_ID_TIMER_0 64<br>
@@ -74,34 +74,28 @@<br>
#define BCM2835_IRQ_ID_GPU1_HALTED 69<br>
#define BCM2835_IRQ_ID_ILL_ACCESS_1 70<br>
#define BCM2835_IRQ_ID_ILL_ACCESS_0 71<br>
-#define BSP_TIMER_VIRT_PPI 27<br>
-#define BSP_TIMER_PHYS_NS_PPI 30<br>
-#define BSP_VPL011_SPI 32<br>
+#define BSP_TIMER_VIRT_PPI 27<br>
+#define BSP_TIMER_PHYS_NS_PPI 30<br>
+#define BSP_VPL011_SPI 32<br>
<br>
-#define BSP_INTERRUPT_VECTOR_COUNT BCM2835_INTC_TOTAL_IRQ<br>
+#define BSP_INTERRUPT_VECTOR_COUNT BCM2835_INTC_TOTAL_IRQ<br>
#define BSP_INTERRUPT_VECTOR_INVALID (UINT32_MAX)<br>
<br>
-#define BSP_IRQ_COUNT (BCM2835_INTC_TOTAL_IRQ)<br>
+#define BSP_IRQ_COUNT (BCM2835_INTC_TOTAL_IRQ)<br>
<br>
#if defined(RTEMS_SMP)<br>
static inline rtems_status_code bsp_interrupt_set_affinity(<br>
- rtems_vector_number vector,<br>
- const Processor_mask *affinity<br>
-)<br>
-{<br>
- (void) vector;<br>
- (void) affinity;<br>
- return RTEMS_UNSATISFIED;<br>
+ rtems_vector_number vector, const Processor_mask *affinity) {<br>
+ (void)vector;<br>
+ (void)affinity;<br>
+ return RTEMS_UNSATISFIED;<br>
}<br>
<br>
static inline rtems_status_code bsp_interrupt_get_affinity(<br>
- rtems_vector_number vector,<br>
- Processor_mask *affinity<br>
-)<br>
-{<br>
- (void) vector;<br>
- _Processor_mask_From_index( affinity, 0 );<br>
- return RTEMS_UNSATISFIED;<br>
+ rtems_vector_number vector, Processor_mask *affinity) {<br>
+ (void)vector;<br>
+ _Processor_mask_From_index(affinity, 0);<br>
+ return RTEMS_UNSATISFIED;<br>
}<br>
#endif<br>
<br>
diff --git a/bsps/aarch64/raspberrypi/include/bsp/raspberrypi.h b/bsps/aarch64/raspberrypi/include/bsp/raspberrypi.h<br>
deleted file mode 100644<br>
index 55dd9ed1e9..0000000000<br>
--- a/bsps/aarch64/raspberrypi/include/bsp/raspberrypi.h<br>
+++ /dev/null<br>
@@ -1,471 +0,0 @@<br>
-/**<br>
- * @file<br>
- *<br>
- * @ingroup raspberrypi_4_regs<br>
- *<br>
- * @brief Register definitions.<br>
- */<br>
-<br>
-/*<br>
- * Copyright (c) 2022 Mohd Noor Aman<br>
- *<br>
- * The license and distribution terms for this file may be<br>
- * found in the file LICENSE in this distribution or at<br>
- *<br>
- * <a href="http://www.rtems.org/license/LICENSE" rel="noreferrer" target="_blank">http://www.rtems.org/license/LICENSE</a><br>
- *<br>
- */<br>
-<br>
-<br>
-#ifndef LIBBSP_AARCH64_RASPBERRYPI_RASPBERRYPI_4_H<br>
-#define LIBBSP_AARCH64_RASPBERRYPI_RASPBERRYPI_4_H<br>
-<br>
-<br>
-#include <bspopts.h><br>
-#include <stdint.h><br>
-#include <bsp/utility.h><br>
-<br>
-<br>
-/**<br>
- * @defgroup raspberrypi_reg Register Definitions<br>
- *<br>
- * @ingroup RTEMSBSPsARMRaspberryPi<br>
- *<br>
- * @brief Register Definitions<br>
- *<br>
- * @{<br>
- */<br>
-<br>
-/**<br>
- * @name Register Macros<br>
- *<br>
- * @{<br>
- */<br>
-<br>
-#define BCM2711_REG(x) (*(volatile uint64_t *)(x))<br>
-#define BCM2711_BIT(n) (1 << (n))<br>
-<br>
-/** @} */<br>
-<br>
-/**<br>
- * @name Peripheral Base Register Address<br>
- *<br>
- * @{<br>
- */<br>
-<br>
-#define RPI_PERIPHERAL_BASE 0xFE000000<br>
-#define BASE_OFFSET 0xFE000000<br>
-#define RPI_PERIPHERAL_SIZE 0x01800000<br>
-<br>
-/**<br>
- * @name Bus to Physical address translation<br>
- * Macro.<br>
- * @{<br>
- */<br>
-#define BUS_TO_PHY(x) ((x) - BASE_OFFSET)<br>
-<br>
-/** @} */<br>
-<br>
-/**<br>
- * @name Internal ARM Timer Registers<br>
- *<br>
- * @{<br>
- */<br>
-<br>
-#define BCM2711_CLOCK_FREQ 250000000<br>
-<br>
-#define BCM2711_TIMER_BASE (RPI_PERIPHERAL_BASE + 0xB400)<br>
-<br>
-#define BCM2711_TIMER_LOD (BCM2711_TIMER_BASE + 0x00)<br>
-#define BCM2711_TIMER_VAL (BCM2711_TIMER_BASE + 0x04)<br>
-#define BCM2711_TIMER_CTL (BCM2711_TIMER_BASE + 0x08)<br>
-#define BCM2711_TIMER_CLI (BCM2711_TIMER_BASE + 0x0C)<br>
-#define BCM2711_TIMER_RIS (BCM2711_TIMER_BASE + 0x10)<br>
-#define BCM2711_TIMER_MIS (BCM2711_TIMER_BASE + 0x14)<br>
-#define BCM2711_TIMER_RLD (BCM2711_TIMER_BASE + 0x18)<br>
-#define BCM2711_TIMER_DIV (BCM2711_TIMER_BASE + 0x1C)<br>
-#define BCM2711_TIMER_CNT (BCM2711_TIMER_BASE + 0x20)<br>
-<br>
-#define BCM2711_TIMER_PRESCALE 0xF9<br>
-<br>
-/** @} */<br>
-<br>
-/**<br>
- * @name Power Management and Watchdog Registers<br>
- *<br>
- * @{<br>
- */<br>
-<br>
-#define BCM2711_PM_PASSWD_MAGIC 0x5a000000<br>
-<br>
-#define BCM2711_PM_BASE (RPI_PERIPHERAL_BASE + 0x100000)<br>
-<br>
-#define BCM2711_PM_GNRIC (BCM2711_PM_BASE + 0x00)<br>
-#define BCM2711_PM_GNRIC_POWUP 0x00000001<br>
-#define BCM2711_PM_GNRIC_POWOK 0x00000002<br>
-#define BCM2711_PM_GNRIC_ISPOW 0x00000004<br>
-#define BCM2711_PM_GNRIC_MEMREP 0x00000008<br>
-#define BCM2711_PM_GNRIC_MRDONE 0x00000010<br>
-#define BCM2711_PM_GNRIC_ISFUNC 0x00000020<br>
-#define BCM2711_PM_GNRIC_RSTN 0x00000fc0<br>
-#define BCM2711_PM_GNRIC_ENAB 0x00001000<br>
-#define BCM2711_PM_GNRIC_CFG 0x007f0000<br>
-<br>
-#define BCM2711_PM_AUDIO (BCM2711_PM_BASE + 0x04)<br>
-#define BCM2711_PM_AUDIO_APSM 0x000fffff<br>
-#define BCM2711_PM_AUDIO_CTRLEN 0x00100000<br>
-#define BCM2711_PM_AUDIO_RSTN 0x00200000<br>
-<br>
-#define BCM2711_PM_STATUS (BCM2711_PM_BASE + 0x18)<br>
-<br>
-#define BCM2711_PM_RSTC (BCM2711_PM_BASE + 0x1c)<br>
-#define BCM2711_PM_RSTC_DRCFG 0x00000003<br>
-#define BCM2711_PM_RSTC_WRCFG 0x00000030<br>
-#define BCM2711_PM_RSTC_WRCFG_FULL 0x00000020<br>
-#define BCM2711_PM_RSTC_SRCFG 0x00000300<br>
-#define BCM2711_PM_RSTC_QRCFG 0x00003000<br>
-#define BCM2711_PM_RSTC_FRCFG 0x00030000<br>
-#define BCM2711_PM_RSTC_HRCFG 0x00300000<br>
-<br>
-#define BCM2711_PM_RSTS (BCM2711_PM_BASE + 0x20)<br>
-#define BCM2711_PM_RSTS_HADDRQ 0x00000001<br>
-#define BCM2711_PM_RSTS_HADDRF 0x00000002<br>
-#define BCM2711_PM_RSTS_HADDRH 0x00000004<br>
-#define BCM2711_PM_RSTS_HADWRQ 0x00000010<br>
-#define BCM2711_PM_RSTS_HADWRF 0x0000002<br>
-#define BCM2711_PM_RSTS_HADWRH 0x00000040<br>
-#define BCM2711_PM_RSTS_HADSRQ 0x00000100<br>
-#define BCM2711_PM_RSTS_HADSRF 0x00000200<br>
-#define BCM2711_PM_RSTS_HADSRH 0x00000400<br>
-#define BCM2711_PM_RSTS_HADPOR 0x00001000<br>
-<br>
-#define BCM2711_PM_WDOG (BCM2711_PM_BASE + 0x24)<br>
-<br>
-/** @} */<br>
-<br>
-<br>
-/** @} */<br>
-<br>
-/**<br>
- * @name AUX Registers<br>
- *<br>
- * @{<br>
- */<br>
-<br>
-#define BCM2711_AUX_BASE (RPI_PERIPHERAL_BASE + 0x215000)<br>
-<br>
-#define AUX_ENABLES (BCM2711_AUX_BASE + 0x04)<br>
-#define AUX_MU_IO_REG (BCM2711_AUX_BASE + 0x40)<br>
-#define AUX_MU_IER_REG (BCM2711_AUX_BASE + 0x44)<br>
-#define AUX_MU_IIR_REG (BCM2711_AUX_BASE + 0x48)<br>
-#define AUX_MU_LCR_REG (BCM2711_AUX_BASE + 0x4C)<br>
-#define AUX_MU_MCR_REG (BCM2711_AUX_BASE + 0x50)<br>
-#define AUX_MU_LSR_REG (BCM2711_AUX_BASE + 0x54)<br>
-#define AUX_MU_MSR_REG (BCM2711_AUX_BASE + 0x58)<br>
-#define AUX_MU_SCRATCH (BCM2711_AUX_BASE + 0x5C)<br>
-#define AUX_MU_CNTL_REG (BCM2711_AUX_BASE + 0x60)<br>
-#define AUX_MU_STAT_REG (BCM2711_AUX_BASE + 0x64)<br>
-#define AUX_MU_BAUD_REG (BCM2711_AUX_BASE + 0x68)<br>
-<br>
-/** @} */<br>
-<br>
-<br>
-<br>
-/** @} */<br>
-<br>
-/**<br>
- * @name GPU Timer Registers<br>
- *<br>
- * @{<br>
- */<br>
-<br>
-/**<br>
- * NOTE: The GPU uses Compare registers 0 and 2 for<br>
- * it's own RTOS. 1 and 3 are available for use in<br>
- * RTEMS.<br>
- */<br>
-#define BCM2711_GPU_TIMER_BASE (RPI_PERIPHERAL_BASE + 0x3000)<br>
-<br>
-#define BCM2711_GPU_TIMER_CS (BCM2711_GPU_TIMER_BASE + 0x00)<br>
-#define BCM2711_GPU_TIMER_CS_M0 0x00000001<br>
-#define BCM2711_GPU_TIMER_CS_M1 0x00000002<br>
-#define BCM2711_GPU_TIMER_CS_M2 0x00000004<br>
-#define BCM2711_GPU_TIMER_CS_M3 0x00000008<br>
-#define BCM2711_GPU_TIMER_CLO (BCM2711_GPU_TIMER_BASE + 0x04)<br>
-#define BCM2711_GPU_TIMER_CHI (BCM2711_GPU_TIMER_BASE + 0x08)<br>
-#define BCM2711_GPU_TIMER_C0 (BCM2711_GPU_TIMER_BASE + 0x0C)<br>
-#define BCM2711_GPU_TIMER_C1 (BCM2711_GPU_TIMER_BASE + 0x10)<br>
-#define BCM2711_GPU_TIMER_C2 (BCM2711_GPU_TIMER_BASE + 0x14)<br>
-#define BCM2711_GPU_TIMER_C3 (BCM2711_GPU_TIMER_BASE + 0x18)<br>
-<br>
-/** @} */<br>
-<br>
-/**<br>
- * @name EMMC Registers<br>
- *<br>
- * @{<br>
- */<br>
-<br>
-/**<br>
- * NOTE: Since the SD controller follows the SDHCI standard,<br>
- * the rtems-libbsd tree already provides the remaining registers.<br>
- */<br>
-<br>
-#define BCM2711_EMMC_BASE (RPI_PERIPHERAL_BASE + 0x300000)<br>
-<br>
-/** @} */<br>
-<br>
-/**<br>
-* @name Mailbox Registers<br>
-*<br>
-* @{<br>
-*/<br>
-<br>
-#define BCM2711_MBOX_BASE (RPI_PERIPHERAL_BASE+0xB880)<br>
-<br>
-#define BCM2711_MBOX_READ (BCM2711_MBOX_BASE+0x00)<br>
-#define BCM2711_MBOX_PEEK (BCM2711_MBOX_BASE+0x10)<br>
-#define BCM2711_MBOX_SENDER (BCM2711_MBOX_BASE+0x14)<br>
-#define BCM2711_MBOX_STATUS (BCM2711_MBOX_BASE+0x18)<br>
-#define BCM2711_MBOX_WRITE (BCM2711_MBOX_BASE+0x20)<br>
-#define BCM2711_MBOX_CONFIG (BCM2711_MBOX_BASE+0x1C)<br>
-<br>
-#define BCM2711_MBOX_RESPONSE 0x80000000<br>
-#define BCM2711_MBOX_FULL 0x80000000<br>
-#define BCM2711_MBOX_EMPTY 0x40000000<br>
-<br>
-/** @} */<br>
-<br>
-/**<br>
-* @name Mailbox Channels<br>
-*<br>
-* @{<br>
-*/<br>
-<br>
-/* Power Manager channel */<br>
-#define BCM2711_MBOX_CHANNEL_PM 0<br>
-/* Framebuffer channel */<br>
-#define BCM2711_MBOX_CHANNEL_FB 1<br>
- /* Virtual UART channel */<br>
-#define BCM2711_MBOX_CHANNEL_VUART 2<br>
- /* VCHIQ channel */<br>
-#define BCM2711_MBOX_CHANNEL_VCHIQ 3<br>
- /* LEDs channel */<br>
-#define BCM2711_MBOX_CHANNEL_LED 4<br>
- /* Button channel */<br>
-#define BCM2711_MBOX_CHANNEL_BUTTON 5<br>
- /* Touch screen channel */<br>
-#define BCM2711_MBOX_CHANNEL_TOUCHS 6<br>
-<br>
-#define BCM2711_MBOX_CHANNEL_COUNT 7<br>
-/* Property tags (ARM <-> VC) channel */<br>
-#define BCM2711_MBOX_CHANNEL_PROP_AVC 8<br>
- /* Property tags (VC <-> ARM) channel */<br>
-#define BCM2711_MBOX_CHANNEL_PROP_VCA 9<br>
-<br>
-/** @} */<br>
-<br>
-<br>
-<br>
-/**<br>
- * @name Raspberry Pi 2 Interrupt Register Defines<br>
- *<br>
- * @{<br>
- */<br>
-<br>
-/* Timers interrupt control registers */<br>
-#define BCM2711_CORE0_TIMER_IRQ_CTRL_BASE 0xFF800040<br>
-#define BCM2711_CORE1_TIMER_IRQ_CTRL_BASE 0xFF800044<br>
-#define BCM2711_CORE2_TIMER_IRQ_CTRL_BASE 0xFF800048<br>
-#define BCM2711_CORE3_TIMER_IRQ_CTRL_BASE 0xFF80004C<br>
-<br>
-#define BCM2711_CORE_TIMER_IRQ_CTRL(cpuidx) \<br>
- (BCM2711_CORE0_TIMER_IRQ_CTRL_BASE + 0x4 * (cpuidx))<br>
-<br>
-<br>
-/**<br>
- * @name Raspberry Pi 4 ARM_LOCAL registers<br>
- *<br>
- * @{<br>
- */<br>
-<br>
-#define BCM2711_LOCAL_REGS_BASE 0x4C0000000<br>
-#define BCM2711_LOCAL_REGS_SIZE 0x100<br>
-<br>
-#define BCM2711_LOCAL_ARM_CONTROL (BCM2711_LOCAL_REGS_BASE + 0x00)<br>
-#define BCM2711_LOCAL_CORE_IRQ_CONTROL (BCM2711_LOCAL_REGS_BASE + 0x0c)<br>
-#define BCM2711_LOCAL_PMU_CONTROL_SET (BCM2711_LOCAL_REGS_BASE + 0x10)<br>
-#define BCM2711_LOCAL_PMU_CONTROL_CLR (BCM2711_LOCAL_REGS_BASE + 0x14)<br>
-#define BCM2711_LOCAL_PERI_IRQ_ROUTE0 (BCM2711_LOCAL_REGS_BASE + 0x24)<br>
-#define BCM2711_LOCAL_AXI_QUIET_TIME (BCM2711_LOCAL_REGS_BASE + 0x30)<br>
-#define BCM2711_LOCAL_LOCAL_TIMER_CONTROL (BCM2711_LOCAL_REGS_BASE + 0x34)<br>
-#define BCM2711_LOCAL_LOCAL_TIMER_IRQ (BCM2711_LOCAL_REGS_BASE + 0x38)<br>
-<br>
-#define BCM2711_LOCAL_TIMER_CNTRL0 (BCM2711_LOCAL_REGS_BASE + 0x40)<br>
-#define BCM2711_LOCAL_TIMER_CNTRL1 (BCM2711_LOCAL_REGS_BASE + 0x44)<br>
-#define BCM2711_LOCAL_TIMER_CNTRL2 (BCM2711_LOCAL_REGS_BASE + 0x48)<br>
-#define BCM2711_LOCAL_TIMER_CNTRL3 (BCM2711_LOCAL_REGS_BASE + 0x4c)<br>
-<br>
-#define BCM2711_LOCAL_MAILBOX_CNTRL0 (BCM2711_LOCAL_REGS_BASE + 0x50)<br>
-#define BCM2711_LOCAL_MAILBOX_CNTRL1 (BCM2711_LOCAL_REGS_BASE + 0x54)<br>
-#define BCM2711_LOCAL_MAILBOX_CNTRL2 (BCM2711_LOCAL_REGS_BASE + 0x58)<br>
-#define BCM2711_LOCAL_MAILBOX_CNTRL3 (BCM2711_LOCAL_REGS_BASE + 0x5c)<br>
-<br>
-#define BCM2711_LOCAL_IRQ_SOURCE0 (BCM2711_LOCAL_REGS_BASE + 0x60)<br>
-#define BCM2711_LOCAL_IRQ_SOURCE1 (BCM2711_LOCAL_REGS_BASE + 0x64)<br>
-#define BCM2711_LOCAL_IRQ_SOURCE2 (BCM2711_LOCAL_REGS_BASE + 0x68)<br>
-#define BCM2711_LOCAL_IRQ_SOURCE3 (BCM2711_LOCAL_REGS_BASE + 0x6c)<br>
-<br>
-#define BCM2711_LOCAL_FIQ_SOURCE0 (BCM2711_LOCAL_REGS_BASE + 0x70)<br>
-#define BCM2711_LOCAL_FIQ_SOURCE1 (BCM2711_LOCAL_REGS_BASE + 0x74)<br>
-#define BCM2711_LOCAL_FIQ_SOURCE2 (BCM2711_LOCAL_REGS_BASE + 0x78)<br>
-#define BCM2711_LOCAL_FIQ_SOURCE3 (BCM2711_LOCAL_REGS_BASE + 0x7c)<br>
-<br>
-/**<br>
- * @name Raspberry Pi 4 Mailbox registers<br>
- *<br>
- * @{<br>
- */<br>
-<br>
-<br>
-<br>
-#define BCM2711_MAILBOX_00_WRITE_SET_BASE 0x4C000080<br>
-#define BCM2711_MAILBOX_01_WRITE_SET_BASE 0x4C000084<br>
-#define BCM2711_MAILBOX_02_WRITE_SET_BASE 0x4C000088<br>
-#define BCM2711_MAILBOX_03_WRITE_SET_BASE 0x4C00008C<br>
-#define BCM2711_MAILBOX_04_WRITE_SET_BASE 0x4C000090<br>
-#define BCM2711_MAILBOX_05_WRITE_SET_BASE 0x4C000094<br>
-#define BCM2711_MAILBOX_06_WRITE_SET_BASE 0x4C000098<br>
-#define BCM2711_MAILBOX_07_WRITE_SET_BASE 0x4C00009C<br>
-#define BCM2711_MAILBOX_08_WRITE_SET_BASE 0x4C0000A0<br>
-#define BCM2711_MAILBOX_09_WRITE_SET_BASE 0x4C0000A4<br>
-#define BCM2711_MAILBOX_10_WRITE_SET_BASE 0x4C0000A8<br>
-#define BCM2711_MAILBOX_11_WRITE_SET_BASE 0x4C0000AC<br>
-#define BCM2711_MAILBOX_12_WRITE_SET_BASE 0x4C0000B0<br>
-#define BCM2711_MAILBOX_13_WRITE_SET_BASE 0x4C0000B4<br>
-#define BCM2711_MAILBOX_14_WRITE_SET_BASE 0x4C0000B8<br>
-#define BCM2711_MAILBOX_15_WRITE_SET_BASE 0x4C0000BC<br>
-<br>
-#define BCM2711_MAILBOX_00_READ_CLEAR_BASE 0x4C0000C0<br>
-#define BCM2711_MAILBOX_01_READ_CLEAR_BASE 0x4C0000C4<br>
-#define BCM2711_MAILBOX_02_READ_CLEAR_BASE 0x4C0000C8<br>
-#define BCM2711_MAILBOX_03_READ_CLEAR_BASE 0x4C0000CC<br>
-#define BCM2711_MAILBOX_04_READ_CLEAR_BASE 0x4C0000D0<br>
-#define BCM2711_MAILBOX_05_READ_CLEAR_BASE 0x4C0000D4<br>
-#define BCM2711_MAILBOX_06_READ_CLEAR_BASE 0x4C0000D8<br>
-#define BCM2711_MAILBOX_07_READ_CLEAR_BASE 0x4C0000DC<br>
-#define BCM2711_MAILBOX_08_READ_CLEAR_BASE 0x4C0000E0<br>
-#define BCM2711_MAILBOX_09_READ_CLEAR_BASE 0x4C0000E4<br>
-#define BCM2711_MAILBOX_10_READ_CLEAR_BASE 0x4C0000E8<br>
-#define BCM2711_MAILBOX_11_READ_CLEAR_BASE 0x4C0000EC<br>
-#define BCM2711_MAILBOX_12_READ_CLEAR_BASE 0x4C0000F0<br>
-#define BCM2711_MAILBOX_13_READ_CLEAR_BASE 0x4C0000F4<br>
-#define BCM2711_MAILBOX_14_READ_CLEAR_BASE 0x4C0000F8<br>
-#define BCM2711_MAILBOX_15_READ_CLEAR_BASE 0x4C0000FC<br>
-<br>
-<br>
-/**<br>
- * @name Raspberry Pi 4 ARM_C FIQ and IRQ registers<br>
- *<br>
- * @{<br>
- */<br>
-<br>
-#define BCM2711_ARMC_REGS_BASE (RPI_PERIPHERAL_BASE + 0xB200)<br>
-#define BCM2711_ARMC_REGS_SIZE 0x200<br>
-<br>
-#define BCM2711_ARMC_IRQ0_PENDING0 (BCM2711_ARMC_REGS_BASE + 0x00)<br>
-#define BCM2711_ARMC_IRQ0_PENDING1 (BCM2711_ARMC_REGS_BASE + 0x04)<br>
-#define BCM2711_ARMC_IRQ0_PENDING2 (BCM2711_ARMC_REGS_BASE + 0x08)<br>
-#define BCM2711_ARMC_IRQ0_SET_EN_0 (BCM2711_ARMC_REGS_BASE + 0x10)<br>
-#define BCM2711_ARMC_IRQ0_SET_EN_1 (BCM2711_ARMC_REGS_BASE + 0x14)<br>
-#define BCM2711_ARMC_IRQ0_SET_EN_2 (BCM2711_ARMC_REGS_BASE + 0x18)<br>
-#define BCM2711_ARMC_IRQ0_CLR_EN_0 (BCM2711_ARMC_REGS_BASE + 0x20)<br>
-#define BCM2711_ARMC_IRQ0_CLR_EN_1 (BCM2711_ARMC_REGS_BASE + 0x24)<br>
-#define BCM2711_ARMC_IRQ0_CLR_EN_2 (BCM2711_ARMC_REGS_BASE + 0x28)<br>
-<br>
-#define BCM2711_ARMC_IRQ_STATUS0 (BCM2711_ARMC_REGS_BASE + 0x30)<br>
-#define BCM2711_ARMC_IRQ_STATUS1 (BCM2711_ARMC_REGS_BASE + 0x34)<br>
-#define BCM2711_ARMC_IRQ_STATUS2 (BCM2711_ARMC_REGS_BASE + 0x38)<br>
-<br>
-#define BCM2711_ARMC_IRQ1_PENDING0 (BCM2711_ARMC_REGS_BASE + 0x40)<br>
-#define BCM2711_ARMC_IRQ1_PENDING1 (BCM2711_ARMC_REGS_BASE + 0x44)<br>
-#define BCM2711_ARMC_IRQ1_PENDING2 (BCM2711_ARMC_REGS_BASE + 0x48)<br>
-#define BCM2711_ARMC_IRQ1_SET_EN_0 (BCM2711_ARMC_REGS_BASE + 0x50)<br>
-#define BCM2711_ARMC_IRQ1_SET_EN_1 (BCM2711_ARMC_REGS_BASE + 0x54)<br>
-#define BCM2711_ARMC_IRQ1_SET_EN_2 (BCM2711_ARMC_REGS_BASE + 0x58)<br>
-#define BCM2711_ARMC_IRQ1_CLR_EN_0 (BCM2711_ARMC_REGS_BASE + 0x60)<br>
-#define BCM2711_ARMC_IRQ1_CLR_EN_1 (BCM2711_ARMC_REGS_BASE + 0x64)<br>
-#define BCM2711_ARMC_IRQ1_CLR_EN_2 (BCM2711_ARMC_REGS_BASE + 0x68)<br>
-<br>
-#define BCM2711_ARMC_IRQ2_PENDING0 (BCM2711_ARMC_REGS_BASE + 0x80)<br>
-#define BCM2711_ARMC_IRQ2_PENDING1 (BCM2711_ARMC_REGS_BASE + 0x84)<br>
-#define BCM2711_ARMC_IRQ2_PENDING2 (BCM2711_ARMC_REGS_BASE + 0x88)<br>
-#define BCM2711_ARMC_IRQ2_SET_EN_0 (BCM2711_ARMC_REGS_BASE + 0x90)<br>
-#define BCM2711_ARMC_IRQ2_SET_EN_1 (BCM2711_ARMC_REGS_BASE + 0x94)<br>
-#define BCM2711_ARMC_IRQ2_SET_EN_2 (BCM2711_ARMC_REGS_BASE + 0x98)<br>
-#define BCM2711_ARMC_IRQ2_CLR_EN_0 (BCM2711_ARMC_REGS_BASE + 0xA0)<br>
-#define BCM2711_ARMC_IRQ2_CLR_EN_1 (BCM2711_ARMC_REGS_BASE + 0xA4)<br>
-#define BCM2711_ARMC_IRQ2_CLR_EN_2 (BCM2711_ARMC_REGS_BASE + 0xA8)<br>
-<br>
-#define BCM2711_ARMC_IRQ3_PENDING0 (BCM2711_ARMC_REGS_BASE + 0xC0)<br>
-#define BCM2711_ARMC_IRQ3_PENDING1 (BCM2711_ARMC_REGS_BASE + 0xC4)<br>
-#define BCM2711_ARMC_IRQ3_PENDING2 (BCM2711_ARMC_REGS_BASE + 0xC8)<br>
-#define BCM2711_ARMC_IRQ3_SET_EN_0 (BCM2711_ARMC_REGS_BASE + 0xD0)<br>
-#define BCM2711_ARMC_IRQ3_SET_EN_1 (BCM2711_ARMC_REGS_BASE + 0xD4)<br>
-#define BCM2711_ARMC_IRQ3_SET_EN_2 (BCM2711_ARMC_REGS_BASE + 0xD8)<br>
-#define BCM2711_ARMC_IRQ3_CLR_EN_0 (BCM2711_ARMC_REGS_BASE + 0xE0)<br>
-#define BCM2711_ARMC_IRQ3_CLR_EN_1 (BCM2711_ARMC_REGS_BASE + 0xE4)<br>
-#define BCM2711_ARMC_IRQ3_CLR_EN_2 (BCM2711_ARMC_REGS_BASE + 0xE8)<br>
-<br>
-<br>
-<br>
-#define BCM2711_ARMC_FIQ0_PENDING0 (BCM2711_ARMC_REGS_BASE + 0x100)<br>
-#define BCM2711_ARMC_FIQ0_PENDING1 (BCM2711_ARMC_REGS_BASE + 0x104)<br>
-#define BCM2711_ARMC_FIQ0_PENDING2 (BCM2711_ARMC_REGS_BASE + 0x108)<br>
-#define BCM2711_ARMC_FIQ0_SET_EN_0 (BCM2711_ARMC_REGS_BASE + 0x110)<br>
-#define BCM2711_ARMC_FIQ0_SET_EN_1 (BCM2711_ARMC_REGS_BASE + 0x114)<br>
-#define BCM2711_ARMC_FIQ0_SET_EN_2 (BCM2711_ARMC_REGS_BASE + 0x118)<br>
-#define BCM2711_ARMC_FIQ0_CLR_EN_0 (BCM2711_ARMC_REGS_BASE + 0x120)<br>
-#define BCM2711_ARMC_FIQ0_CLR_EN_1 (BCM2711_ARMC_REGS_BASE + 0x124)<br>
-#define BCM2711_ARMC_FIQ0_CLR_EN_2 (BCM2711_ARMC_REGS_BASE + 0x128)<br>
-<br>
-#define BCM2711_ARMC_FIQ1_PENDING0 (BCM2711_ARMC_REGS_BASE + 0x140)<br>
-#define BCM2711_ARMC_FIQ1_PENDING1 (BCM2711_ARMC_REGS_BASE + 0x144)<br>
-#define BCM2711_ARMC_FIQ1_PENDING2 (BCM2711_ARMC_REGS_BASE + 0x148)<br>
-#define BCM2711_ARMC_FIQ1_SET_EN_0 (BCM2711_ARMC_REGS_BASE + 0x150)<br>
-#define BCM2711_ARMC_FIQ1_SET_EN_1 (BCM2711_ARMC_REGS_BASE + 0x154)<br>
-#define BCM2711_ARMC_FIQ1_SET_EN_2 (BCM2711_ARMC_REGS_BASE + 0x158)<br>
-#define BCM2711_ARMC_FIQ1_CLR_EN_0 (BCM2711_ARMC_REGS_BASE + 0x160)<br>
-#define BCM2711_ARMC_FIQ1_CLR_EN_1 (BCM2711_ARMC_REGS_BASE + 0x164)<br>
-#define BCM2711_ARMC_FIQ1_CLR_EN_2 (BCM2711_ARMC_REGS_BASE + 0x168)<br>
-<br>
-#define BCM2711_ARMC_FIQ2_PENDING0 (BCM2711_ARMC_REGS_BASE + 0x180)<br>
-#define BCM2711_ARMC_FIQ2_PENDING1 (BCM2711_ARMC_REGS_BASE + 0x184)<br>
-#define BCM2711_ARMC_FIQ2_PENDING2 (BCM2711_ARMC_REGS_BASE + 0x188)<br>
-#define BCM2711_ARMC_FIQ2_SET_EN_0 (BCM2711_ARMC_REGS_BASE + 0x190)<br>
-#define BCM2711_ARMC_FIQ2_SET_EN_1 (BCM2711_ARMC_REGS_BASE + 0x194)<br>
-#define BCM2711_ARMC_FIQ2_SET_EN_2 (BCM2711_ARMC_REGS_BASE + 0x198)<br>
-#define BCM2711_ARMC_FIQ2_CLR_EN_0 (BCM2711_ARMC_REGS_BASE + 0x1A0)<br>
-#define BCM2711_ARMC_FIQ2_CLR_EN_1 (BCM2711_ARMC_REGS_BASE + 0x1A4)<br>
-#define BCM2711_ARMC_FIQ2_CLR_EN_2 (BCM2711_ARMC_REGS_BASE + 0x1A8)<br>
-<br>
-#define BCM2711_ARMC_FIQ3_PENDING0 (BCM2711_ARMC_REGS_BASE + 0x1C0)<br>
-#define BCM2711_ARMC_FIQ3_PENDING1 (BCM2711_ARMC_REGS_BASE + 0x1C4)<br>
-#define BCM2711_ARMC_FIQ3_PENDING2 (BCM2711_ARMC_REGS_BASE + 0x1C8)<br>
-#define BCM2711_ARMC_FIQ3_SET_EN_0 (BCM2711_ARMC_REGS_BASE + 0x1D0)<br>
-#define BCM2711_ARMC_FIQ3_SET_EN_1 (BCM2711_ARMC_REGS_BASE + 0x1D4)<br>
-#define BCM2711_ARMC_FIQ3_SET_EN_2 (BCM2711_ARMC_REGS_BASE + 0x1D8)<br>
-#define BCM2711_ARMC_FIQ3_CLR_EN_0 (BCM2711_ARMC_REGS_BASE + 0x1E0)<br>
-#define BCM2711_ARMC_FIQ3_CLR_EN_1 (BCM2711_ARMC_REGS_BASE + 0x1E4)<br>
-#define BCM2711_ARMC_FIQ3_CLR_EN_2 (BCM2711_ARMC_REGS_BASE + 0x1E8)<br>
-<br>
-#define BCM2711_ARMC_SWIRQ_SET (BCM2711_ARMC_REGS_BASE + 0x1F0)<br>
-#define BCM2711_ARMC_SWIRQ_CLEAR (BCM2711_ARMC_REGS_BASE + 0x1F4)<br>
-<br>
-<br>
-<br>
-<br>
-<br>
-/** @} */<br>
-<br>
-#endif /* LIBBSP_ARM_RASPBERRYPI_RASPBERRYPI_H */<br>
diff --git a/bsps/aarch64/raspberrypi/include/bsp/start/bspstartmmu.h b/bsps/aarch64/raspberrypi/include/bsp/start/bspstartmmu.h<br>
new file mode 100644<br>
index 0000000000..cb1b24ac72<br>
--- /dev/null<br>
+++ b/bsps/aarch64/raspberrypi/include/bsp/start/bspstartmmu.h<br>
@@ -0,0 +1,8 @@<br>
+#ifndef LIBBSP_AARCH64_RASPBERRYPI_BSP_START_BSPSTARTMMU_H<br>
+#define LIBBSP_AARCH64_RASPBERRYPI_BSP_START_BSPSTARTMMU_H<br>
+<br>
+#include <bsp/start.h><br>
+<br>
+BSP_START_TEXT_SECTION void bsp_start_mmu_setup(void);<br>
+<br>
+#endif<br>
diff --git a/bsps/aarch64/raspberrypi/start/bspstart.c b/bsps/aarch64/raspberrypi/start/bspstart.c<br>
index 368c5d0d08..03d5ae4c77 100644<br>
--- a/bsps/aarch64/raspberrypi/start/bspstart.c<br>
+++ b/bsps/aarch64/raspberrypi/start/bspstart.c<br>
@@ -3,13 +3,14 @@<br>
/**<br>
* @file<br>
*<br>
- * @ingroup RTEMSBSPsAArch64Raspberrypi4<br>
+ * @ingroup RTEMSBSPsAArch64RaspberryPi<br>
*<br>
- * @brief BSP Startup<br>
+ * @brief BSP startup routines<br>
*/<br>
<br>
/*<br>
* Copyright (C) 2022 Mohd Noor Aman<br>
+ * Copyright (C) 2023 Utkarsh Verma<br>
*<br>
*<br>
* Redistribution and use in source and binary forms, with or without<br>
@@ -34,16 +35,13 @@<br>
* POSSIBILITY OF SUCH DAMAGE.<br>
*/<br>
<br>
-#include <bsp.h><br>
#include <bsp/bootcard.h><br>
#include <bsp/irq-generic.h><br>
#include <bsp/linker-symbols.h><br>
+#include <stdint.h><br>
<br>
-void bsp_start( void )<br>
-{<br>
- bsp_interrupt_initialize();<br>
- rtems_cache_coherent_add_area(<br>
- bsp_section_nocacheheap_begin,<br>
- (uintptr_t) bsp_section_nocacheheap_size<br>
- );<br>
+void bsp_start(void) {<br>
+ bsp_interrupt_initialize();<br>
+ rtems_cache_coherent_add_area(bsp_section_nocacheheap_begin,<br>
+ (uintptr_t)bsp_section_nocacheheap_size);<br>
}<br>
diff --git a/bsps/aarch64/raspberrypi/start/bspstarthooks.c b/bsps/aarch64/raspberrypi/start/bspstarthooks.c<br>
index fe0fe77c09..2444767874 100644<br>
--- a/bsps/aarch64/raspberrypi/start/bspstarthooks.c<br>
+++ b/bsps/aarch64/raspberrypi/start/bspstarthooks.c<br>
@@ -3,13 +3,14 @@<br>
/**<br>
* @file<br>
*<br>
- * @ingroup RTEMSBSPsAArch64Raspberrypi4<br>
+ * @ingroup RTEMSBSPsAArch64RaspberryPi<br>
*<br>
* @brief BSP Startup Hooks<br>
*/<br>
<br>
/*<br>
* Copyright (C) 2022 Mohd Noor Aman<br>
+ * Copyright (C) 2023 Utkarsh Verma<br>
*<br>
*<br>
* Redistribution and use in source and binary forms, with or without<br>
@@ -34,20 +35,15 @@<br>
* POSSIBILITY OF SUCH DAMAGE.<br>
*/<br>
<br>
-#include <bsp.h><br>
-#include <bsp/irq-generic.h><br>
-#include <bsp/start.h><br>
-#include <rtems/score/cpu.h><br>
+#include "bsp/start/bspstartmmu.h"<br>
<br>
-BSP_START_TEXT_SECTION void bsp_start_hook_0(void)<br>
-{<br>
- /* Do nothing */<br>
+BSP_START_TEXT_SECTION void bsp_start_hook_0(void) {<br>
+ /* Do nothing */<br>
}<br>
<br>
-BSP_START_TEXT_SECTION void bsp_start_hook_1(void)<br>
-{<br>
- AArch64_start_set_vector_base();<br>
- bsp_start_copy_sections();<br>
- raspberrypi_4_setup_mmu_and_cache();<br>
- bsp_start_clear_bss();<br>
-}<br>
\ No newline at end of file<br>
+BSP_START_TEXT_SECTION void bsp_start_hook_1(void) {<br>
+ AArch64_start_set_vector_base();<br>
+ bsp_start_copy_sections();<br>
+ bsp_start_mmu_setup();<br>
+ bsp_start_clear_bss();<br>
+}<br>
diff --git a/bsps/aarch64/raspberrypi/start/bspstartmmu.c b/bsps/aarch64/raspberrypi/start/bspstartmmu.c<br>
index 18a9a112b0..9a5824e29a 100644<br>
--- a/bsps/aarch64/raspberrypi/start/bspstartmmu.c<br>
+++ b/bsps/aarch64/raspberrypi/start/bspstartmmu.c<br>
@@ -3,13 +3,14 @@<br>
/**<br>
* @file<br>
*<br>
- * @ingroup RTEMSBSPsAArch64Raspberrypi4<br>
+ * @ingroup RTEMSBSPsAArch64RaspberryPi<br>
*<br>
* @brief This source file contains the default MMU tables and setup.<br>
*/<br>
<br>
/*<br>
* Copyright (C) 2022 Mohd Noor Aman<br>
+ * Copyright (C) 2023 Utkarsh Verma<br>
*<br>
*<br>
* Redistribution and use in source and binary forms, with or without<br>
@@ -34,51 +35,34 @@<br>
* POSSIBILITY OF SUCH DAMAGE.<br>
*/<br>
<br>
-#include <bsp.h><br>
-#include <bsp/start.h><br>
+#include "bsp/start/bspstartmmu.h"<br>
+<br>
#include <bsp/aarch64-mmu.h><br>
-#include <bsp/raspberrypi.h><br>
-#include <libcpu/mmu-vmsav8-64.h><br>
<br>
+#include "bsp.h"<br>
<br>
BSP_START_DATA_SECTION static const aarch64_mmu_config_entry<br>
-raspberrypi_4_mmu_config_table[] = {<br>
- AARCH64_MMU_DEFAULT_SECTIONS,<br>
-<br>
- { /* RPI peripheral address */<br>
- .begin = (unsigned)RPI_PERIPHERAL_BASE,<br>
- .end = (unsigned)RPI_PERIPHERAL_BASE + (unsigned)RPI_PERIPHERAL_SIZE,<br>
- .flags = AARCH64_MMU_DEVICE<br>
- },<br>
-<br>
- { /* RPI ARM local registers */<br>
- .begin = (unsigned)BCM2711_LOCAL_REGS_BASE,<br>
- .end = (unsigned)BCM2711_LOCAL_REGS_BASE + (unsigned)BCM2711_LOCAL_REGS_SIZE,<br>
- .flags = AARCH64_MMU_DEVICE<br>
- },<br>
-<br>
- { /* RPI GIC Interface address */<br>
- .begin = 0xFF800000U,<br>
- .end = 0xFFA00000U,<br>
- .flags = AARCH64_MMU_DEVICE<br>
- }<br>
-<br>
+ bsp_mmu_config_table[] = {<br>
+ AARCH64_MMU_DEFAULT_SECTIONS,<br>
+ {<br>
+ // UART0<br>
+ .begin = BSP_UART0_BASE,<br>
+ .end = BSP_UART0_BASE + BSP_UART0_SIZE,<br>
+ .flags = AARCH64_MMU_DEVICE,<br>
+ },<br>
+ {<br>
+ /* Interrupts */<br>
+ .begin = BSP_GIC_BASE,<br>
+ .end = BSP_GIC_BASE + BSP_GIC_SIZE,<br>
+ .flags = AARCH64_MMU_DEVICE,<br>
+ },<br>
};<br>
-/*<br>
- * Make weak and let the user override.<br>
- */<br>
-BSP_START_TEXT_SECTION void<br>
-raspberrypi_4_setup_mmu_and_cache( void ) __attribute__ ((weak));<br>
<br>
-BSP_START_TEXT_SECTION void<br>
-raspberrypi_4_setup_mmu_and_cache( void )<br>
-{<br>
- aarch64_mmu_setup();<br>
+BSP_START_TEXT_SECTION void bsp_start_mmu_setup(void) {<br>
+ aarch64_mmu_setup();<br>
<br>
- aarch64_mmu_setup_translation_table(<br>
- &raspberrypi_4_mmu_config_table[ 0 ],<br>
- RTEMS_ARRAY_SIZE( raspberrypi_4_mmu_config_table )<br>
- );<br>
+ aarch64_mmu_setup_translation_table(<br>
+ &bsp_mmu_config_table[0], RTEMS_ARRAY_SIZE(bsp_mmu_config_table));<br>
<br>
- aarch64_mmu_enable();<br>
-}<br>
\ No newline at end of file<br>
+ aarch64_mmu_enable();<br>
+}<br>
diff --git a/spec/build/bsps/aarch64/raspberrypi/abi.yml b/spec/build/bsps/aarch64/raspberrypi/abi.yml<br>
index 38a8d8bc8f..63c2afbea6 100644<br>
--- a/spec/build/bsps/aarch64/raspberrypi/abi.yml<br>
+++ b/spec/build/bsps/aarch64/raspberrypi/abi.yml<br>
@@ -1,19 +1,26 @@<br>
SPDX-License-Identifier: CC-BY-SA-4.0 OR BSD-2-Clause<br>
-actions:<br>
-- get-string: null<br>
-- split: null<br>
-- env-append: null<br>
-build-type: option<br>
copyrights:<br>
-- Copyright (C) 2022 Mohd Noor Aman<br>
-default:<br>
-- enabled-by: true<br>
- value:<br>
- - -mcpu=cortex-a72<br>
- - -march=armv8-a<br>
-description: |<br>
- ABI flags<br>
+ - Copyright (C) 2022 Mohd Noor Aman<br>
+ - Copyright (C) 2023 Utkarsh Verma<br>
+<br>
+type: build<br>
enabled-by: true<br>
-links: []<br>
+<br>
+build-type: option<br>
name: ABI_FLAGS<br>
-type: build<br>
+description: ABI flags<br>
+<br>
+actions:<br>
+ - get-string: null<br>
+ - split: null<br>
+ - env-append: null<br>
+<br>
+default:<br>
+ - enabled-by:<br>
+ - aarch64/raspberrypi4b<br>
+ value:<br>
+ - -mcpu=cortex-a72<br>
+ - -march=armv8-a<br>
+ - -mstrict-align<br>
+<br>
+links: []<br>
diff --git a/spec/build/bsps/aarch64/raspberrypi/bsp4b.yml b/spec/build/bsps/aarch64/raspberrypi/bsp4b.yml<br>
new file mode 100644<br>
index 0000000000..058f97d1eb<br>
--- /dev/null<br>
+++ b/spec/build/bsps/aarch64/raspberrypi/bsp4b.yml<br>
@@ -0,0 +1,23 @@<br>
+SPDX-License-Identifier: CC-BY-SA-4.0 OR BSD-2-Clause<br>
+copyrights:<br>
+ - Copyright (C) 2022 Mohd Noor Aman<br>
+ - Copyright (C) 2023 Utkarsh Verma<br>
+<br>
+type: build<br>
+enabled-by: true<br>
+<br>
+build-type: bsp<br>
+arch: aarch64<br>
+bsp: raspberrypi4b<br>
+family: raspberrypi<br>
+cflags: []<br>
+cppflags: []<br>
+includes: []<br>
+install: []<br>
+source: []<br>
+<br>
+links:<br>
+ - role: build-dependency<br>
+ uid: grp4b<br>
+ - role: build-dependency<br>
+ uid: linkcmds<br>
diff --git a/spec/build/bsps/aarch64/raspberrypi/bspraspberrypi4.yml b/spec/build/bsps/aarch64/raspberrypi/bspraspberrypi4.yml<br>
deleted file mode 100644<br>
index a579c094ba..0000000000<br>
--- a/spec/build/bsps/aarch64/raspberrypi/bspraspberrypi4.yml<br>
+++ /dev/null<br>
@@ -1,72 +0,0 @@<br>
-SPDX-License-Identifier: CC-BY-SA-4.0 OR BSD-2-Clause<br>
-arch: aarch64<br>
-bsp: raspberrypi4b<br>
-build-type: bsp<br>
-cflags: []<br>
-copyrights:<br>
-- Copyright (C) 2022 Mohd Noor Aman<br>
-cppflags: []<br>
-enabled-by: true<br>
-family: raspberrypi<br>
-includes: []<br>
-install:<br>
-- destination: ${BSP_INCLUDEDIR}<br>
- source:<br>
- - bsps/aarch64/raspberrypi/include/bsp.h<br>
- - bsps/aarch64/raspberrypi/include/tm27.h<br>
-- destination: ${BSP_INCLUDEDIR}/bsp<br>
- source:<br>
- - bsps/aarch64/raspberrypi/include/bsp/irq.h<br>
- - bsps/aarch64/raspberrypi/include/bsp/raspberrypi.h<br>
-links:<br>
-- role: build-dependency<br>
- uid: ../grp<br>
-- role: build-dependency<br>
- uid: ../start<br>
-- role: build-dependency<br>
- uid: ../optmmupages<br>
-- role: build-dependency<br>
- uid: ../optgtusevirt<br>
-- role: build-dependency<br>
- uid: ../optgtuseps<br>
-- role: build-dependency<br>
- uid: abi<br>
-- role: build-dependency<br>
- uid: ../../optcachedata<br>
-- role: build-dependency<br>
- uid: ../../optcacheinst<br>
-- role: build-dependency<br>
- uid: ../../opto2<br>
-- role: build-dependency<br>
- uid: ../../bspopts<br>
-- role: build-dependency<br>
- uid: linkercmds<br>
-- role: build-dependency<br>
- uid: ../../obj<br>
-- role: build-dependency<br>
- uid: ../../objirq<br>
-source:<br>
-- bsps/aarch64/raspberrypi/console/console.c<br>
-- bsps/aarch64/raspberrypi/start/bspstart.c<br>
-- bsps/aarch64/raspberrypi/start/bspstarthooks.c<br>
-- bsps/aarch64/raspberrypi/start/bspstartmmu.c<br>
-- bsps/aarch64/shared/clock/arm-generic-timer-aarch64.c<br>
-- bsps/aarch64/shared/cache/cache.c<br>
-- bsps/aarch64/shared/mmu/vmsav8-64.c<br>
-- bsps/shared/dev/clock/arm-generic-timer.c<br>
-- bsps/shared/dev/irq/arm-gicv2.c<br>
-- bsps/shared/dev/irq/arm-gicv2-get-attributes.c<br>
-- bsps/shared/dev/serial/console-termios-init.c<br>
-- bsps/shared/dev/serial/console-termios.c<br>
-- bsps/shared/dev/serial/arm-pl011.c<br>
-- bsps/shared/dev/getentropy/getentropy-cpucounter.c<br>
-- bsps/shared/dev/btimer/btimer-cpucounter.c<br>
-- bsps/shared/irq/irq-default-handler.c<br>
-- bsps/shared/start/bspfatal-default.c<br>
-- bsps/shared/start/bspreset-arm-psci.c<br>
-- bsps/shared/start/gettargethash-default.c<br>
-- bsps/shared/start/sbrk.c<br>
-- bsps/shared/start/wkspaceinitone.c<br>
-- bsps/shared/start/mallocinitmulti.c<br>
-- bsps/shared/start/bspgetworkarea-default.c<br>
-type: build<br>
diff --git a/spec/build/bsps/aarch64/raspberrypi/grp.yml b/spec/build/bsps/aarch64/raspberrypi/grp.yml<br>
new file mode 100644<br>
index 0000000000..4e6b022e3c<br>
--- /dev/null<br>
+++ b/spec/build/bsps/aarch64/raspberrypi/grp.yml<br>
@@ -0,0 +1,49 @@<br>
+SPDX-License-Identifier: CC-BY-SA-4.0 OR BSD-2-Clause<br>
+copyrights:<br>
+ - Copyright (C) 2022 Mohd Noor Aman<br>
+ - Copyright (C) 2023 Utkarsh Verma<br>
+<br>
+type: build<br>
+enabled-by: true<br>
+<br>
+build-type: group<br>
+cflags: []<br>
+cppflags: []<br>
+cxxflags: []<br>
+includes: []<br>
+install: []<br>
+ldflags: []<br>
+use-after: []<br>
+use-before: []<br>
+<br>
+links:<br>
+ - role: build-dependency<br>
+ uid: abi<br>
+ - role: build-dependency<br>
+ uid: obj<br>
+ - role: build-dependency<br>
+ uid: optclockpl011freq<br>
+ - role: build-dependency<br>
+ uid: optconsolebaud<br>
+ - role: build-dependency<br>
+ uid: ../grp<br>
+ - role: build-dependency<br>
+ uid: ../start<br>
+ - role: build-dependency<br>
+ uid: ../optmmupages<br>
+ - role: build-dependency<br>
+ uid: ../optgtusevirt<br>
+ - role: build-dependency<br>
+ uid: ../optgtuseps<br>
+ - role: build-dependency<br>
+ uid: ../../optcachedata<br>
+ - role: build-dependency<br>
+ uid: ../../optcacheinst<br>
+ - role: build-dependency<br>
+ uid: ../../opto2<br>
+ - role: build-dependency<br>
+ uid: ../../bspopts<br>
+ - role: build-dependency<br>
+ uid: ../../obj<br>
+ - role: build-dependency<br>
+ uid: ../../objirq<br>
diff --git a/spec/build/bsps/aarch64/raspberrypi/grp4b.yml b/spec/build/bsps/aarch64/raspberrypi/grp4b.yml<br>
new file mode 100644<br>
index 0000000000..8a4b8c0370<br>
--- /dev/null<br>
+++ b/spec/build/bsps/aarch64/raspberrypi/grp4b.yml<br>
@@ -0,0 +1,26 @@<br>
+SPDX-License-Identifier: CC-BY-SA-4.0 OR BSD-2-Clause<br>
+copyrights:<br>
+ - Copyright (C) 2022 Mohd Noor Aman<br>
+ - Copyright (C) 2023 Utkarsh Verma<br>
+<br>
+type: build<br>
+enabled-by: true<br>
+<br>
+build-type: group<br>
+cflags: []<br>
+cppflags: []<br>
+cxxflags: []<br>
+includes: []<br>
+<br>
+install:<br>
+ - destination: ${BSP_INCLUDEDIR}/bsp<br>
+ source:<br>
+ - bsps/aarch64/raspberrypi/include/bsp/bcm2711.h<br>
+<br>
+ldflags: []<br>
+use-after: []<br>
+use-before: []<br>
+<br>
+links:<br>
+ - role: build-dependency<br>
+ uid: grp<br>
diff --git a/spec/build/bsps/aarch64/raspberrypi/linkercmds.yml b/spec/build/bsps/aarch64/raspberrypi/linkcmds.yml<br>
similarity index 90%<br>
rename from spec/build/bsps/aarch64/raspberrypi/linkercmds.yml<br>
rename to spec/build/bsps/aarch64/raspberrypi/linkcmds.yml<br>
index 701f9f935c..6988d54422 100644<br>
--- a/spec/build/bsps/aarch64/raspberrypi/linkercmds.yml<br>
+++ b/spec/build/bsps/aarch64/raspberrypi/linkcmds.yml<br>
@@ -1,10 +1,19 @@<br>
SPDX-License-Identifier: CC-BY-SA-4.0 OR BSD-2-Clause<br>
+copyrights:<br>
+ - Copyright (C) 2022 Mohd Noor Aman<br>
+ - Copyright (C) 2023 Utkarsh Verma<br>
+<br>
+type: build<br>
+enabled-by: true<br>
+<br>
build-type: config-file<br>
+<br>
content: |<br>
/* SPDX-License-Identifier: BSD-2-Clause */<br>
<br>
/*<br>
* Copyright (C) 2022 Mohd Noor Aman<br>
+ * Copyright (C) 2023 Utkarsh Verma<br>
*<br>
* Redistribution and use in source and binary forms, with or without<br>
* modification, are permitted provided that the following conditions<br>
@@ -29,8 +38,8 @@ content: |<br>
*/<br>
<br>
MEMORY {<br>
- RAM_MMU : ORIGIN = 0x0, LENGTH = (0x1000 * ${AARCH64_MMU_TRANSLATION_TABLE_PAGES})<br>
- RAM : ORIGIN = 0x80000, LENGTH = 1024M<br>
+ RAM_MMU : ORIGIN = 0x0, LENGTH = (CONSTANT(COMMONPAGESIZE) * ${AARCH64_MMU_TRANSLATION_TABLE_PAGES})<br>
+ RAM : ORIGIN = 0x80000, LENGTH = 1024M<br>
}<br>
<br>
REGION_ALIAS ("REGION_START", RAM);<br>
@@ -51,11 +60,11 @@ content: |<br>
REGION_ALIAS ("REGION_NOCACHE", RAM);<br>
REGION_ALIAS ("REGION_NOCACHE_LOAD", RAM);<br>
<br>
- bsp_stack_abt_size = DEFINED (bsp_stack_abt_size) ? bsp_stack_abt_size : 1024;<br>
+ bsp_stack_abt_size = DEFINED (bsp_stack_abt_size) ? bsp_stack_abt_size : 1K;<br>
<br>
bsp_section_rwbarrier_align = DEFINED (bsp_section_rwbarrier_align) ? bsp_section_rwbarrier_align : 1M;<br>
<br>
- bsp_stack_exception_size = DEFINED (bsp_stack_exception_size) ? bsp_stack_exception_size : 1024;<br>
+ bsp_stack_exception_size = DEFINED (bsp_stack_exception_size) ? bsp_stack_exception_size : 1K;<br>
<br>
bsp_section_rwbarrier_align = DEFINED (bsp_section_rwbarrier_align) ? bsp_section_rwbarrier_align : 1M;<br>
<br>
@@ -67,10 +76,8 @@ content: |<br>
OUTPUT_ARCH (aarch64)<br>
<br>
INCLUDE linkcmds.base<br>
-copyrights:<br>
-- Copyright (C) 2022 Mohd Noor Aman<br>
-enabled-by: true<br>
+<br>
install-path: ${BSP_LIBDIR}<br>
-links: []<br>
target: linkcmds<br>
-type: build<br>
+<br>
+links: []<br>
diff --git a/spec/build/bsps/aarch64/raspberrypi/obj.yml b/spec/build/bsps/aarch64/raspberrypi/obj.yml<br>
new file mode 100644<br>
index 0000000000..6a57210d36<br>
--- /dev/null<br>
+++ b/spec/build/bsps/aarch64/raspberrypi/obj.yml<br>
@@ -0,0 +1,50 @@<br>
+SPDX-License-Identifier: CC-BY-SA-4.0 OR BSD-2-Clause<br>
+copyrights:<br>
+ - Copyright (C) 2022 Mohd Noor Aman<br>
+ - Copyright (C) 2023 Utkarsh Verma<br>
+<br>
+type: build<br>
+enabled-by: true<br>
+<br>
+build-type: objects<br>
+cflags: []<br>
+cppflags: []<br>
+cxxflags: []<br>
+includes: []<br>
+<br>
+install:<br>
+ - destination: ${BSP_INCLUDEDIR}<br>
+ source:<br>
+ - bsps/aarch64/raspberrypi/include/bsp.h<br>
+ - bsps/aarch64/raspberrypi/include/tm27.h<br>
+ - destination: ${BSP_INCLUDEDIR}/bsp<br>
+ source:<br>
+ - bsps/aarch64/raspberrypi/include/bsp/irq.h<br>
+<br>
+source:<br>
+ - bsps/aarch64/shared/cache/cache.c<br>
+ - bsps/aarch64/shared/clock/arm-generic-timer-aarch64.c<br>
+ - bsps/aarch64/shared/mmu/vmsav8-64.c<br>
+ - bsps/aarch64/raspberrypi/console/console.c<br>
+ - bsps/aarch64/raspberrypi/start/bspstart.c<br>
+ - bsps/aarch64/raspberrypi/start/bspstarthooks.c<br>
+ - bsps/aarch64/raspberrypi/start/bspstartmmu.c<br>
+ - bsps/shared/dev/clock/arm-generic-timer.c<br>
+ - bsps/shared/dev/irq/arm-gicv2.c<br>
+ - bsps/shared/dev/irq/arm-gicv2-get-attributes.c<br>
+ - bsps/shared/dev/serial/console-termios-init.c<br>
+ - bsps/shared/dev/serial/console-termios.c<br>
+ - bsps/shared/dev/getentropy/getentropy-cpucounter.c<br>
+ - bsps/shared/dev/btimer/btimer-cpucounter.c<br>
+ - bsps/shared/irq/irq-default-handler.c<br>
+ - bsps/shared/start/bspfatal-default.c<br>
+ - bsps/shared/start/bspreset-arm-psci.c<br>
+ - bsps/shared/start/gettargethash-default.c<br>
+ - bsps/shared/start/sbrk.c<br>
+ - bsps/shared/start/wkspaceinitone.c<br>
+ - bsps/shared/start/mallocinitmulti.c<br>
+ - bsps/shared/start/bspgetworkarea-default.c<br>
+<br>
+links:<br>
+ - role: build-dependency<br>
+ uid: objconsolepl011<br>
diff --git a/spec/build/bsps/aarch64/raspberrypi/objconsolepl011.yml b/spec/build/bsps/aarch64/raspberrypi/objconsolepl011.yml<br>
new file mode 100644<br>
index 0000000000..0c5135cdc5<br>
--- /dev/null<br>
+++ b/spec/build/bsps/aarch64/raspberrypi/objconsolepl011.yml<br>
@@ -0,0 +1,24 @@<br>
+SPDX-License-Identifier: CC-BY-SA-4.0 OR BSD-2-Clause<br>
+copyrights:<br>
+ - Copyright (C) 2022 Mohd Noor Aman<br>
+ - Copyright (C) 2023 Utkarsh Verma<br>
+<br>
+type: build<br>
+enabled-by: true<br>
+<br>
+build-type: objects<br>
+cflags: []<br>
+cppflags: []<br>
+cxxflags: []<br>
+includes: []<br>
+<br>
+install:<br>
+ - destination: ${BSP_INCLUDEDIR}/dev/serial<br>
+ source:<br>
+ - bsps/include/dev/serial/arm-pl011.h<br>
+ - bsps/include/dev/serial/arm-pl011-regs.h<br>
+<br>
+source:<br>
+ - bsps/shared/dev/serial/arm-pl011.c<br>
+<br>
+links: []<br>
diff --git a/spec/build/bsps/aarch64/raspberrypi/optclockpl011freq.yml b/spec/build/bsps/aarch64/raspberrypi/optclockpl011freq.yml<br>
new file mode 100644<br>
index 0000000000..e6432c7010<br>
--- /dev/null<br>
+++ b/spec/build/bsps/aarch64/raspberrypi/optclockpl011freq.yml<br>
@@ -0,0 +1,23 @@<br>
+SPDX-License-Identifier: CC-BY-SA-4.0 OR BSD-2-Clause<br>
+copyrights:<br>
+ - Copyright (C) 2023 Utkarsh Verma<br>
+<br>
+type: build<br>
+enabled-by: true<br>
+<br>
+build-type: option<br>
+name: BSP_PL011_CLOCK_FREQ<br>
+description: PL011 UART clock frequency in Hz<br>
+<br>
+actions:<br>
+ - get-integer: null<br>
+ - define: null<br>
+<br>
+default:<br>
+ - enabled-by:<br>
+ - aarch64/raspberrypi4b<br>
+ value: 48000000<br>
+<br>
+format: '{}'<br>
+<br>
+links: []<br>
diff --git a/spec/build/bsps/aarch64/raspberrypi/optconsolebaud.yml b/spec/build/bsps/aarch64/raspberrypi/optconsolebaud.yml<br>
new file mode 100644<br>
index 0000000000..bff49ad71a<br>
--- /dev/null<br>
+++ b/spec/build/bsps/aarch64/raspberrypi/optconsolebaud.yml<br>
@@ -0,0 +1,23 @@<br>
+SPDX-License-Identifier: CC-BY-SA-4.0 OR BSD-2-Clause<br>
+copyrights:<br>
+ - Copyright (C) 2023 Utkarsh Verma<br>
+<br>
+type: build<br>
+enabled-by: true<br>
+<br>
+build-type: option<br>
+name: BSP_CONSOLE_BAUD<br>
+description: Default baudrate for the console device.<br>
+<br>
+actions:<br>
+ - get-integer: null<br>
+ - define: null<br>
+<br>
+default:<br>
+ - enabled-by:<br>
+ - aarch64/raspberrypi4b<br>
+ value: 115200<br>
+<br>
+format: '{}'<br>
+<br>
+links: []<br>
-- <br>
2.41.0<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></div>
</blockquote></div>