Merge git://www.denx.de/git/u-boot-imx

[people/ms/u-boot.git] / include / configs / rk3036_common.h

diff --git a/include/configs/rk3036_common.h b/include/configs/rk3036_common.h
index 1fd33a067a3d9f67ae7ceaa6e997235e20843ba4..43fece6b8a71bfaa389123918503d3bcaaf825d5 100644 (file)
--- a/include/configs/rk3036_common.h
+++ b/include/configs/rk3036_common.h
@@ -9,16 +9,12 @@
 #include <asm/arch/hardware.h>
 #include "rockchip-common.h"
 
-#define CONFIG_SYS_NO_FLASH
 #define CONFIG_NR_DRAM_BANKS           1
-#define CONFIG_ENV_IS_NOWHERE
 #define CONFIG_ENV_SIZE                        0x2000
 #define CONFIG_SYS_MAXARGS             16
-#define CONFIG_BAUDRATE                        115200
 #define CONFIG_SYS_MALLOC_LEN          (32 << 20)
 #define CONFIG_SYS_CBSIZE              1024
 #define CONFIG_SKIP_LOWLEVEL_INIT
-#define CONFIG_SYS_THUMB_BUILD
 
 #define CONFIG_SYS_TIMER_RATE          (24 * 1000 * 1000)
 #define CONFIG_SYS_TIMER_BASE          0x200440a0 /* TIMER5 */
@@ -37,16 +33,12 @@
 #define CONFIG_ROCKCHIP_CHIP_TAG       "RK30"
 
 /* MMC/SD IP block */
-#define CONFIG_GENERIC_MMC
 #define CONFIG_BOUNCE_BUFFER
 
-#define CONFIG_FAT_WRITE
-#define CONFIG_PARTITION_UUIDS
-#define CONFIG_CMD_PART
-
 #define CONFIG_SYS_SDRAM_BASE          0x60000000
 #define CONFIG_NR_DRAM_BANKS           1
 #define SDRAM_BANK_SIZE                        (512UL << 20UL)
+#define SDRAM_MAX_SIZE                  (CONFIG_NR_DRAM_BANKS * SDRAM_BANK_SIZE)
 
 #define CONFIG_SPI_FLASH
 #define CONFIG_SPI
@@ -79,7 +71,6 @@
 
 /* usb host */
 #ifdef CONFIG_CMD_USB
-#define CONFIG_USB_DWC2
 #define CONFIG_USB_HOST_ETHER
 #define CONFIG_USB_ETHER_SMSC95XX
 #define CONFIG_USB_ETHER_ASIX
@@ -102,7 +93,6 @@
        BOOTENV
 #endif
 
-#define CONFIG_BOARD_LATE_INIT
 #define CONFIG_PREBOOT
 
 #endif