diff --git a/ports/broadcom/boards/diodes_delight_piunora/mpconfigboard.mk b/ports/broadcom/boards/diodes_delight_piunora/mpconfigboard.mk
index 9eed0b6d30..d05bb16028 100644
--- a/ports/broadcom/boards/diodes_delight_piunora/mpconfigboard.mk
+++ b/ports/broadcom/boards/diodes_delight_piunora/mpconfigboard.mk
@@ -1,5 +1,5 @@
 USB_VID = 0x1209
-USB_PID = 0x000D
+USB_PID = 0xD10D
 USB_PRODUCT = "Piunora"
 USB_MANUFACTURER = "Diodes Delight"
 
diff --git a/ports/broadcom/mpconfigport.mk b/ports/broadcom/mpconfigport.mk
index 5f3c7cdac0..7296461d1f 100644
--- a/ports/broadcom/mpconfigport.mk
+++ b/ports/broadcom/mpconfigport.mk
@@ -1,61 +1,26 @@
 # All broadcom ports have longints.
 LONGINT_IMPL = MPZ
 
-# Typically the first module to create
-CIRCUITPY_MICROCONTROLLER = 1
-# Typically the second module to create
-CIRCUITPY_DIGITALIO = 1
-# Other modules:
+CIRCUITPY_FULL_BUILD = 1
+
+# Modules in FULL_BUILD that we don't support.
 CIRCUITPY_ANALOGIO = 0
-CIRCUITPY_BUSIO = 1
-CIRCUITPY_ONEWIREIO = 0
-CIRCUITPY_PWMIO = 0
-CIRCUITPY_COUNTIO = 0
-CIRCUITPY_NEOPIXEL_WRITE = 1
-CIRCUITPY_PULSEIO = 0
-CIRCUITPY_OS = 1
-CIRCUITPY_NVM = 0
 CIRCUITPY_AUDIOBUSIO = 0
 CIRCUITPY_AUDIOIO = 0
-CIRCUITPY_ROTARYIO = 0
-CIRCUITPY_RTC = 0
-CIRCUITPY_SDCARDIO = 0
-CIRCUITPY_SDIOIO = 1
-CIRCUITPY_FRAMEBUFFERIO = 1
+CIRCUITPY_COUNTIO = 0
 CIRCUITPY_FREQUENCYIO = 0
 CIRCUITPY_I2CPERIPHERAL = 0
-# Requires SPI, PulseIO (stub ok):
-CIRCUITPY_DISPLAYIO = 1
-
-# These modules are implemented in shared-module/ - they can be included in
-# any port once their prerequisites in common-hal are complete.
-# Requires DigitalIO:
-CIRCUITPY_BITBANGIO = 1
-# Requires DigitalIO
-CIRCUITPY_GAMEPAD = 0
-# Requires neopixel_write or SPI (dotstar)
-CIRCUITPY_PIXELBUF = 1
-# Requires OS
-CIRCUITPY_RANDOM = 1
-# Requires OS, filesystem
-CIRCUITPY_STORAGE = 1
-# Requires Microcontroller
-CIRCUITPY_TOUCHIO = 0
-# Requires USB
-CIRCUITPY_USB = 1
-CIRCUITPY_USB_MSC = 1
-CIRCUITPY_USB_HID = 1
-CIRCUITPY_USB_MIDI = 1
-USB_NUM_ENDPOINT_PAIRS = 8
-# Does nothing without I2C
-CIRCUITPY_REQUIRE_I2C_PULLUPS = 0
-# No requirements, but takes extra flash
-CIRCUITPY_ULAB = 0
+CIRCUITPY_NVM = 0
+CIRCUITPY_PARALLELDISPLAY = 0
+CIRCUITPY_PULSEIO = 0
+CIRCUITPY_PWMIO = 0
+CIRCUITPY_ROTARYIO = 0
+CIRCUITPY_RTC = 0
 
+CIRCUITPY_SDIOIO = 1
 CIRCUITPY_VIDEOCORE = 1
 
-CIRCUITPY_ERRNO = 0
-
-CIRCUITPY_FULL_BUILD = 0
-
 INTERNAL_FLASH_FILESYSTEM = 1
+
+USB_NUM_ENDPOINT_PAIRS = 8
+USB_HIGHSPEED = 1
diff --git a/ports/broadcom/mphalport.h b/ports/broadcom/mphalport.h
index 1efd931974..d67c9f4a50 100644
--- a/ports/broadcom/mphalport.h
+++ b/ports/broadcom/mphalport.h
@@ -1,26 +1,51 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2022 Scott Shawcroft
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
+#ifndef MICROPY_INCLUDED_BROADCOM_MPHALPORT_H
+#define MICROPY_INCLUDED_BROADCOM_MPHALPORT_H
+
 #include <stdint.h>
 #include "py/obj.h"
 
+
+#include "supervisor/shared/tick.h"
+
 void mp_hal_delay_ms(mp_uint_t ms);
 void mp_hal_delay_us(mp_uint_t us);
-mp_uint_t mp_hal_ticks_cpu(void);
-mp_uint_t mp_hal_ticks_us(void);
-mp_uint_t mp_hal_ticks_ms(void);
+
+#define mp_hal_ticks_ms()       ((mp_uint_t)supervisor_ticks_ms32())
 
 void mp_hal_set_interrupt_char(int c);
 int mp_hal_stdin_rx_chr(void);
 void mp_hal_stdout_tx_strn(const char *str, size_t len);
 
-typedef enum std_io_t {
-    MINI_UART = 0,
-    UART,
-    UART_QEMU
-} std_io_t;
-
-void uart_init(std_io_t interface);
-
 #ifdef MICROPY_HW_USBHOST
 #include "usbkbd.h"
 
 void usbkbd_setup();
 #endif
+
+#endif // MICROPY_INCLUDED_BROADCOM_MPHALPORT_H