Merge pull request #26 from dinkelk/pico_update

Pico Runtime Update

alire.toml

@@ -14,18 +14,19 @@ licenses = "Apache-2.0"
 # Project file lives with the hello pico program:
 project-files = ["src/pico_util/hello_pico/hello_pico.gpr"]
 
-tags = ["embedded", "framework", "demo", "rp2040", "raspberrypi"]
+tags = ["embedded", "framework", "demo", "rp2040", "raspberrypi", "arm"]
 website = "https://github.com/lasp/adamant_example"
 
+# Depend on forks of the rp2040_hal & pico_bsp that don't conflict with
+# the pico runtimes provided in the gnat_arm_elf crate.
 [[depends-on]]
-ravenscar_full_rp2040 = "~0.2.0"
+rp2040_hal = "^2.3.0"
 [[pins]]
-ravenscar_full_rp2040 = { url='https://github.com/dinkelk/ravenscar_full_rp2040.git', branch="pico-bsp" }
-
+rp2040_hal = { url='https://github.com/dinkelk/rp2040_hal.git', branch="ravenscar" }
 [configuration.values]
 rp2040_hal.Use_Startup = false
 
 [[depends-on]]
-pico_bsp = "^2.0.0"
+pico_bsp = "^2.1.0"
 [[pins]]
 pico_bsp = { url='https://github.com/dinkelk/pico_bsp.git', branch="ravenscar" }

redo/targets/gpr/pico_debug.gpr

@@ -1,5 +1,4 @@
 with "pico_bsp.gpr";
-with "ravenscar_build.gpr";
 
 project pico_debug extends all "a_bareboard_debug.gpr" is
 
@@ -15,7 +14,7 @@ project pico_debug extends all "a_bareboard_debug.gpr" is
 
    -- Specify cross compiler ARM target and Ravenscar runtime:
    for Target use "arm-eabi";
-   for Runtime ("Ada") use Ravenscar_Build'Runtime ("Ada");
+   for Runtime ("Ada") use "embedded-rpi-pico";
    -- C++ not supported for arm-eabi currently.
    for Languages use ("Ada", "C", "ASM_CPP");
 

redo/targets/gpr/pico_development.gpr

@@ -1,5 +1,4 @@
 with "pico_bsp.gpr";
-with "ravenscar_build.gpr";
 
 project pico_development extends all "a_bareboard_development.gpr" is
 
@@ -15,7 +14,7 @@ project pico_development extends all "a_bareboard_development.gpr" is
 
    -- Specify cross compiler ARM target and Ravenscar runtime:
    for Target use "arm-eabi";
-   for Runtime ("Ada") use Ravenscar_Build'Runtime ("Ada");
+   for Runtime ("Ada") use "embedded-rpi-pico";
    -- C++ not supported for arm-eabi currently.
    for Languages use ("Ada", "C", "ASM_CPP");
 

redo/targets/gpr/pico_production.gpr

@@ -1,5 +1,4 @@
 with "pico_bsp.gpr";
-with "ravenscar_build.gpr";
 
 project pico_production extends all "a_bareboard_production.gpr" is
 
@@ -15,7 +14,7 @@ project pico_production extends all "a_bareboard_production.gpr" is
 
    -- Specify cross compiler ARM target and Ravenscar runtime:
    for Target use "arm-eabi";
-   for Runtime ("Ada") use Ravenscar_Build'Runtime ("Ada");
+   for Runtime ("Ada") use "embedded-rpi-pico";
    -- C++ not supported for arm-eabi currently.
    for Languages use ("Ada", "C", "ASM_CPP");
 

redo/targets/pico.py

@@ -3,7 +3,7 @@
 
 #
 # This file contains the cross compile build targets for the
-# Raspberry Pi Pico microprocessor. It utilizes the embedded-rpi-pico-smp
+# Raspberry Pi Pico microprocessor. It utilizes the embedded-rpi-pico
 # runtime provided in the gnat_arm_elf Alire crate.
 #
 

src/pico_util/hello_pico/hello_pico.gpr

@@ -1,5 +1,4 @@
 with "../../../config/adamant_example_config.gpr";
-with "ravenscar_build.gpr";
 
 -- This project simply compiles a hello world to make sure the alire environment
 -- for the Adamant example is functioning properly. This alire environment contains
@@ -9,7 +8,7 @@ project Hello_Pico is
    -- Use the arm-eabi-elf cross compiler with a Ravenscar tasking
    -- runtime.
    for Target use "arm-eabi";
-   for Runtime ("Ada") use Ravenscar_Build'Runtime ("Ada");
+   for Runtime ("Ada") use "embedded-rpi-pico";
 
    -- Add the Raspberry Pi Pico hello world as source file.
    for Source_Dirs use (".", "../../../config/");