Upstream changes and fixes

.gitignore

@@ -8,3 +8,7 @@ node_modules
 scripts/clean-ifaces/*.plist
 .vscode/c_cpp_properties.json
 TAGS
+
+**/.DS_STORE
+**/*.iml
+**/.idea

.vscode/tasks.json

@@ -1,9 +1,16 @@
 {
     // See https://go.microsoft.com/fwlink/?LinkId=733558
     // for the documentation about the tasks.json format
-    "version": "0.1.0",
+    "version": "2.0.0",
     "command": "make",
-    "isShellCommand": true,
     "args": [],
-    "showOutput": "always"
+    "tasks": [
+        {
+            "label": "make",
+            "type": "shell",
+            "command": "make",
+            "problemMatcher": [],
+            "group": "build"
+        }
+    ]
 }

README.md

@@ -115,7 +115,7 @@ to temporarily turn off the protection. In gdb the command is:
 
 ### Requirements
 
-* `make` and an Unix environment
+* GNU `make` and a Unix environment
 * `node`.js in path (optional)
 * `arm-none-eabi-gcc` in the path (the one coming with Yotta will do just fine). You can get the latest version from ARM: https://developer.arm.com/open-source/gnu-toolchain/gnu-rm/downloads
 * `openocd` - you can use the one coming with Arduino (after your install the M0 board support)
@@ -188,6 +188,30 @@ Thus, it's best to set the USB ID to one for which there are no drivers.
 
 The bootloader sits at 0x00000000, and the application starts at 0x00002000 (SAMD21) or 0x00004000 (SAMD51).
 
+#### Bootloader Hold Switch
+
+A Board can be configured to sense the state of a GPIO and to hold the bootloader from running an application if it is in the appropriate state.  To enable this, add the following to your board configuration header file.
+
+```C
+// The Pin that will tell us to stay in the bootloader or not.
+#define HOLD_PIN PIN_PA02
+
+// Optional, define if a Pull up or pulldown is needed.
+#define HOLD_PIN_PULLUP
+//#define HOLD_PIN_PULLDOWN
+
+// What is the Hold state of the GPIO, 0 or 1.
+#define HOLD_STATE 1
+```
+
+Set `HOLD_PIN` to the appropriate GPIO and `HOLD_STATE` to the logic level which will hold the bootloader from running the application.
+
+The definition of _BOTH_ `HOLD_PIN` and `HOLD_STATE` triggers the inclusion of this feature. If either of these is undefined, this feature is not enabled.
+
+If an internal pullup/pulldown is required for the IO, it can be enabled with the _OPTIONAL_ `HOLD_PIN_PULLUP` or `HOLD_PIN_PULLDOWN` macros.  If neither are defined, then no pullup/pulldown will be enabled for the io pin.
+
+This switch is NOT dynamic.  Once the bootloader has sensed this pin and decided not to run the application, then a change in this IO will not, itself, then cause the Application to run, without also resetting the board.
+
 ## Code of Conduct
 
 This project has adopted the [Microsoft Open Source Code of Conduct](https://opensource.microsoft.com/codeofconduct/). For more information see the [Code of Conduct FAQ](https://opensource.microsoft.com/codeofconduct/faq/) or contact [[email protected]](mailto:[email protected]) with any additional questions or comments.

SECURITY.md

@@ -0,0 +1,41 @@
+<!-- BEGIN MICROSOFT SECURITY.MD V0.0.7 BLOCK -->
+
+## Security
+
+Microsoft takes the security of our software products and services seriously, which includes all source code repositories managed through our GitHub organizations, which include [Microsoft](https://github.com/Microsoft), [Azure](https://github.com/Azure), [DotNet](https://github.com/dotnet), [AspNet](https://github.com/aspnet), [Xamarin](https://github.com/xamarin), and [our GitHub organizations](https://opensource.microsoft.com/).
+
+If you believe you have found a security vulnerability in any Microsoft-owned repository that meets [Microsoft's definition of a security vulnerability](https://aka.ms/opensource/security/definition), please report it to us as described below.
+
+## Reporting Security Issues
+
+**Please do not report security vulnerabilities through public GitHub issues.**
+
+Instead, please report them to the Microsoft Security Response Center (MSRC) at [https://msrc.microsoft.com/create-report](https://aka.ms/opensource/security/create-report).
+
+If you prefer to submit without logging in, send email to [[email protected]](mailto:[email protected]).  If possible, encrypt your message with our PGP key; please download it from the [Microsoft Security Response Center PGP Key page](https://aka.ms/opensource/security/pgpkey).
+
+You should receive a response within 24 hours. If for some reason you do not, please follow up via email to ensure we received your original message. Additional information can be found at [microsoft.com/msrc](https://aka.ms/opensource/security/msrc). 
+
+Please include the requested information listed below (as much as you can provide) to help us better understand the nature and scope of the possible issue:
+
+  * Type of issue (e.g. buffer overflow, SQL injection, cross-site scripting, etc.)
+  * Full paths of source file(s) related to the manifestation of the issue
+  * The location of the affected source code (tag/branch/commit or direct URL)
+  * Any special configuration required to reproduce the issue
+  * Step-by-step instructions to reproduce the issue
+  * Proof-of-concept or exploit code (if possible)
+  * Impact of the issue, including how an attacker might exploit the issue
+
+This information will help us triage your report more quickly.
+
+If you are reporting for a bug bounty, more complete reports can contribute to a higher bounty award. Please visit our [Microsoft Bug Bounty Program](https://aka.ms/opensource/security/bounty) page for more details about our active programs.
+
+## Preferred Languages
+
+We prefer all communications to be in English.
+
+## Policy
+
+Microsoft follows the principle of [Coordinated Vulnerability Disclosure](https://aka.ms/opensource/security/cvd).
+
+<!-- END MICROSOFT SECURITY.MD BLOCK -->

boards/arcade_itsybitsy_m4/ili9341.cf2

@@ -0,0 +1,6 @@
+DISPLAY_CFG0 = 0xc8
+DISPLAY_CFG1 = 0x0018ff
+DISPLAY_CFG2 = 50
+DISPLAY_WIDTH = 320
+DISPLAY_HEIGHT = 240
+DISPLAY_TYPE = 9341

boards/pewpew_m4/board_config.h

@@ -45,7 +45,8 @@ const uint32_t config_data[] = {
     36, 0x10, // PIN_DISPLAY_DC = PA16
     37, 0xa0, // DISPLAY_WIDTH = 160
     38, 0x80, // DISPLAY_HEIGHT = 128
-    39, 0x20180, // DISPLAY_CFG0 = 0x20180
+    //39, 0x80, // DISPLAY_CFG0 = 0x80 (prototype)
+    39, 0x20180, // DISPLAY_CFG0 = 0x20180 (sold version)
     40, 0x12c2d, // DISPLAY_CFG1 = 0x12c2d
     41, 0x18, // DISPLAY_CFG2 = 0x18
     43, 0x11, // PIN_DISPLAY_RST = PA17

inc/uf2.h

@@ -267,6 +267,9 @@ void system_init(void);
 #define LED_TICK led_tick
 
 #define PINOP(pin, OP) (PORT->Group[(pin) / 32].OP.reg = (1 << ((pin) % 32)))
+#define PINIP(pin) (((PORT->Group[(pin) / 32].IN.reg) >> ((pin) % 32)) & 0x1)
+#define PINCFG(pin) (PORT->Group[(pin) / 32].PINCFG[(pin) % 32].reg)
+#define PINMUX(pin) (PORT->Group[(pin) / 32].PMUX[((pin) % 32)/2].reg)
 
 void led_tick(void);
 void led_signal(void);

lib/cmsis/CMSIS/Include/core_cmFunc.h

@@ -426,7 +426,7 @@ __attribute__( ( always_inline ) ) __STATIC_INLINE uint32_t __get_PSP(void)
  */
 __attribute__( ( always_inline ) ) __STATIC_INLINE void __set_PSP(uint32_t topOfProcStack)
 {
-  __ASM volatile ("MSR psp, %0\n" : : "r" (topOfProcStack) : "sp");
+  __ASM volatile ("MSR psp, %0\n" : : "r" (topOfProcStack) : );
 }
 
 
@@ -454,7 +454,7 @@ __attribute__( ( always_inline ) ) __STATIC_INLINE uint32_t __get_MSP(void)
 __attribute__( ( always_inline ) ) __STATIC_INLINE void __set_MSP(uint32_t topOfMainStack)
 {
 // : "sp" removed from clobber list to avoid gcc 9 warning.
-  __ASM volatile ("MSR msp, %0\n" : : "r" (topOfMainStack));
+  __ASM volatile ("MSR msp, %0\n" : : "r" (topOfMainStack) : );
 }