diff --git a/arch/xtensa/src/esp32/Kconfig b/arch/xtensa/src/esp32/Kconfig
index 5263d6c5b70..3d7592362c5 100644
--- a/arch/xtensa/src/esp32/Kconfig
+++ b/arch/xtensa/src/esp32/Kconfig
@@ -5,6 +5,194 @@
 
 if ARCH_CHIP_ESP32
 
+menu "ESP32 Peripheral Selection"
+
+config ESP32_BT
+	bool "Bluetooth"
+	default n
+	depends on EXPERIMENTAL
+	---help---
+		No yet implemented
+
+config ESP32_EMAC
+	bool "Ethernet MAC"
+	default n
+	depends on EXPERIMENTAL
+	---help---
+		No yet implemented
+
+config ESP32_I2C
+	bool "I2C"
+	default n
+	depends on EXPERIMENTAL
+	---help---
+		No yet implemented
+
+config ESP32_I2S0
+	bool "I2S 0"
+	default n
+	depends on EXPERIMENTAL
+	---help---
+		No yet implemented
+
+config ESP32_I2S1
+	bool "I2S 2"
+	default n
+	depends on EXPERIMENTAL
+	---help---
+		No yet implemented
+
+config ESP32_LEDC
+	bool "LED PWM (LEDC)"
+	default n
+	depends on EXPERIMENTAL
+	---help---
+		No yet implemented
+
+config ESP32_PCNT
+	bool "Pulse Count Module (PCNT)"
+	default n
+	depends on EXPERIMENTAL
+	---help---
+		No yet implemented
+
+config ESP32_RMT
+	bool "Remote Control Module (RMT)"
+	default n
+	depends on EXPERIMENTAL
+	---help---
+		No yet implemented
+
+config ESP32_SDIO_SAVE
+	bool "SDIO Slave"
+	default n
+	depends on EXPERIMENTAL
+	---help---
+		No yet implemented
+
+config ESP32_SDMMC
+	bool "SD/MMC card support"
+	default n
+	depends on EXPERIMENTAL
+	---help---
+		No yet implemented
+
+config ESP32_SPI0
+	bool "SPI 0"
+	default n
+	depends on EXPERIMENTAL
+	---help---
+		No yet implemented
+
+config ESP32_SPI1
+	bool "SPI 1"
+	default n
+	depends on EXPERIMENTAL
+	---help---
+		No yet implemented
+
+config ESP32_SPI2
+	bool "SPI 2"
+	default n
+	---help---
+		No yet implemented
+
+config XTENSA_TIMER1
+	bool "Xtensa Timer 1"
+	default n
+
+config XTENSA_TIMER2
+	bool "Xtensa Timer 2"
+	default n
+
+config ESP32_TIMER0
+	bool "64-bit Timer 0"
+	default n
+	depends on EXPERIMENTAL
+	---help---
+		No yet implemented
+
+config ESP32_TIMER1
+	bool "64-bit Timer 1"
+	default n
+	depends on EXPERIMENTAL
+	---help---
+		No yet implemented
+
+config ESP32_TIMER2
+	bool "64-bit Timer 2"
+	default n
+	depends on EXPERIMENTAL
+	---help---
+		No yet implemented
+
+config ESP32_TIMER3
+	bool "64-bit Timer 3"
+	default n
+	depends on EXPERIMENTAL
+	---help---
+		No yet implemented
+
+config ESP32_MWDT0
+	bool "Timer 0 Watchdog"
+	default n
+	depends on EXPERIMENTAL
+	select ESP32_TIMER0
+	---help---
+		No yet implemented
+
+config ESP32_MWDT1
+	bool "Timer 1 Watchdog"
+	default n
+	depends on EXPERIMENTAL
+	select ESP32_TIMER1
+	---help---
+		No yet implemented
+
+config ESP32_MWDT2
+	bool "Timer 2 Watchdog"
+	default n
+	depends on EXPERIMENTAL
+	select ESP32_TIMER2
+	---help---
+		No yet implemented
+
+config ESP32_MWDT3
+	bool "Timer 3 Watchdog"
+	default n
+	depends on EXPERIMENTAL
+	select ESP32_TIMER3
+	---help---
+		No yet implemented
+
+config ESP32_RWDT
+	bool "RTC Watchdog"
+	default n
+	depends on EXPERIMENTAL
+	---help---
+		No yet implemented
+
+config ESP32_UART0
+	bool "UART 0"
+	default n
+
+config ESP32_UART1
+	bool "UART 1"
+	default n
+
+config ESP32_UART2
+	bool "UART 2"
+	default n
+
+config ESP32_WIRELESS
+	bool "Wireless"
+	default n
+	depends on EXPERIMENTAL
+	---help---
+		No yet implemented
+
+endmenu # ESP32 Peripheral Selection
+
 config ESP32_BT_RESERVE_DRAM
 	int "Reserved BT DRAM"
 	default 0
diff --git a/arch/xtensa/src/esp32/chip/esp32_soc.h b/arch/xtensa/src/esp32/chip/esp32_soc.h
index 20405c067db..0073508ab6a 100644
--- a/arch/xtensa/src/esp32/chip/esp32_soc.h
+++ b/arch/xtensa/src/esp32/chip/esp32_soc.h
@@ -7,7 +7,8 @@
  *   Author: Gregory Nutt <gnutt@nuttx.org>
  *
  * Derives from logic originally provided by Espressif Systems:
- * Copyright 2010-2016 Espressif Systems (Shanghai) PTE LTD
+ *
+ *   Copyright 2010-2016 Espressif Systems (Shanghai) PTE LTD
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/configs/esp32-core/README.txt b/configs/esp32-core/README.txt
index 50fd2d273d3..1f0ff0d717f 100644
--- a/configs/esp32-core/README.txt
+++ b/configs/esp32-core/README.txt
@@ -79,7 +79,8 @@ ESP32 Toolchain
 Serial Console
 ==============
 
-  To be provided
+  USART0 is, by default, the serial console.  It connects to the on-board
+  CP2102 converter and is available on the USB connector USB CON8 (J1).
 
 Buttons and LEDs
 ================