Merge branch 'master_sh/gen4/mmcfix' of https://source.denx.de/u-boot/custodians...

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

diff --git a/include/configs/rk322x_common.h b/include/configs/rk322x_common.h
index cc08699..39a40f4 100644 (file)
--- a/include/configs/rk322x_common.h
+++ b/include/configs/rk322x_common.h
@@ -8,34 +8,13 @@
 #include <asm/arch-rockchip/hardware.h>
 #include "rockchip-common.h"
 
-#define CONFIG_SKIP_LOWLEVEL_INIT
-#define CONFIG_SYS_MALLOC_LEN          (32 << 20)
-#define CONFIG_SYS_CBSIZE              1024
-#define CONFIG_SYS_BOOTM_LEN   (64 << 20)      /*  64M */
+#define CFG_SYS_HZ_CLOCK               24000000
 
-#define CONFIG_ROCKCHIP_STIMER_BASE    0x110d0020
-#define COUNTER_FREQUENCY              24000000
-#define CONFIG_SYS_ARCH_TIMER
-#define CONFIG_SYS_HZ_CLOCK            24000000
+#define CFG_IRAM_BASE          0x10080000
 
-#define CONFIG_SYS_INIT_SP_ADDR                0x61100000
-#define CONFIG_SYS_LOAD_ADDR           0x61800800
-#define CONFIG_SPL_MAX_SIZE            0x100000
-
-#define CONFIG_ROCKCHIP_MAX_INIT_SIZE  (28 << 10)
-#define CONFIG_ROCKCHIP_CHIP_TAG       "RK32"
-
-#define CONFIG_SYS_SDRAM_BASE          0x60000000
-#define SDRAM_BANK_SIZE                        (512UL << 20UL)
+#define CFG_SYS_SDRAM_BASE             0x60000000
 #define SDRAM_MAX_SIZE                 0x80000000
 
-#ifndef CONFIG_SPL_BUILD
-/* usb otg */
-
-/* usb mass storage */
-#define CONFIG_CMD_USB_MASS_STORAGE
-
-/* usb host */
 #define ENV_MEM_LAYOUT_SETTINGS \
        "scriptaddr=0x60000000\0" \
        "pxefile_addr_r=0x60100000\0" \
@@ -47,14 +26,11 @@
 
 /* Linux fails to load the fdt if it's loaded above 512M on a evb-rk3036 board,
  * so limit the fdt reallocation to that */
-#define CONFIG_EXTRA_ENV_SETTINGS \
+#define CFG_EXTRA_ENV_SETTINGS \
        "fdtfile=" CONFIG_DEFAULT_FDT_FILE "\0" \
        "fdt_high=0x7fffffff\0" \
        "partitions=" PARTS_DEFAULT \
        ENV_MEM_LAYOUT_SETTINGS \
        BOOTENV
-#endif
-
-#define CONFIG_PREBOOT
 
 #endif