pw_kernel: Add Cortex-M33 mps2-an505 QEMU platform
- adds mps2-an505
- removes lm3s6965evb and microbit
Change-Id: I5c939ff1bf1a683143a742fd21e253d2704bfe41
Reviewed-on: https://pigweed-review.googlesource.com/c/pigweed/pigweed/+/271473
Commit-Queue: Dave Roth <davidroth@google.com>
Reviewed-by: Erik Gilling <konkers@google.com>
Lint: Lint 🤖 <android-build-ayeaye@system.gserviceaccount.com>
Presubmit-Verified: CQ Bot Account <pigweed-scoped@luci-project-accounts.iam.gserviceaccount.com>
diff --git a/pigweed.json b/pigweed.json
index 4473d7a..1ce5907 100644
--- a/pigweed.json
+++ b/pigweed.json
@@ -213,12 +213,12 @@
],
[
"build",
- "--config=k_qemu_lm3s6965evb",
+ "--config=k_qemu_mps2_an505",
"//pw_kernel/..."
],
[
"test",
- "--config=k_qemu_lm3s6965evb",
+ "--config=k_qemu_mps2_an505",
"//pw_kernel/..."
],
[
diff --git a/pw_build/constraints/chipset/BUILD.bazel b/pw_build/constraints/chipset/BUILD.bazel
index c682fea..a11fc30 100644
--- a/pw_build/constraints/chipset/BUILD.bazel
+++ b/pw_build/constraints/chipset/BUILD.bazel
@@ -30,6 +30,11 @@
)
constraint_value(
+ name = "mps2-an505",
+ constraint_setting = ":chipset",
+)
+
+constraint_value(
name = "nrf52833",
constraint_setting = ":chipset",
)
diff --git a/pw_kernel/cheat_sheet.rst b/pw_kernel/cheat_sheet.rst
index 6524022..a96caad 100644
--- a/pw_kernel/cheat_sheet.rst
+++ b/pw_kernel/cheat_sheet.rst
@@ -18,7 +18,7 @@
For a given ``$CONFIG`` in:
* k_host
-* k_qemu_lm3s6965evb
+* k_qemu_mps2_an505
* k_rp2350
.. code-block:: shell
@@ -65,7 +65,7 @@
.. code-block:: shell
- bazelisk test --config k_qemu_lm3s6965evb //pw_kernel/...
+ bazelisk test --config k_qemu_mps2_an505 //pw_kernel/...
Run
---
@@ -74,7 +74,7 @@
.. code-block:: shell
- bazelisk run --config k_qemu_lm3s6965evb //pw_kernel/entry:kernel
+ bazelisk run --config k_qemu_mps2_an505 //pw_kernel/entry:kernel
RP2350 Target Board
===================
diff --git a/pw_kernel/entry/BUILD.bazel b/pw_kernel/entry/BUILD.bazel
index 033509a..5ad694c 100644
--- a/pw_kernel/entry/BUILD.bazel
+++ b/pw_kernel/entry/BUILD.bazel
@@ -23,8 +23,7 @@
edition = "2021",
tags = ["kernel"],
target_compatible_with = select({
- "//pw_build/constraints/chipset:lm3s6965evb": [],
- "//pw_build/constraints/chipset:nrf52833": [],
+ "//pw_build/constraints/chipset:mps2-an505": [],
"//pw_kernel/target/rp:rp235x": [],
"//conditions:default": ["@platforms//:incompatible"],
}),
diff --git a/pw_kernel/kernel.bazelrc b/pw_kernel/kernel.bazelrc
index c5f009c..2ab6b52 100644
--- a/pw_kernel/kernel.bazelrc
+++ b/pw_kernel/kernel.bazelrc
@@ -34,26 +34,25 @@
# ===========================
common:k_host --config=k_common
-# QEMU lm3s6965evb target configuration
+# QEMU mps2-an505 target configuration
# =======================================
-common:k_qemu_lm3s6965evb --config=k_common
-build:k_qemu_lm3s6965evb --platforms=//pw_kernel/target/qemu:lm3s6965evb
-run:k_qemu_lm3s6965evb --run_under="@qemu//:qemu-system-arm \
- -cpu cortex-m3 \
- -machine lm3s6965evb \
+common:k_qemu_mps2_an505 --config=k_common
+build:k_qemu_mps2_an505 --platforms=//pw_kernel/target/qemu:mps2-an505
+run:k_qemu_mps2_an505 --run_under="@qemu//:qemu-system-arm \
+ -cpu cortex-m33 \
+ -machine mps2-an505 \
-nographic \
-semihosting-config enable=on,target=native \
-serial mon:stdio \
-kernel "
-test:k_qemu_lm3s6965evb --run_under="@qemu//:qemu-system-arm \
- -cpu cortex-m3 \
- -machine lm3s6965evb \
+test:k_qemu_mps2_an505 --run_under="@qemu//:qemu-system-arm \
+ -cpu cortex-m33 \
+ -machine mps2-an505 \
-nographic \
-semihosting-config enable=on,target=native \
-serial mon:stdio \
-kernel "
-
# RP2350 target configuration
# =======================================
common:k_rp2350 --config=k_common
diff --git a/pw_kernel/lib/unittest/BUILD.bazel b/pw_kernel/lib/unittest/BUILD.bazel
index 305ffaf..cec0180 100644
--- a/pw_kernel/lib/unittest/BUILD.bazel
+++ b/pw_kernel/lib/unittest/BUILD.bazel
@@ -49,12 +49,6 @@
name = "unittest_core",
srcs = ["unittest_core.rs"],
tags = ["kernel"],
- target_compatible_with = select({
- # The intrusive collections crate uses atomics which are not available
- # on the M0.
- "@pigweed//pw_build/constraints/chipset:nrf52833": ["@platforms//:incompatible"],
- "//conditions:default": [],
- }),
visibility = ["//visibility:public"],
deps = [
"//pw_bytes/rust:pw_bytes",
diff --git a/pw_kernel/target/qemu/BUILD.bazel b/pw_kernel/target/qemu/BUILD.bazel
index edd9a32..9414f6e 100644
--- a/pw_kernel/target/qemu/BUILD.bazel
+++ b/pw_kernel/target/qemu/BUILD.bazel
@@ -17,32 +17,17 @@
package(default_visibility = ["//visibility:public"])
platform(
- name = "lm3s6965evb",
+ name = "mps2-an505",
constraint_values = [
- "//pw_build/constraints/chipset:lm3s6965evb",
- "//pw_build/constraints/arm:cortex-m3",
- "@platforms//cpu:armv7-m",
+ "//pw_build/constraints/chipset:mps2-an505",
+ "//pw_build/constraints/arm:cortex-m33",
+ "@platforms//cpu:armv8-m",
"@platforms//os:none",
"@rust_crates//:no_std",
],
flags = flags_from_dict({
"//pw_kernel/lib/unittest:unittest_runner": "//pw_kernel/lib/unittest:unittest_runner_cortex_m",
"//pw_kernel/subsys/console:console_backend": "//pw_kernel/subsys/console:console_backend_semihosting",
- "//pw_kernel/target:linker_script": "//pw_kernel/target/qemu/linker_scripts:qemu_lm3s6965_linker_script",
- }),
-)
-
-platform(
- name = "microbit",
- constraint_values = [
- "//pw_build/constraints/chipset:nrf52833",
- "//pw_build/constraints/arm:cortex-m0",
- "@platforms//cpu:armv6-m",
- "@platforms//os:none",
- "@rust_crates//:no_std",
- ],
- flags = flags_from_dict({
- "//pw_kernel/subsys/console:console_backend": "//pw_kernel/subsys/console:console_backend_semihosting",
- "//pw_kernel/target:linker_script": "//pw_kernel/target/qemu/linker_scripts:qemu_nrf51823_linker_script",
+ "//pw_kernel/target:linker_script": "//pw_kernel/target/qemu/linker_scripts:qemu_mps2_an505_linker_script",
}),
)
diff --git a/pw_kernel/target/qemu/linker_scripts/BUILD.bazel b/pw_kernel/target/qemu/linker_scripts/BUILD.bazel
index 2f8867f..9e692ef 100644
--- a/pw_kernel/target/qemu/linker_scripts/BUILD.bazel
+++ b/pw_kernel/target/qemu/linker_scripts/BUILD.bazel
@@ -17,19 +17,10 @@
package(default_visibility = ["//visibility:public"])
cc_library(
- name = "qemu_nrf51823_linker_script",
- linkopts = ["-T$(location qemu-nrf51823.ld)"],
- target_compatible_with = ["@pigweed//pw_build/constraints/chipset:nrf52833"],
+ name = "qemu_mps2_an505_linker_script",
+ linkopts = ["-T$(location qemu-mps2-an505.ld)"],
+ target_compatible_with = ["@pigweed//pw_build/constraints/chipset:mps2-an505"],
deps = [
- "qemu-nrf51823.ld",
- ],
-)
-
-cc_library(
- name = "qemu_lm3s6965_linker_script",
- linkopts = ["-T$(location qemu-lm3s6965.ld)"],
- target_compatible_with = ["@pigweed//pw_build/constraints/chipset:lm3s6965evb"],
- deps = [
- "qemu-lm3s6965.ld",
+ "qemu-mps2-an505.ld",
],
)
diff --git a/pw_kernel/target/qemu/linker_scripts/qemu-lm3s6965.ld b/pw_kernel/target/qemu/linker_scripts/qemu-mps2-an505.ld
similarity index 97%
rename from pw_kernel/target/qemu/linker_scripts/qemu-lm3s6965.ld
rename to pw_kernel/target/qemu/linker_scripts/qemu-mps2-an505.ld
index 720923b..ea3f95e 100644
--- a/pw_kernel/target/qemu/linker_scripts/qemu-lm3s6965.ld
+++ b/pw_kernel/target/qemu/linker_scripts/qemu-mps2-an505.ld
@@ -36,11 +36,11 @@
*/
/* Vector Table (typically in flash) */
- VECTOR_TABLE(rx) : ORIGIN = 0x00000000, LENGTH = 1024
+ VECTOR_TABLE(rx) : ORIGIN = 0x10000000, LENGTH = 2048
/* Internal Flash */
- FLASH(rx) : ORIGIN = 0x00000400, LENGTH = 255K
+ FLASH(rx) : ORIGIN = 0x10000800, LENGTH = 255K
/* Internal SRAM */
- RAM(rwx) : ORIGIN = 0x20000000, LENGTH = 64K
+ RAM(rwx) : ORIGIN = 0x38000000, LENGTH = 64K
/* Each memory region above has an associated .*.unused_space section that
* overlays the unused space at the end of the memory segment. These segments
@@ -250,6 +250,7 @@
PROVIDE(MemoryManagement = DefaultHandler);
PROVIDE(BusFault = DefaultHandler);
PROVIDE(UsageFault = DefaultHandler);
+PROVIDE(SecureFault = DefaultHandler);
PROVIDE(SVCall = DefaultHandler);
PROVIDE(DebugMonitor = DefaultHandler);
PROVIDE(PendSV = DefaultHandler);
diff --git a/pw_kernel/target/qemu/linker_scripts/qemu-nrf51823.ld b/pw_kernel/target/qemu/linker_scripts/qemu-nrf51823.ld
deleted file mode 100644
index 233699b..0000000
--- a/pw_kernel/target/qemu/linker_scripts/qemu-nrf51823.ld
+++ /dev/null
@@ -1,308 +0,0 @@
-/*
- * Copyright 2025 The Pigweed Authors
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not
- * use this file except in compliance with the License. You may obtain a copy of
- * the License at
- *
- * https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
- * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
- * License for the specific language governing permissions and limitations under
- * the License.
- */
-
-/* This relatively simplified linker script will work with many ARMv7-M and
- * ARMv8-M cores that have on-board memory-mapped RAM and FLASH. For more
- * complex projects and devices, it's possible this linker script will not be
- * sufficient as-is.
- *
- * This linker script is likely not suitable for a project with a bootloader.
- */
-
-/* Note: This technically doesn't set the firmware's entry point. Setting the
- * firmware entry point is done by setting vector_table[1]
- * (Reset_Handler). However, this DOES tell the compiler how to optimize
- * when --gc-sections is enabled.
- */
-ENTRY(Reset)
-
-MEMORY
-{
- /* TODO: b/234892223 - Make it possible for projects to freely customize
- * memory regions.
- */
-
- /* Vector Table (typically in flash) */
- VECTOR_TABLE(rx) : ORIGIN = 0x00000000, LENGTH = 1024
- /* Internal Flash */
- FLASH(rx) : ORIGIN = 0x00000400, LENGTH = 255K
- /* Internal SRAM */
- RAM(rwx) : ORIGIN = 0x20000000, LENGTH = 16K
-
- /* Each memory region above has an associated .*.unused_space section that
- * overlays the unused space at the end of the memory segment. These segments
- * are used by pw_bloat.bloaty_config to create the utilization data source
- * for bloaty size reports.
- *
- * These sections MUST be located immediately after the last section that is
- * placed in the respective memory region or lld will issue a warning like:
- *
- * warning: ignoring memory region assignment for non-allocatable section
- * '.VECTOR_TABLE.unused_space'
- *
- * If this warning occurs, it's also likely that LLD will have created quite
- * large padded regions in the ELF file due to bad cursor operations. This
- * can cause ELF files to balloon from hundreds of kilobytes to hundreds of
- * megabytes.
- *
- * Attempting to add sections to the memory region AFTER the unused_space
- * section will cause the region to overflow.
- */
-}
-
-SECTIONS
-{
- /* This is the link-time vector table. If used, the VTOR (Vector Table Offset
- * Register) MUST point to this memory location in order to be used. This can
- * be done by ensuring this section exists at the default location of the VTOR
- * so it's used on reset, or by explicitly setting the VTOR in a bootloader
- * manually to point to &pw_boot_vector_table_addr before interrupts are
- * enabled.
- *
- * The ARMv7-M architecture requires this is at least aligned to 128 bytes,
- * and aligned to a power of two that is greater than 4 times the number of
- * supported exceptions. 512 has been selected as it accommodates most
- * devices' vector tables.
- */
- .vector_table : ALIGN(512)
- {
- LONG(pw_boot_stack_high_addr);
- pw_boot_vector_table_addr = .;
- KEEP(*(.vector_table))
- KEEP(*(.vector_table.reset_vector))
- KEEP(*(.vector_table.exceptions))
- KEEP(*(.vector_table.interrupts))
- } >VECTOR_TABLE
-
- /* Represents unused space in the VECTOR_TABLE segment. This MUST be the last
- * section assigned to the VECTOR_TABLE region.
- */
- .VECTOR_TABLE.unused_space (NOLOAD) : ALIGN(4)
- {
- . = ABSOLUTE(ORIGIN(VECTOR_TABLE) + LENGTH(VECTOR_TABLE));
- } >VECTOR_TABLE
-
- /* Main executable code. */
- .code : ALIGN(4)
- {
- . = ALIGN(4);
- /* cortex-m-rt expects these to be nearby each other because short branches
- * are used.
- */
- *(.PreResetTrampoline);
- *(.Reset);
- *(.HardFaultTrampoline);
- *(.HardFault.*);
-
- /* Application code. */
- *(.text)
- *(.text*)
- KEEP(*(.init))
- KEEP(*(.fini))
-
- . = ALIGN(4);
- /* Constants.*/
- *(.rodata)
- *(.rodata*)
-
- /* .preinit_array, .init_array, .fini_array are used by libc.
- * Each section is a list of function pointers that are called pre-main and
- * post-exit for object initialization and tear-down.
- * Since the region isn't explicitly referenced, specify KEEP to prevent
- * link-time garbage collection. SORT is used for sections that have strict
- * init/de-init ordering requirements. */
- . = ALIGN(4);
- PROVIDE_HIDDEN(__preinit_array_start = .);
- KEEP(*(.preinit_array*))
- PROVIDE_HIDDEN(__preinit_array_end = .);
-
- PROVIDE_HIDDEN(__init_array_start = .);
- KEEP(*(SORT(.init_array.*)))
- KEEP(*(.init_array*))
- PROVIDE_HIDDEN(__init_array_end = .);
-
- PROVIDE_HIDDEN(__fini_array_start = .);
- KEEP(*(SORT(.fini_array.*)))
- KEEP(*(.fini_array*))
- PROVIDE_HIDDEN(__fini_array_end = .);
- } >FLASH
-
- /* Used by unwind-arm/ */
- .ARM : ALIGN(4) {
- __exidx_start = .;
- *(.ARM.exidx*)
- __exidx_end = .;
- } >FLASH
-
- /* Explicitly initialized global and static data. (.data)*/
- .static_init_ram : ALIGN(4)
- {
- *(.data)
- *(.data*)
- . = ALIGN(4);
- } >RAM AT> FLASH
-
- /* Represents unused space in the FLASH segment. This MUST be the last section
- * assigned to the FLASH region.
- */
- .FLASH.unused_space (NOLOAD) : ALIGN(4)
- {
- . = ABSOLUTE(ORIGIN(FLASH) + LENGTH(FLASH));
- } >FLASH
-
- /* The .zero_init_ram, .heap, and .stack sections below require (NOLOAD)
- * annotations for LLVM lld, but not GNU ld, because LLVM's lld intentionally
- * interprets the linker file differently from ld:
- *
- * https://discourse.llvm.org/t/lld-vs-ld-section-type-progbits-vs-nobits/5999/3
- *
- * Zero initialized global/static data (.bss) is initialized in
- * pw_boot_Entry() via memset(), so the section doesn't need to be loaded from
- * flash. The .heap and .stack sections don't require any initialization,
- * as they only represent allocated memory regions, so they also do not need
- * to be loaded.
- */
- .zero_init_ram (NOLOAD) : ALIGN(4)
- {
- *(.bss)
- *(.bss*)
- *(COMMON)
- . = ALIGN(4);
- } >RAM
-
- .heap (NOLOAD) : ALIGN(4)
- {
- pw_boot_heap_low_addr = .;
- . = . + 0;
- . = ALIGN(4);
- pw_boot_heap_high_addr = .;
- } >RAM
-
- /* Link-time check for stack overlaps.
- *
- * The ARMv7-M architecture may require 8-byte alignment of the stack pointer
- * rather than 4 in some contexts and implementations, so this region is
- * 8-byte aligned (see ARMv7-M Architecture Reference Manual DDI0403E
- * section B1.5.7).
- */
- .stack (NOLOAD) : ALIGN(8)
- {
- /* Set the address that the main stack pointer should be initialized to. */
- pw_boot_stack_low_addr = .;
- HIDDEN(_stack_size = ORIGIN(RAM) + LENGTH(RAM) - .);
- /* Align the stack to a lower address to ensure it isn't out of range. */
- HIDDEN(_stack_high = (. + _stack_size) & ~0x7);
- ASSERT(_stack_high - . >= 1K,
- "Error: Not enough RAM for desired minimum stack size.");
- . = _stack_high;
- pw_boot_stack_high_addr = .;
- } >RAM
-
- /* Represents unused space in the RAM segment. This MUST be the last section
- * assigned to the RAM region.
- */
- .RAM.unused_space (NOLOAD) : ALIGN(4)
- {
- . = ABSOLUTE(ORIGIN(RAM) + LENGTH(RAM));
- } >RAM
-
- /* Discard unwind info. */
- .ARM.extab 0x0 (INFO) :
- {
- KEEP(*(.ARM.extab*))
- }
-}
-
-/* Symbols used by core_init.c: */
-/* Start of .static_init_ram in FLASH. */
-_pw_static_init_flash_start = LOADADDR(.static_init_ram);
-
-/* Region of .static_init_ram in RAM. */
-_pw_static_init_ram_start = ADDR(.static_init_ram);
-_pw_static_init_ram_end = _pw_static_init_ram_start + SIZEOF(.static_init_ram);
-
-/* Region of .zero_init_ram. */
-_pw_zero_init_ram_start = ADDR(.zero_init_ram);
-_pw_zero_init_ram_end = _pw_zero_init_ram_start + SIZEOF(.zero_init_ram);
-
-/* Symbols needed for the Rust cortex-m-rt crate. */
-__sbss = _pw_zero_init_ram_start;
-__ebss = _pw_zero_init_ram_end;
-__sdata = _pw_static_init_ram_start;
-__edata = _pw_static_init_ram_end;
-__sidata = LOADADDR(.static_init_ram);
-__pre_init = DefaultPreInit;
-PROVIDE(DefaultHandler = DefaultHandler_);
-PROVIDE(NonMaskableInt = DefaultHandler);
-PROVIDE(MemoryManagement = DefaultHandler);
-PROVIDE(BusFault = DefaultHandler);
-PROVIDE(UsageFault = DefaultHandler);
-PROVIDE(SVCall = DefaultHandler);
-PROVIDE(DebugMonitor = DefaultHandler);
-PROVIDE(PendSV = DefaultHandler);
-PROVIDE(SysTick = DefaultHandler);
-PROVIDE(HardFault = HardFault_);
-
-/* arm-none-eabi expects `end` symbol to point to start of heap for sbrk. */
-PROVIDE(end = _pw_zero_init_ram_end);
-
-/* These symbols are used by pw_bloat.bloaty_config to create the memoryregions
- * data source for bloaty in this format (where the optional _N defaults to 0):
- * pw_bloat_config_memory_region_NAME_{start,end}{_N,} */
-pw_bloat_config_memory_region_VECTOR_TABLE_start = ORIGIN(VECTOR_TABLE);
-pw_bloat_config_memory_region_VECTOR_TABLE_end =
- ORIGIN(VECTOR_TABLE) + LENGTH(VECTOR_TABLE);
-pw_bloat_config_memory_region_FLASH_start = ORIGIN(FLASH);
-pw_bloat_config_memory_region_FLASH_end = ORIGIN(FLASH) + LENGTH(FLASH);
-pw_bloat_config_memory_region_RAM_start = ORIGIN(RAM);
-pw_bloat_config_memory_region_RAM_end = ORIGIN(RAM) + LENGTH(RAM);
-
-SECTIONS
-{
- /*
- * This section stores metadata that may be used during tokenized string
- * decoding. This metadata describes properties that may affect how the
- * tokenized string is encoded or decoded -- the maximum length of the hash
- * function and the sizes of certain integer types.
- *
- * Metadata is declared as key-value pairs. See the metadata variable in
- * tokenize.cc for further details.
- */
- .pw_tokenizer.info 0x0 (INFO) :
- {
- KEEP(*(.pw_tokenizer.info))
- }
-
- /*
- * Tokenized string entries are stored in this section. Each entry contains
- * the original string literal and the calculated token that represents it. In
- * the compiled code, the token and a compact argument list encoded in a
- * uint32_t are used in place of the format string. The compiled code
- * contains no references to the tokenized string entries in this section.
- *
- * The tokenized string entry format is specified by the
- * pw::tokenizer::internal::Entry class in
- * pw_tokenizer/public/pw_tokenizer/internal/tokenize_string.h.
- *
- * The section contents are declared with KEEP so that they are not removed
- * from the ELF. These are never emitted in the final binary or loaded into
- * memory.
- */
- .pw_tokenizer.entries 0x0 (INFO) :
- {
- KEEP(*(.pw_tokenizer.entries.*))
- }
-}
