diff --git a/configs/sam4l-xplained/README.txt b/configs/sam4l-xplained/README.txt
index ea97942f7a8..8d3784b3ee6 100644
--- a/configs/sam4l-xplained/README.txt
+++ b/configs/sam4l-xplained/README.txt
@@ -329,15 +329,61 @@ SAM4L Xplained Pro-specific Configuration Options
 
   Individual subsystems can be enabled:
 
-    CONFIG_SAM34_DMA
-    CONFIG_SAM34_HSMCI
-    CONFIG_SAM34_NAND
+    CPU
+    ---
+    CONFIG_SAM34_OCD
+
+    HSB
+    ---
+    CONFIG_SAM34_APBA
+    CONFIG_SAM34_AESA
+
+    PBA
+    ---
+    CONFIG_SAM34_IISC
     CONFIG_SAM34_SPI
-    CONFIG_SAM34_UART
+    CONFIG_SAM34_TC0
+    CONFIG_SAM34_TC1
+    CONFIG_SAM34_TWIM0
+    CONFIG_SAM34_TWIS0
+    CONFIG_SAM34_TWIM1
+    CONFIG_SAM34_TWIS1
     CONFIG_SAM34_USART0
     CONFIG_SAM34_USART1
     CONFIG_SAM34_USART2
     CONFIG_SAM34_USART3
+    CONFIG_SAM34_ADCIFE
+    CONFIG_SAM34_DACC
+    CONFIG_SAM34_ACIFC
+    CONFIG_SAM34_GLOC
+    CONFIG_SAM34_ABDACB
+    CONFIG_SAM34_TRNG
+    CONFIG_SAM34_PARC
+    CONFIG_SAM34_CATB
+    CONFIG_SAM34_TWIM2
+    CONFIG_SAM34_TWIM3
+    CONFIG_SAM34_LCDCA
+
+    PBB
+    ---
+    CONFIG_SAM34_HRAMC1
+    CONFIG_SAM34_HMATRIX
+    CONFIG_SAM34_PDCA
+    CONFIG_SAM34_CRCCU
+    CONFIG_SAM34_USBC
+    CONFIG_SAM34_PEVC
+
+    PBC
+    ---
+    CONFIG_SAM34_CHIPID
+    CONFIG_SAM34_FREQM
+
+    PBD
+    ---
+    CONFIG_SAM34_AST
+    CONFIG_SAM34_WDT
+    CONFIG_SAM34_EIC
+    CONFIG_SAM34_PICOUART
 
   Some subsystems can be configured to operate in different ways. The drivers
   need to know how to configure the subsystem.
diff --git a/configs/sam4l-xplained/ostest/defconfig b/configs/sam4l-xplained/ostest/defconfig
index a33d555fa5e..6d4bcab946f 100644
--- a/configs/sam4l-xplained/ostest/defconfig
+++ b/configs/sam4l-xplained/ostest/defconfig
@@ -127,18 +127,47 @@ CONFIG_ARCH_CHIP_SAM4L=y
 # AT91SAM3 Peripheral Support
 #
 CONFIG_SAM_PICOCACHE=y
-# CONFIG_SAM34_DMA is not set
-# CONFIG_SAM34_NAND is not set
-# CONFIG_SAM34_HSMCI is not set
-# CONFIG_SAM34_UART is not set
+# CONFIG_SAM34_OCD is not set
+# CONFIG_SAM34_APBA is not set
+# CONFIG_SAM34_AESA is not set
+# CONFIG_SAM34_IISC is not set
+# CONFIG_SAM34_SPI is not set
+# CONFIG_SAM34_TC0 is not set
+# CONFIG_SAM34_TC1 is not set
+# CONFIG_SAM34_TWIM0 is not set
+# CONFIG_SAM34_TWIS0 is not set
+# CONFIG_SAM34_TWIM1 is not set
+# CONFIG_SAM34_TWIS1 is not set
+# CONFIG_SAM34_TWIM2 is not set
+# CONFIG_SAM34_TWIM3 is not set
+# CONFIG_SAM34_PICOUART is not set
 # CONFIG_SAM34_USART0 is not set
 CONFIG_SAM34_USART1=y
 # CONFIG_SAM34_USART2 is not set
 # CONFIG_SAM34_USART3 is not set
-# CONFIG_SAM34_SPI is not set
+# CONFIG_SAM34_ADCIFE is not set
+# CONFIG_SAM34_DACC is not set
+# CONFIG_SAM34_ACIFC is not set
+# CONFIG_SAM34_GLOC is not set
+# CONFIG_SAM34_ABDACB is not set
+# CONFIG_SAM34_TRNG is not set
+# CONFIG_SAM34_PARC is not set
+# CONFIG_SAM34_CATB is not set
+# CONFIG_SAM34_LCDCA is not set
+# CONFIG_SAM34_HRAMC1 is not set
+# CONFIG_SAM34_HMATRIX is not set
+# CONFIG_SAM34_PDCA is not set
+# CONFIG_SAM34_CRCCU is not set
+# CONFIG_SAM34_USBC is not set
+# CONFIG_SAM34_PEVC is not set
+# CONFIG_SAM34_CHIPID is not set
+# CONFIG_SAM34_FREQM is not set
+# CONFIG_SAM34_AST is not set
+# CONFIG_SAM34_WDT is not set
+# CONFIG_SAM34_EIC is not set
 
 #
-# AT91SAM3 UART Configuration
+# AT91SAM3/4 USART Configuration
 #
 CONFIG_USART1_ISUART=y