diff options
author | Stefano Babic <sbabic@denx.de> | 2015-07-10 09:21:44 +0200 |
---|---|---|
committer | Stefano Babic <sbabic@denx.de> | 2015-07-10 09:21:44 +0200 |
commit | 1254ff97abb7606ccd0d7bdcd9f22581c50fe535 (patch) | |
tree | 61b31e61173154abd38aaa6584e84ea77314b861 /include/configs/controlcenterd.h | |
parent | 54e0f96f764f662be186baae7d6c2c97423bc29d (diff) | |
parent | f3edfd30541d6f245d7dfa6fa7354cc916cc53e1 (diff) |
Merge branch 'master' of git://git.denx.de/u-boot
Diffstat (limited to 'include/configs/controlcenterd.h')
-rw-r--r-- | include/configs/controlcenterd.h | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/include/configs/controlcenterd.h b/include/configs/controlcenterd.h index 9cab9fb8f9..8f829eddb1 100644 --- a/include/configs/controlcenterd.h +++ b/include/configs/controlcenterd.h @@ -219,7 +219,6 @@ #define CONFIG_HARD_SPI #define CONFIG_FSL_ESPI -#define CONFIG_SPI_FLASH #define CONFIG_SPI_FLASH_STMICRO #define CONFIG_CMD_SF @@ -353,7 +352,6 @@ #if defined(CONFIG_TRAILBLAZER) #define CONFIG_ENV_IS_NOWHERE #define CONFIG_ENV_SIZE 0x2000 /* 8KB */ -#undef CONFIG_CMD_SAVEENV #elif defined(CONFIG_RAMBOOT_SPIFLASH) #define CONFIG_ENV_IS_IN_SPI_FLASH #define CONFIG_ENV_SPI_BUS 0 @@ -395,8 +393,6 @@ #define CONFIG_SYS_MAXARGS 16 #define CONFIG_SYS_BARGSIZE CONFIG_SYS_CBSIZE -#include <config_cmd_default.h> - #ifndef CONFIG_TRAILBLAZER #define CONFIG_CMD_ELF |