summaryrefslogtreecommitdiff
path: root/configs/Merrii_A80_Optimus_defconfig
diff options
context:
space:
mode:
authorSimon Glass <sjg@chromium.org>2015-08-19 09:33:42 -0600
committerJoe Hershberger <joe.hershberger@ni.com>2015-08-21 16:39:39 -0500
commitb880fcf02128401c823f2a42aca6ae52df5f8625 (patch)
tree160330a1c49a439c20972e4c8a821adf85185d15 /configs/Merrii_A80_Optimus_defconfig
parentc294ac5c16f5ad5107b051f4a0de46d04d8ce13b (diff)
Tidy up some defconfig files
Several files are out of order. This means that when the moveconfig tool moves CONFIG options to Kconfig it generates a large diff. To avoid this, reorder the files first. Signed-off-by: Simon Glass <sjg@chromium.org>
Diffstat (limited to 'configs/Merrii_A80_Optimus_defconfig')
-rw-r--r--configs/Merrii_A80_Optimus_defconfig1
1 files changed, 0 insertions, 1 deletions
diff --git a/configs/Merrii_A80_Optimus_defconfig b/configs/Merrii_A80_Optimus_defconfig
index 8587bc8e7c..53e023a75f 100644
--- a/configs/Merrii_A80_Optimus_defconfig
+++ b/configs/Merrii_A80_Optimus_defconfig
@@ -6,7 +6,6 @@ CONFIG_DRAM_ZQ=123
CONFIG_SYS_CLK_FREQ=1008000000
CONFIG_MMC0_CD_PIN="PH18"
# CONFIG_VIDEO is not set
-# CONFIG_USB_KEYBOARD is not set
CONFIG_DEFAULT_DEVICE_TREE="sun9i-a80-optimus"
# CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
# CONFIG_CMD_IMLS is not set