diff options
| author | Jeffy Chen <jeffy.chen@rock-chips.com> | 2015-11-17 14:20:29 +0800 |
|---|---|---|
| committer | Simon Glass <sjg@chromium.org> | 2015-12-01 08:07:22 -0700 |
| commit | 6ae5860942f4eb053e9b8c7e2673eaa7d648082d (patch) | |
| tree | 7694a565eb15215a7e57e5864016e26433fc72bb /tools/rkspi.c | |
| parent | d8b597823b90f43cb3cd1fb82ab1f4804a8ad1e5 (diff) | |
| download | u-boot-6ae5860942f4eb053e9b8c7e2673eaa7d648082d.tar.gz | |
rockchip: Add max spl size & spl header configs
Our chips may have different max spl size and spl header, so
we need to add configs for that.
Signed-off-by: Jeffy Chen <jeffy.chen@rock-chips.com>
Acked-by: Simon Glass <sjg@chromium.org>
Dropped CONFIG_ROCKCHIP_MAX_SPL_SIZE from rk3288_common.h,
Added $(if...) to tools/Makefile to fix widespread build breakage
Signed-off-by: Simon Glass <sjg@chromium.org>
Series-changes: 8
- Drop CONFIG_ROCKCHIP_MAX_SPL_SIZE from rk3288_common.h,
- Add $(if...) to tools/Makefile to fix widespread build breakage
Diffstat (limited to 'tools/rkspi.c')
| -rw-r--r-- | tools/rkspi.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/tools/rkspi.c b/tools/rkspi.c index a3c4c73916..13cc593279 100644 --- a/tools/rkspi.c +++ b/tools/rkspi.c @@ -53,7 +53,7 @@ static void rkspi_set_header(void *buf, struct stat *sbuf, int ifd, size); } - memcpy(buf + RKSPI_SPL_HDR_START, "RK32", 4); + memcpy(buf + RKSPI_SPL_HDR_START, CONFIG_ROCKCHIP_SPL_HDR, 4); /* * Spread the image out so we only use the first 2KB of each 4KB @@ -89,7 +89,7 @@ static int rkspi_vrec_header(struct image_tool_params *params, { int pad_size; - pad_size = (RK_MAX_CODE1_SIZE + 0x7ff) / 0x800 * 0x800; + pad_size = (CONFIG_ROCKCHIP_MAX_SPL_SIZE + 0x7ff) / 0x800 * 0x800; params->orig_file_size = pad_size; /* We will double the image size due to the SPI format */ |