sparc,sparc64: unify boot/
Simple unification: o renamed piggyback to *_32.c/*_64.c o copied content of Makefile from sparc64 to sparc and guard it o updated sparc/boot/.gitignore o deleted remaining files in sparc64/boot Signed-off-by: Sam Ravnborg <sam@ravnborg.org> Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
committed by
David S. Miller
parent
a88b5ba8bd
commit
a8c601ca21
@ -89,17 +89,16 @@ ifdef CONFIG_KALLSYMS
|
||||
export kallsyms.o := .tmp_kallsyms2.o
|
||||
endif
|
||||
|
||||
boot-y := arch/sparc/boot
|
||||
boot-$(CONFIG_SPARC64) := arch/sparc64/boot
|
||||
boot := arch/sparc/boot
|
||||
|
||||
image zImage tftpboot.img vmlinux.aout: vmlinux
|
||||
$(Q)$(MAKE) $(build)=$(boot-y) $(boot-y)/$@
|
||||
$(Q)$(MAKE) $(build)=$(boot) $(boot)/$@
|
||||
|
||||
archclean:
|
||||
$(Q)$(MAKE) $(clean)=$(boot-y)
|
||||
$(Q)$(MAKE) $(clean)=$(boot)
|
||||
|
||||
# This is the image used for packaging
|
||||
KBUILD_IMAGE := $(boot-y)/zImage
|
||||
KBUILD_IMAGE := $(boot)/zImage
|
||||
|
||||
# Don't use tabs in echo arguments.
|
||||
ifeq ($(ARCH),sparc)
|
||||
|
3
arch/sparc/boot/.gitignore
vendored
3
arch/sparc/boot/.gitignore
vendored
@ -2,4 +2,7 @@ btfix.S
|
||||
btfixupprep
|
||||
image
|
||||
zImage
|
||||
tftpboot.img
|
||||
vmlinux.aout
|
||||
piggyback
|
||||
|
||||
|
@ -6,14 +6,16 @@
|
||||
ROOT_IMG := /usr/src/root.img
|
||||
ELFTOAOUT := elftoaout
|
||||
|
||||
hostprogs-y := piggyback btfixupprep
|
||||
targets := tftpboot.img btfix.o btfix.S image zImage
|
||||
hostprogs-y := piggyback_32 piggyback_64 btfixupprep
|
||||
targets := tftpboot.img btfix.o btfix.S image zImage vmlinux.aout
|
||||
clean-files := System.map
|
||||
|
||||
quiet_cmd_elftoaout = ELFTOAOUT $@
|
||||
cmd_elftoaout = $(ELFTOAOUT) $(obj)/image -o $@
|
||||
|
||||
ifeq ($(CONFIG_SPARC32),y)
|
||||
quiet_cmd_piggy = PIGGY $@
|
||||
cmd_piggy = $(obj)/piggyback $@ $(obj)/System.map $(ROOT_IMG)
|
||||
cmd_piggy = $(obj)/piggyback_32 $@ $(obj)/System.map $(ROOT_IMG)
|
||||
quiet_cmd_btfix = BTFIX $@
|
||||
cmd_btfix = $(OBJDUMP) -x vmlinux | $(obj)/btfixupprep > $@
|
||||
quiet_cmd_sysmap = SYSMAP $(obj)/System.map
|
||||
@ -62,3 +64,28 @@ $(obj)/tftpboot.img: $(obj)/piggyback $(obj)/System.map $(obj)/image FORCE
|
||||
|
||||
$(obj)/btfix.S: $(obj)/btfixupprep vmlinux FORCE
|
||||
$(call if_changed,btfix)
|
||||
|
||||
endif
|
||||
|
||||
ifeq ($(CONFIG_SPARC64),y)
|
||||
quiet_cmd_piggy = PIGGY $@
|
||||
cmd_piggy = $(obj)/piggyback_64 $@ System.map $(ROOT_IMG)
|
||||
quiet_cmd_strip = STRIP $@
|
||||
cmd_strip = $(STRIP) -R .comment -R .note -K sun4u_init -K _end -K _start vmlinux -o $@
|
||||
|
||||
|
||||
# Actual linking
|
||||
$(obj)/image: vmlinux FORCE
|
||||
$(call if_changed,strip)
|
||||
@echo ' kernel: $@ is ready'
|
||||
|
||||
$(obj)/tftpboot.img: vmlinux $(obj)/piggyback_64 System.map $(ROOT_IMG) FORCE
|
||||
$(call if_changed,elftoaout)
|
||||
$(call if_changed,piggy)
|
||||
@echo ' kernel: $@ is ready'
|
||||
|
||||
$(obj)/vmlinux.aout: vmlinux FORCE
|
||||
$(call if_changed,elftoaout)
|
||||
@echo ' kernel: $@ is ready'
|
||||
endif
|
||||
|
||||
|
109
arch/sparc/boot/piggyback_64.c
Normal file
109
arch/sparc/boot/piggyback_64.c
Normal file
@ -0,0 +1,109 @@
|
||||
/*
|
||||
Simple utility to make a single-image install kernel with initial ramdisk
|
||||
for Sparc64 tftpbooting without need to set up nfs.
|
||||
|
||||
Copyright (C) 1997 Jakub Jelinek (jj@sunsite.mff.cuni.cz)
|
||||
|
||||
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.
|
||||
|
||||
This program is distributed in the hope that it will be useful,
|
||||
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
GNU General Public License for more details.
|
||||
|
||||
You should have received a copy of the GNU General Public License
|
||||
along with this program; if not, write to the Free Software
|
||||
Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */
|
||||
|
||||
#include <stdio.h>
|
||||
#include <string.h>
|
||||
#include <ctype.h>
|
||||
#include <errno.h>
|
||||
#include <fcntl.h>
|
||||
#include <dirent.h>
|
||||
#include <unistd.h>
|
||||
#include <stdlib.h>
|
||||
#include <sys/types.h>
|
||||
#include <sys/stat.h>
|
||||
|
||||
/* Note: run this on an a.out kernel (use elftoaout for it), as PROM looks for a.out image onlly
|
||||
usage: piggyback vmlinux System.map tail, where tail is gzipped fs of the initial ramdisk */
|
||||
|
||||
void die(char *str)
|
||||
{
|
||||
perror (str);
|
||||
exit(1);
|
||||
}
|
||||
|
||||
int main(int argc,char **argv)
|
||||
{
|
||||
char buffer [1024], *q, *r;
|
||||
unsigned int i, j, k, start, end, offset;
|
||||
FILE *map;
|
||||
struct stat s;
|
||||
int image, tail;
|
||||
|
||||
if (stat (argv[3], &s) < 0) die (argv[3]);
|
||||
map = fopen (argv[2], "r");
|
||||
if (!map) die(argv[2]);
|
||||
while (fgets (buffer, 1024, map)) {
|
||||
if (!strcmp (buffer + 19, "_start\n"))
|
||||
start = strtoul (buffer + 8, NULL, 16);
|
||||
else if (!strcmp (buffer + 19, "_end\n"))
|
||||
end = strtoul (buffer + 8, NULL, 16);
|
||||
}
|
||||
fclose (map);
|
||||
if ((image = open(argv[1],O_RDWR)) < 0) die(argv[1]);
|
||||
if (read(image,buffer,512) != 512) die(argv[1]);
|
||||
if (!memcmp (buffer, "\177ELF", 4)) {
|
||||
unsigned int *p = (unsigned int *)(buffer + *(unsigned int *)(buffer + 28));
|
||||
|
||||
i = p[1] + *(unsigned int *)(buffer + 24) - p[2];
|
||||
if (lseek(image,i,0) < 0) die("lseek");
|
||||
if (read(image,buffer,512) != 512) die(argv[1]);
|
||||
j = 0;
|
||||
} else if (*(unsigned int *)buffer == 0x01030107) {
|
||||
i = j = 32;
|
||||
} else {
|
||||
fprintf (stderr, "Not ELF nor a.out. Don't blame me.\n");
|
||||
exit(1);
|
||||
}
|
||||
k = i;
|
||||
if (j == 32 && buffer[40] == 'H' && buffer[41] == 'd' && buffer[42] == 'r' && buffer[43] == 'S') {
|
||||
offset = 40 + 10;
|
||||
} else {
|
||||
i += ((*(unsigned short *)(buffer + j + 2))<<2) - 512;
|
||||
if (lseek(image,i,0) < 0) die("lseek");
|
||||
if (read(image,buffer,1024) != 1024) die(argv[1]);
|
||||
for (q = buffer, r = q + 512; q < r; q += 4) {
|
||||
if (*q == 'H' && q[1] == 'd' && q[2] == 'r' && q[3] == 'S')
|
||||
break;
|
||||
}
|
||||
if (q == r) {
|
||||
fprintf (stderr, "Couldn't find headers signature in the kernel.\n");
|
||||
exit(1);
|
||||
}
|
||||
offset = i + (q - buffer) + 10;
|
||||
}
|
||||
if (lseek(image, offset, 0) < 0) die ("lseek");
|
||||
*(unsigned *)buffer = 0;
|
||||
*(unsigned *)(buffer + 4) = 0x01000000;
|
||||
*(unsigned *)(buffer + 8) = ((end + 32 + 8191) & ~8191);
|
||||
*(unsigned *)(buffer + 12) = s.st_size;
|
||||
if (write(image,buffer+2,14) != 14) die (argv[1]);
|
||||
if (lseek(image, 4, 0) < 0) die ("lseek");
|
||||
*(unsigned *)buffer = ((end + 32 + 8191) & ~8191) - (start & ~0x3fffffUL) + s.st_size;
|
||||
*(unsigned *)(buffer + 4) = 0;
|
||||
*(unsigned *)(buffer + 8) = 0;
|
||||
if (write(image,buffer,12) != 12) die (argv[1]);
|
||||
if (lseek(image, k - start + ((end + 32 + 8191) & ~8191), 0) < 0) die ("lseek");
|
||||
if ((tail = open(argv[3],O_RDONLY)) < 0) die(argv[3]);
|
||||
while ((i = read (tail,buffer,1024)) > 0)
|
||||
if (write(image,buffer,i) != i) die (argv[1]);
|
||||
if (close(image) < 0) die("close");
|
||||
if (close(tail) < 0) die("close");
|
||||
return 0;
|
||||
}
|
Reference in New Issue
Block a user