diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 1999-10-09 00:00:47 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 1999-10-09 00:00:47 +0000 |
| commit | d6434e1042f3b0a6dfe1b1f615af369486f9b1fa (patch) | |
| tree | e2be02f33984c48ec019c654051d27964e42c441 /arch/ppc/chrpboot | |
| parent | 609d1e803baf519487233b765eb487f9ec227a18 (diff) | |
Merge with 2.3.19.
Diffstat (limited to 'arch/ppc/chrpboot')
| -rw-r--r-- | arch/ppc/chrpboot/Makefile | 8 | ||||
| -rw-r--r-- | arch/ppc/chrpboot/main.c | 4 |
2 files changed, 6 insertions, 6 deletions
diff --git a/arch/ppc/chrpboot/Makefile b/arch/ppc/chrpboot/Makefile index eb4720927..15f9a8e53 100644 --- a/arch/ppc/chrpboot/Makefile +++ b/arch/ppc/chrpboot/Makefile @@ -57,7 +57,10 @@ floppy: zImage mcopy zImage a:zImage piggyback: piggyback.c - $(HOSTCC) -DKERNELBASE=$(KERNELBASE) -o piggyback piggyback.c + $(HOSTCC) $(HOSTCFLAGS) -DKERNELBASE=$(KERNELBASE) -o piggyback piggyback.c + +mknote: mknote.c + $(HOSTCC) $(HOSTCFLAGS) -o mknote mknote.c image.o: piggyback ../coffboot/vmlinux.gz ./piggyback image < ../coffboot/vmlinux.gz | $(AS) -o image.o @@ -70,9 +73,6 @@ zImage: $(OBJS) no_initrd.o mknote ./mknote > note $(OBJCOPY) $@ $@ --add-section=.note=note -R .comment -mknote: mknote.c - $(HOSTCC) $(HOSTCFLAGS) -o $@ mknote.c - zImage.initrd: $(OBJS) initrd.o $(LD) $(LD_ARGS) -o $@ $(OBJS) initrd.o $(LIBS) diff --git a/arch/ppc/chrpboot/main.c b/arch/ppc/chrpboot/main.c index 210dd43ad..80db69a7b 100644 --- a/arch/ppc/chrpboot/main.c +++ b/arch/ppc/chrpboot/main.c @@ -68,10 +68,10 @@ chrpboot(int a1, int a2, void *prom) flush_cache(dst, len); - sa = *(unsigned long *)PROG_START+PROG_START; + sa = (unsigned long)PROG_START; printf("start address = 0x%x\n\r", sa); - (*(void (*)())sa)(a1, a2, prom, 0, 0); + (*(void (*)())sa)(0, 0, prom, a1, a2); printf("returned?\n\r"); |