From 78d1e1d0a157c8b48ea19be6170b992745d30f38 Mon Sep 17 00:00:00 2001 From: Tom Rini Date: Fri, 22 Apr 2016 16:41:25 -0400 Subject: configs: Re-sync almost all of cmd/Kconfig This syncs up the current cmd/Kconfig and include/configs/ files with the only exception being CMD_NAND. Due to how we have used this historically we need to take further care here when converting. Signed-off-by: Tom Rini --- include/configs/km/keymile-common.h | 6 ------ include/configs/km/km_arm.h | 1 - include/configs/km/kmp204x-common.h | 1 - 3 files changed, 8 deletions(-) (limited to 'include/configs/km') diff --git a/include/configs/km/keymile-common.h b/include/configs/km/keymile-common.h index ab727aa..dd0cec4 100644 --- a/include/configs/km/keymile-common.h +++ b/include/configs/km/keymile-common.h @@ -14,14 +14,11 @@ * Command line configuration. */ #define CONFIG_CMD_ASKENV -#define CONFIG_CMD_DHCP #define CONFIG_CMD_DEFAULTENV_VARS #define CONFIG_CMD_GREPENV #define CONFIG_CMD_IMMAP #define CONFIG_CMD_MII -#define CONFIG_CMD_PING #define CONFIG_CMD_EEPROM -#define CONFIG_CMD_I2C #define CONFIG_CMD_JFFS2 #define CONFIG_CMD_MTDPARTS @@ -55,9 +52,6 @@ #define CONFIG_LOADS_ECHO #define CONFIG_SYS_LOADS_BAUD_CHANGE -#define CONFIG_AUTOBOOT_KEYED -#define CONFIG_AUTOBOOT_PROMPT "Hit key to stop autoboot in %2ds\n" -#define CONFIG_AUTOBOOT_STOP_STR " " /* Support the IVM EEprom */ #define CONFIG_SYS_IVM_EEPROM_ADR 0x50 diff --git a/include/configs/km/km_arm.h b/include/configs/km/km_arm.h index dfc1c7e..fdd293f 100644 --- a/include/configs/km/km_arm.h +++ b/include/configs/km/km_arm.h @@ -41,7 +41,6 @@ #include "keymile-common.h" #define CONFIG_CMD_NAND -#define CONFIG_CMD_SF /* SPI NOR Flash default params, used by sf commands */ #define CONFIG_SF_DEFAULT_SPEED 8100000 diff --git a/include/configs/km/kmp204x-common.h b/include/configs/km/kmp204x-common.h index 44829e8..9232ee3 100644 --- a/include/configs/km/kmp204x-common.h +++ b/include/configs/km/kmp204x-common.h @@ -285,7 +285,6 @@ int get_scl(void); * eSPI - Enhanced SPI */ #define CONFIG_SPI_FLASH_BAR /* 4 byte-addressing */ -#define CONFIG_CMD_SF #define CONFIG_SF_DEFAULT_SPEED 20000000 #define CONFIG_SF_DEFAULT_MODE 0 -- cgit v1.1