char *conf_file = NULL, *p;
struct boot_file_t file;
int sz, opened = 0, result = 0;
- char conf_path[512];
/* Allocate a buffer for the config file */
conf_file = malloc(CONFIG_FILE_MAX);
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);
if (result != FILE_ERR_OK) {
prom_printf("%s:%d,", fspec->dev, fspec->part);
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 */
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.
*/
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]))
+ char *cfgpath = (_machine == _MACH_chrp) ? "/etc/" : "";
+ int flen;
+ int minlen;
- chosen = prom_finddevice("/chosen");
- if (chosen < 0) {
- prom_printf("chosen=%d\n", chosen);
- return 0;
- }
-
- 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();
/*
* 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);
- }
-
- //DEBUG_F("----> mac addr: %s\n", fspec.file);
+ 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:
orig_fspec->file = fspec.file;
else
free(fspec.file);
- free(bootp_response);
return rc;
}
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) {
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;
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) {
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;
}
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++) {
projects / yaboot.git / blobdiff