diff --git a/adafruit_platformdetect/board.py b/adafruit_platformdetect/board.py
index 1ccfb53..820028c 100644
--- a/adafruit_platformdetect/board.py
+++ b/adafruit_platformdetect/board.py
@@ -93,6 +93,8 @@ def id(self):
             board_id = boards.FEATHER_M0_EXPRESS
         elif chip_id == chips.STM32F405:
             board_id = boards.PYBOARD
+        elif chip_id == chips.RP2040:
+            board_id = boards.RASPBERRY_PI_PICO
         elif chip_id == chips.S805:
             board_id = boards.ODROID_C1
         elif chip_id == chips.S905:
diff --git a/adafruit_platformdetect/chip.py b/adafruit_platformdetect/chip.py
index dcaffec..57151e8 100644
--- a/adafruit_platformdetect/chip.py
+++ b/adafruit_platformdetect/chip.py
@@ -147,6 +147,9 @@ def id(
         if platform == "pyboard":
             self._chip_id = chips.STM32F405
             return self._chip_id
+        if platform == "rp2":
+            self._chip_id = chips.RP2040
+            return self._chip_id
         # nothing found!
         return None
 
diff --git a/adafruit_platformdetect/constants/boards.py b/adafruit_platformdetect/constants/boards.py
index 53b0b24..bc8b9e3 100644
--- a/adafruit_platformdetect/constants/boards.py
+++ b/adafruit_platformdetect/constants/boards.py
@@ -24,6 +24,7 @@
 GENERIC_LINUX_PC = "GENERIC_LINUX_PC"
 PYBOARD = "PYBOARD"
 NODEMCU = "NODEMCU"
+RASPBERRY_PI_PICO = "RASPBERRY_PI_PICO"
 GIANT_BOARD = "GIANT_BOARD"
 
 # ASUS Tinker Boards
diff --git a/adafruit_platformdetect/constants/chips.py b/adafruit_platformdetect/constants/chips.py
index 4433005..da9e65d 100644
--- a/adafruit_platformdetect/constants/chips.py
+++ b/adafruit_platformdetect/constants/chips.py
@@ -41,6 +41,7 @@
 RK3288 = "RK3288"
 PENTIUM_N3710 = "PENTIUM_N3710"  # SOC Braswell core
 STM32F405 = "STM32F405"
+RP2040 = "RP2040"
 STM32MP157 = "STM32MP157"
 MT8167 = "MT8167"
 ATOM_X5_Z8350 = "X5-Z8350"