projects
/
platform
/
kernel
/
u-boot.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge tag 'u-boot-nand-20230417' of https://source.denx.de/u-boot/custodians/u-boot...
[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
f66a7d2
..
39a40f4
100644
(file)
--- a/
include/configs/rk322x_common.h
+++ b/
include/configs/rk322x_common.h
@@
-8,22
+8,13
@@
#include <asm/arch-rockchip/hardware.h>
#include "rockchip-common.h"
#include <asm/arch-rockchip/hardware.h>
#include "rockchip-common.h"
-#define CONFIG_SYS_CBSIZE 1024
-#define CONFIG_SYS_BOOTM_LEN (64 << 20) /* 64M */
+#define CFG_SYS_HZ_CLOCK 24000000
-#define C
ONFIG_SYS_HZ_CLOCK 2400
0000
+#define C
FG_IRAM_BASE 0x1008
0000
-#define CONFIG_SYS_INIT_SP_ADDR 0x61100000
-#define CONFIG_SPL_MAX_SIZE 0x100000
-
-#define CONFIG_IRAM_BASE 0x10080000
-
-#define CONFIG_SYS_SDRAM_BASE 0x60000000
-#define SDRAM_BANK_SIZE (512UL << 20UL)
+#define CFG_SYS_SDRAM_BASE 0x60000000
#define SDRAM_MAX_SIZE 0x80000000
#define SDRAM_MAX_SIZE 0x80000000
-#ifndef CONFIG_SPL_BUILD
-
#define ENV_MEM_LAYOUT_SETTINGS \
"scriptaddr=0x60000000\0" \
"pxefile_addr_r=0x60100000\0" \
#define ENV_MEM_LAYOUT_SETTINGS \
"scriptaddr=0x60000000\0" \
"pxefile_addr_r=0x60100000\0" \
@@
-35,12
+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 */
/* 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 C
ONFI
G_EXTRA_ENV_SETTINGS \
+#define C
F
G_EXTRA_ENV_SETTINGS \
"fdtfile=" CONFIG_DEFAULT_FDT_FILE "\0" \
"fdt_high=0x7fffffff\0" \
"partitions=" PARTS_DEFAULT \
ENV_MEM_LAYOUT_SETTINGS \
BOOTENV
"fdtfile=" CONFIG_DEFAULT_FDT_FILE "\0" \
"fdt_high=0x7fffffff\0" \
"partitions=" PARTS_DEFAULT \
ENV_MEM_LAYOUT_SETTINGS \
BOOTENV
-#endif
#endif
#endif