From: Tony Breeds Date: Fri, 16 Jul 2010 04:56:12 +0000 (+1000) Subject: Merge branch 'netboot' X-Git-Tag: yaboot-1.3.17-rc1~28 X-Git-Url: https://git.ozlabs.org/?p=yaboot.git;a=commitdiff_plain;h=1f0f86b8e9cb113674bec055c2d0f182a28a5bd2;hp=d8ea971a7f1c29e384c813773331c7148e5a18aa Merge branch 'netboot' --- diff --git a/Developers_Certificate_of_Origin.txt b/Developers_Certificate_of_Origin.txt new file mode 100644 index 0000000..7fd781a --- /dev/null +++ b/Developers_Certificate_of_Origin.txt @@ -0,0 +1,17 @@ +Developer's Certificate of Origin 1.1 + +By making a contribution to this project, I certify that: + +(a) The contribution was created in whole or in part by me and I have the right to submit it under the open source license indicated in the file; or + +(b) The contribution is based upon previous work that, to the best of my knowledge, is covered under an appropriate open source license and I have the right under that license to submit that work with modifications, whether created in whole or in part by me, under the same open source license (unless I am permitted to submit under a different license), as indicated in the file; or + +(c) The contribution was provided directly to me by some other person who certified (a), (b) or (c) and I have not modified it. + +(d) The contribution is made free of any other party's intellectual property claims or rights. + +(e) I understand and agree that this project and the contribution are public and that a record of the contribution (including all personal information I submit with it, including my sign-off) is maintained indefinitely and may be redistributed consistent with this project or the open source license(s) involved. + +then you just add a line saying + + Signed-off-by: Random J Developer random@developer.org> diff --git a/Makefile b/Makefile index bcc2210..d975e4e 100644 --- a/Makefile +++ b/Makefile @@ -2,7 +2,7 @@ include Config -VERSION = 1.3.14 +VERSION = 1.3.16 # Debug mode (spam/verbose) DEBUG = 0 # make install vars diff --git a/include/bootinfo.h b/include/bootinfo.h index 7602e48..3a02c90 100644 --- a/include/bootinfo.h +++ b/include/bootinfo.h @@ -36,20 +36,6 @@ #define _MACH_walnut 0x00001000 /* IBM "Walnut" 405GP eval. board */ #define _MACH_bplan 0x00002000 /* Pegasos/Efika, broken partition #s */ -struct bi_record { - unsigned long tag; /* tag ID */ - unsigned long size; /* size of record (in bytes) */ - unsigned long data[0]; /* data */ -}; - -#define BI_FIRST 0x1010 /* first record - marker */ -#define BI_LAST 0x1011 /* last record - marker */ -#define BI_CMD_LINE 0x1012 -#define BI_BOOTLOADER_ID 0x1013 -#define BI_INITRD 0x1014 -#define BI_SYSMAP 0x1015 -#define BI_MACHTYPE 0x1016 - #endif /* _PPC_BOOTINFO_H */ extern int _machine; diff --git a/second/yaboot.c b/second/yaboot.c index 66f288b..5df0760 100644 --- a/second/yaboot.c +++ b/second/yaboot.c @@ -1053,7 +1053,6 @@ yaboot_text_ui(void) void *sysmap_base; unsigned long sysmap_size; kernel_entry_t kernel_entry; - struct bi_record* birec; char* loc=NULL; loadinfo_t loadinfo; void *initrd_more,*initrd_want; @@ -1245,50 +1244,6 @@ yaboot_text_ui(void) flush_icache_range ((long)loadinfo.base, (long)loadinfo.base+loadinfo.memsize); DEBUG_F(" done\n"); - if (flat_vmlinux) { - /* - * Fill new boot infos (only if booting a vmlinux). - * - * The birec is low on memory, probably inside the malloc pool, - * so we don't write it earlier. At this point, we should not - * use anything coming from the malloc pool. - */ - birec = (struct bi_record *)_ALIGN(loadinfo.filesize+(1<<20)-1,(1<<20)); - - /* We make sure it's mapped. We map only 64k for now, it's - * plenty enough we don't claim since this precise memory - * range may already be claimed by the malloc pool. - */ - prom_map (birec, birec, 0x10000); - DEBUG_F("birec at %p\n", birec); - DEBUG_SLEEP; - - birec->tag = BI_FIRST; - birec->size = sizeof(struct bi_record); - birec = (struct bi_record *)((ulong)birec + birec->size); - - birec->tag = BI_BOOTLOADER_ID; - sprintf( (char *)birec->data, "yaboot"); - birec->size = sizeof(struct bi_record) + strlen("yaboot") + 1; - birec = (struct bi_record *)((ulong)birec + birec->size); - - birec->tag = BI_MACHTYPE; - birec->data[0] = _machine; - birec->size = sizeof(struct bi_record) + sizeof(ulong); - birec = (struct bi_record *)((ulong)birec + birec->size); - - if (sysmap_base) { - birec->tag = BI_SYSMAP; - birec->data[0] = (ulong)sysmap_base; - birec->data[1] = sysmap_size; - birec->size = sizeof(struct bi_record) + sizeof(ulong)*2; - birec = (struct bi_record *)((ulong)birec + birec->size); - } - birec->tag = BI_LAST; - birec->size = sizeof(struct bi_record); - birec = (struct bi_record *)((ulong)birec + birec->size); - } - /* compute the kernel's entry point. */ kernel_entry = loadinfo.base + loadinfo.entry - loadinfo.load_loc; @@ -1526,8 +1481,7 @@ load_elf64(struct boot_file_t *file, loadinfo_t *loadinfo) goto bail; } - /* leave some room (1Mb) for boot infos */ - loadinfo->memsize = _ALIGN(loadinfo->memsize,(1<<20)) + 0x100000; + loadinfo->memsize = _ALIGN(loadinfo->memsize,(1<<20)); /* Claim OF memory */ DEBUG_F("Before prom_claim, mem_sz: 0x%08lx\n", loadinfo->memsize); diff --git a/ybin/ybin b/ybin/ybin index d883622..44e63f4 100755 --- a/ybin/ybin +++ b/ybin/ybin @@ -29,7 +29,7 @@ fi PRG="${0##*/}" ABSPRG="$0" SIGINT="$PRG: Interrupt caught ... exiting" -VERSION=1.3.14 +VERSION=1.3.16 DEBUG=0 VERBOSE=0 TMP="${TMPDIR:-/tmp}"