cbmem console: Move the implementation from libpayload to depthcharge.
Change-Id: I8b74e17df1dca09352d40d6b7a93e74e0f6fcf9f
diff --git a/config/auron/defconfig b/config/auron/defconfig
index 65b15ef..a8143a3 100644
--- a/config/auron/defconfig
+++ b/config/auron/defconfig
@@ -25,6 +25,7 @@
# Drivers
CONFIG_DRIVER_AHCI=y
CONFIG_DRIVER_BLOCKDEV_USB=y
+CONFIG_DRIVER_CONSOLE_CBMEM=y
CONFIG_DRIVER_CONSOLE_DISPLAY=y
CONFIG_DRIVER_CONSOLE_UART=y
CONFIG_DRIVER_DISPLAY_FRAMEBUFFER=y
@@ -43,7 +44,5 @@
CONFIG_DRIVER_USB_HID=y
# libpayload
-CONFIG_CBMEM_CONSOLE=y
-
CONFIG_USB=y
CONFIG_USB_XHCI=y
diff --git a/config/bayleybay/defconfig b/config/bayleybay/defconfig
index 66da942..c8a28c3 100644
--- a/config/bayleybay/defconfig
+++ b/config/bayleybay/defconfig
@@ -29,6 +29,7 @@
CONFIG_DRIVER_BLOCKDEV_SDHCI=y
CONFIG_DRIVER_BLOCKDEV_SDHCI_PCI=y
CONFIG_DRIVER_BLOCKDEV_USB=y
+CONFIG_DRIVER_CONSOLE_CBMEM=y
CONFIG_DRIVER_CONSOLE_DISPLAY=y
CONFIG_DRIVER_CONSOLE_UART=y
CONFIG_DRIVER_DISPLAY_FRAMEBUFFER=y
@@ -44,7 +45,5 @@
CONFIG_DRIVER_USB_HID=y
# libpayload
-CONFIG_CBMEM_CONSOLE=y
-
CONFIG_USB=y
CONFIG_USB_XHCI=y
diff --git a/config/bolt/defconfig b/config/bolt/defconfig
index 7baa5ad..2323b26 100644
--- a/config/bolt/defconfig
+++ b/config/bolt/defconfig
@@ -25,6 +25,7 @@
# Drivers
CONFIG_DRIVER_AHCI=y
CONFIG_DRIVER_BLOCKDEV_USB=y
+CONFIG_DRIVER_CONSOLE_CBMEM=y
CONFIG_DRIVER_CONSOLE_DISPLAY=y
CONFIG_DRIVER_CONSOLE_UART=y
CONFIG_DRIVER_DISPLAY_FRAMEBUFFER=y
@@ -44,8 +45,6 @@
CONFIG_DRIVER_USB_HID=y
# libpayload
-CONFIG_CBMEM_CONSOLE=y
-
CONFIG_USB=y
CONFIG_USB_EHCI=y
CONFIG_USB_OHCI=y
diff --git a/config/chell/defconfig b/config/chell/defconfig
index a2d9dcd..fdb8e47 100644
--- a/config/chell/defconfig
+++ b/config/chell/defconfig
@@ -29,6 +29,7 @@
CONFIG_DRIVER_BLOCKDEV_USB=y
CONFIG_DRIVER_BUS_I2C_DESIGNWARE=y
CONFIG_DRIVER_BUS_I2C_DESIGNWARE_PCI=y
+CONFIG_DRIVER_CONSOLE_CBMEM=y
CONFIG_DRIVER_CONSOLE_DISPLAY=y
CONFIG_DRIVER_CONSOLE_UART=y
CONFIG_DRIVER_DISPLAY_FRAMEBUFFER=y
@@ -50,7 +51,5 @@
CONFIG_DRIVER_USB_HID=y
# libpayload
-CONFIG_CBMEM_CONSOLE=y
-
CONFIG_USB=y
CONFIG_USB_XHCI=y
diff --git a/config/daisy/defconfig b/config/daisy/defconfig
index 7faed69..38c7688 100644
--- a/config/daisy/defconfig
+++ b/config/daisy/defconfig
@@ -31,6 +31,7 @@
CONFIG_DRIVER_BUS_I2C_S3C24X0=y
CONFIG_DRIVER_BUS_I2S_EXYNOS5=y
CONFIG_DRIVER_BUS_SPI_EXYNOS5=y
+CONFIG_DRIVER_CONSOLE_CBMEM=y
CONFIG_DRIVER_CONSOLE_DISPLAY=y
CONFIG_DRIVER_CONSOLE_UART=y
CONFIG_DRIVER_DISPLAY_FRAMEBUFFER=y
@@ -53,8 +54,6 @@
CONFIG_DRIVER_USB_HID=y
# libpayload
-CONFIG_CBMEM_CONSOLE=y
-
CONFIG_USB=y
CONFIG_USB_EHCI=y
CONFIG_USB_OHCI=y
diff --git a/config/falco/defconfig b/config/falco/defconfig
index 04adfe2..9638fd4 100644
--- a/config/falco/defconfig
+++ b/config/falco/defconfig
@@ -25,6 +25,7 @@
# Drivers
CONFIG_DRIVER_AHCI=y
CONFIG_DRIVER_BLOCKDEV_USB=y
+CONFIG_DRIVER_CONSOLE_CBMEM=y
CONFIG_DRIVER_CONSOLE_DISPLAY=y
CONFIG_DRIVER_CONSOLE_UART=y
CONFIG_DRIVER_DISPLAY_FRAMEBUFFER=y
@@ -44,8 +45,6 @@
CONFIG_DRIVER_USB_HID=y
# libpayload
-CONFIG_CBMEM_CONSOLE=y
-
CONFIG_USB=y
CONFIG_USB_EHCI=y
CONFIG_USB_OHCI=y
diff --git a/config/foster/defconfig b/config/foster/defconfig
index 28d35c8..b344b9b 100644
--- a/config/foster/defconfig
+++ b/config/foster/defconfig
@@ -51,7 +51,7 @@
CONFIG_DRIVER_USB_HID=y
# libpayload
-CONFIG_CBMEM_CONSOLE=y
+CONFIG_DRIVER_CONSOLE_CBMEM=y
CONFIG_USB=y
CONFIG_USB_EHCI=y
diff --git a/config/glados/defconfig b/config/glados/defconfig
index cd449fd..e2c87cf 100644
--- a/config/glados/defconfig
+++ b/config/glados/defconfig
@@ -28,6 +28,7 @@
CONFIG_DRIVER_BLOCKDEV_USB=y
CONFIG_DRIVER_BUS_I2C_DESIGNWARE=y
CONFIG_DRIVER_BUS_I2C_DESIGNWARE_PCI=y
+CONFIG_DRIVER_CONSOLE_CBMEM=y
CONFIG_DRIVER_CONSOLE_DISPLAY=y
CONFIG_DRIVER_CONSOLE_UART=y
CONFIG_DRIVER_DISPLAY_FRAMEBUFFER=y
@@ -49,7 +50,5 @@
CONFIG_DRIVER_USB_HID=y
# libpayload
-CONFIG_CBMEM_CONSOLE=y
-
CONFIG_USB=y
CONFIG_USB_XHCI=y
diff --git a/config/jecht/defconfig b/config/jecht/defconfig
index d9c2a61..837e002 100644
--- a/config/jecht/defconfig
+++ b/config/jecht/defconfig
@@ -25,6 +25,7 @@
# Drivers
CONFIG_DRIVER_AHCI=y
CONFIG_DRIVER_BLOCKDEV_USB=y
+CONFIG_DRIVER_CONSOLE_CBMEM=y
CONFIG_DRIVER_CONSOLE_DISPLAY=y
CONFIG_DRIVER_CONSOLE_UART=y
CONFIG_DRIVER_DISPLAY_FRAMEBUFFER=y
@@ -41,7 +42,5 @@
CONFIG_DRIVER_USB_HID=y
# libpayload
-CONFIG_CBMEM_CONSOLE=y
-
CONFIG_USB=y
CONFIG_USB_XHCI=y
diff --git a/config/link/defconfig b/config/link/defconfig
index b158531..bcd5617 100644
--- a/config/link/defconfig
+++ b/config/link/defconfig
@@ -25,6 +25,7 @@
# Drivers
CONFIG_DRIVER_AHCI=y
CONFIG_DRIVER_BLOCKDEV_USB=y
+CONFIG_DRIVER_CONSOLE_CBMEM=y
CONFIG_DRIVER_CONSOLE_DISPLAY=y
CONFIG_DRIVER_CONSOLE_UART=y
CONFIG_DRIVER_DISPLAY_FRAMEBUFFER=y
@@ -43,8 +44,6 @@
CONFIG_DRIVER_USB_HID=y
# libpayload
-CONFIG_CBMEM_CONSOLE=y
-
CONFIG_USB=y
CONFIG_USB_EHCI=y
CONFIG_USB_OHCI=y
diff --git a/config/nyan/defconfig b/config/nyan/defconfig
index 6e01a26..72b71b2 100644
--- a/config/nyan/defconfig
+++ b/config/nyan/defconfig
@@ -31,6 +31,7 @@
CONFIG_DRIVER_BUS_I2C_TEGRA=y
CONFIG_DRIVER_BUS_I2S_TEGRA=y
CONFIG_DRIVER_BUS_SPI_TEGRA=y
+CONFIG_DRIVER_CONSOLE_CBMEM=y
CONFIG_DRIVER_CONSOLE_DISPLAY=y
CONFIG_DRIVER_CONSOLE_UART=y
CONFIG_DRIVER_DISPLAY_FRAMEBUFFER=y
@@ -55,8 +56,6 @@
CONFIG_DRIVER_USB_HID=y
# libpayload
-CONFIG_CBMEM_CONSOLE=y
-
CONFIG_USB=y
CONFIG_USB_EHCI=y
CONFIG_USB_UHCI=y
diff --git a/config/nyan_big/defconfig b/config/nyan_big/defconfig
index 7b114de..b9cf4b3 100644
--- a/config/nyan_big/defconfig
+++ b/config/nyan_big/defconfig
@@ -31,6 +31,7 @@
CONFIG_DRIVER_BUS_I2C_TEGRA=y
CONFIG_DRIVER_BUS_I2S_TEGRA=y
CONFIG_DRIVER_BUS_SPI_TEGRA=y
+CONFIG_DRIVER_CONSOLE_CBMEM=y
CONFIG_DRIVER_CONSOLE_DISPLAY=y
CONFIG_DRIVER_CONSOLE_UART=y
CONFIG_DRIVER_DISPLAY_FRAMEBUFFER=y
@@ -55,8 +56,6 @@
CONFIG_DRIVER_USB_HID=y
# libpayload
-CONFIG_CBMEM_CONSOLE=y
-
CONFIG_USB=y
CONFIG_USB_EHCI=y
CONFIG_USB_UHCI=y
diff --git a/config/nyan_blaze/defconfig b/config/nyan_blaze/defconfig
index f8aea68..6b9cff6 100644
--- a/config/nyan_blaze/defconfig
+++ b/config/nyan_blaze/defconfig
@@ -31,6 +31,7 @@
CONFIG_DRIVER_BUS_I2C_TEGRA=y
CONFIG_DRIVER_BUS_I2S_TEGRA=y
CONFIG_DRIVER_BUS_SPI_TEGRA=y
+CONFIG_DRIVER_CONSOLE_CBMEM=y
CONFIG_DRIVER_CONSOLE_DISPLAY=y
CONFIG_DRIVER_CONSOLE_UART=y
CONFIG_DRIVER_DISPLAY_FRAMEBUFFER=y
@@ -55,8 +56,6 @@
CONFIG_DRIVER_USB_HID=y
# libpayload
-CONFIG_CBMEM_CONSOLE=y
-
CONFIG_USB=y
CONFIG_USB_EHCI=y
CONFIG_USB_UHCI=y
diff --git a/config/panther/defconfig b/config/panther/defconfig
index 53ed9a9..7f53fba 100644
--- a/config/panther/defconfig
+++ b/config/panther/defconfig
@@ -25,6 +25,7 @@
# Drivers
CONFIG_DRIVER_AHCI=y
CONFIG_DRIVER_BLOCKDEV_USB=y
+CONFIG_DRIVER_CONSOLE_CBMEM=y
CONFIG_DRIVER_CONSOLE_DISPLAY=y
CONFIG_DRIVER_CONSOLE_UART=y
CONFIG_DRIVER_DISPLAY_FRAMEBUFFER=y
@@ -41,7 +42,5 @@
CONFIG_DRIVER_USB_HID=y
# libpayload
-CONFIG_CBMEM_CONSOLE=y
-
CONFIG_USB=y
CONFIG_USB_XHCI=y
diff --git a/config/peach_pit/defconfig b/config/peach_pit/defconfig
index e9d8c8a..4e552fd 100644
--- a/config/peach_pit/defconfig
+++ b/config/peach_pit/defconfig
@@ -53,7 +53,7 @@
CONFIG_DRIVER_USB_HID=y
# libpayload
-CONFIG_CBMEM_CONSOLE=y
+CONFIG_DRIVER_CONSOLE_CBMEM=y
CONFIG_USB=y
CONFIG_USB_UHCI=y
diff --git a/config/peppy/defconfig b/config/peppy/defconfig
index f00a187..ef80c07 100644
--- a/config/peppy/defconfig
+++ b/config/peppy/defconfig
@@ -44,7 +44,7 @@
CONFIG_DRIVER_USB_HID=y
# libpayload
-CONFIG_CBMEM_CONSOLE=y
+CONFIG_DRIVER_CONSOLE_CBMEM=y
CONFIG_USB=y
CONFIG_USB_EHCI=y
diff --git a/config/qemu-x86/defconfig b/config/qemu-x86/defconfig
index d55ed36..e8cabc9 100644
--- a/config/qemu-x86/defconfig
+++ b/config/qemu-x86/defconfig
@@ -21,6 +21,7 @@
CONFIG_KERNEL_ZIMAGE=y
# Drivers
+CONFIG_DRIVER_CONSOLE_CBMEM=y
CONFIG_DRIVER_CONSOLE_UART=y
CONFIG_DRIVER_KEYBOARD_PS2=y
CONFIG_DRIVER_LAYOUT_DCDIR=y
@@ -28,6 +29,3 @@
CONFIG_DRIVER_STORAGE_MEMORY=y
CONFIG_DRIVER_TIMER_RDTSC=y
CONFIG_DRIVER_UART_8250=y
-
-# libpayload
-CONFIG_CBMEM_CONSOLE=y
diff --git a/config/rambi/defconfig b/config/rambi/defconfig
index 0e223c5..04a0f8d 100644
--- a/config/rambi/defconfig
+++ b/config/rambi/defconfig
@@ -30,6 +30,7 @@
CONFIG_DRIVER_BUS_I2C_DESIGNWARE=y
CONFIG_DRIVER_BUS_I2S_BAYTRAIL=y
CONFIG_DRIVER_BUS_I2S_BAYTRAIL_MAX98090=y
+CONFIG_DRIVER_CONSOLE_CBMEM=y
CONFIG_DRIVER_CONSOLE_DISPLAY=y
CONFIG_DRIVER_CONSOLE_UART=y
CONFIG_DRIVER_DISPLAY_FRAMEBUFFER=y
@@ -51,8 +52,6 @@
CONFIG_DRIVER_USB_HID=y
# libpayload
-CONFIG_CBMEM_CONSOLE=y
-
CONFIG_USB=y
CONFIG_USB_EHCI=y
CONFIG_USB_XHCI=y
diff --git a/config/rush/defconfig b/config/rush/defconfig
index 09565a7..2294001 100644
--- a/config/rush/defconfig
+++ b/config/rush/defconfig
@@ -31,6 +31,7 @@
CONFIG_DRIVER_BUS_I2C_TEGRA=y
CONFIG_DRIVER_BUS_I2S_TEGRA=y
CONFIG_DRIVER_BUS_SPI_TEGRA=y
+CONFIG_DRIVER_CONSOLE_CBMEM=y
CONFIG_DRIVER_CONSOLE_DISPLAY=y
CONFIG_DRIVER_CONSOLE_UART=y
CONFIG_DRIVER_DISPLAY_FRAMEBUFFER=y
@@ -55,8 +56,6 @@
CONFIG_DRIVER_USB_HID=y
# libpayload
-CONFIG_CBMEM_CONSOLE=y
-
CONFIG_USB=y
CONFIG_USB_EHCI=y
CONFIG_USB_UHCI=y
diff --git a/config/rush_ryu/defconfig b/config/rush_ryu/defconfig
index 11e6af4..be8c8e1 100644
--- a/config/rush_ryu/defconfig
+++ b/config/rush_ryu/defconfig
@@ -31,6 +31,7 @@
CONFIG_DRIVER_BUS_I2C_TEGRA=y
CONFIG_DRIVER_BUS_I2S_TEGRA=y
CONFIG_DRIVER_BUS_SPI_TEGRA=y
+CONFIG_DRIVER_CONSOLE_CBMEM=y
CONFIG_DRIVER_CONSOLE_DISPLAY=y
CONFIG_DRIVER_CONSOLE_UART=y
CONFIG_DRIVER_DISPLAY_FRAMEBUFFER=y
@@ -54,8 +55,6 @@
CONFIG_DRIVER_USB_HID=y
# libpayload
-CONFIG_CBMEM_CONSOLE=y
-
CONFIG_USB=y
CONFIG_USB_EHCI=y
CONFIG_USB_UHCI=y
diff --git a/config/samus-cb/defconfig b/config/samus-cb/defconfig
index 993bc9d..fb092b4 100644
--- a/config/samus-cb/defconfig
+++ b/config/samus-cb/defconfig
@@ -31,6 +31,7 @@
CONFIG_DRIVER_BUS_I2C_DESIGNWARE=y
CONFIG_DRIVER_BUS_I2S_BROADWELL=y
CONFIG_DRIVER_BUS_I2S_BROADWELL_ALC5677=y
+CONFIG_DRIVER_CONSOLE_CBMEM=y
CONFIG_DRIVER_CONSOLE_DISPLAY=y
CONFIG_DRIVER_CONSOLE_UART=y
CONFIG_DRIVER_DISPLAY_FRAMEBUFFER=y
@@ -52,7 +53,5 @@
CONFIG_DRIVER_USB_HID=y
# libpayload
-CONFIG_CBMEM_CONSOLE=y
-
CONFIG_USB=y
CONFIG_USB_XHCI=y
diff --git a/config/samus/defconfig b/config/samus/defconfig
index 48ab375..a2077b5 100644
--- a/config/samus/defconfig
+++ b/config/samus/defconfig
@@ -30,6 +30,7 @@
CONFIG_DRIVER_BUS_I2C_DESIGNWARE=y
CONFIG_DRIVER_BUS_I2S_BROADWELL=y
CONFIG_DRIVER_BUS_I2S_BROADWELL_ALC5677=y
+CONFIG_DRIVER_CONSOLE_CBMEM=y
CONFIG_DRIVER_CONSOLE_DISPLAY=y
CONFIG_DRIVER_CONSOLE_UART=y
CONFIG_DRIVER_DISPLAY_FRAMEBUFFER=y
@@ -51,7 +52,5 @@
CONFIG_DRIVER_USB_HID=y
# libpayload
-CONFIG_CBMEM_CONSOLE=y
-
CONFIG_USB=y
CONFIG_USB_XHCI=y
diff --git a/config/slippy/defconfig b/config/slippy/defconfig
index 051dc7e..9b09f90 100644
--- a/config/slippy/defconfig
+++ b/config/slippy/defconfig
@@ -25,6 +25,7 @@
# Drivers
CONFIG_DRIVER_AHCI=y
CONFIG_DRIVER_BLOCKDEV_USB=y
+CONFIG_DRIVER_CONSOLE_CBMEM=y
CONFIG_DRIVER_CONSOLE_DISPLAY=y
CONFIG_DRIVER_CONSOLE_UART=y
CONFIG_DRIVER_DISPLAY_FRAMEBUFFER=y
@@ -44,8 +45,6 @@
CONFIG_DRIVER_USB_HID=y
# libpayload
-CONFIG_CBMEM_CONSOLE=y
-
CONFIG_USB=y
CONFIG_USB_EHCI=y
CONFIG_USB_OHCI=y
diff --git a/config/smaug/defconfig b/config/smaug/defconfig
index 5a1bfee..375d28a 100644
--- a/config/smaug/defconfig
+++ b/config/smaug/defconfig
@@ -31,6 +31,7 @@
CONFIG_DRIVER_BUS_I2C_TEGRA=y
CONFIG_DRIVER_BUS_I2S_TEGRA=y
CONFIG_DRIVER_BUS_SPI_TEGRA=y
+CONFIG_DRIVER_CONSOLE_CBMEM=y
CONFIG_DRIVER_CONSOLE_DISPLAY=y
CONFIG_DRIVER_CONSOLE_UART=y
CONFIG_DRIVER_DISPLAY_FRAMEBUFFER=y
@@ -53,8 +54,6 @@
CONFIG_DRIVER_USB_HID=y
# libpayload
-CONFIG_CBMEM_CONSOLE=y
-
CONFIG_USB=y
CONFIG_USB_EHCI=y
CONFIG_USB_UHCI=y
diff --git a/config/strago/defconfig b/config/strago/defconfig
index 34613b6..05d5399 100755
--- a/config/strago/defconfig
+++ b/config/strago/defconfig
@@ -25,6 +25,7 @@
CONFIG_DRIVER_BLOCKDEV_SDHCI=y
CONFIG_DRIVER_BLOCKDEV_SDHCI_PCI=y
CONFIG_DRIVER_BLOCKDEV_USB=y
+CONFIG_DRIVER_CONSOLE_CBMEM=y
CONFIG_DRIVER_CONSOLE_DISPLAY=y
CONFIG_DRIVER_CONSOLE_UART=y
CONFIG_DRIVER_DISPLAY_FRAMEBUFFER=y
@@ -42,8 +43,6 @@
# libpayload
-CONFIG_CBMEM_CONSOLE=y
-
CONFIG_USB=y
CONFIG_USB_EHCI=y
CONFIG_USB_XHCI=y
diff --git a/config/uefi/defconfig b/config/uefi/defconfig
index c1916b1..ded41ee 100644
--- a/config/uefi/defconfig
+++ b/config/uefi/defconfig
@@ -27,6 +27,7 @@
# Drivers
CONFIG_DRIVER_BLOCKDEV_UEFI=y
+CONFIG_DRIVER_CONSOLE_CBMEM=y
CONFIG_DRIVER_CONSOLE_DISPLAY=y
CONFIG_DRIVER_CONSOLE_UEFI=y
CONFIG_DRIVER_DISPLAY_FRAMEBUFFER=y
@@ -37,6 +38,3 @@
CONFIG_DRIVER_STORAGE_FWDB=y
CONFIG_DRIVER_STORAGE_UEFI_NV=y
CONFIG_DRIVER_TIMER_RDTSC=y
-
-# libpayload
-CONFIG_CBMEM_CONSOLE=y
diff --git a/config/veyron_gus/defconfig b/config/veyron_gus/defconfig
index fd79209..6d0371c 100644
--- a/config/veyron_gus/defconfig
+++ b/config/veyron_gus/defconfig
@@ -32,6 +32,7 @@
CONFIG_DRIVER_BUS_I2C_ROCKCHIP=y
CONFIG_DRIVER_BUS_I2S_ROCKCHIP=y
CONFIG_DRIVER_BUS_SPI_ROCKCHIP=y
+CONFIG_DRIVER_CONSOLE_CBMEM=y
CONFIG_DRIVER_CONSOLE_DISPLAY=y
CONFIG_DRIVER_CONSOLE_UART=y
CONFIG_DRIVER_DISPLAY_FRAMEBUFFER=y
@@ -54,8 +55,6 @@
CONFIG_DRIVER_UART_8250=y
# libpayload
-CONFIG_CBMEM_CONSOLE=y
-
CONFIG_USB=y
CONFIG_USB_EHCI=y
CONFIG_USB_UHCI=y
diff --git a/config/veyron_jaq/defconfig b/config/veyron_jaq/defconfig
index 7c75482..df6b8b3 100644
--- a/config/veyron_jaq/defconfig
+++ b/config/veyron_jaq/defconfig
@@ -32,6 +32,7 @@
CONFIG_DRIVER_BUS_I2C_ROCKCHIP=y
CONFIG_DRIVER_BUS_I2S_ROCKCHIP=y
CONFIG_DRIVER_BUS_SPI_ROCKCHIP=y
+CONFIG_DRIVER_CONSOLE_CBMEM=y
CONFIG_DRIVER_CONSOLE_DISPLAY=y
CONFIG_DRIVER_CONSOLE_UART=y
CONFIG_DRIVER_DISPLAY_FRAMEBUFFER=y
@@ -54,8 +55,6 @@
CONFIG_DRIVER_UART_8250=y
# libpayload
-CONFIG_CBMEM_CONSOLE=y
-
CONFIG_USB=y
CONFIG_USB_EHCI=y
CONFIG_USB_UHCI=y
diff --git a/config/veyron_jerry/defconfig b/config/veyron_jerry/defconfig
index 1feaba5..5341b5f 100644
--- a/config/veyron_jerry/defconfig
+++ b/config/veyron_jerry/defconfig
@@ -32,6 +32,7 @@
CONFIG_DRIVER_BUS_I2C_ROCKCHIP=y
CONFIG_DRIVER_BUS_I2S_ROCKCHIP=y
CONFIG_DRIVER_BUS_SPI_ROCKCHIP=y
+CONFIG_DRIVER_CONSOLE_CBMEM=y
CONFIG_DRIVER_CONSOLE_DISPLAY=y
CONFIG_DRIVER_CONSOLE_UART=y
CONFIG_DRIVER_DISPLAY_FRAMEBUFFER=y
@@ -54,8 +55,6 @@
CONFIG_DRIVER_UART_8250=y
# libpayload
-CONFIG_CBMEM_CONSOLE=y
-
CONFIG_USB=y
CONFIG_USB_EHCI=y
CONFIG_USB_UHCI=y
diff --git a/config/veyron_mighty/defconfig b/config/veyron_mighty/defconfig
index 0091a8d..8494833 100644
--- a/config/veyron_mighty/defconfig
+++ b/config/veyron_mighty/defconfig
@@ -32,6 +32,7 @@
CONFIG_DRIVER_BUS_I2C_ROCKCHIP=y
CONFIG_DRIVER_BUS_I2S_ROCKCHIP=y
CONFIG_DRIVER_BUS_SPI_ROCKCHIP=y
+CONFIG_DRIVER_CONSOLE_CBMEM=y
CONFIG_DRIVER_CONSOLE_DISPLAY=y
CONFIG_DRIVER_CONSOLE_UART=y
CONFIG_DRIVER_DISPLAY_FRAMEBUFFER=y
@@ -54,8 +55,6 @@
CONFIG_DRIVER_UART_8250=y
# libpayload
-CONFIG_CBMEM_CONSOLE=y
-
CONFIG_USB=y
CONFIG_USB_EHCI=y
CONFIG_USB_UHCI=y
diff --git a/config/veyron_minnie/defconfig b/config/veyron_minnie/defconfig
index 60961d0..cadb3c4 100644
--- a/config/veyron_minnie/defconfig
+++ b/config/veyron_minnie/defconfig
@@ -32,6 +32,7 @@
CONFIG_DRIVER_BUS_I2C_ROCKCHIP=y
CONFIG_DRIVER_BUS_I2S_ROCKCHIP=y
CONFIG_DRIVER_BUS_SPI_ROCKCHIP=y
+CONFIG_DRIVER_CONSOLE_CBMEM=y
CONFIG_DRIVER_CONSOLE_DISPLAY=y
CONFIG_DRIVER_CONSOLE_UART=y
CONFIG_DRIVER_DISPLAY_FRAMEBUFFER=y
@@ -54,8 +55,6 @@
CONFIG_DRIVER_UART_8250=y
# libpayload
-CONFIG_CBMEM_CONSOLE=y
-
CONFIG_USB=y
CONFIG_USB_EHCI=y
CONFIG_USB_UHCI=y
diff --git a/config/veyron_nicky/defconfig b/config/veyron_nicky/defconfig
index 0f0e63a..2011879 100644
--- a/config/veyron_nicky/defconfig
+++ b/config/veyron_nicky/defconfig
@@ -32,6 +32,7 @@
CONFIG_DRIVER_BUS_I2C_ROCKCHIP=y
CONFIG_DRIVER_BUS_I2S_ROCKCHIP=y
CONFIG_DRIVER_BUS_SPI_ROCKCHIP=y
+CONFIG_DRIVER_CONSOLE_CBMEM=y
CONFIG_DRIVER_CONSOLE_DISPLAY=y
CONFIG_DRIVER_CONSOLE_UART=y
CONFIG_DRIVER_DISPLAY_FRAMEBUFFER=y
@@ -54,8 +55,6 @@
CONFIG_DRIVER_UART_8250=y
# libpayload
-CONFIG_CBMEM_CONSOLE=y
-
CONFIG_USB=y
CONFIG_USB_EHCI=y
CONFIG_USB_UHCI=y
diff --git a/config/veyron_pinky/defconfig b/config/veyron_pinky/defconfig
index 89360fb..4928522 100644
--- a/config/veyron_pinky/defconfig
+++ b/config/veyron_pinky/defconfig
@@ -32,6 +32,7 @@
CONFIG_DRIVER_BUS_I2C_ROCKCHIP=y
CONFIG_DRIVER_BUS_I2S_ROCKCHIP=y
CONFIG_DRIVER_BUS_SPI_ROCKCHIP=y
+CONFIG_DRIVER_CONSOLE_CBMEM=y
CONFIG_DRIVER_CONSOLE_DISPLAY=y
CONFIG_DRIVER_CONSOLE_UART=y
CONFIG_DRIVER_DISPLAY_FRAMEBUFFER=y
@@ -54,8 +55,6 @@
CONFIG_DRIVER_UART_8250=y
# libpayload
-CONFIG_CBMEM_CONSOLE=y
-
CONFIG_USB=y
CONFIG_USB_UHCI=y
CONFIG_USB_EHCI=y
diff --git a/config/veyron_rialto/defconfig b/config/veyron_rialto/defconfig
index 49a82da..ebe0af9 100644
--- a/config/veyron_rialto/defconfig
+++ b/config/veyron_rialto/defconfig
@@ -32,6 +32,7 @@
CONFIG_DRIVER_BUS_I2C_ROCKCHIP=y
CONFIG_DRIVER_BUS_I2S_ROCKCHIP=y
CONFIG_DRIVER_BUS_SPI_ROCKCHIP=y
+CONFIG_DRIVER_CONSOLE_CBMEM=y
CONFIG_DRIVER_CONSOLE_UART=y
CONFIG_DRIVER_FLASH_SPI=y
CONFIG_DRIVER_GPIO_ROCKCHIP=y
@@ -43,8 +44,6 @@
CONFIG_DRIVER_UART_8250=y
# libpayload
-CONFIG_CBMEM_CONSOLE=y
-
CONFIG_USB=y
CONFIG_USB_EHCI=y
CONFIG_USB_UHCI=y
diff --git a/config/veyron_shark/defconfig b/config/veyron_shark/defconfig
index 82382b0..4e72904 100644
--- a/config/veyron_shark/defconfig
+++ b/config/veyron_shark/defconfig
@@ -32,6 +32,7 @@
CONFIG_DRIVER_BUS_I2C_ROCKCHIP=y
CONFIG_DRIVER_BUS_I2S_ROCKCHIP=y
CONFIG_DRIVER_BUS_SPI_ROCKCHIP=y
+CONFIG_DRIVER_CONSOLE_CBMEM=y
CONFIG_DRIVER_CONSOLE_DISPLAY=y
CONFIG_DRIVER_CONSOLE_UART=y
CONFIG_DRIVER_DISPLAY_FRAMEBUFFER=y
@@ -54,8 +55,6 @@
CONFIG_DRIVER_UART_8250=y
# libpayload
-CONFIG_CBMEM_CONSOLE=y
-
CONFIG_USB=y
CONFIG_USB_EHCI=y
CONFIG_USB_UHCI=y
diff --git a/config/veyron_speedy/defconfig b/config/veyron_speedy/defconfig
index 72b221d..1cf5110 100644
--- a/config/veyron_speedy/defconfig
+++ b/config/veyron_speedy/defconfig
@@ -32,6 +32,7 @@
CONFIG_DRIVER_BUS_I2C_ROCKCHIP=y
CONFIG_DRIVER_BUS_I2S_ROCKCHIP=y
CONFIG_DRIVER_BUS_SPI_ROCKCHIP=y
+CONFIG_DRIVER_CONSOLE_CBMEM=y
CONFIG_DRIVER_CONSOLE_DISPLAY=y
CONFIG_DRIVER_CONSOLE_UART=y
CONFIG_DRIVER_DISPLAY_FRAMEBUFFER=y
@@ -54,8 +55,6 @@
CONFIG_DRIVER_UART_8250=y
# libpayload
-CONFIG_CBMEM_CONSOLE=y
-
CONFIG_USB=y
CONFIG_USB_EHCI=y
CONFIG_USB_UHCI=y
diff --git a/config/veyron_thea/defconfig b/config/veyron_thea/defconfig
index 501c939..c4b0f34 100644
--- a/config/veyron_thea/defconfig
+++ b/config/veyron_thea/defconfig
@@ -32,6 +32,7 @@
CONFIG_DRIVER_BUS_I2C_ROCKCHIP=y
CONFIG_DRIVER_BUS_I2S_ROCKCHIP=y
CONFIG_DRIVER_BUS_SPI_ROCKCHIP=y
+CONFIG_DRIVER_CONSOLE_CBMEM=y
CONFIG_DRIVER_CONSOLE_DISPLAY=y
CONFIG_DRIVER_CONSOLE_UART=y
CONFIG_DRIVER_DISPLAY_FRAMEBUFFER=y
@@ -54,8 +55,6 @@
CONFIG_DRIVER_UART_8250=y
# libpayload
-CONFIG_CBMEM_CONSOLE=y
-
CONFIG_USB=y
CONFIG_USB_EHCI=y
CONFIG_USB_UHCI=y
diff --git a/src/drivers/console/Kconfig b/src/drivers/console/Kconfig
index f8944ca..c00c4de 100644
--- a/src/drivers/console/Kconfig
+++ b/src/drivers/console/Kconfig
@@ -14,6 +14,10 @@
## along with this program; if not, write to the Free Software
## Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+config DRIVER_CONSOLE_CBMEM
+ bool "Provide a console which stores log messages in memory"
+ default n
+
config DRIVER_CONSOLE_DISPLAY
bool "Provide a console on the display device"
default n
diff --git a/src/drivers/console/Makefile.inc b/src/drivers/console/Makefile.inc
index 1b8d01e..2f03dee 100644
--- a/src/drivers/console/Makefile.inc
+++ b/src/drivers/console/Makefile.inc
@@ -15,6 +15,7 @@
## Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
##
+depthcharge-$(CONFIG_DRIVER_CONSOLE_CBMEM) += cbmem.c
depthcharge-y += console.c
depthcharge-$(CONFIG_DRIVER_CONSOLE_DISPLAY) += display.c
depthcharge-y += keyboard.c
diff --git a/src/libpayload/drivers/cbmem_console.c b/src/drivers/console/cbmem.c
similarity index 100%
rename from src/libpayload/drivers/cbmem_console.c
rename to src/drivers/console/cbmem.c
diff --git a/src/libpayload/Kconfig b/src/libpayload/Kconfig
index 4f9ee19..f4c12d1 100644
--- a/src/libpayload/Kconfig
+++ b/src/libpayload/Kconfig
@@ -28,10 +28,6 @@
menu "Console Options"
-config CBMEM_CONSOLE
- bool "Send output to the in memory CBMEM console"
- default n
-
config SERIAL_SET_SPEED
bool "Override the serial console baud rate"
default n
diff --git a/src/libpayload/drivers/Makefile.inc b/src/libpayload/drivers/Makefile.inc
index 16c5a45..30d9fe7 100644
--- a/src/libpayload/drivers/Makefile.inc
+++ b/src/libpayload/drivers/Makefile.inc
@@ -29,8 +29,6 @@
libc-$(CONFIG_PCI) += pci.c
-libc-$(CONFIG_CBMEM_CONSOLE) += cbmem_console.c
-
libc-$(CONFIG_NVRAM) += nvram.c
# USB stack
