5 files changed, 3 insertions, 211 deletions

diff --git a/arch/ppc/boot/ld.script b/arch/ppc/boot/ld.script
index 6ee602d8b6a0..9362193742ac 100644
--- a/arch/ppc/boot/ld.script
+++ b/arch/ppc/boot/ld.script
@@ -58,9 +58,6 @@ SECTIONS
     *(.ramdisk)
     __ramdisk_end = .;
     . = ALIGN(4096);
-    __sysmap_begin = .;
-    *(.sysmap)
-    __sysmap_end = .;
     CONSTRUCTORS
   }
   _edata  =  .;
diff --git a/arch/ppc/boot/openfirmware/Makefile b/arch/ppc/boot/openfirmware/Makefile
index 4eacbd8c772a..03415238fabf 100644
--- a/arch/ppc/boot/openfirmware/Makefile
+++ b/arch/ppc/boot/openfirmware/Makefile
@@ -54,13 +54,10 @@ $(images)/ramdisk.image.gz:
         @echo '          RAM disk image must be provided separately'
         @/bin/false
 
-objcpxmon-$(CONFIG_XMON) := --add-section=.sysmap=System.map \
-        --set-section-flags=.sysmap=contents,alloc,load,readonly,data
 quiet_cmd_genimage = GEN     $@
       cmd_genimage = $(OBJCOPY) -R .comment       \
         --add-section=.image=$(images)/vmlinux.gz \
-        --set-section-flags=.image=contents,alloc,load,readonly,data \
-        $(objcpxmon-y) $< $@
+        --set-section-flags=.image=contents,alloc,load,readonly,data $< $@
 
 targets += image.o
 $(obj)/image.o: $(obj)/dummy.o $(images)/vmlinux.gz FORCE
diff --git a/arch/ppc/boot/openfirmware/common.c b/arch/ppc/boot/openfirmware/common.c
index 9e6952781f1f..0f46756a903e 100644
--- a/arch/ppc/boot/openfirmware/common.c
+++ b/arch/ppc/boot/openfirmware/common.c
@@ -15,7 +15,6 @@
 #include <asm/page.h>
 
 /* Information from the linker */
-extern char __sysmap_begin, __sysmap_end;
 
 extern int strcmp(const char *s1, const char *s2);
 extern char *avail_ram, *avail_high;
@@ -116,14 +115,8 @@ void gunzip(void *dst, int dstlen, unsigned char *src, int *lenp)
 void make_bi_recs(unsigned long addr, char *name, unsigned int mach,
                 unsigned long progend)
 {
-        unsigned long sysmap_size;
         struct bi_record *rec;
 
-        /* Figure out the size of a possible System.map we're going to
-         * pass along.
-         * */
-        sysmap_size = (unsigned long)(&__sysmap_end) -
-                (unsigned long)(&__sysmap_begin);
 
         /* leave a 1MB gap then align to the next 1MB boundary */
         addr = _ALIGN(addr+ (1<<20) - 1, (1<<20));
@@ -147,15 +140,6 @@ void make_bi_recs(unsigned long addr, char *name, unsigned int mach,
         rec->size = sizeof(struct bi_record) + 2 * sizeof(unsigned long);
         rec = (struct bi_record *)((unsigned long)rec + rec->size);
 
-        if (sysmap_size) {
-                rec->tag = BI_SYSMAP;
-                rec->data[0] = (unsigned long)(&__sysmap_begin);
-                rec->data[1] = sysmap_size;
-                rec->size = sizeof(struct bi_record) + 2 *
-                        sizeof(unsigned long);
-                rec = (struct bi_record *)((unsigned long)rec + rec->size);
-        }
-
         rec->tag = BI_LAST;
         rec->size = sizeof(struct bi_record);
         rec = (struct bi_record *)((unsigned long)rec + rec->size);
diff --git a/arch/ppc/boot/simple/Makefile b/arch/ppc/boot/simple/Makefile
index c28061ad5982..991b4cbb83c8 100644
--- a/arch/ppc/boot/simple/Makefile
+++ b/arch/ppc/boot/simple/Makefile
@@ -203,7 +203,7 @@ $(obj)/zvmlinux: $(OBJS) $(LIBS) $(srctree)/$(boot)/ld.script \
                 $(obj)/dummy.o $(obj)/image.o
         $(LD) $(LD_ARGS) -o $@ $(OBJS) $(obj)/image.o $(LIBS)
         $(OBJCOPY) $(OBJCOPY_ARGS) $@ $@ -R .comment -R .stab \
-                -R .stabstr -R .ramdisk -R .sysmap
+                -R .stabstr -R .ramdisk
 
 $(obj)/zvmlinux.initrd: $(OBJS) $(LIBS) $(srctree)/$(boot)/ld.script \
                 $(images)/vmlinux.gz $(obj)/dummy.o
@@ -215,7 +215,7 @@ $(obj)/zvmlinux.initrd: $(OBJS) $(LIBS) $(srctree)/$(boot)/ld.script \
                 $(obj)/dummy.o $(obj)/image.o
         $(LD) $(LD_ARGS) -o $@ $(OBJS) $(obj)/image.o $(LIBS)
         $(OBJCOPY) $(OBJCOPY_ARGS) $@ $@ -R .comment -R .stab \
-                -R .stabstr -R .sysmap
+                -R .stabstr
 
 # Sort-of dummy rules, that let us format the image we want.
 zImage: $(images)/$(zimage-y) $(obj)/zvmlinux
diff --git a/arch/ppc/boot/utils/addSystemMap.c b/arch/ppc/boot/utils/addSystemMap.c
deleted file mode 100644
index 4654f891b274..000000000000
--- a/arch/ppc/boot/utils/addSystemMap.c
+++ /dev/null
@@ -1,186 +0,0 @@
-#include <stdio.h>
-#include <stdlib.h>
-#include <byteswap.h>
-#include <sys/types.h>
-#include <sys/stat.h>
-
-void xlate( char * inb, char * trb, unsigned len )
-{
-    unsigned i;
-    for (  i=0; i<len; ++i ) {
-        char c = *inb++;
-        char c1 = c >> 4;
-        char c2 = c & 0xf;
-        if ( c1 > 9 )
-            c1 = c1 + 'A' - 10;
-        else
-            c1 = c1 + '0';
-        if ( c2 > 9 )
-            c2 = c2 + 'A' - 10;
-        else
-            c2 = c2 + '0';
-        *trb++ = c1;
-        *trb++ = c2;
-    }
-    *trb = 0;
-}
-
-#define ElfHeaderSize  (64 * 1024)
-#define ElfPages  (ElfHeaderSize / 4096)
-#define KERNELBASE (0xc0000000)
-
-void get4k( /*istream *inf*/FILE *file, char *buf )
-{
-    unsigned j;
-    unsigned num = fread(buf, 1, 4096, file);
-    for (  j=num; j<4096; ++j )
-        buf[j] = 0;
-}
-
-void put4k( /*ostream *outf*/FILE *file, char *buf )
-{
-    fwrite(buf, 1, 4096, file);
-}
-
-int main(int argc, char **argv)
-{
-    char inbuf[4096];
-    FILE *ramDisk = NULL;
-    FILE *inputVmlinux = NULL;
-    FILE *outputVmlinux = NULL;
-    unsigned i = 0;
-    unsigned long ramFileLen = 0;
-    unsigned long ramLen = 0;
-    unsigned long roundR = 0;
-    unsigned long kernelLen = 0;
-    unsigned long actualKernelLen = 0;
-    unsigned long round = 0;
-    unsigned long roundedKernelLen = 0;
-    unsigned long ramStartOffs = 0;
-    unsigned long ramPages = 0;
-    unsigned long roundedKernelPages = 0;
-    if ( argc < 2 ) {
-        printf("Name of System Map file missing.\n");
-        exit(1);
-    }
-
-    if ( argc < 3 ) {
-        printf("Name of vmlinux file missing.\n");
-        exit(1);
-    }
-
-    if ( argc < 4 ) {
-        printf("Name of vmlinux output file missing.\n");
-        exit(1);
-    }
-
-    ramDisk = fopen(argv[1], "r");
-    if ( ! ramDisk ) {
-        printf("System Map file \"%s\" failed to open.\n", argv[1]);
-        exit(1);
-    }
-    inputVmlinux = fopen(argv[2], "r");
-    if ( ! inputVmlinux ) {
-        printf("vmlinux file \"%s\" failed to open.\n", argv[2]);
-        exit(1);
-    }
-    outputVmlinux = fopen(argv[3], "w");
-    if ( ! outputVmlinux ) {
-        printf("output vmlinux file \"%s\" failed to open.\n", argv[3]);
-        exit(1);
-    }
-    fseek(ramDisk, 0, SEEK_END);
-    ramFileLen = ftell(ramDisk);
-    fseek(ramDisk, 0, SEEK_SET);
-    printf("%s file size = %ld\n", argv[1], ramFileLen);
-
-    ramLen = ramFileLen;
-
-    roundR = 4096 - (ramLen % 4096);
-    if ( roundR ) {
-        printf("Rounding System Map file up to a multiple of 4096, adding %ld\n", roundR);
-        ramLen += roundR;
-    }
-
-    printf("Rounded System Map size is %ld\n", ramLen);
-    fseek(inputVmlinux, 0, SEEK_END);
-    kernelLen = ftell(inputVmlinux);
-    fseek(inputVmlinux, 0, SEEK_SET);
-    printf("kernel file size = %ld\n", kernelLen);
-    if ( kernelLen == 0 ) {
-        printf("You must have a linux kernel specified as argv[2]\n");
-        exit(1);
-    }
-
-    actualKernelLen = kernelLen - ElfHeaderSize;
-
-    printf("actual kernel length (minus ELF header) = %ld\n", actualKernelLen);
-
-    round = actualKernelLen % 4096;
-    roundedKernelLen = actualKernelLen;
-    if ( round )
-        roundedKernelLen += (4096 - round);
-
-    printf("actual kernel length rounded up to a 4k multiple = %ld\n", roundedKernelLen);
-
-    ramStartOffs = roundedKernelLen;
-    ramPages = ramLen / 4096;
-
-    printf("System map pages to copy = %ld\n", ramPages);
-
-    // Copy 64K ELF header
-      for (i=0; i<(ElfPages); ++i) {
-          get4k( inputVmlinux, inbuf );
-          put4k( outputVmlinux, inbuf );
-      }
-
-
-
-    roundedKernelPages = roundedKernelLen / 4096;
-
-    fseek(inputVmlinux, ElfHeaderSize, SEEK_SET);
-
-    {
-        for ( i=0; i<roundedKernelPages; ++i ) {
-            get4k( inputVmlinux, inbuf );
-            if ( i == 0 ) {
-                unsigned long * p;
-                printf("Storing embedded_sysmap_start at 0x3c\n");
-                p = (unsigned long *)(inbuf + 0x3c);
-
-#if (BYTE_ORDER == __BIG_ENDIAN)
-                *p = ramStartOffs;
-#else
-                *p = bswap_32(ramStartOffs);
-#endif
-
-                printf("Storing embedded_sysmap_end at 0x44\n");
-                p = (unsigned long *)(inbuf + 0x44);
-#if (BYTE_ORDER == __BIG_ENDIAN)
-                *p = ramStartOffs + ramFileLen;
-#else
-                *p = bswap_32(ramStartOffs + ramFileLen);
-#endif
-            }
-            put4k( outputVmlinux, inbuf );
-        }
-    }
-
-    {
-        for ( i=0; i<ramPages; ++i ) {
-            get4k( ramDisk, inbuf );
-            put4k( outputVmlinux, inbuf );
-        }
-    }
-
-
-    fclose(ramDisk);
-    fclose(inputVmlinux);
-    fclose(outputVmlinux);
-    /* Set permission to executable */
-    chmod(argv[3], S_IRUSR|S_IWUSR|S_IXUSR|S_IRGRP|S_IXGRP|S_IROTH|S_IXOTH);
-
-    return 0;
-
-}
-