Merge git://git.denx.de/u-boot-rockchip

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

diff --git a/include/configs/poplar.h b/include/configs/poplar.h
index d2ecd0dec178e01c384cafbe3fa5b584261d59a9..859da38462d7f6aee24f8334cb67ddc28f710489 100644 (file)
--- a/include/configs/poplar.h
+++ b/include/configs/poplar.h
@@ -18,7 +18,7 @@
 #define CONFIG_NR_DRAM_BANKS                   2
 
 /* SYS */
-#define CONFIG_SYS_BOOTM_LEN                   0x1400000
+#define CONFIG_SYS_BOOTM_LEN                   SZ_64M
 #define CONFIG_SYS_INIT_SP_ADDR                        0x200000
 #define CONFIG_SYS_LOAD_ADDR                   0x800000
 #define CONFIG_SYS_MALLOC_LEN                  SZ_32M
@@ -26,14 +26,8 @@
 /* ATF bl33.bin load address (must match) */
 #define CONFIG_SYS_TEXT_BASE                   0x37000000
 
-/* PL010/PL011 */
-#define CONFIG_PL01X_SERIAL
-
 /* USB configuration */
 #define CONFIG_USB_MAX_CONTROLLER_COUNT                2
-#define CONFIG_SYS_USB_EVENT_POLL
-#define CONFIG_USB_HOST_ETHER
-#define CONFIG_USB_ETHER_ASIX
 
 /* SD/MMC */
 #define CONFIG_BOUNCE_BUFFER
@@ -69,7 +63,6 @@
 #define CONFIG_SYS_MMC_ENV_DEV         0
 #define CONFIG_ENV_OFFSET              (0x780 * 512)   /* env_mmc_blknum */
 #define CONFIG_ENV_SIZE                        0x10000 /* env_mmc_nblks bytes */
-#define CONFIG_FAT_WRITE
 #define CONFIG_ENV_VARS_UBOOT_CONFIG
 
 /* Monitor Command Prompt */
@@ -77,8 +70,5 @@
 #define CONFIG_SYS_LONGHELP
 #define CONFIG_SYS_CBSIZE              512
 #define CONFIG_SYS_MAXARGS             64
-#define CONFIG_SYS_PBSIZE              (CONFIG_SYS_CBSIZE + \
-                                       sizeof(CONFIG_SYS_PROMPT) + 16)
-#define CONFIG_SYS_BARGSIZE            CONFIG_SYS_CBSIZE
 
 #endif /* _POPLAR_H_ */