X-Git-Url: https://git.ozlabs.org/?a=blobdiff_plain;f=second%2Fyaboot.c;h=e91b6c7bf5efa0943da4e606866ed020480cba7a;hb=fac08a190a9d932020b6f9275783aba2bd0902c4;hp=d6e8017bae35b01be0ab916ae0eef588b8a3472f;hpb=37578220a9120f0a7770b0c6c6eae046ce72fc93;p=yaboot.git

diff --git a/second/yaboot.c b/second/yaboot.c
index d6e8017..e91b6c7 100644
--- a/second/yaboot.c
+++ b/second/yaboot.c
@@ -1047,7 +1047,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 +1238,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 +1475,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 +1560,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);
 }