Merge https://source.denx.de/u-boot/custodians/u-boot-riscv

[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 517d058..c1e26a0 100644 (file)
--- a/include/configs/rk3328_common.h
+++ b/include/configs/rk3328_common.h
@@ -1,7 +1,6 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
 /*
  * (C) Copyright 2016 Rockchip Electronics Co., Ltd
- *
- * SPDX-License-Identifier:     GPL-2.0+
  */
 
 #ifndef __CONFIG_RK3328_COMMON_H
@@ -9,33 +8,25 @@
 
 #include "rockchip-common.h"
 
-#define CONFIG_SYS_MALLOC_LEN          (32 << 20)
-#define CONFIG_SYS_CBSIZE              1024
-#define CONFIG_SKIP_LOWLEVEL_INIT
+#define CONFIG_IRAM_BASE               0xff090000
+
+#define CONFIG_ROCKCHIP_STIMER_BASE    0xff1d0020
+#define COUNTER_FREQUENCY              24000000
 
-#define CONFIG_SYS_NS16550_MEM32
+#define CONFIG_SYS_CBSIZE              1024
 
 #define CONFIG_SYS_INIT_SP_ADDR                0x00300000
-#define CONFIG_SYS_LOAD_ADDR           0x00800800
+#define CONFIG_SPL_STACK               0x00400000
+#define CONFIG_SPL_MAX_SIZE            0x40000
+#define CONFIG_SPL_BSS_START_ADDR      0x2000000
+#define CONFIG_SPL_BSS_MAX_SIZE                0x2000
 
 #define CONFIG_SYS_BOOTM_LEN   (64 << 20)      /* 64M */
 
-/* MMC/SD IP block */
-#define CONFIG_BOUNCE_BUFFER
-
-/* RAW SD card / eMMC locations. */
-#define CONFIG_SYS_SPI_U_BOOT_OFFS     (128 << 10)
-
 /* FAT sd card locations. */
-#define CONFIG_SYS_MMCSD_FS_BOOT_PARTITION     1
 #define CONFIG_SYS_SDRAM_BASE          0
-#define CONFIG_NR_DRAM_BANKS           1
 #define SDRAM_MAX_SIZE                 0xff000000
 
-#define CONFIG_SPI_FLASH
-#define CONFIG_SPI
-#define CONFIG_SF_DEFAULT_SPEED 20000000
-
 #ifndef CONFIG_SPL_BUILD
 
 #define ENV_MEM_LAYOUT_SETTINGS \
@@ -43,11 +34,12 @@
        "pxefile_addr_r=0x00600000\0" \
        "fdt_addr_r=0x01f00000\0" \
        "kernel_addr_r=0x02080000\0" \
-       "ramdisk_addr_r=0x04000000\0"
+       "ramdisk_addr_r=0x06000000\0"
 
 #include <config_distro_bootcmd.h>
 #define CONFIG_EXTRA_ENV_SETTINGS \
        ENV_MEM_LAYOUT_SETTINGS \
+       "fdtfile=" CONFIG_DEFAULT_FDT_FILE "\0" \
        "partitions=" PARTS_DEFAULT \
        BOOTENV