Fixup for publishing

raspberrypi · Apr 24, 2024 · 75eb390 · 75eb390
1 parent d41e3ea
commit 75eb390
Show file tree

Hide file tree

Showing 5 changed files with 54 additions and 41 deletions.
diff --git a/.github/workflows/cmake-single-platform.yml b/.github/workflows/cmake-single-platform.yml
@@ -12,7 +12,7 @@ jobs:
     name: Generate pack
     runs-on: ubuntu-20.04
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
         with:
           fetch-depth: 0
 

diff --git a/Keil.RP2040_DFP.pdsc → RaspberryPi.RP2xxx_DFP.pdsc b/Keil.RP2040_DFP.pdsc → RaspberryPi.RP2xxx_DFP.pdsc
@@ -1,11 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
 <package schemaVersion="1.7.28" xmlns:xs="http://www.w3.org/2001/XMLSchema-instance" xs:noNamespaceSchemaLocation="https://raw.githubusercontent.com/Open-CMSIS-Pack/Open-CMSIS-Pack-Spec/v1.7.28/schema/PACK.xsd">
-  <name>RP2040_DFP</name>
-  <description>Raspberry Pi RP2040 Device Family Pack</description>
-  <vendor>Keil</vendor>
+  <name>RP2xxx_DFP</name>
+  <description>Raspberry Pi RP2xxx Device Family Pack</description>
+  <vendor>RaspberryPi</vendor>
   <!-- <license>license.txt</license> -->
-  <url>https://www.keil.com/pack/</url>
+  <url>https://github.com/raspberrypi/cmsis-rp2xxx-dfp/releases/download/v0.9.4/</url>
+  <repository type="git">https://github.com/raspberrypi/cmsis-rp2xxx-dfp.git</repository>
 
   <releases>
     <!--automatically generated content, please do not modify -->

diff --git a/RaspberryPi.pidx b/RaspberryPi.pidx
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+
+<index schemaVersion="1.0.0" xs:noNamespaceSchemaLocation="PackIndex.xsd"
+xmlns:xs="http://www.w3.org/2001/XMLSchema-instance">
+<vendor>RaspberryPi</vendor>
+<url>https://raw.githubusercontent.com/raspberrypi/cmsis-rp2xxx-dfp/main/</url>
+<timestamp>2024-04-24 10:08:36</timestamp>
+<pindex>
+<pdsc url="https://github.com/raspberrypi/cmsis-rp2xxx-dfp/releases/download/v1.0.0/"
+vendor="RaspberryPi" name="RP2xxx_DFP" version="0.9.4"/>
+</pindex>
+</index>
diff --git a/example/mdk/pico/rp2040_example.uvprojx b/example/mdk/pico/rp2040_example.uvprojx
@@ -16,8 +16,8 @@
         <TargetCommonOption>
           <Device>RP2040:Core0</Device>
           <Vendor>RPi</Vendor>
-          <PackID>Keil.RP2040_DFP.9.9.9</PackID>
-          <PackURL>https://www.keil.com/pack/</PackURL>
+          <PackID>RaspberryPi.RP2xxx_DFP.0.9.4</PackID>
+          <PackURL>https://github.com/raspberrypi/cmsis-rp2xxx-dfp/releases/download/v0.9.4/</PackURL>
           <Cpu>IRAM(0x20000000,0x00042000) IROM(0x10000000,0x00200000) CPUTYPE("Cortex-M0+") CLOCK(12000000) ELITTLE</Cpu>
           <FlashUtilSpec></FlashUtilSpec>
           <StartupFile></StartupFile>
@@ -425,20 +425,20 @@
           <targetInfo name="Pico" versionMatchMode="fixed"/>
         </targetInfos>
       </component>
-      <component Cclass="Device" Cgroup="Pico Board" Cvariant="Pico W" Cvendor="Keil" Cversion="1.5.1" condition="RP2040">
-        <package name="RP2040_DFP" schemaVersion="1.7.28" url="https://www.keil.com/pack/" vendor="Keil" version="0.9.2"/>
+      <component Cclass="Device" Cgroup="Pico Board" Cvariant="Pico" Cvendor="RaspberryPi" Cversion="1.5.1" condition="RP2040">
+        <package name="RP2xxx_DFP" schemaVersion="1.7.28" url="https://github.com/raspberrypi/cmsis-rp2xxx-dfp/releases/download/v0.9.4/" vendor="RaspberryPi" version="0.9.4"/>
         <targetInfos>
           <targetInfo name="Pico"/>
         </targetInfos>
       </component>
-      <component Cclass="Device" Cgroup="Pico SDK" Cvendor="Keil" Cversion="1.5.1" condition="RP2040 BOARD">
-        <package name="RP2040_DFP" schemaVersion="1.7.28" url="https://www.keil.com/pack/" vendor="Keil" version="9.9.9"/>
+      <component Cclass="Device" Cgroup="Pico SDK" Cvendor="RaspberryPi" Cversion="1.5.1" condition="RP2040 BOARD">
+        <package name="RP2xxx_DFP" schemaVersion="1.7.28" url="https://github.com/raspberrypi/cmsis-rp2xxx-dfp/releases/download/v0.9.4/" vendor="RaspberryPi" version="0.9.4"/>
         <targetInfos>
           <targetInfo name="Pico" versionMatchMode="fixed"/>
         </targetInfos>
       </component>
-      <component Cclass="Device" Cgroup="Startup" Cvariant="C Startup" Cvendor="Keil" Cversion="1.1.0" condition="RP2040 CMSIS">
-        <package name="RP2040_DFP" schemaVersion="1.7.28" url="https://www.keil.com/pack/" vendor="Keil" version="9.9.9"/>
+      <component Cclass="Device" Cgroup="Startup" Cvariant="C Startup" Cvendor="RaspberryPi" Cversion="1.1.0" condition="RP2040 CMSIS">
+        <package name="RP2xxx_DFP" schemaVersion="1.7.28" url="https://github.com/raspberrypi/cmsis-rp2xxx-dfp/releases/download/v0.9.4/" vendor="RaspberryPi" version="0.9.4"/>
         <targetInfos>
           <targetInfo name="Pico" versionMatchMode="fixed"/>
         </targetInfos>
@@ -473,32 +473,32 @@
       </file>
       <file attr="config" category="preIncludeGlobal" name="__wrapper\env_wrapper.h" version="1.5.1">
         <instance index="0">RTE\Device\RP2040_Core0\env_wrapper.h</instance>
-        <component Cclass="Device" Cgroup="Pico SDK" Cvendor="Keil" Cversion="1.5.1" condition="RP2040 BOARD"/>
-        <package name="RP2040_DFP" schemaVersion="1.7.28" url="https://www.keil.com/pack/" vendor="Keil" version="9.9.9"/>
+        <component Cclass="Device" Cgroup="Pico SDK" Cvendor="RaspberryPi" Cversion="1.5.1" condition="RP2040 BOARD"/>
+        <package name="RP2xxx_DFP" schemaVersion="1.7.28" url="https://github.com/raspberrypi/cmsis-rp2xxx-dfp/releases/download/v0.9.4/" vendor="RaspberryPi" version="0.9.4"/>
         <targetInfos>
           <targetInfo name="Pico"/>
         </targetInfos>
       </file>
       <file attr="config" category="linkerScript" condition="ARMCC" name="CMSIS\Device\RP2040\Source\ARM\rp2040.sct" version="1.2.1">
         <instance index="0">RTE\Device\RP2040_Core0\rp2040.sct</instance>
-        <component Cclass="Device" Cgroup="Startup" Cvariant="C Startup" Cvendor="Keil" Cversion="1.1.0" condition="RP2040 CMSIS" isDefaultVariant="1"/>
-        <package name="RP2040_DFP" schemaVersion="1.7.28" url="https://www.keil.com/pack/" vendor="Keil" version="9.9.9"/>
+        <component Cclass="Device" Cgroup="Startup" Cvariant="C Startup" Cvendor="RaspberryPi" Cversion="1.1.0" condition="RP2040 CMSIS" isDefaultVariant="1"/>
+        <package name="RP2xxx_DFP" schemaVersion="1.7.28" url="https://github.com/raspberrypi/cmsis-rp2xxx-dfp/releases/download/v0.9.4/" vendor="RaspberryPi" version="0.9.4"/>
         <targetInfos>
           <targetInfo name="Pico"/>
         </targetInfos>
       </file>
       <file attr="config" category="sourceC" name="CMSIS\Device\RP2040\Source\startup_rp2040.c" version="1.2.0">
         <instance index="0">RTE\Device\RP2040_Core0\startup_rp2040.c</instance>
-        <component Cclass="Device" Cgroup="Startup" Cvariant="C Startup" Cvendor="Keil" Cversion="1.1.0" condition="RP2040 CMSIS" isDefaultVariant="1"/>
-        <package name="RP2040_DFP" schemaVersion="1.7.28" url="https://www.keil.com/pack/" vendor="Keil" version="9.9.9"/>
+        <component Cclass="Device" Cgroup="Startup" Cvariant="C Startup" Cvendor="RaspberryPi" Cversion="1.1.0" condition="RP2040 CMSIS" isDefaultVariant="1"/>
+        <package name="RP2xxx_DFP" schemaVersion="1.7.28" url="https://github.com/raspberrypi/cmsis-rp2xxx-dfp/releases/download/v0.9.4/" vendor="RaspberryPi" version="0.9.4"/>
         <targetInfos>
           <targetInfo name="Pico"/>
         </targetInfos>
       </file>
       <file attr="config" category="sourceC" name="CMSIS\Device\RP2040\Source\system_rp2040.c" version="1.1.0">
         <instance index="0">RTE\Device\RP2040_Core0\system_rp2040.c</instance>
-        <component Cclass="Device" Cgroup="Startup" Cvariant="C Startup" Cvendor="Keil" Cversion="1.1.0" condition="RP2040 CMSIS" isDefaultVariant="1"/>
-        <package name="RP2040_DFP" schemaVersion="1.7.28" url="https://www.keil.com/pack/" vendor="Keil" version="9.9.9"/>
+        <component Cclass="Device" Cgroup="Startup" Cvariant="C Startup" Cvendor="RaspberryPi" Cversion="1.1.0" condition="RP2040 CMSIS" isDefaultVariant="1"/>
+        <package name="RP2xxx_DFP" schemaVersion="1.7.28" url="https://github.com/raspberrypi/cmsis-rp2xxx-dfp/releases/download/v0.9.4/" vendor="RaspberryPi" version="0.9.4"/>
         <targetInfos>
           <targetInfo name="Pico"/>
         </targetInfos>

diff --git a/example/mdk/pico_w/rp2040_example.uvprojx b/example/mdk/pico_w/rp2040_example.uvprojx
@@ -16,8 +16,8 @@
         <TargetCommonOption>
           <Device>RP2040:Core0</Device>
           <Vendor>RPi</Vendor>
-          <PackID>Keil.RP2040_DFP.9.9.9</PackID>
-          <PackURL>https://www.keil.com/pack/</PackURL>
+          <PackID>RaspberryPi.RP2xxx_DFP.0.9.4</PackID>
+          <PackURL>https://github.com/raspberrypi/cmsis-rp2xxx-dfp/releases/download/v0.9.4/</PackURL>
           <Cpu>IRAM(0x20000000,0x00042000) IROM(0x10000000,0x00200000) CPUTYPE("Cortex-M0+") CLOCK(12000000) ELITTLE</Cpu>
           <FlashUtilSpec></FlashUtilSpec>
           <StartupFile></StartupFile>
@@ -425,26 +425,26 @@
           <targetInfo name="Pico" versionMatchMode="fixed"/>
         </targetInfos>
       </component>
-      <component Cclass="Device" Cgroup="Pico Board" Cvariant="Pico W" Cvendor="Keil" Cversion="1.5.1" condition="RP2040">
-        <package name="RP2040_DFP" schemaVersion="1.7.28" url="https://www.keil.com/pack/" vendor="Keil" version="0.9.2"/>
+      <component Cclass="Device" Cgroup="Pico Board" Cvariant="Pico W" Cvendor="RaspberryPi" Cversion="1.5.1" condition="RP2040">
+        <package name="RP2xxx_DFP" schemaVersion="1.7.28" url="https://github.com/raspberrypi/cmsis-rp2xxx-dfp/releases/download/v0.9.4/" vendor="RaspberryPi" version="0.9.4"/>
         <targetInfos>
           <targetInfo name="Pico"/>
         </targetInfos>
       </component>
-      <component Cclass="Device" Cgroup="Pico SDK" Cvendor="Keil" Cversion="1.5.1" condition="RP2040 BOARD">
-        <package name="RP2040_DFP" schemaVersion="1.7.28" url="https://www.keil.com/pack/" vendor="Keil" version="9.9.9"/>
+      <component Cclass="Device" Cgroup="Pico SDK" Cvendor="RaspberryPi" Cversion="1.5.1" condition="RP2040 BOARD">
+        <package name="RP2xxx_DFP" schemaVersion="1.7.28" url="https://github.com/raspberrypi/cmsis-rp2xxx-dfp/releases/download/v0.9.4/" vendor="RaspberryPi" version="0.9.4"/>
         <targetInfos>
           <targetInfo name="Pico" versionMatchMode="fixed"/>
         </targetInfos>
       </component>
-      <component Cclass="Device" Cgroup="Pico W SDK" Cvendor="Keil" Cversion="1.5.1" condition="Pico W SDK">
-        <package name="RP2040_DFP" schemaVersion="1.7.28" url="https://www.keil.com/pack/" vendor="Keil" version="0.9.2"/>
+      <component Cclass="Device" Cgroup="Pico W SDK" Cvendor="RaspberryPi" Cversion="1.5.1" condition="Pico W SDK">
+        <package name="RP2xxx_DFP" schemaVersion="1.7.28" url="https://github.com/raspberrypi/cmsis-rp2xxx-dfp/releases/download/v0.9.4/" vendor="RaspberryPi" version="0.9.4"/>
         <targetInfos>
           <targetInfo name="Pico"/>
         </targetInfos>
       </component>
-      <component Cclass="Device" Cgroup="Startup" Cvariant="C Startup" Cvendor="Keil" Cversion="1.1.0" condition="RP2040 CMSIS">
-        <package name="RP2040_DFP" schemaVersion="1.7.28" url="https://www.keil.com/pack/" vendor="Keil" version="9.9.9"/>
+      <component Cclass="Device" Cgroup="Startup" Cvariant="C Startup" Cvendor="RaspberryPi" Cversion="1.1.0" condition="RP2040 CMSIS">
+        <package name="RP2xxx_DFP" schemaVersion="1.7.28" url="https://github.com/raspberrypi/cmsis-rp2xxx-dfp/releases/download/v0.9.4/" vendor="RaspberryPi" version="0.9.4"/>
         <targetInfos>
           <targetInfo name="Pico" versionMatchMode="fixed"/>
         </targetInfos>
@@ -479,40 +479,40 @@
       </file>
       <file attr="config" category="preIncludeGlobal" name="__wrapper\env_wrapper.h" version="1.5.1">
         <instance index="0">RTE\Device\RP2040_Core0\env_wrapper.h</instance>
-        <component Cclass="Device" Cgroup="Pico SDK" Cvendor="Keil" Cversion="1.5.1" condition="RP2040 BOARD"/>
-        <package name="RP2040_DFP" schemaVersion="1.7.28" url="https://www.keil.com/pack/" vendor="Keil" version="9.9.9"/>
+        <component Cclass="Device" Cgroup="Pico SDK" Cvendor="RaspberryPi" Cversion="1.5.1" condition="RP2040 BOARD"/>
+        <package name="RP2xxx_DFP" schemaVersion="1.7.28" url="https://github.com/raspberrypi/cmsis-rp2xxx-dfp/releases/download/v0.9.4/" vendor="RaspberryPi" version="0.9.4"/>
         <targetInfos>
           <targetInfo name="Pico"/>
         </targetInfos>
       </file>
       <file attr="config" category="preIncludeLocal" name="__wrapper\lwipopts.h" version="1.5.1">
         <instance index="0">RTE\Device\RP2040_Core0\lwipopts.h</instance>
-        <component Cclass="Device" Cgroup="Pico W SDK" Cvendor="Keil" Cversion="1.5.1" condition="Pico W SDK"/>
-        <package name="RP2040_DFP" schemaVersion="1.7.28" url="https://www.keil.com/pack/" vendor="Keil" version="9.9.9"/>
+        <component Cclass="Device" Cgroup="Pico W SDK" Cvendor="RaspberryPi" Cversion="1.5.1" condition="Pico W SDK"/>
+        <package name="RP2xxx_DFP" schemaVersion="1.7.28" url="https://github.com/raspberrypi/cmsis-rp2xxx-dfp/releases/download/v0.9.4/" vendor="RaspberryPi" version="0.9.4"/>
         <targetInfos>
           <targetInfo name="Pico"/>
         </targetInfos>
       </file>
       <file attr="config" category="linkerScript" condition="ARMCC" name="CMSIS\Device\RP2040\Source\ARM\rp2040.sct" version="1.2.1">
         <instance index="0">RTE\Device\RP2040_Core0\rp2040.sct</instance>
-        <component Cclass="Device" Cgroup="Startup" Cvariant="C Startup" Cvendor="Keil" Cversion="1.1.0" condition="RP2040 CMSIS" isDefaultVariant="1"/>
-        <package name="RP2040_DFP" schemaVersion="1.7.28" url="https://www.keil.com/pack/" vendor="Keil" version="9.9.9"/>
+        <component Cclass="Device" Cgroup="Startup" Cvariant="C Startup" Cvendor="RaspberryPi" Cversion="1.1.0" condition="RP2040 CMSIS" isDefaultVariant="1"/>
+        <package name="RP2xxx_DFP" schemaVersion="1.7.28" url="https://github.com/raspberrypi/cmsis-rp2xxx-dfp/releases/download/v0.9.4/" vendor="RaspberryPi" version="0.9.4"/>
         <targetInfos>
           <targetInfo name="Pico"/>
         </targetInfos>
       </file>
       <file attr="config" category="sourceC" name="CMSIS\Device\RP2040\Source\startup_rp2040.c" version="1.2.0">
         <instance index="0">RTE\Device\RP2040_Core0\startup_rp2040.c</instance>
-        <component Cclass="Device" Cgroup="Startup" Cvariant="C Startup" Cvendor="Keil" Cversion="1.1.0" condition="RP2040 CMSIS" isDefaultVariant="1"/>
-        <package name="RP2040_DFP" schemaVersion="1.7.28" url="https://www.keil.com/pack/" vendor="Keil" version="9.9.9"/>
+        <component Cclass="Device" Cgroup="Startup" Cvariant="C Startup" Cvendor="RaspberryPi" Cversion="1.1.0" condition="RP2040 CMSIS" isDefaultVariant="1"/>
+        <package name="RP2xxx_DFP" schemaVersion="1.7.28" url="https://github.com/raspberrypi/cmsis-rp2xxx-dfp/releases/download/v0.9.4/" vendor="RaspberryPi" version="0.9.4"/>
         <targetInfos>
           <targetInfo name="Pico"/>
         </targetInfos>
       </file>
       <file attr="config" category="sourceC" name="CMSIS\Device\RP2040\Source\system_rp2040.c" version="1.1.0">
         <instance index="0">RTE\Device\RP2040_Core0\system_rp2040.c</instance>
-        <component Cclass="Device" Cgroup="Startup" Cvariant="C Startup" Cvendor="Keil" Cversion="1.1.0" condition="RP2040 CMSIS" isDefaultVariant="1"/>
-        <package name="RP2040_DFP" schemaVersion="1.7.28" url="https://www.keil.com/pack/" vendor="Keil" version="9.9.9"/>
+        <component Cclass="Device" Cgroup="Startup" Cvariant="C Startup" Cvendor="RaspberryPi" Cversion="1.1.0" condition="RP2040 CMSIS" isDefaultVariant="1"/>
+        <package name="RP2xxx_DFP" schemaVersion="1.7.28" url="https://github.com/raspberrypi/cmsis-rp2xxx-dfp/releases/download/v0.9.4/" vendor="RaspberryPi" version="0.9.4"/>
         <targetInfos>
           <targetInfo name="Pico"/>
         </targetInfos>