?  search:
summary | log | graphiclog1 | graphiclog2 | commit | commitdiff | tree | refs | edit | fork
blame | history | raw | HEAD
Dash:
[t2.git] / package / boot / arcload / 13_initrd_support.patch
blob7853b97656cf03db207b04fa9b1a5dc0272086cc
1 #! /bin/sh /usr/share/dpatch/dpatch-run
2 # --- T2-COPYRIGHT-NOTE-BEGIN ---
3 # This copyright note is auto-generated by scripts/Create-CopyPatch.
4 #
5 # T2 SDE: package/*/arcload/13_initrd_support.patch
6 # Copyright (C) 2020 - 2021 The T2 SDE Project
7 #
8 # More information can be found in the files COPYING and README.
9 #
10 # This patch file is dual-licensed. It is available under the license the
11 # patched project is licensed under, as long as it is an OpenSource license
12 # as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms
13 # of the GNU General Public License as published by the Free Software
14 # Foundation; either version 2 of the License, or (at your option) any later
15 # version.
16 # --- T2-COPYRIGHT-NOTE-END ---
17
18 diff -urNad arcload-0.5~/loader/block.c arcload-0.5/loader/block.c
19 --- arcload-0.5~/loader/block.c 2006-01-20 05:06:27.000000000 +0000
20 +++ arcload-0.5/loader/block.c 2007-09-26 16:49:18.000000000 +0000
21 @@ -89,6 +89,7 @@
22 return -1;
23 }
24 dev->pos = 0;
25 + dev->size = i->file.size;
26 dev->file = i;
27 i->refcnt++;
28
29 diff -urNad arcload-0.5~/loader/block.h arcload-0.5/loader/block.h
30 --- arcload-0.5~/loader/block.h 2006-01-18 03:46:45.000000000 +0000
31 +++ arcload-0.5/loader/block.h 2007-09-26 16:49:18.000000000 +0000
32 @@ -10,6 +10,7 @@
33 typedef struct {
34 void *file;
35 ULONG pos;
36 + ULONG size;
37 } BDEV;
38
39 INT bopen(BDEV *dev, CHAR *path);
40 diff -urNad arcload-0.5~/loader/config.c arcload-0.5/loader/config.c
41 --- arcload-0.5~/loader/config.c 2006-01-20 05:06:50.000000000 +0000
42 +++ arcload-0.5/loader/config.c 2007-09-26 16:49:18.000000000 +0000
43 @@ -37,6 +37,8 @@
44 #define S_SYSIMG 7
45 #define S_DESCR 8
46 #define S_COMMENT 9
47 +#define S_INITRD 10
48 +#define S_SYSINITRD 11
49
50 static char *token_names[] = {
51 "NONE",
52 @@ -59,7 +61,9 @@
53 "TERM",
54 "SYSIMG",
55 "DESCR",
56 - "COMMENT"
57 + "COMMENT",
58 + "INITRD",
59 + "SYSINITRD"
60 };
61
62 static int is_space(char ch)
63 @@ -98,8 +102,8 @@
64 static int rx_token(int token, char *text, int *s_state, char **label, int n_label, int *label_count,
65 char *image, int n_image, char **append, int n_append,
66 char *append_space, int *append_space_ptr, int n_append_space,
67 - int *append_count, char *descr, char *lastl, int *s_level, int *s_ignore,
68 - char *system)
69 + int *append_count, char *initrd, int n_initrd, char *descr, char *lastl,
70 + int *s_level, int *s_ignore, char *system)
71 {
72 int len;
73 switch(*s_state) {
74 @@ -160,6 +164,11 @@
75 break;
76 }
77
78 + if(!strcmp(text, "initrd")) {
79 + *s_state = S_INITRD;
80 + break;
81 + }
82 +
83 if(!*label_count) {
84 strcpy(lastl,text);
85 descr[0] = 0;
86 @@ -299,6 +308,32 @@
87
88 *s_state = S_TERM;
89 break;
90 +
91 + case S_INITRD:
92 + case S_SYSINITRD:
93 + if(token != T_STRING)
94 + return token_bomb(token, text, *s_state, image, "STRING");
95 +
96 + if((*s_state == S_INITRD) && !strcmp(text, "system")) {
97 + strcpy(initrd, system);
98 + *s_state = S_SYSINITRD;
99 + break;
100 + }
101 +
102 + if((*s_state == S_INITRD) && !strcmp(text, "absolute")) {
103 + *s_state = S_SYSINITRD;
104 + break;
105 + }
106 +
107 + if(strlen(text) >= (n_initrd - strlen(initrd))) {
108 + printf("Error: N_INITRD exceeded.\n\r");
109 + initrd[0] = 0;
110 + return 1;
111 + }
112 +
113 + strcat(initrd, text);
114 + *s_state = S_TERM;
115 + break;
116 }
117 return 0;
118 }
119 @@ -308,6 +343,7 @@
120 if(rx_token(a, b, &s_state, label, n_label, label_count, image, \
121 n_image, append, n_append, append_space, \
122 &append_space_ptr, n_append_space, append_count, \
123 + initrd, n_initrd, \
124 descr, lastl, &s_level, &s_ignore, system)) { \
125 bclose(&file); \
126 return; \
127 @@ -317,7 +353,8 @@
128
129 void parseconfig(char **label, int n_label, int *label_count, char *image,
130 int n_image, char **append, int n_append, char *append_space,
131 - int n_append_space, int *append_count, char *system)
132 + int n_append_space, int *append_count, char *initrd, int n_initrd,
133 + char *system)
134 {
135 BDEV file;
136 char str[STRING_LEN], descr[STRING_LEN], lastl[STRING_LEN];
137 diff -urNad arcload-0.5~/loader/config.h arcload-0.5/loader/config.h
138 --- arcload-0.5~/loader/config.h 2005-09-02 13:56:02.000000000 +0000
139 +++ arcload-0.5/loader/config.h 2007-09-26 16:49:18.000000000 +0000
140 @@ -16,6 +16,8 @@
141 * append_space - in-out parameter, will contain append as linear string
142 * n_append_space - input parameter, size of append_space
143 * append_count - output parameter, count of kernel arguments
144 + * initrd - output parameter, will contain path to initrd image
145 + * n_initrd - input parameter, contains maximum length of initrd
146 *
147 * if image[0] == 0 on output, we failed
148 */
149 @@ -23,7 +25,8 @@
150 char *image, int n_image,
151 char **append, int n_append,
152 char *append_space, int n_append_space,
153 - int *append_count, char *system);
154 + int *append_count, char *initrd, int n_initrd,
155 + char *system);
156
157 /* this function parses text label format into an array
158 * I'm pretty sure that by know you can guess the meanings */
159 diff -urNad arcload-0.5~/loader/main.c arcload-0.5/loader/main.c
160 --- arcload-0.5~/loader/main.c 2007-09-26 16:48:57.000000000 +0000
161 +++ arcload-0.5/loader/main.c 2007-09-26 16:49:40.000000000 +0000
162 @@ -1,5 +1,6 @@
163 /*
164 * ARCload (c) 2005 Stanislaw Skowronek
165 + * Copyright (C) 2007 Julien BLACHE
166 */
167
168 #include <arclib/arc.h>
169 @@ -21,6 +22,7 @@
170 #define N_IMAGE 256
171 #define N_APPEND 32
172 #define N_APPEND_SPACE 2048
173 +#define N_INITRD 256
174
175 #define PAGESHIFT 12
176 #define READBLOCK 16384
177 @@ -30,6 +32,12 @@
178 // malloc pool size
179 #define ARENA 1048576
180
181 +/* See load_initrd() */
182 +#define STACK_PAGES 4
183 +
184 +#define KSEG0ADDR(addr) (((addr) & 0x1fffffff) | 0x80000000)
185 +
186 +/* #define RD_DEBUG */
187
188 typedef union {
189 unsigned char e_ident[EI_NIDENT];
190 @@ -41,6 +49,13 @@
191 INT is_elf64 = 1;
192 #endif
193
194 +/* End address of kernel image */
195 +ULONG kernel_end = 0;
196 +
197 +/* Maximum page size supported by the machine */
198 +unsigned long max_page_size = 0;
199 +
200 +
201 INT checkmemmap(ULONG elf_start, ULONG elf_size)
202 {
203 MEMORYDESCRIPTOR *md;
204 @@ -70,10 +85,10 @@
205 return -1;
206 }
207
208 -ULONG vtophys(ULONG addr)
209 +ULONG vtophys(ULONG addr, int warn)
210 {
211 #ifdef M32
212 - if((addr & 0xC0000000) != 0x80000000)
213 + if(warn && ((addr & 0xC0000000) != 0x80000000))
214 printf("Warning: kernel is in a mapped area!\n\r");
215
216 return (addr & 0x1FFFFFFF);
217 @@ -82,28 +97,51 @@
218 if((addr >> 62) == 2)
219 return (addr & ((1UL << 40) - 1));
220
221 - /* ckseg */
222 + /* xkseg */
223 if((addr >> 60) == 15) {
224 - if((addr & 0xC0000000UL) != 0x80000000UL)
225 + if(warn && ((addr & 0xC0000000UL) != 0x80000000UL))
226 printf("Warning: kernel is in a mapped area!\n\r");
227
228 return (addr & 0x1FFFFFFF);
229 }
230
231 - printf("Warning: kernel is in a mapped area!\n\r");
232 + if(warn)
233 + printf("Warning: kernel is in a mapped area!\n\r");
234 +
235 return (addr & ((1UL << 40) - 1));
236 #endif
237 }
238
239 +static int load_file(BDEV *file, UCHAR *ptr, ULONG size)
240 +{
241 + INT i;
242 + ULONG pos = 0;
243 +
244 + while(size > 0) {
245 + i = ((size > READBLOCK) ? READBLOCK : size);
246 + if(bread(file, i, ptr) < 0) {
247 + printf("failed at %u!\n\r", pos);
248 + return 1;
249 + }
250 + size -= i;
251 + ptr += i;
252 + pos += i;
253 + }
254 + printf("OK.\n\r");
255 +
256 + return 0;
257 +}
258
259 #ifdef M32
260 Elf64_Addr load_elf32(Elf32_Ehdr *hdr, BDEV *file)
261 {
262 Elf32_Phdr ph[N_PHDR];
263 - INT i, j, nph = 0;
264 - ULONG left, pos;
265 + INT i, nph = 0;
266 + ULONG pos;
267 UCHAR *ptr;
268
269 + int ret;
270 +
271 /* Not Relocatable? */
272 if(hdr->e_type != ET_EXEC) {
273 printf("ELF file is not executable.\n\r");
274 @@ -125,6 +165,14 @@
275 return 0;
276 }
277
278 + /*
279 + * The offset of the first segment should be equal to the
280 + * maximal page size supported by the machine.
281 + */
282 + if(max_page_size == 0) {
283 + max_page_size = ph[nph].p_offset;
284 + }
285 +
286 if(ph[nph].p_type != PT_LOAD)
287 continue;
288
289 @@ -144,31 +192,29 @@
290 /* Realize LOAD headers */
291 for(i = 0; i < nph; i++) {
292 /* Check the Memory Map */
293 - if(checkmemmap(vtophys(ph[i].p_vaddr), ph[i].p_memsz)) {
294 + if(checkmemmap(vtophys(ph[i].p_vaddr, 1), ph[i].p_memsz)) {
295 printf("File can't be loaded into current memory map.\n\r");
296 return 0;
297 }
298
299 /* Load the ELF into memory */
300 - printf("Reading %u bytes... ", (ULONG)ph[i].p_filesz);
301 - left = ph[i].p_filesz;
302 - pos = 0;
303 ptr = (UCHAR *)ph[i].p_vaddr;
304 +
305 + printf("Loading kernel at 0x%p; reading %u bytes... ", ptr, (ULONG)ph[i].p_filesz);
306 +
307 bseek(file, ph[i].p_offset);
308 - while(left > 0) {
309 - j = ((left > READBLOCK) ? READBLOCK : left);
310 - if(bread(file, j, ptr)<0) {
311 - printf("failed at %u!\n\r", (ULONG)pos);
312 - return 0;
313 - }
314 - left -= j;
315 - ptr += j;
316 - pos += j;
317 - }
318 - printf("OK.\n\r");
319 - ptr = (UCHAR *)(ph[i].p_vaddr + ph[i].p_filesz);
320 + ret = load_file(file, ptr, ph[i].p_filesz);
321 +
322 + if(ret != 0)
323 + return 0;
324 +
325 + ptr += ph[i].p_filesz;
326 for(pos = ph[i].p_filesz; pos < ph[i].p_memsz; pos++)
327 *(ptr++) = 0;
328 +
329 + /* Save the end of the kernel image, needed to load the initrd */
330 + if((ULONG)ptr > kernel_end)
331 + kernel_end = (ULONG)ptr;
332 }
333
334 return (Elf64_Addr) hdr->e_entry;
335 @@ -178,10 +224,12 @@
336 Elf64_Addr load_elf64(Elf64_Ehdr *hdr, BDEV *file)
337 {
338 Elf64_Phdr ph[N_PHDR];
339 - INT i, j, nph = 0;
340 - ULONG left, pos;
341 + INT i, nph = 0;
342 + ULONG pos;
343 UCHAR *ptr;
344
345 + int ret;
346 +
347 /* Not Relocatable? */
348 if(hdr->e_type != ET_EXEC) {
349 printf("ELF file is not executable.\n\r");
350 @@ -203,6 +251,14 @@
351 return 0;
352 }
353
354 + /*
355 + * The offset of the first segment should be equal to the
356 + * maximal page size supported by the machine.
357 + */
358 + if(max_page_size == 0) {
359 + max_page_size = ph[nph].p_offset;
360 + }
361 +
362 if(ph[nph].p_type != PT_LOAD)
363 continue;
364
365 @@ -222,39 +278,33 @@
366 /* Realize LOAD headers */
367 for(i = 0; i < nph; i++) {
368 /* Check the Memory Map */
369 - if(checkmemmap(vtophys(ph[i].p_vaddr), ph[i].p_memsz)) {
370 + if(checkmemmap(vtophys(ph[i].p_vaddr, 1), ph[i].p_memsz)) {
371 printf("File can't be loaded into current memory map.\n\r");
372 return 0;
373 }
374
375 /* Load the ELF into memory */
376 - printf("Reading %u bytes... ", (ULONG)ph[i].p_filesz);
377 - left = ph[i].p_filesz;
378 - pos = 0;
379 #ifdef M32
380 ptr = (UCHAR *)(Elf32_Addr)ph[i].p_vaddr;
381 #else
382 ptr = (UCHAR *)ph[i].p_vaddr;
383 #endif
384 +
385 + printf("Loading kernel at 0x%p; reading %u bytes... ", ptr, (ULONG)ph[i].p_filesz);
386 +
387 bseek(file, ph[i].p_offset);
388 - while(left > 0) {
389 - j = ((left > READBLOCK) ? READBLOCK : left);
390 - if(bread(file, j, ptr)<0) {
391 - printf("failed at %u!\n\r", (ULONG)pos);
392 - return 0;
393 - }
394 - left -= j;
395 - ptr += j;
396 - pos += j;
397 - }
398 - printf("OK.\n\r");
399 -#ifdef M32
400 - ptr = (UCHAR *)(Elf32_Addr)(ph[i].p_vaddr + ph[i].p_filesz);
401 -#else
402 - ptr = (UCHAR *)(ph[i].p_vaddr + ph[i].p_filesz);
403 -#endif
404 + ret = load_file(file, ptr, ph[i].p_filesz);
405 +
406 + if(ret != 0)
407 + return 0;
408 +
409 + ptr += ph[i].p_filesz;
410 for(pos = ph[i].p_filesz; pos < ph[i].p_memsz; pos++)
411 *(ptr++) = 0;
412 +
413 + /* Save the end of the kernel image, needed to load the initrd */
414 + if((ULONG)ptr > kernel_end)
415 + kernel_end = (ULONG)ptr;
416 }
417
418 return hdr->e_entry;
419 @@ -280,7 +330,7 @@
420 goto close;
421 }
422
423 - /* Is is an ELF binary? */
424 + /* Is it an ELF binary? */
425 if((hdr.e_ident[0] != 0x7f) ||
426 (hdr.e_ident[1] != 'E') ||
427 (hdr.e_ident[2] != 'L') ||
428 @@ -322,6 +372,181 @@
429 }
430
431
432 +int load_initrd(char *fname, char **append, int n_append,
433 + char *append_space, int n_append_space, int *append_count)
434 +{
435 + BDEV file;
436 +
437 + ULONG initrd_addr;
438 +
439 + char buf[64];
440 + char *append_ptr;
441 + int len, ret;
442 +
443 + MEMORYDESCRIPTOR *current = NULL;
444 + ULONG start = 0;
445 + ULONG end;
446 +
447 + ULONG stack = vtophys((ULONG) &end, 0);
448 +
449 + kernel_end = vtophys(kernel_end, 0) + 8 * max_page_size;
450 +
451 + printf("Loading initrd %s ...\n\r", fname);
452 +
453 +#ifdef RD_DEBUG
454 + printf("RD: Max page size seems to be 0x%x\n\r", max_page_size);
455 +#endif
456 +
457 + /* Open */
458 + if(bopen(&file, fname)) {
459 + printf("Opening %s failed.\n\r", fname);
460 + return 1;
461 + }
462 + if (!file.size) file.size = 7 * 1024 * 1024; /* zero for bootp(): */
463 + /* Find a free memory region big enough to hold the initrd image */
464 + current = ArcGetMemoryDescriptor(current);
465 + if(!current) {
466 + printf("Can't find any valid memory descriptors!\n\r");
467 + goto rd_close;
468 + }
469 +
470 +#ifdef RD_DEBUG
471 + printf("RD: stack at 0x%p, kernel ends at 0x%p\n\r", stack, kernel_end);
472 +#endif
473 +
474 + while ((current = ArcGetMemoryDescriptor(current)) != NULL) {
475 + if(current->Type == FreeMemory) {
476 + start = current->BasePage << PAGESHIFT;
477 + end = start + (current->PageCount << PAGESHIFT);
478 +#ifdef RD_DEBUG
479 + printf("RD: considering area 0x%p - 0x%p, %u pages\n\r", start, end, current->PageCount);
480 +#endif
481 + /* Leave some more room for our stack - at that point we don't need that much */
482 + if((stack >= start) && (stack < end)) {
483 +#ifdef RD_DEBUG
484 + printf("RD: area includes stack\n\r");
485 +#endif
486 + end = (stack - (STACK_PAGES << PAGESHIFT)) & ~((1 << PAGESHIFT) - 1);
487 + }
488 +
489 + /* Did we load the kernel there already ? */
490 + if((kernel_end > start) && (kernel_end < end)) {
491 +#ifdef RD_DEBUG
492 + printf("RD: area includes kernel\n\r");
493 +#endif
494 + start = (kernel_end + (1 << PAGESHIFT)) & ~((1 << PAGESHIFT) - 1);
495 + }
496 +
497 + if((end < start) || (end - start) < (file.size + max_page_size)) {
498 +#ifdef RD_DEBUG
499 + printf("RD: area too small: %u needs %u\n\r", (end - start), (file.size + max_page_size));
500 +#endif
501 + start = end = 0;
502 + continue;
503 + }
504 +#ifdef RD_DEBUG
505 + printf("RD: area 0x%p - 0x%p OK for initrd\n\r", start, end);
506 +#endif
507 + break;
508 + }
509 + }
510 +
511 + if(start == 0) {
512 + printf("initrd can't be loaded into current memory map\n\r");
513 + goto rd_close;
514 + }
515 +
516 +#ifdef M32
517 + /* Turn the physical start address into a KSEG0 address */
518 + start = KSEG0ADDR(start);
519 +#else
520 + /*
521 + * Turn the physical address into an uncached XKPHYS address
522 + * This should probably be flagged as FIXME.
523 + */
524 + start = start | 0xa800000000000000;
525 +#endif
526 +
527 + /*
528 + * Compute initrd address: must be page-aligned; as we don't know
529 + * what page size the kernel uses, we'll use the max page size we
530 + * determined from the ELF file structure when loading the kernel.
531 + */
532 + initrd_addr = (start + max_page_size) & ~(max_page_size - 1);
533 +
534 + /* Load the initrd image into memory */
535 + printf("Loading initrd at 0x%p; reading %u bytes... ", initrd_addr, file.size);
536 +
537 + ret = load_file(&file, (UCHAR *)initrd_addr, file.size);
538 + if(ret != 0)
539 + goto rd_close;
540 +
541 + /* Add rd_start= and rd_size= to the kernel arguments */
542 +
543 + if(*append_count + 2 >= n_append) {
544 + printf("Error: N_APPEND exceeded.\n\r");
545 + goto rd_close;
546 + }
547 +
548 + /* Get the tail of the append_space currently used */
549 + if(*append_count == 0) {
550 + append_ptr = append_space;
551 + } else {
552 + append_ptr = append[(*append_count) - 1];
553 + append_ptr += strlen(append_ptr) + 1;
554 + }
555 +
556 +#ifdef M64
557 + /* The kernel wants a KSEG0 address and takes care of the sign extension */
558 + initrd_addr = KSEG0ADDR(initrd_addr);
559 +#endif
560 +
561 + /* rd_start= */
562 + len = sprintf(buf, "rd_start=0x%x", initrd_addr);
563 +
564 +#ifdef RD_DEBUG
565 + printf("APPEND: '%s'\n\r", buf);
566 +#endif
567 +
568 + if((append_ptr - append_space + len + 1) > n_append_space) {
569 + printf("Error: N_APPEND_SPACE exceeded.\n\r");
570 + goto rd_close;
571 + }
572 +
573 + strcpy(append_ptr, buf);
574 + append[*append_count] = append_ptr;
575 + (*append_count)++;
576 +
577 + append_ptr += len + 1;
578 +
579 + /* rd_size= */
580 + len = sprintf(buf, "rd_size=0x%x", file.size);
581 +
582 +#ifdef RD_DEBUG
583 + printf("APPEND: '%s'\n\r", buf);
584 +#endif
585 +
586 + if((append_ptr - append_space + len + 1) > n_append_space) {
587 + printf("Error: N_APPEND_SPACE exceeded.\n\r");
588 + goto rd_close;
589 + }
590 +
591 + strcpy(append_ptr, buf);
592 + append[*append_count] = append_ptr;
593 + (*append_count)++;
594 +
595 + bclose(&file);
596 +
597 + return 0;
598 +
599 +/* Failed to do something, close and return */
600 +rd_close:
601 + bclose(&file);
602 + return 1;
603 +}
604 +
605 +
606 +
607 #ifdef M64
608 unsigned fixup_trampolines_data[]={
609 0x03e00821, 0x04110001, 0x00000000, 0xdfe30014,
610 @@ -389,8 +616,12 @@
611 char append_space[N_APPEND_SPACE];
612 int append_count;
613
614 + char initrd[N_INITRD];
615 +
616 unsigned long arena_start;
617
618 - printf("ARCLoad version " VERSION " (c) 2004-5 Stanislaw Skowronek\n\r");
619 + int ret;
620 +
621 + printf("ARCLoad version " VERSION " (c)2004-5 Stanislaw Skowronek, (c)2006-2021 Ren\xe9 Rebe\n\r");
622
623 #ifdef M64
624 @@ -398,9 +629,9 @@
625 #endif
626
627 arena_start = (((ULONG)__start) - ARENA)&~((1UL<<PAGESHIFT)-1);
628 - if(checkmemmap(vtophys(arena_start), ARENA)) {
629 + if(checkmemmap(vtophys(arena_start, 1), ARENA)) {
630 printf("Internal error: dynamic memory arena allocation failed.\n\r");
631 - printf("Attempted: 0x%p bytes at 0x%p.\n\r", ARENA, vtophys(((ULONG)__start) - ARENA));
632 + printf("Attempted: 0x%p bytes at 0x%p.\n\r", ARENA, vtophys(((ULONG)__start) - ARENA, 1));
633 return 1;
634 }
635 arclib_malloc_add(arena_start, ARENA);
636 @@ -427,7 +658,9 @@
637 printf("Loading configuration for '%s'...\n\r", text_label);
638 parselabel(text_label, label, N_LABEL, &label_count, label_space, N_LABEL_SPACE);
639
640 - parseconfig(label, N_LABEL, &label_count, image, N_IMAGE, append, N_APPEND, append_space, N_APPEND_SPACE, &append_count, system);
641 + *initrd = 0;
642 +
643 + parseconfig(label, N_LABEL, &label_count, image, N_IMAGE, append, N_APPEND, append_space, N_APPEND_SPACE, &append_count, initrd, N_INITRD, system);
644 if(!*label)
645 return 0;
646 if(!*image) {
647 @@ -439,6 +672,12 @@
648 if(!entry)
649 return 1;
650
651 + if(*initrd) {
652 + ret = load_initrd(initrd, append, N_APPEND, append_space, N_APPEND_SPACE, &append_count);
653 + if (ret != 0)
654 + return 1;
655 + }
656 +
657 #ifdef M32
658 if(!is_elf64) {
659 kernel_entry = (VOID(*)(INT, CHAR **, CHAR **))entry32;
660 --- arcload-0.5/loader/main.c.vanilla 2021-08-31 17:28:51.865158898 +0200
661 +++ arcload-0.5/loader/main.c 2021-08-31 18:03:45.529308219 +0200
662 @@ -112,20 +112,25 @@
663 #endif
664 }
665
666 -static int load_file(BDEV *file, UCHAR *ptr, ULONG size)
667 +static int load_file(BDEV *file, UCHAR *ptr, LONG size)
668 {
669 INT i;
670 ULONG pos = 0;
671
672 - while(size > 0) {
673 - i = ((size > READBLOCK) ? READBLOCK : size);
674 - if(bread(file, i, ptr) < 0) {
675 + while(size) {
676 + if (size < 0) i = READBLOCK;
677 + else i = ((size > READBLOCK) ? READBLOCK : size);
678 + if((i = bread(file, i, ptr)) < 0) {
679 printf("failed at %u!\n\r", pos);
680 return 1;
681 }
682 size -= i;
683 ptr += i;
684 pos += i;
685 + if ((size < 0) && (i < READBLOCK)) {
686 + file->size = pos;
687 + break;
688 + }
689 }
690 printf("OK.\n\r");
691
692 @@ -384,6 +389,7 @@
693 BDEV file;
694
695 ULONG initrd_addr;
696 + ULONG initrd_size;
697
698 char buf[64];
699 char *append_ptr;
700 @@ -408,7 +414,7 @@
701 printf("Opening %s failed.\n\r", fname);
702 return 1;
703 }
704 - if (!file.size) file.size = 7 * 1024 * 1024; /* zero for bootp(): */
705 + initrd_size = file.size ? file.size : 7*1024*1024; /* zero for bootp(): */
706 /* Find a free memory region big enough to hold the initrd image */
707 current = ArcGetMemoryDescriptor(current);
708 if(!current) {
709 @@ -444,9 +450,9 @@
710 start = end = 0; continue;
711 }
712
713 - if((end < start) || (end - start) < (file.size + max_page_size)) {
714 + if((end < start) || (end - start) < (initrd_size + max_page_size)) {
715 #ifdef RD_DEBUG
716 - printf("RD: area too small: %u needs %u\n\r", (end - start), (file.size + max_page_size));
717 + printf("RD: area too small: %u needs %u\n\r", (end - start), (initrd_size + max_page_size));
718 #endif
719 start = end = 0;
720
721 @@ -483,9 +489,9 @@
722 initrd_addr = (start + max_page_size) & ~(max_page_size - 1);
723
724 /* Load the initrd image into memory */
725 - printf("Loading initrd at 0x%p; reading %u bytes... ", initrd_addr, file.size);
726 + printf("Loading initrd at 0x%p; reading %u bytes... ", initrd_addr, initrd_size);
727
728 - ret = load_file(&file, (UCHAR *)initrd_addr, file.size);
729 + ret = load_file(&file, (UCHAR *)initrd_addr, file.size ? file.size : -1);
730 if(ret != 0)
731 goto rd_close;
732
t2sde