Merge branch 'master' of git://www.denx.de/git/u-boot-imx

[u-boot] / include / configs / controlcenterd.h

diff --git a/include/configs/controlcenterd.h b/include/configs/controlcenterd.h
index 9cab9fb8f9dcfc9941a123799c5561dbc63a2eca..9a1f6d0782c6b93f760a326832b7472996a25476 100644 (file)
--- 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
@@ -227,14 +226,7 @@
 #define CONFIG_SF_DEFAULT_MODE         0
 #endif
 
-/*
- * TPM
- */
-#define CONFIG_TPM_ATMEL_TWI
-#define CONFIG_TPM
-#define CONFIG_TPM_AUTH_SESSIONS
 #define CONFIG_SHA1
-#define CONFIG_CMD_TPM
 
 /*
  * MMC
@@ -353,7 +345,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 +386,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