WIP: Iar develop (DO NOT MERGE) #1287

Draft
kilograham wants to merge 4 commits from iar/develop into develop
kilograham commented 2023-02-27 17:09:40 -06:00 (Migrated from github.com)

This is a branch for development of an IAR compiler capable SDK

This is a branch for development of an IAR compiler capable SDK
micaelbo commented 2024-03-15 04:35:53 -05:00 (Migrated from github.com)

@kilograham What are the chances that this branch will be merged any time soon?

@kilograham What are the chances that this branch will be merged any time soon?
kilograham commented 2024-03-15 07:41:48 -05:00 (Migrated from github.com)

Current plans are:

  1. for this branch to get some more attention
  2. To keep it up to date with each SDK release
  3. for now we will keep it separate, due to the quite disruptive changes, but may change in the future. We will likely release IAR versions too.
Current plans are: 1. for this branch to get some more attention 2. To keep it up to date with each SDK release 3. for now we will keep it separate, due to the quite disruptive changes, but may change in the future. We will likely release IAR versions too.
This pull request has changes conflicting with the target branch.
  • CMakeLists.txt
  • cmake/preload/toolchains/pico_arm_clang.cmake
  • src/common/pico_sync/sem.c
  • src/common/pico_time/time.c
  • src/common/pico_util/include/pico/util/queue.h
  • src/rp2040/pico_platform/platform.c
  • src/rp2350/boot_stage2/CMakeLists.txt
  • src/rp2_common/hardware_clocks/clocks.c
  • src/rp2_common/hardware_divider/include/hardware/divider.h
  • src/rp2_common/hardware_flash/flash.c
  • src/rp2_common/hardware_irq/include/hardware/irq.h
  • src/rp2_common/hardware_irq/irq.c
  • src/rp2_common/hardware_sync/include/hardware/sync.h
  • src/rp2_common/pico_cyw43_driver/cyw43_bus_pio_spi.c
  • src/rp2_common/pico_double/double_init_rom_rp2040.c
  • src/rp2_common/pico_malloc/CMakeLists.txt
  • src/rp2_common/pico_malloc/pico_malloc.c
  • src/rp2_common/pico_multicore/multicore.c
  • src/rp2_common/pico_platform/include/pico/platform.h
  • src/rp2_common/pico_runtime/CMakeLists.txt
  • src/rp2_common/pico_runtime/runtime.c
  • src/rp2_common/pico_standard_link/CMakeLists.txt
  • src/rp2_common/pico_standard_link/crt0.S
  • src/rp2_common/pico_standard_link/memmap_blocked_ram.ld
  • src/rp2_common/pico_standard_link/memmap_copy_to_ram.ld
  • src/rp2_common/pico_standard_link/memmap_default.ld
  • src/rp2_common/pico_standard_link/memmap_no_flash.ld
  • src/rp2_common/pico_stdio_semihosting/stdio_semihosting.c
  • src/rp2_common/tinyusb/CMakeLists.txt
  • test/kitchen_sink/kitchen_sink.c
  • test/pico_divider_test/pico_divider_nesting_test.c
  • test/pico_divider_test/pico_divider_test.c
  • test/pico_float_test/pico_float_test.c
  • tools/elf2uf2/main.cpp
View command line instructions

Manual merge helper

Use this merge commit message when completing the merge manually.

Checkout

From your project repository, check out a new branch and test the changes.
git fetch -u origin 'iar/develop:iar/develop'
git switch 'iar/develop'

Merge

Merge the changes and update on Forgejo.

Warning: The "Autodetect manual merge" setting is not enabled for this repository, you will have to mark this pull request as manually merged afterwards.

git switch 'develop'
git merge --no-ff 'iar/develop'
git switch 'iar/develop'
git rebase 'develop'
git switch 'develop'
git merge --ff-only 'iar/develop'
git switch 'iar/develop'
git rebase 'develop'
git switch 'develop'
git merge --no-ff 'iar/develop'
git switch 'develop'
git merge --squash 'iar/develop'
git switch 'develop'
git merge --ff-only 'iar/develop'
git switch 'develop'
git merge 'iar/develop'
git push origin 'develop'
Sign in to join this conversation.
No reviewers
No milestone
No assignees
1 participant
Notifications
Due date
The due date is invalid or out of range. Please use the format "yyyy-mm-dd".

No due date set.

Dependencies

No dependencies set

Reference
gh-raspberrypi/pico-sdk!1287
No description provided.