Rename CONFIG_EHCI_IS_TDI to CONFIG_USB_EHCI_IS_TDI

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

diff --git a/include/configs/sandbox.h b/include/configs/sandbox.h
index 0353a19..24c9a84 100644 (file)
--- a/include/configs/sandbox.h
+++ b/include/configs/sandbox.h
@@ -22,15 +22,9 @@
 #define CONFIG_SYS_TIMER_RATE          1000000
 #endif
 
-#define CONFIG_LMB
-
 #define CONFIG_HOST_MAX_DEVICES 4
 
-/*
- * Size of malloc() pool, before and after relocation
- */
 #define CONFIG_MALLOC_F_ADDR           0x0010000
-#define CONFIG_SYS_MALLOC_LEN          (32 << 20)      /* 32MB  */
 
 #define CONFIG_SYS_CBSIZE              1024    /* Console I/O Buffer Size */
 
@@ -40,8 +34,6 @@
 
 #define CONFIG_I2C_EDID
 
-/* Memory things - we don't really want a memory test */
-#define CONFIG_SYS_LOAD_ADDR           0x00000000
 #define CONFIG_SYS_FDT_LOAD_ADDR               0x100
 
 #define CONFIG_PHYSMEM
@@ -70,7 +62,6 @@
 #define CONFIG_KEEP_SERVERADDR
 #define CONFIG_UDP_CHECKSUM
 #define CONFIG_TIMESTAMP
-#define CONFIG_BOOTP_SEND_HOSTNAME
 #define CONFIG_BOOTP_SERVERIP
 
 #ifndef SANDBOX_NO_SDL
@@ -81,8 +72,6 @@
 #ifdef CONFIG_SANDBOX_SDL
 #define LCD_BPP                        LCD_COLOR16
 #define CONFIG_LCD_BMP_RLE8
-#define CONFIG_VIDEO_BMP_RLE8
-#define CONFIG_SPLASH_SCREEN_ALIGN
 
 #define CONFIG_KEYBOARD
 
@@ -96,7 +85,9 @@
 #endif
 
 #define SANDBOX_ETH_SETTINGS           "ethaddr=00:00:11:22:33:44\0" \
+                                       "eth2addr=00:00:11:22:33:48\0" \
                                        "eth3addr=00:00:11:22:33:45\0" \
+                                       "eth4addr=00:00:11:22:33:48\0" \
                                        "eth5addr=00:00:11:22:33:46\0" \
                                        "eth6addr=00:00:11:22:33:47\0" \
                                        "ipaddr=1.2.3.4\0"
@@ -133,6 +124,4 @@
 
 #define CONFIG_SYS_SATA_MAX_DEVICE     2
 
-#define CONFIG_MISC_INIT_F
-
 #endif