X-Git-Url: http://git.ozlabs.org/?p=yaboot.git;a=blobdiff_plain;f=second%2Fyaboot.c;h=9075db1bf004fdaab7625683408844e97358d62f;hp=3fbb103ab4d942134be70c0855ceda1b58f7cb24;hb=81d00c88d7a046b86d0f4298686e7627dc8d135e;hpb=874609eb643e1f93f78b36c706dcdfb6bb4ddde3;ds=inline diff --git a/second/yaboot.c b/second/yaboot.c index 3fbb103..9075db1 100644 --- a/second/yaboot.c +++ b/second/yaboot.c @@ -112,6 +112,11 @@ static void setup_display(void); int useconf = 0; char bootdevice[BOOTDEVSZ]; +char bootoncelabel[1024]; +char bootargs[1024]; +char bootlastlabel[BOOTLASTSZ] = {0}; +char fw_nbr_reboots[FW_NBR_REBOOTSZ] = {0}; +long fw_reboot_cnt = 0; char *password = NULL; struct boot_fspec_t boot; int _machine = _MACH_Pmac; @@ -149,10 +154,6 @@ int fgcolor = 15; int bgcolor = 0; #endif /* CONFIG_COLOR_TEXT */ -#if DEBUG -static int test_bss; -static int test_data = 0; -#endif static int pause_after; static char *pause_message = "Type go to continue.\n"; static char given_bootargs[1024]; @@ -169,32 +170,25 @@ extern unsigned char linux_logo_blue[]; extern char* __bss_start; extern char* _end; -static struct first_info *quik_fip = NULL; - int yaboot_start (unsigned long r3, unsigned long r4, unsigned long r5) { int result; void* malloc_base = NULL; + unsigned long addr; prom_handle root; /* OF seems to do it, but I'm not very confident */ memset(&__bss_start, 0, &_end - &__bss_start); - /* Check for quik first stage bootloader (but I don't think we are - * compatible with it anyway, I'll look into backporting to older OF - * versions later - */ - if (r5 == 0xdeadbeef) { - r5 = r3; - quik_fip = (struct first_info *)r4; - } - /* Initialize OF interface */ prom_init ((prom_entry) r5); /* Allocate some memory for malloc'ator */ - malloc_base = prom_claim((void *)MALLOCADDR, MALLOCSIZE, 0); + for (addr = MALLOCADDR; addr <= MALLOCADDR * 16 ;addr+=0x100000) { + malloc_base = prom_claim((void *)addr, MALLOCSIZE, 0); + if (malloc_base != (void *)-1) break; + } if (malloc_base == (void *)-1) { prom_printf("Can't claim malloc buffer (%d bytes at 0x%08x)\n", MALLOCSIZE, MALLOCADDR); @@ -206,10 +200,6 @@ yaboot_start (unsigned long r3, unsigned long r4, unsigned long r5) /* A few useless DEBUG_F's */ DEBUG_F("reloc_offset : %ld (should be 0)\n", reloc_offset()); - DEBUG_F("test_bss : %d (should be 0)\n", test_bss); - DEBUG_F("test_data : %d (should be 0)\n", test_data); - DEBUG_F("&test_data : %p\n", &test_data); - DEBUG_F("&test_bss : %p\n", &test_bss); DEBUG_F("linked at : 0x%08x\n", TEXTADDR); /* ask the OF info if we're a chrp or pmac */ @@ -217,7 +207,10 @@ yaboot_start (unsigned long r3, unsigned long r4, unsigned long r5) root = prom_finddevice("/"); if (root != 0) { static char model[256]; - if (prom_getprop(root, "device_type", model, 256 ) > 0 && + if (prom_getprop(root, "CODEGEN,vendor", model, 256) > 0 && + !strncmp("bplan", model, 5)) + _machine = _MACH_bplan; + else if (prom_getprop(root, "device_type", model, 256 ) > 0 && !strncmp("chrp", model, 4)) _machine = _MACH_chrp; else { @@ -288,6 +281,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; @@ -324,13 +318,11 @@ done: * config file. Handle the "\\" (blessed system folder) */ static int -load_config_file(struct boot_fspec_t *orig_fspec) +load_config_file(struct boot_fspec_t *fspec) { char *conf_file = NULL, *p; struct boot_file_t file; int sz, opened = 0, result = 0; - char conf_path[512]; - struct boot_fspec_t fspec = *orig_fspec; /* Allocate a buffer for the config file */ conf_file = malloc(CONFIG_FILE_MAX); @@ -339,22 +331,11 @@ load_config_file(struct boot_fspec_t *orig_fspec) goto bail; } - /* Build the path to the file */ - if (_machine == _MACH_chrp) - strcpy(conf_path, "/etc/"); - else - conf_path[0] = 0; - if (fspec.file && *fspec.file) - strcat(conf_path, fspec.file); - else - strcat(conf_path, CONFIG_FILE_NAME); - /* Open it */ - fspec.file = conf_path; - result = open_file(&fspec, &file); + result = open_file(fspec, &file); if (result != FILE_ERR_OK) { - prom_printf("%s:%d,", fspec.dev, fspec.part); - prom_perror(result, fspec.file); + prom_printf("%s:%d,", fspec->dev, fspec->part); + prom_perror(result, fspec->file); prom_printf("Can't open config file\n"); goto bail; } @@ -374,11 +355,27 @@ load_config_file(struct boot_fspec_t *orig_fspec) opened = 0; /* Call the parsing code in cfg.c */ - if (cfg_parse(conf_path, conf_file, sz) < 0) { + if (cfg_parse(fspec->file, conf_file, sz) < 0) { prom_printf ("Syntax error or read error config\n"); goto bail; } + /* + * set the default cf_option to label that has the same MAC addr + * it only works if there is a label with the MAC addr on yaboot.conf + */ + if (prom_get_devtype(fspec->dev) == FILE_DEVICE_NET) { + /* change the variable bellow to get the MAC dinamicaly */ + char * macaddr = NULL; + int default_mac = 0; + + macaddr = prom_get_mac(prom_get_netinfo()); + default_mac = cfg_set_default_by_mac(macaddr); + if (default_mac >= 1) { + prom_printf("Default label was changed to macaddr label.\n"); + } + } + DEBUG_F("Config file successfully parsed, %d bytes\n", sz); /* Now, we do the initialisations stored in the config file */ @@ -440,35 +437,6 @@ bail: return result; } -/* - * "bootp-response" is the property name which is specified in - * the recommended practice doc for obp-tftp. However, pmac - * provides a "dhcp-response" property and chrp provides a - * "bootpreply-packet" property. The latter appears to begin the - * bootp packet at offset 0x2a in the property for some reason. - */ - -struct bootp_property_offset { - char *name; /* property name */ - int offset; /* offset into property where bootp packet occurs */ -}; -static const struct bootp_property_offset bootp_response_properties[] = { - { .name = "bootp-response", .offset = 0 }, - { .name = "dhcp-response", .offset = 0 }, - { .name = "bootpreply-packet", .offset = 0x2a }, -}; - -struct bootp_packet { - u8 op, htype, hlen, hops; - u32 xid; - u16 secs, flags; - u32 ciaddr, yiaddr, siaddr, giaddr; - unsigned char chaddr[16]; - unsigned char sname[64]; - unsigned char file[128]; - /* vendor options go here if we need them */ -}; - /* * Search for config file by MAC address, then by IP address. * Basically copying pxelinux's algorithm. @@ -476,84 +444,47 @@ struct bootp_packet { */ static int load_my_config_file(struct boot_fspec_t *orig_fspec) { - void *bootp_response = NULL; - char *propname; struct bootp_packet *packet; - int i = 0, size, offset = 0, rc = 0; - prom_handle chosen; + int rc = 0; struct boot_fspec_t fspec = *orig_fspec; -#define ARRAY_SIZE(x) (sizeof(x) / sizeof(x[0])) - - chosen = prom_finddevice("/chosen"); - if (chosen < 0) { - prom_printf("chosen=%d\n", chosen); - return 0; - } + char *cfgpath = (_machine == _MACH_chrp || _machine == _MACH_bplan) ? "/etc/" : ""; + int flen; + int minlen; - for (i = 0; i < ARRAY_SIZE(bootp_response_properties); i++) { - propname = bootp_response_properties[i].name; - size = prom_getproplen(chosen, propname); - if (size <= 0) - continue; - - DEBUG_F("using /chosen/%s\n", propname); - offset = bootp_response_properties[i].offset; - break; - } - - if (size <= 0) - goto out; - - if (sizeof(*packet) > size - offset) { - prom_printf("Malformed %s property?\n", propname); - goto out; - } - - bootp_response = malloc(size); - if (!bootp_response) - goto out; - - if (prom_getprop(chosen, propname, bootp_response, size) < 0) - goto out; - - packet = bootp_response + offset; + packet = prom_get_netinfo(); + if (!packet) + goto out; /* * First, try to match on mac address with the hardware type * prepended. */ - /* 3 chars per byte in chaddr + 2 chars for htype + \0 */ - fspec.file = malloc(packet->hlen * 3 + 2 + 1); + /* 3 chars per byte in chaddr + 2 chars for htype + /etc/ +\0 */ + fspec.file = malloc(packet->hlen * 3 + 2 + 6); if (!fspec.file) goto out; - sprintf(fspec.file, "%02x", packet->htype); - - for (i = 0; i < packet->hlen; i++) { - char tmp[4]; - sprintf(tmp, "-%02x", packet->chaddr[i]); - strcat(fspec.file, tmp); - } + sprintf(fspec.file, "%s%02x-", cfgpath, packet->htype); + strcat(fspec.file, prom_get_mac(packet)); rc = load_config_file(&fspec); if (rc) goto out; - /* * Now try to match on IP. */ - free(fspec.file); - fspec.file = malloc(9); - sprintf(fspec.file, "%08X", packet->yiaddr); + /* no need to realloc for /etc/ + 8 chars in yiaddr + \0 */ + sprintf(fspec.file, "%s%s", cfgpath, prom_get_ip(packet)); - while (strlen(fspec.file)) { + for (flen = strlen(fspec.file), + minlen = strlen(cfgpath); flen > minlen; flen--) { rc = load_config_file(&fspec); if (rc) goto out; /* Chop one digit off the end, try again */ - fspec.file[strlen(fspec.file) - 1] = '\0'; + fspec.file[flen - 1] = '\0'; } out: @@ -561,7 +492,6 @@ static int load_my_config_file(struct boot_fspec_t *orig_fspec) orig_fspec->file = fspec.file; else free(fspec.file); - free(bootp_response); return rc; } @@ -706,6 +636,7 @@ int get_params(struct boot_param_t* params) { int defpart; char *defdevice = 0; + char defdevice_bak[1024]; char *p, *q, *endp; int c, n; char *imagename = 0, *label; @@ -714,24 +645,22 @@ int get_params(struct boot_param_t* params) int singlekey = 0; int restricted = 0; static int first = 1; - static char bootargs[1024]; static char imagepath[1024]; static char initrdpath[1024]; - static char sysmappath[1024]; + static char manualinitrd[1024]; + static int definitrd = 1, hasarg = 0; pause_after = 0; memset(params, 0, sizeof(*params)); params->args = ""; params->kernel.part = -1; params->rd.part = -1; - params->sysmap.part = -1; defpart = boot.part; cmdinit(); - if (first) { + if (first && !fw_reboot_cnt) { first = 0; - prom_get_chosen("bootargs", bootargs, sizeof(bootargs)); imagename = bootargs; word_split(&imagename, ¶ms->args); timeout = DEFAULT_TIMEOUT; @@ -745,6 +674,13 @@ int get_params(struct boot_param_t* params) timeout = simple_strtol(q, NULL, 0); } + /* If this is a reboot due to FW detecting CAS changes then + * set timeout to 1. The last kernel booted will be booted + * again automatically. It should seem seamless to the user + */ + if (fw_reboot_cnt) + timeout = 1; + prom_printf("boot: "); c = -1; if (timeout != -1) { @@ -778,8 +714,14 @@ int get_params(struct boot_param_t* params) } if (c == '\n' || c == '\r') { - if (!imagename) - imagename = cfg_get_default(); + if (!imagename) { + if (bootoncelabel[0] != 0) + imagename = bootoncelabel; + else if (bootlastlabel[0] != 0) + imagename = bootlastlabel; + else + imagename = cfg_get_default(); + } if (imagename) prom_printf("%s", imagename); if (params->args) @@ -794,13 +736,58 @@ int get_params(struct boot_param_t* params) word_split(&imagename, ¶ms->args); } + /* initrd setup via cmd console */ + /* first, check if the user uses it with some label */ + if (!strncmp(params->args, "initrd=", 7)) { + DEBUG_F("params->args: %s\n", params->args); + definitrd = 0; + } + /* after, check if there is the 'initrd=' in the imagename string */ + if (!strncmp(imagename, "initrd=", 7) || !definitrd) { + + /* return the value of definitrd to 1 */ + if (!definitrd) + definitrd = 1; + + /* args = "initrd=blah" */ + char *args = NULL; + + if (params->args) { + args = params->args; + params->args = NULL; + hasarg = 1; + } else + args = imagename; + + if (strlen(args)){ + /* copy the string after the '=' to manualinitrd */ + strcpy(manualinitrd, args+7); + definitrd = 0; + prom_printf("New initrd file specified: %s\n", manualinitrd); + } else { + prom_printf("ERROR: no initrd specified!\n"); + return 0; + } + + /* set imagename with the default values of the config file */ + if ((prom_get_devtype(boot.dev) == FILE_DEVICE_NET) && !hasarg) + imagename = cfg_get_default(); + else + imagename = cfg_get_default(); + } + /* chrp gets this wrong, force it -- Cort */ if ( useconf && (!imagename || imagename[0] == 0 )) imagename = cfg_get_default(); + /* write the imagename out so it can be reused on reboot if necessary */ + prom_set_options("boot-last-label", imagename, strlen(imagename)); + label = 0; defdevice = boot.dev; + strcpy(defdevice_bak,defdevice); + if (useconf) { defdevice = cfg_get_strg(0, "device"); p = cfg_get_strg(0, "partition"); @@ -853,10 +840,21 @@ int get_params(struct boot_param_t* params) "resides on, and \"partno\" is the partition number the image resides on.\n" "Note that the comma (,) is only required if you specify an OpenFirmware\n" "device, if you only specify a filename you should not start it with a \",\"\n\n" - "If you omit \"device:\" and \"partno\" yaboot will use the values of \n" - "\"device=\" and \"partition=\" in yaboot.conf, right now those are set to: \n" - "device=%s\n" - "partition=%d\n\n", defdevice, defpart); + "To boot a alternative initrd file rather than specified in the yaboot\n" + "configuration file, use the \"initrd\" command on Yaboot's prompt: \n" + "\"initrd=[name.img]\". This will load the \"name.img\" file after the default\n" + "kernel image. You can, also, specify a different initrd file to any other\n" + "label of the yaboot configuration file. Just type \"label initrd=[name.img]\"\n" + "and the specified initrd file will be loaded.\n\n" + "To load an alternative config file rather than /etc/yaboot.conf, enter\n" + "its device, partno and path, on Open Firmware Prompt:\n" + "boot conf=device:partno,/path/to/configfile\n." + "To reload the config file or load a new one, use the \"conf\" command\n" + "on Yaboot's prompt:\n" + "conf [device=device] [partition=partno] [file=/path/to/configfile]\n\n" + "If you omit \"device\" and \"partno\", Yaboot will use their current\n" + "values. You can check them by entering \"conf\" on Yaboot's prompt.\n"); + return 0; } @@ -874,6 +872,91 @@ int get_params(struct boot_param_t* params) return 1; } + if (!strncmp (imagename, "conf", 4)) { + + // imagename = "conf file=blah dev=bleh part=blih" + DEBUG_F("Loading user-specified config file: %s\n",imagename); + if (password) { + check_password ("Restricted command."); + return 1; + } + + // args= "file=blah dev=bleh part=blih" + char *args = params->args; + + if (strlen(args)){ + + // set a pointer to the first space in args + char *space = strchr(args,' '); + + int loop = 3; + while (loop > 0){ + char temp[1024] = "0"; + + // copy next argument to temp + strncpy(temp, args, space-args); + + // parse temp and set boot arguments + if (!strncmp (temp, "file=", 5)){ + DEBUG_F("conf file: %s\n", temp+5); + strcpy(boot.file, temp+5); + } else if (!strncmp (temp, "device=", 7)){ + DEBUG_F("conf device: %s\n", temp+7); + strcpy(boot.dev, temp+7); + } else if (!strncmp (temp, "partition=", 10)){ + DEBUG_F("conf partition: %s\n", temp+10); + boot.part=simple_strtol(temp+10,NULL,10); + } else + space = NULL; + + // set the pointer to the next space in args; + // set the loop control variable + if (strlen(space)>1){ + // Go to the next argument + args = space+1; + + loop--; + if (strchr(args,' ') == NULL) + space = &args[strlen(args)]; + else + space = strchr(args,' '); + } else { + loop = -1; + space = NULL; + } + } + + prom_printf("Loading config file...\n"); + useconf = load_config_file(&boot); + if (useconf > 0){ + if ((q = cfg_get_strg(0, "timeout")) != 0 && *q != 0) + timeout = simple_strtol(q, NULL, 0); + } else { + prom_printf("Restoring default values.\n"); + strcpy(boot.file,""); + strcpy(boot.dev, defdevice_bak); + boot.part = defpart; + } + + } else { + prom_printf("Current configuration:\n"); + prom_printf("device: %s\n", boot.dev); + if (boot.part < 0) + prom_printf("partition: auto\n"); + else + prom_printf("partition: %d\n", boot.part); + if (strlen(boot.file)) + prom_printf("file: %s\n", boot.file); + else + prom_printf("file: /etc/%s\n",CONFIG_FILE_NAME); + } + + imagename = "\0"; + params->args = "\0"; + + return 0; + } + if (imagename[0] == '$') { /* forth command string */ if (password) @@ -887,35 +970,35 @@ 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); return 0; } - DEBUG_F("after parse_device_path: dev=%s part=%d file=%s\n", params->kernel.dev, - params->kernel.part, params->kernel.file); - + DEBUG_F("after parse_device_path: dev=%s part=%d file=%s\n", params->kernel.dev, params->kernel.part, params->kernel.file); if (useconf) { p = cfg_get_strg(label, "initrd"); if (p && *p) { - DEBUG_F("Parsing initrd path <%s>\n", p); - strncpy(initrdpath, p, 1024); + + /* check if user seted to use a initrd file from boot console */ + if (!definitrd && p != manualinitrd) { + if (manualinitrd[0] != "/" && (prom_get_devtype(defdevice_bak) != FILE_DEVICE_NET)) { + strcpy(initrdpath, "/"); + strcat(initrdpath, manualinitrd); + } else + strncpy(initrdpath, manualinitrd, 1024); + } else + 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); return 0; } } - p = cfg_get_strg(label, "sysmap"); - if (p && *p) { - DEBUG_F("Parsing sysmap path <%s>\n", p); - strncpy(sysmappath, p, 1024); - if (!parse_device_path(sysmappath, defdevice, defpart, - "/boot/System.map", ¶ms->sysmap)) { - prom_printf("%s: Unable to parse\n", imagepath); - return 0; - } - } } return 0; } @@ -935,10 +1018,7 @@ yaboot_text_ui(void) static struct boot_param_t params; void *initrd_base; unsigned long initrd_size; - 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; @@ -949,8 +1029,6 @@ yaboot_text_ui(void) for (;;) { initrd_size = 0; initrd_base = 0; - sysmap_base = 0; - sysmap_size = 0; if (get_params(¶ms)) return; @@ -1013,55 +1091,6 @@ yaboot_text_ui(void) file.fs->close(&file); memset(&file, 0, sizeof(file)); - /* If sysmap, load it (only if booting a vmlinux). - */ - if (flat_vmlinux && params.sysmap.file) { - prom_printf("Loading System.map ...\n"); - if(strlen(boot.file) && !strcmp(boot.file,"\\\\") && params.sysmap.file[0] != '/' - && params.sysmap.file[0] != '\\') { - if (loc) free(loc); - loc=(char*)malloc(strlen(params.sysmap.file)+3); - if (!loc) { - prom_printf ("malloc error\n"); - goto next; - } - strcpy(loc,boot.file); - strcat(loc,params.sysmap.file); - free(params.sysmap.file); - params.sysmap.file=loc; - } - - result = open_file(¶ms.sysmap, &file); - if (result != FILE_ERR_OK) { - prom_printf("%s:%d,", params.sysmap.dev, params.sysmap.part); - prom_perror(result, params.sysmap.file); - } - else { - sysmap_base = prom_claim(loadinfo.base+loadinfo.memsize, 0x100000, 0); - if (sysmap_base == (void *)-1) { - prom_printf("Claim failed for sysmap memory\n"); - prom_pause(); - sysmap_base = 0; - } else { - sysmap_size = file.fs->read(&file, 0xfffff, sysmap_base); - if (sysmap_size == 0) - sysmap_base = 0; - else - ((char *)sysmap_base)[sysmap_size++] = 0; - } - file.fs->close(&file); - memset(&file, 0, sizeof(file)); - } - if (sysmap_base) { - prom_printf("System.map loaded at %p, size: %lu Kbytes\n", - sysmap_base, sysmap_size >> 10); - loadinfo.memsize += _ALIGN(0x100000, 0x1000); - } else { - prom_printf("System.map load failed !\n"); - prom_pause(); - } - } - /* If ramdisk, load it (only if booting a vmlinux). For now, we * can't tell the size it will be so we claim an arbitrary amount * of 4Mb. @@ -1130,50 +1159,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; @@ -1202,7 +1187,7 @@ load_elf32(struct boot_file_t *file, loadinfo_t *loadinfo) Elf32_Ehdr *e = &(loadinfo->elf.elf32hdr); Elf32_Phdr *p, *ph; int size = sizeof(Elf32_Ehdr) - sizeof(Elf_Ident); - unsigned long addr, loadaddr; + unsigned long loadaddr; /* Read the rest of the Elf header... */ if ((*(file->fs->read))(file, size, &e->e_version) < size) { @@ -1290,13 +1275,7 @@ load_elf32(struct boot_file_t *file, loadinfo_t *loadinfo) loadaddr = loadinfo->load_loc; } - /* On some systems, loadaddr may already be claimed, so try some - * other nearby addresses before giving up. - */ - for(addr=loadaddr; addr <= loadaddr * 8 ;addr+=0x100000) { - loadinfo->base = prom_claim((void *)addr, loadinfo->memsize, 0); - if (loadinfo->base != (void *)-1) break; - } + loadinfo->base = prom_claim_chunk((void *)loadaddr, loadinfo->memsize, 0); if (loadinfo->base == (void *)-1) { prom_printf("Claim error, can't allocate kernel memory\n"); goto bail; @@ -1346,7 +1325,7 @@ load_elf64(struct boot_file_t *file, loadinfo_t *loadinfo) Elf64_Ehdr *e = &(loadinfo->elf.elf64hdr); Elf64_Phdr *p, *ph; int size = sizeof(Elf64_Ehdr) - sizeof(Elf_Ident); - unsigned long addr, loadaddr; + unsigned long loadaddr; /* Read the rest of the Elf header... */ if ((*(file->fs->read))(file, size, &e->e_version) < size) { @@ -1417,8 +1396,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); @@ -1434,13 +1412,7 @@ load_elf64(struct boot_file_t *file, loadinfo_t *loadinfo) loadaddr = e->e_entry; } - /* On some systems, loadaddr may already be claimed, so try some - * other nearby addresses before giving up. - */ - for(addr=loadaddr; addr <= loadaddr * 8 ;addr+=0x100000) { - loadinfo->base = prom_claim((void *)addr, loadinfo->memsize, 0); - if (loadinfo->base != (void *)-1) break; - } + loadinfo->base = prom_claim_chunk((void *)loadaddr, loadinfo->memsize, 0); if (loadinfo->base == (void *)-1) { prom_printf("Claim error, can't allocate kernel memory\n"); goto bail; @@ -1509,7 +1481,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); } @@ -1559,7 +1531,7 @@ setup_display(void) } if (scrn == PROM_INVALID_HANDLE) { - prom_printf("No screen device found !/n"); + prom_printf("No screen device found !\n"); return; } for(i=0;i<16;i++) { @@ -1594,12 +1566,44 @@ int yaboot_main(void) { char *ptype; + char *endp; + int conf_given = 0; + char conf_path[1024]; if (_machine == _MACH_Pmac) setup_display(); + prom_get_chosen("bootargs", bootargs, sizeof(bootargs)); + DEBUG_F("/chosen/bootargs = %s\n", bootargs); prom_get_chosen("bootpath", bootdevice, BOOTDEVSZ); DEBUG_F("/chosen/bootpath = %s\n", bootdevice); + 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); + + /* If conf= specified on command line, it overrides + Usage: conf=device:partition,/path/to/conffile + Example: On Open Firmware Prompt, type + boot conf=/pci@8000000f8000000/pci@1/pci1014,028C@1/scsi@0/sd@1,0:3,/etc/yaboot.conf */ + + if (!strncmp(bootargs, "conf=", 5)) { + DEBUG_F("Using conf argument in Open Firmware\n"); + char *end = strchr(bootargs,' '); + if (end) + *end = 0; + + strcpy(bootdevice, bootargs + 5); + conf_given = 1; + DEBUG_F("Using conf=%s\n", bootdevice); + + /* Remove conf=xxx from bootargs */ + if (end) + memmove(bootargs, end+1, strlen(end+1)+1); + else + bootargs[0] = 0; + } if (bootdevice[0] == 0) { prom_get_options("boot-device", bootdevice, BOOTDEVSZ); DEBUG_F("boot-device = %s\n", bootdevice); @@ -1609,34 +1613,51 @@ yaboot_main(void) return -1; } + if (bootoncelabel[0] == 0) { + prom_get_options("boot-once", bootoncelabel, + sizeof(bootoncelabel)); + if (bootoncelabel[0] != 0) + DEBUG_F("boot-once: [%s]\n", bootoncelabel); + } + prom_set_options("boot-once", NULL, 0); + if (!parse_device_path(bootdevice, NULL, -1, "", &boot)) { prom_printf("%s: Unable to parse\n", bootdevice); return -1; } + 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); - if (strlen(boot.file)) { - if (!strncmp(boot.file, "\\\\", 2)) - boot.file = "\\\\"; - else { - char *p, *last; - p = last = boot.file; - while(*p) { - if (*p == '\\') - last = p; - p++; - } - if (p) - *(last) = 0; - else - boot.file = ""; - if (strlen(boot.file)) - strcat(boot.file, "\\"); - } + if (!conf_given) { + if (_machine == _MACH_chrp || _machine == _MACH_bplan) + boot.file = "/etc/"; + else if (strlen(boot.file)) { + if (!strncmp(boot.file, "\\\\", 2)) + boot.file = "\\\\"; + else { + char *p, *last; + p = last = boot.file; + while(*p) { + if (*p == '\\') + last = p; + p++; + } + if (p) + *(last) = 0; + else + boot.file = ""; + if (strlen(boot.file)) + strcat(boot.file, "\\"); + } + } + strcpy(conf_path, boot.file); + strcat(conf_path, CONFIG_FILE_NAME); + boot.file = conf_path; + DEBUG_F("After path kludgeup: dev=%s, part=%d, file=%s\n", + boot.dev, boot.part, boot.file); } - DEBUG_F("After pmac path kludgeup: dev=%s, part=%d, file=%s\n", - boot.dev, boot.part, boot.file); /* * If we're doing a netboot, first look for one which matches our