summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--debian.linaro/config/config.common.ubuntu14
-rw-r--r--debian.linaro/config/enforce2
2 files changed, 6 insertions, 10 deletions
diff --git a/debian.linaro/config/config.common.ubuntu b/debian.linaro/config/config.common.ubuntu
index e8fe725948a..c1ff232be06 100644
--- a/debian.linaro/config/config.common.ubuntu
+++ b/debian.linaro/config/config.common.ubuntu
@@ -552,7 +552,7 @@ CONFIG_DRM=y
CONFIG_DUMMY_CONSOLE=y
# CONFIG_DVB_CORE is not set
# CONFIG_DW_DMAC is not set
-# CONFIG_DYNAMIC_DEBUG is not set
+CONFIG_DYNAMIC_DEBUG=y
CONFIG_DYNAMIC_FTRACE=y
# CONFIG_EASYCAP is not set
# CONFIG_ECHO is not set
@@ -639,16 +639,11 @@ CONFIG_FIRMWARE_IN_KERNEL=y
CONFIG_FLATMEM=y
CONFIG_FLATMEM_MANUAL=y
CONFIG_FLAT_NODE_MEM_MAP=y
-# CONFIG_FONTS is not set
-CONFIG_FONT_8x16=y
-CONFIG_FONT_8x8=y
CONFIG_FORCE_MAX_ZONEORDER=12
# CONFIG_FPE_FASTFPE is not set
CONFIG_FPE_NWFPE=y
# CONFIG_FPE_NWFPE_XP is not set
-CONFIG_FRAMEBUFFER_CONSOLE=y
-# CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY is not set
-# CONFIG_FRAMEBUFFER_CONSOLE_ROTATION is not set
+# CONFIG_FRAMEBUFFER_CONSOLE is not set
CONFIG_FRAME_POINTER=y
CONFIG_FRAME_WARN=1024
CONFIG_FREEZER=y
@@ -2028,7 +2023,8 @@ CONFIG_USB_CDC_COMPOSITE=m
CONFIG_USB_ETH=m
# CONFIG_USB_ETH_EEM is not set
CONFIG_USB_ETH_RNDIS=y
-# CONFIG_USB_FILE_STORAGE is not set
+CONFIG_USB_FILE_STORAGE=m
+# CONFIG_USB_FILE_STORAGE_TEST is not set
# CONFIG_USB_FTDI_ELAN is not set
# CONFIG_USB_FUNCTIONFS is not set
CONFIG_USB_GADGET=y
@@ -2047,7 +2043,7 @@ CONFIG_USB_GADGET_SELECTED=y
CONFIG_USB_GADGET_VBUS_DRAW=500
# CONFIG_USB_GPIO_VBUS is not set
# CONFIG_USB_G_DBGP is not set
-# CONFIG_USB_G_HID is not set
+CONFIG_USB_G_HID=m
CONFIG_USB_G_MULTI=m
CONFIG_USB_G_MULTI_CDC=y
# CONFIG_USB_G_MULTI_RNDIS is not set
diff --git a/debian.linaro/config/enforce b/debian.linaro/config/enforce
index e60591bfbc7..88aaec2d05d 100644
--- a/debian.linaro/config/enforce
+++ b/debian.linaro/config/enforce
@@ -49,7 +49,7 @@ value CONFIG_LOCALVERSION_AUTO n
# provide framebuffer console form the start
# UbuntuSpec:foundations-m-grub2-boot-framebuffer
-value CONFIG_FRAMEBUFFER_CONSOLE y
+#value CONFIG_FRAMEBUFFER_CONSOLE y
# GRUB changes will rely on built in vesafb on x86,
# UbuntuSpec:foundations-m-grub2-boot-framebuffer