From bd328eb38274ffaf04caaa8a6ecc09b7e19a650e Mon Sep 17 00:00:00 2001 From: Joe Hershberger Date: Tue, 12 May 2015 14:46:24 -0500 Subject: Clean all defconfigs with savedefconfig In order to reduce merge conflicts and to maintain the simplest possible defconfig files, we should be using the savedefconfig feature of Kconfig every time a new feature is added. This keeps the defconfig settings to a minimum (only those things not default) and keeps them in the same order as the Kconfig options. Signed-off-by: Joe Hershberger Cc: Masahiro Yamada Acked-by: Stephen Warren Cc: Tom Rini --- configs/sandbox_defconfig | 36 ++++++++++++++++++------------------ 1 file changed, 18 insertions(+), 18 deletions(-) (limited to 'configs/sandbox_defconfig') diff --git a/configs/sandbox_defconfig b/configs/sandbox_defconfig index 70ae531..cc309c8 100644 --- a/configs/sandbox_defconfig +++ b/configs/sandbox_defconfig @@ -1,30 +1,30 @@ -CONFIG_OF_CONTROL=y -CONFIG_OF_HOSTFILE=y +CONFIG_DM_USB=y +CONFIG_PCI=y +CONFIG_SYS_VSNPRINTF=y +CONFIG_DEFAULT_DEVICE_TREE="sandbox" +CONFIG_BOOTSTAGE=y +CONFIG_BOOTSTAGE_REPORT=y CONFIG_FIT=y CONFIG_FIT_VERBOSE=y CONFIG_FIT_SIGNATURE=y -CONFIG_DEFAULT_DEVICE_TREE="sandbox" +CONFIG_CMD_SOUND=y +CONFIG_OF_CONTROL=y +CONFIG_OF_HOSTFILE=y +CONFIG_DM_PCI=y +CONFIG_PCI_SANDBOX=y +CONFIG_SPI_FLASH_SANDBOX=y +CONFIG_CMD_CROS_EC=y CONFIG_CROS_EC=y CONFIG_CROS_EC_SANDBOX=y CONFIG_CROS_EC_KEYB=y -CONFIG_CMD_CROS_EC=y -CONFIG_PCI=y -CONFIG_DM_PCI=y -CONFIG_PCI_SANDBOX=y -CONFIG_USB=y -CONFIG_DM_USB=y -CONFIG_USB_EMUL=y -CONFIG_USB_STORAGE=y -CONFIG_BOOTSTAGE=y -CONFIG_BOOTSTAGE_REPORT=y -CONFIG_SANDBOX_GPIO=y -CONFIG_SYS_VSNPRINTF=y +CONFIG_TPM_TIS_SANDBOX=y CONFIG_SYS_I2C_SANDBOX=y CONFIG_SANDBOX_SPI=y -CONFIG_SPI_FLASH_SANDBOX=y -CONFIG_TPM_TIS_SANDBOX=y +CONFIG_SANDBOX_GPIO=y CONFIG_SOUND=y -CONFIG_CMD_SOUND=y CONFIG_SOUND_SANDBOX=y +CONFIG_USB=y +CONFIG_USB_EMUL=y +CONFIG_USB_STORAGE=y CONFIG_DM_RTC=y CONFIG_CMD_UT_TIME=y -- cgit v1.1