Merge tag 'tpm-030822' of https://source.denx.de/u-boot/custodians/u-boot-tpm

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

diff --git a/include/configs/rk3368_common.h b/include/configs/rk3368_common.h
index 0e77866..37e0c1d 100644 (file)
--- a/include/configs/rk3368_common.h
+++ b/include/configs/rk3368_common.h
@@ -8,34 +8,14 @@
 
 #include "rockchip-common.h"
 
-#define CONFIG_SYS_CACHELINE_SIZE      64
-
-#include <asm/arch/hardware.h>
+#include <asm/arch-rockchip/hardware.h>
 #include <linux/sizes.h>
 
 #define CONFIG_SYS_SDRAM_BASE          0
 #define SDRAM_MAX_SIZE                 0xff000000
-#define CONFIG_NR_DRAM_BANKS           1
-#define CONFIG_BAUDRATE                        115200
-#define CONFIG_SYS_MALLOC_LEN          (32 << 20)
-#define CONFIG_SYS_CBSIZE              1024
-#define CONFIG_SKIP_LOWLEVEL_INIT
-
-#define COUNTER_FREQUENCY               24000000
-
-#define CONFIG_SYS_NS16550_MEM32
-
-#define CONFIG_SYS_INIT_SP_ADDR                0x00300000
-#define CONFIG_SYS_LOAD_ADDR           0x00280000
 
-#define CONFIG_SPL_TEXT_BASE            0x00000000
-#define CONFIG_SPL_MAX_SIZE             0x40000
-#define CONFIG_SPL_BSS_START_ADDR       0x400000
-#define CONFIG_SPL_BSS_MAX_SIZE         0x20000
+#define CONFIG_IRAM_BASE               0xff8c0000
 
-#define CONFIG_BOUNCE_BUFFER
-
-#ifndef CONFIG_SPL_BUILD
 #define ENV_MEM_LAYOUT_SETTINGS \
        "scriptaddr=0x00500000\0" \
        "pxefile_addr_r=0x00600000\0" \
@@ -51,5 +31,3 @@
        BOOTENV
 
 #endif
-
-#endif