mirror of
https://github.com/brain-hackers/u-boot-brain
synced 2024-06-09 15:26:03 +09:00
bootstage: Fix counting of entries in stash
The current code searches for empty records but these not existing with bootstage now. This used to be needed when bootstage records were stored in a spare array. Drop the unnecessary code and fix a code-style nit at the same time. Signed-off-by: Simon Glass <sjg@chromium.org>
This commit is contained in:
parent
53a4f253f1
commit
ed54bdaf88
|
@ -373,7 +373,6 @@ int bootstage_stash(void *base, int size)
|
|||
const struct bootstage_record *rec;
|
||||
char buf[20];
|
||||
char *ptr = base, *end = ptr + size;
|
||||
uint32_t count;
|
||||
int i;
|
||||
|
||||
if (hdr + 1 > (struct bootstage_hdr *)end) {
|
||||
|
@ -384,22 +383,15 @@ int bootstage_stash(void *base, int size)
|
|||
/* Write an arbitrary version number */
|
||||
hdr->version = BOOTSTAGE_VERSION;
|
||||
|
||||
/* Count the number of records, and write that value first */
|
||||
for (rec = data->record, i = count = 0; i < data->rec_count;
|
||||
i++, rec++) {
|
||||
if (rec->id != 0)
|
||||
count++;
|
||||
}
|
||||
hdr->count = count;
|
||||
hdr->count = data->rec_count;
|
||||
hdr->size = 0;
|
||||
hdr->magic = BOOTSTAGE_MAGIC;
|
||||
hdr->next_id = data->next_id;
|
||||
ptr += sizeof(*hdr);
|
||||
|
||||
/* Write the records, silently stopping when we run out of space */
|
||||
for (rec = data->record, i = 0; i < data->rec_count; i++, rec++) {
|
||||
for (rec = data->record, i = 0; i < data->rec_count; i++, rec++)
|
||||
append_data(&ptr, end, rec, sizeof(*rec));
|
||||
}
|
||||
|
||||
/* Write the name strings */
|
||||
for (rec = data->record, i = 0; i < data->rec_count; i++, rec++) {
|
||||
|
|
Loading…
Reference in New Issue
Block a user