Commit 12829dcb authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge rsync://rsync.kernel.org/pub/scm/linux/kernel/git/paulus/ppc64-2.6

parents c60e81ee 719d1cd8

arch/ppc64/boot/Makefile

+1 −4
Original line number Diff line number Diff line
@@ -52,7 +52,7 @@ obj-sec = $(foreach section, $(1), $(patsubst %,$(obj)/kernel-%.o, $(section))) 
src-sec = $(foreach section, $(1), $(patsubst %,$(obj)/kernel-%.c, $(section)))

gz-sec  = $(foreach section, $(1), $(patsubst %,$(obj)/kernel-%.gz, $(section)))



hostprogs-y		:= piggy addnote addRamDisk

hostprogs-y		:= addnote addRamDisk

targets 		+= zImage zImage.initrd imagesize.c \

			   $(patsubst $(obj)/%,%, $(call obj-sec, $(required) $(initrd))) \

			   $(patsubst $(obj)/%,%, $(call src-sec, $(required) $(initrd))) \
@@ -78,9 +78,6 @@ addsection = $(CROSS32OBJCOPY) $(1) \ 
quiet_cmd_addnote = ADDNOTE $@ 

      cmd_addnote = $(CROSS32LD) $(BOOTLFLAGS) -o $@ $(obj-boot) && $(obj)/addnote $@



quiet_cmd_piggy = PIGGY   $@

      cmd_piggy = $(obj)/piggyback $(@:.o=) < $< | $(CROSS32AS) -o $@



$(call gz-sec, $(required)): $(obj)/kernel-%.gz: % FORCE

	$(call if_changed,gzip)

arch/ppc64/boot/main.c

+2 −6
Original line number Diff line number Diff line
@@ -17,7 +17,6 @@ 


extern void *finddevice(const char *);

extern int getprop(void *, const char *, void *, int);

extern void printk(char *fmt, ...);

extern void printf(const char *fmt, ...);

extern int sprintf(char *buf, const char *fmt, ...);

void gunzip(void *, int, unsigned char *, int *);
@@ -147,10 +146,10 @@ void start(unsigned long a1, unsigned long a2, void *promptr) 
		}

		a1 = initrd.addr;

		a2 = initrd.size;

		printf("initial ramdisk moving 0x%lx <- 0x%lx (%lx bytes)\n\r",

		printf("initial ramdisk moving 0x%lx <- 0x%lx (0x%lx bytes)\n\r",

		       initrd.addr, (unsigned long)_initrd_start, initrd.size);

		memmove((void *)initrd.addr, (void *)_initrd_start, initrd.size);

		printf("initrd head: 0x%lx\n\r", *((u32 *)initrd.addr));

		printf("initrd head: 0x%lx\n\r", *((unsigned long *)initrd.addr));

	}



	/* Eventually gunzip the kernel */
@@ -201,9 +200,6 @@ void start(unsigned long a1, unsigned long a2, void *promptr) 


	flush_cache((void *)vmlinux.addr, vmlinux.size);



	if (a1)

		printf("initrd head: 0x%lx\n\r", *((u32 *)initrd.addr));



	kernel_entry = (kernel_entry_t)vmlinux.addr;

#ifdef DEBUG

	printf( "kernel:\n\r"

arch/ppc64/boot/mknote.c

deleted100644 → 0
+0 −43
Original line number Diff line number Diff line 
/*

 * Copyright (C) Cort Dougan 1999.

 *

 * This program is free software; you can redistribute it and/or

 * modify it under the terms of the GNU General Public License

 * as published by the Free Software Foundation; either version

 * 2 of the License, or (at your option) any later version.

 *

 * Generate a note section as per the CHRP specification.

 *

 */



#include <stdio.h>



#define PL(x) printf("%c%c%c%c", ((x)>>24)&0xff, ((x)>>16)&0xff, ((x)>>8)&0xff, (x)&0xff );



int main(void)

{

/* header */

	/* namesz */

	PL(strlen("PowerPC")+1);

	/* descrsz */

	PL(6*4);

	/* type */

	PL(0x1275);

	/* name */

	printf("PowerPC"); printf("%c", 0);

	

/* descriptor */

	/* real-mode */

	PL(0xffffffff);

	/* real-base */

	PL(0x00c00000);

	/* real-size */

	PL(0xffffffff);

	/* virt-base */

	PL(0xffffffff);

	/* virt-size */

	PL(0xffffffff);

	/* load-base */

	PL(0x4000);

	return 0;

}

arch/ppc64/boot/piggyback.c

deleted100644 → 0
+0 −83
Original line number Diff line number Diff line 
/*

 * Copyright 2001 IBM Corp 

 *

 * This program is free software; you can redistribute it and/or

 * modify it under the terms of the GNU General Public License

 * as published by the Free Software Foundation; either version

 * 2 of the License, or (at your option) any later version.

 */

#include <stdio.h>

#include <unistd.h>

#include <string.h>



extern long ce_exec_config[];



int main(int argc, char *argv[])

{

	int i, cnt, pos, len;

	unsigned int cksum, val;

	unsigned char *lp;

	unsigned char buf[8192];

	char *varname;

	if (argc != 2)

	{

		fprintf(stderr, "usage: %s name <in-file >out-file\n",

			argv[0]);

		exit(1);

	}



	varname = strrchr(argv[1], '/');

	if (varname)

		varname++;

	else

		varname = argv[1];



	fprintf(stdout, "#\n");

	fprintf(stdout, "# Miscellaneous data structures:\n");

	fprintf(stdout, "# WARNING - this file is automatically generated!\n");

	fprintf(stdout, "#\n");

	fprintf(stdout, "\n");

	fprintf(stdout, "\t.data\n");

	fprintf(stdout, "\t.globl %s_data\n", varname);

	fprintf(stdout, "%s_data:\n", varname);

	pos = 0;

	cksum = 0;

	while ((len = read(0, buf, sizeof(buf))) > 0)

	{

		cnt = 0;

		lp = (unsigned char *)buf;

		len = (len + 3) & ~3;  /* Round up to longwords */

		for (i = 0;  i < len;  i += 4)

		{

			if (cnt == 0)

			{

				fprintf(stdout, "\t.long\t");

			}

			fprintf(stdout, "0x%02X%02X%02X%02X", lp[0], lp[1], lp[2], lp[3]);

			val = *(unsigned long *)lp;

			cksum ^= val;

			lp += 4;

			if (++cnt == 4)

			{

				cnt = 0;

				fprintf(stdout, " # %x \n", pos+i-12);

				fflush(stdout);

			} else

			{

				fprintf(stdout, ",");

			}

		}

		if (cnt)

		{

			fprintf(stdout, "0\n");

		}

		pos += len;

	}

	fprintf(stdout, "\t.globl %s_len\n", varname);

	fprintf(stdout, "%s_len:\t.long\t0x%x\n", varname, pos);

	fflush(stdout);

	fclose(stdout);

	fprintf(stderr, "cksum = %x\n", cksum);

	exit(0);

}

arch/ppc64/boot/prom.c

+2 −14
Original line number Diff line number Diff line
@@ -40,7 +40,7 @@ void *finddevice(const char *name); 
int getprop(void *phandle, const char *name, void *buf, int buflen);

void chrpboot(int a1, int a2, void *prom);	/* in main.c */



void printk(char *fmt, ...);

int printf(char *fmt, ...);



/* there is no convenient header to get this from...  -- paulus */

extern unsigned long strlen(const char *);
@@ -220,7 +220,7 @@ readchar(void) 
		case 1:

			return ch;

		case -1:

			printk("read(stdin) returned -1\r\n");

			printf("read(stdin) returned -1\r\n");

			return -1;

		}

	}
@@ -627,18 +627,6 @@ int sprintf(char * buf, const char *fmt, ...) 


static char sprint_buf[1024];



void

printk(char *fmt, ...)

{

	va_list args;

	int n;



	va_start(args, fmt);

	n = vsprintf(sprint_buf, fmt, args);

	va_end(args);

	write(stdout, sprint_buf, n);

}



int

printf(char *fmt, ...)

{