Merge branch 'rmobile' of git://git.denx.de/u-boot-sh

[oweals/u-boot.git] / include / configs / sandbox.h

diff --git a/include/configs/sandbox.h b/include/configs/sandbox.h
index 905fcd95e9beef03dbe6d4d3952c55ccd7118462..71c2ae3b3951aeb3ab5b3e4a72053a62cc4a03ce 100644 (file)
--- a/include/configs/sandbox.h
+++ b/include/configs/sandbox.h
@@ -8,7 +8,6 @@
 
 #ifdef FTRACE
 #define CONFIG_TRACE
-#define CONFIG_CMD_TRACE
 #define CONFIG_TRACE_BUFFER_SIZE       (16 << 20)
 #define CONFIG_TRACE_EARLY_SIZE                (8 << 20)
 #define CONFIG_TRACE_EARLY
@@ -25,12 +24,7 @@
 #endif
 
 #define CONFIG_LMB
-#define CONFIG_ANDROID_BOOT_IMAGE
 
-#define CONFIG_CMD_PCI
-
-#define CONFIG_FS_FAT
-#define CONFIG_FAT_WRITE
 #define CONFIG_FS_EXT4
 #define CONFIG_EXT4_WRITE
 #define CONFIG_HOST_MAX_DEVICES 4
@@ -43,20 +37,15 @@
 
 #define CONFIG_SYS_LONGHELP                    /* #undef to save memory */
 #define CONFIG_SYS_CBSIZE              1024    /* Console I/O Buffer Size */
-
-/* Print Buffer Size */
-#define CONFIG_SYS_PBSIZE (CONFIG_SYS_CBSIZE + sizeof(CONFIG_SYS_PROMPT) + 16)
-#define CONFIG_SYS_MAXARGS     16
+#define CONFIG_DISPLAY_BOARDINFO_LATE
 
 /* turn on command-line edit/c/auto */
 #define CONFIG_CMDLINE_EDITING
 #define CONFIG_AUTO_COMPLETE
 
 #define CONFIG_ENV_SIZE                8192
-#define CONFIG_ENV_IS_NOWHERE
 
 /* SPI - enable all SPI flash types for testing purposes */
-#define CONFIG_CMD_SF_TEST
 
 #define CONFIG_I2C_EDID
 
@@ -98,12 +87,6 @@
 #define CONFIG_BOOTP_SERVERIP
 #define CONFIG_IP_DEFRAG
 
-#define CONFIG_HASH_VERIFY
-
-#define CONFIG_CMD_SANDBOX
-
-#define CONFIG_BOOTARGS ""
-
 #ifndef SANDBOX_NO_SDL
 #define CONFIG_SANDBOX_SDL
 #endif
@@ -148,10 +131,6 @@
 
 #define CONFIG_GZIP_COMPRESSED
 #define CONFIG_BZIP2
-#define CONFIG_LZO
-#define CONFIG_LZMA
-
-#define CONFIG_CMD_LZMADEC
 
 #ifndef CONFIG_SPL_BUILD
 #define CONFIG_SYS_IDE_MAXBUS          1
@@ -164,13 +143,11 @@
 #define CONFIG_SYS_ATA_STRIDE          4
 #endif
 
-#define CONFIG_SCSI
 #define CONFIG_SCSI_AHCI_PLAT
 #define CONFIG_SYS_SCSI_MAX_DEVICE     2
 #define CONFIG_SYS_SCSI_MAX_SCSI_ID    8
 #define CONFIG_SYS_SCSI_MAX_LUN                4
 
-#define CONFIG_CMD_SATA
 #define CONFIG_SYS_SATA_MAX_DEVICE     2
 
 #define CONFIG_SYSTEMACE