diff options
| author | Jeffy Chen <jeffy.chen@rock-chips.com> | 2015-11-27 12:07:16 +0800 |
|---|---|---|
| committer | Simon Glass <sjg@chromium.org> | 2015-12-13 17:07:06 -0700 |
| commit | 5cc5b901e6d319af18b8dc59537c503bbd3ca7f0 (patch) | |
| tree | 1a1f8acf7594f27ce86623db443fef261446a72f /tools | |
| parent | 5076c64a08d2083af5a7761b12a30116ef0da967 (diff) | |
| download | u-boot-imx-5cc5b901e6d319af18b8dc59537c503bbd3ca7f0.zip u-boot-imx-5cc5b901e6d319af18b8dc59537c503bbd3ca7f0.tar.gz u-boot-imx-5cc5b901e6d319af18b8dc59537c503bbd3ca7f0.tar.bz2 | |
Revert "rockchip: Add max spl size & spl header configs"
This reverts commit 10b4615f9d7e177ec7fe644fbb2616e0e0956f6e
Signed-off-by: Jeffy Chen <jeffy.chen@rock-chips.com>
Acked-by: Simon Glass <sjg@chromium.org>
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/Makefile | 8 | ||||
| -rw-r--r-- | tools/rkcommon.c | 2 | ||||
| -rw-r--r-- | tools/rkcommon.h | 1 | ||||
| -rw-r--r-- | tools/rkimage.c | 2 | ||||
| -rw-r--r-- | tools/rksd.c | 4 | ||||
| -rw-r--r-- | tools/rkspi.c | 4 |
6 files changed, 8 insertions, 13 deletions
diff --git a/tools/Makefile b/tools/Makefile index 7b4cd3f..9cfd80b 100644 --- a/tools/Makefile +++ b/tools/Makefile @@ -64,7 +64,7 @@ RSA_OBJS-$(CONFIG_FIT_SIGNATURE) := $(addprefix lib/rsa/, \ rsa-sign.o rsa-verify.o rsa-checksum.o \ rsa-mod-exp.o) -ROCKCHIP_OBS = $(if $(CONFIG_ARCH_ROCKCHIP),lib/rc4.o rkcommon.o rkimage.o rksd.o,) +ROCKCHIP_OBS = lib/rc4.o rkcommon.o rkimage.o rksd.o # common objs for dumpimage and mkimage dumpimage-mkimage-objs := aisimage.o \ @@ -109,12 +109,6 @@ fit_check_sign-objs := $(dumpimage-mkimage-objs) fit_check_sign.o # TODO(sjg@chromium.org): Is this correct on Mac OS? -ifneq ($(CONFIG_ARCH_ROCKCHIP),) -HOST_EXTRACFLAGS += \ - -DCONFIG_ROCKCHIP_MAX_SPL_SIZE=$(CONFIG_ROCKCHIP_MAX_SPL_SIZE) \ - -DCONFIG_ROCKCHIP_SPL_HDR="\"$(CONFIG_ROCKCHIP_SPL_HDR)\"" -endif - ifneq ($(CONFIG_MX23)$(CONFIG_MX28),) # Add CONFIG_MXS into host CFLAGS, so we can check whether or not register # the mxsimage support within tools/mxsimage.c . diff --git a/tools/rkcommon.c b/tools/rkcommon.c index 249c862..9e2173f 100644 --- a/tools/rkcommon.c +++ b/tools/rkcommon.c @@ -49,7 +49,7 @@ int rkcommon_set_header(void *buf, uint file_size) { struct header0_info *hdr; - if (file_size > CONFIG_ROCKCHIP_MAX_SPL_SIZE) + if (file_size > RK_MAX_CODE1_SIZE) return -ENOSPC; memset(buf, '\0', RK_INIT_OFFSET * RK_BLK_SIZE); diff --git a/tools/rkcommon.h b/tools/rkcommon.h index 0fc1e96..222156e 100644 --- a/tools/rkcommon.h +++ b/tools/rkcommon.h @@ -12,6 +12,7 @@ enum { RK_BLK_SIZE = 512, RK_INIT_OFFSET = 4, RK_MAX_BOOT_SIZE = 512 << 10, + RK_MAX_CODE1_SIZE = 32 << 10, }; /** diff --git a/tools/rkimage.c b/tools/rkimage.c index 73634e3..7b292f4 100644 --- a/tools/rkimage.c +++ b/tools/rkimage.c @@ -30,7 +30,7 @@ static void rkimage_print_header(const void *buf) static void rkimage_set_header(void *buf, struct stat *sbuf, int ifd, struct image_tool_params *params) { - memcpy(buf, CONFIG_ROCKCHIP_SPL_HDR, 4); + memcpy(buf, "RK32", 4); } static int rkimage_extract_subimage(void *buf, struct image_tool_params *params) diff --git a/tools/rksd.c b/tools/rksd.c index f660d56..39f5c75 100644 --- a/tools/rksd.c +++ b/tools/rksd.c @@ -50,7 +50,7 @@ static void rksd_set_header(void *buf, struct stat *sbuf, int ifd, size); } - memcpy(buf + RKSD_SPL_HDR_START, CONFIG_ROCKCHIP_SPL_HDR, 4); + memcpy(buf + RKSD_SPL_HDR_START, "RK32", 4); } static int rksd_extract_subimage(void *buf, struct image_tool_params *params) @@ -72,7 +72,7 @@ static int rksd_vrec_header(struct image_tool_params *params, { int pad_size; - pad_size = RKSD_SPL_HDR_START + CONFIG_ROCKCHIP_MAX_SPL_SIZE; + pad_size = RKSD_SPL_HDR_START + RK_MAX_CODE1_SIZE; debug("pad_size %x\n", pad_size); return pad_size - params->file_size; diff --git a/tools/rkspi.c b/tools/rkspi.c index 69a12f0..eb8119b 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, CONFIG_ROCKCHIP_SPL_HDR, 4); + memcpy(buf + RKSPI_SPL_HDR_START, "RK32", 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 = (CONFIG_ROCKCHIP_MAX_SPL_SIZE + 0x7ff) / 0x800 * 0x800; + pad_size = (RK_MAX_CODE1_SIZE + 0x7ff) / 0x800 * 0x800; params->orig_file_size = pad_size; /* We will double the image size due to the SPI format */ |