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

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

diff --git a/include/configs/rk3328_common.h b/include/configs/rk3328_common.h
index 25e2c65..e565ccf 100644 (file)
--- a/include/configs/rk3328_common.h
+++ b/include/configs/rk3328_common.h
@@ -8,36 +8,25 @@
 
 #include "rockchip-common.h"
 
-#define CONFIG_IRAM_BASE               0xff090000
+#define CFG_IRAM_BASE          0xff090000
 
-#define CONFIG_SPL_BSS_START_ADDR      0x2000000
-
-#define CONFIG_SYS_BOOTM_LEN   (64 << 20)      /* 64M */
-
-/* FAT sd card locations. */
-#define CONFIG_SYS_SDRAM_BASE          0
+#define CFG_SYS_SDRAM_BASE             0
 #define SDRAM_MAX_SIZE                 0xff000000
 
-#ifndef CONFIG_SPL_BUILD
-
 #define ENV_MEM_LAYOUT_SETTINGS \
        "scriptaddr=0x00500000\0" \
        "pxefile_addr_r=0x00600000\0" \
        "fdt_addr_r=0x01f00000\0" \
        "kernel_addr_r=0x02080000\0" \
-       "ramdisk_addr_r=0x06000000\0"
+       "ramdisk_addr_r=0x06000000\0" \
+       "kernel_comp_addr_r=0x08000000\0" \
+       "kernel_comp_size=0x2000000\0"
 
 #include <config_distro_bootcmd.h>
-#define CONFIG_EXTRA_ENV_SETTINGS \
+#define CFG_EXTRA_ENV_SETTINGS \
        ENV_MEM_LAYOUT_SETTINGS \
        "fdtfile=" CONFIG_DEFAULT_FDT_FILE "\0" \
        "partitions=" PARTS_DEFAULT \
        BOOTENV
 
 #endif
-
-/* rockchip ohci host driver */
-#define CONFIG_USB_OHCI_NEW
-#define CONFIG_SYS_USB_OHCI_MAX_ROOT_PORTS     1
-
-#endif