summaryrefslogtreecommitdiffstats
path: root/configs/cm_fx6_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/cm_fx6_defconfig
parentc294ac5c16f5ad5107b051f4a0de46d04d8ce13b (diff)
downloadblackbird-obmc-uboot-b880fcf02128401c823f2a42aca6ae52df5f8625.tar.gz
blackbird-obmc-uboot-b880fcf02128401c823f2a42aca6ae52df5f8625.zip
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/cm_fx6_defconfig')
-rw-r--r--configs/cm_fx6_defconfig7
1 files changed, 3 insertions, 4 deletions
diff --git a/configs/cm_fx6_defconfig b/configs/cm_fx6_defconfig
index 66fc382155..21c35e3d94 100644
--- a/configs/cm_fx6_defconfig
+++ b/configs/cm_fx6_defconfig
@@ -8,6 +8,9 @@ CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/imx-common/spl_sd.cfg,MX6QDL,SPL"
# CONFIG_CMD_LOADB is not set
# CONFIG_CMD_LOADS is not set
# CONFIG_CMD_FLASH is not set
+CONFIG_CMD_SF=y
+CONFIG_CMD_I2C=y
+CONFIG_CMD_USB=y
# CONFIG_CMD_FPGA is not set
# CONFIG_CMD_SETEXPR is not set
CONFIG_CMD_DHCP=y
@@ -21,12 +24,8 @@ CONFIG_SPI_FLASH_SPANSION=y
CONFIG_SPI_FLASH_STMICRO=y
CONFIG_SPI_FLASH_SST=y
CONFIG_SPI_FLASH_WINBOND=y
-CONFIG_CMD_SF=y
-CONFIG_CMD_I2C=y
CONFIG_USB=y
-CONFIG_CMD_USB=y
CONFIG_USB_EHCI_HCD=y
-CONFIG_USB_EHCI_MX6=y
CONFIG_USB_STORAGE=y
CONFIG_USB_KEYBOARD=y
CONFIG_SYS_USB_EVENT_POLL_VIA_CONTROL_EP=y
OpenPOWER on IntegriCloud