X-Git-Url: https://git.ozlabs.org/?a=blobdiff_plain;f=second%2Fyaboot.c;h=5df07608dacb297eda7352fa03c55013ec3d2f64;hb=1f0f86b8e9cb113674bec055c2d0f182a28a5bd2;hp=5fc1213114d0a651123d1b71cba1eb9b8fb723a6;hpb=526b77920b050e1e37e842e8def4a5e7fb04cee6;p=yaboot.git diff --git a/second/yaboot.c b/second/yaboot.c index 5fc1213..5df0760 100644 --- a/second/yaboot.c +++ b/second/yaboot.c @@ -300,6 +300,7 @@ void print_message_file(char *filename) } strncpy(msgpath, filename, sizeof(msgpath)); + msgfile = boot; /* Copy all the original paramters */ if (!parse_device_path(msgpath, defdev, defpart, "/etc/yaboot.msg", &msgfile)) { prom_printf("%s: Unable to parse\n", msgpath); goto done; @@ -470,6 +471,8 @@ static int load_my_config_file(struct boot_fspec_t *orig_fspec) int minlen; packet = prom_get_netinfo(); + if (!packet) + goto out; /* * First, try to match on mac address with the hardware type @@ -988,6 +991,7 @@ int get_params(struct boot_param_t* params) if (!label && password) check_password ("To boot a custom image you must enter the password."); + params->kernel = boot; /* Copy all the original paramters */ if (!parse_device_path(imagepath, defdevice, defpart, "/vmlinux", ¶ms->kernel)) { prom_printf("%s: Unable to parse\n", imagepath); @@ -1009,6 +1013,7 @@ int get_params(struct boot_param_t* params) strncpy(initrdpath, p, 1024); DEBUG_F("Parsing initrd path <%s>\n", initrdpath); + params->rd = boot; /* Copy all the original paramters */ if (!parse_device_path(initrdpath, defdevice, defpart, "/root.bin", ¶ms->rd)) { prom_printf("%s: Unable to parse\n", imagepath); @@ -1019,6 +1024,7 @@ int get_params(struct boot_param_t* params) if (p && *p) { DEBUG_F("Parsing sysmap path <%s>\n", p); strncpy(sysmappath, p, 1024); + params->sysmap = boot; /* Copy all the original paramters */ if (!parse_device_path(sysmappath, defdevice, defpart, "/boot/System.map", ¶ms->sysmap)) { prom_printf("%s: Unable to parse\n", imagepath); @@ -1047,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; @@ -1239,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; @@ -1520,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); @@ -1606,7 +1566,7 @@ is_elf64(loadinfo_t *loadinfo) e->e_ident[EI_MAG3] == ELFMAG3 && e->e_ident[EI_CLASS] == ELFCLASS64 && e->e_ident[EI_DATA] == ELFDATA2MSB && - e->e_type == ET_EXEC && + (e->e_type == ET_EXEC || e->e_type == ET_DYN) && e->e_machine == EM_PPC64); } @@ -1702,7 +1662,8 @@ yaboot_main(void) DEBUG_F("/chosen/bootargs = %s\n", bootargs); prom_get_chosen("bootpath", bootdevice, BOOTDEVSZ); DEBUG_F("/chosen/bootpath = %s\n", bootdevice); - prom_get_options("ibm,fw-nbr-reboots",fw_nbr_reboots, FW_NBR_REBOOTSZ); + if (prom_get_options("ibm,client-architecture-support-reboot",fw_nbr_reboots, FW_NBR_REBOOTSZ) == -1 ) + prom_get_options("ibm,fw-nbr-reboots",fw_nbr_reboots, FW_NBR_REBOOTSZ); fw_reboot_cnt = simple_strtol(fw_nbr_reboots,&endp,10); if (fw_reboot_cnt > 0L) prom_get_options("boot-last-label", bootlastlabel, BOOTLASTSZ); @@ -1749,7 +1710,7 @@ yaboot_main(void) prom_printf("%s: Unable to parse\n", bootdevice); return -1; } - if (_machine == _MACH_bplan) + if (_machine == _MACH_bplan && !conf_given) boot.part++; DEBUG_F("After parse_device_path: dev=%s, part=%d, file=%s\n", boot.dev, boot.part, boot.file);