brain-hackers_pepepper-mirror/u-boot-brain
1
0
Fork 0
mirror of https://github.com/brain-hackers/u-boot-brain synced 2024-06-09 23:36:03 +09:00
Code Issues Projects Releases Wiki Activity

Revert "habv4: tools: Avoid hardcoded CSF size for SPL targets"

Browse Source 
This reverts commit 62a52f3f85bf33e286632e99f0d39b2c166af0c4.
This commit is contained in:
Stefano Babic 2019-09-13 18:53:03 +02:00
parent 40af7d39aa
commit 70026345ed
2 changed files with 4 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
common/image.c
View File

@ -61,8 +61,6 @@ static const image_header_t *image_get_ramdisk(ulong rd_addr, uint8_t arch,
#endif /* !USE_HOSTCC*/
#include <u-boot/crc.h>
#include <imximage.h>
#include <generated/autoconf.h>
#ifndef CONFIG_SYS_BARGSIZE
#define CONFIG_SYS_BARGSIZE 512
@ -380,9 +378,9 @@ void image_print_contents(const void *ptr)
}
} else if (image_check_type(hdr, IH_TYPE_FIRMWARE_IVT)) {
printf("HAB Blocks: 0x%08x 0x0000 0x%08x\n",
image_get_load(hdr) - image_get_header_size(),
(int)(image_get_size(hdr) + image_get_header_size()
+ sizeof(flash_header_v2_t) - CONFIG_CSF_SIZE));
image_get_load(hdr) - image_get_header_size(),
image_get_size(hdr) + image_get_header_size()
- 0x1FE0);
}
}

5
tools/default_image.c
View File

@ -19,8 +19,6 @@
#include <image.h>
#include <tee/optee.h>
#include <u-boot/crc.h>
#include <imximage.h>
#include <generated/autoconf.h>
static image_header_t header;
@ -108,8 +106,7 @@ static void image_set_header(void *ptr, struct stat *sbuf, int ifd,
if (params->type == IH_TYPE_FIRMWARE_IVT)
/* Add size of CSF minus IVT */
imagesize = sbuf->st_size - sizeof(image_header_t)
+ CONFIG_CSF_SIZE - sizeof(flash_header_v2_t);
imagesize = sbuf->st_size - sizeof(image_header_t) + 0x1FE0;
else
imagesize = sbuf->st_size - sizeof(image_header_t);