diff options
Diffstat (limited to 'arch/sparc/boot')
| -rw-r--r-- | arch/sparc/boot/Makefile | 109 | ||||
| -rw-r--r-- | arch/sparc/boot/btfixupprep.c | 386 | ||||
| -rw-r--r-- | arch/sparc/boot/piggyback.c | 272 | ||||
| -rw-r--r-- | arch/sparc/boot/piggyback_32.c | 137 | ||||
| -rw-r--r-- | arch/sparc/boot/piggyback_64.c | 110 | 
5 files changed, 315 insertions, 699 deletions
diff --git a/arch/sparc/boot/Makefile b/arch/sparc/boot/Makefile index 97e3feb9ff1..6e63afb128d 100644 --- a/arch/sparc/boot/Makefile +++ b/arch/sparc/boot/Makefile @@ -6,89 +6,66 @@  ROOT_IMG	:= /usr/src/root.img  ELFTOAOUT	:= elftoaout -hostprogs-y	:= piggyback_32 piggyback_64 btfixupprep -targets		:= tftpboot.img btfix.o btfix.S image zImage vmlinux.aout +hostprogs-y	:= piggyback +targets		:= tftpboot.img 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_32 $@ System.map $(ROOT_IMG) -quiet_cmd_btfix		= BTFIX   $@ -      cmd_btfix		= $(OBJDUMP) -x vmlinux | $(obj)/btfixupprep > $@ -quiet_cmd_sysmap        = SYSMAP  $(obj)/System.map -      cmd_sysmap        = $(CONFIG_SHELL) $(srctree)/scripts/mksysmap -quiet_cmd_image = LD      $@ -      cmd_image = $(LD) $(LDFLAGS) $(EXTRA_LDFLAGS) $(LDFLAGS_$(@F)) -o $@ -quiet_cmd_strip = STRIP   $@ -      cmd_strip = $(STRIP) -R .comment -R .note -K sun4u_init -K _end -K _start $(obj)/image -o $@ - - -define rule_image -	$(if $($(quiet)cmd_image),               \ -	  echo '  $($(quiet)cmd_image)' &&)      \ -	  $(cmd_image);                          \ -	$(if $($(quiet)cmd_sysmap),              \ -	  echo '  $($(quiet)cmd_sysmap)' &&)  \ -	$(cmd_sysmap) $@ $(obj)/System.map;      \ -	if [ $$? -ne 0 ]; then                   \ -		rm -f $@;                        \ -		/bin/false;                      \ -	fi;                                      \ -	echo 'cmd_$@ := $(cmd_image)' > $(@D)/.$(@F).cmd -endef - -BTOBJS := $(patsubst %/, %/built-in.o, $(VMLINUX_INIT)) -BTLIBS := $(patsubst %/, %/built-in.o, $(VMLINUX_MAIN)) -LDFLAGS_image := -T arch/sparc/kernel/vmlinux.lds $(BTOBJS) \ -                  --start-group $(BTLIBS) --end-group \ -                  $(kallsyms.o) $(obj)/btfix.o - -# Link the final image including btfixup'ed symbols. -# This is a replacement for the link done in the top-level Makefile. -# Note: No dependency on the prerequisite files since that would require -# make to try check if they are updated - and due to changes -# in gcc options (path for example) this would result in -# these files being recompiled for each build. -$(obj)/image: $(obj)/btfix.o FORCE -	$(call if_changed_rule,image) +      cmd_piggy		= $(obj)/piggyback $(BITS) $@ System.map $(ROOT_IMG) +quiet_cmd_strip		= STRIP   $@ +      cmd_strip		= $(STRIP) -R .comment -R .note -K sun4u_init -K _end -K _start $< -o $@ + +ifeq ($(CONFIG_SPARC64),y) + +# Actual linking  $(obj)/zImage: $(obj)/image -	$(call if_changed,strip) +	$(call if_changed,gzip) +	@echo '  kernel: $@ is ready' -$(obj)/tftpboot.img: $(obj)/image $(obj)/piggyback_32 System.map $(ROOT_IMG) FORCE +$(obj)/vmlinux.aout: vmlinux FORCE  	$(call if_changed,elftoaout) -	$(call if_changed,piggy) +	@echo '  kernel: $@ is ready' +else -$(obj)/btfix.S: $(obj)/btfixupprep vmlinux FORCE -	$(call if_changed,btfix) +$(obj)/zImage: $(obj)/image +	$(call if_changed,strip) +	@echo '  kernel: $@ is ready' -endif +# The following lines make a readable image for U-Boot. +#  uImage   - Binary file read by U-boot +#  uImage.o - object file of uImage for loading with a +#             flash programmer understanding ELF. -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 $@ +OBJCOPYFLAGS_image.bin := -S -O binary -R .note -R .comment +$(obj)/image.bin: $(obj)/image FORCE +	$(call if_changed,objcopy) +$(obj)/image.gz: $(obj)/image.bin +	$(call if_changed,gzip) + +UIMAGE_LOADADDR = $(CONFIG_UBOOT_LOAD_ADDR) +UIMAGE_ENTRYADDR = $(CONFIG_UBOOT_ENTRY_ADDR) +UIMAGE_COMPRESSION = gzip + +quiet_cmd_uimage.o = UIMAGE.O $@ +      cmd_uimage.o = $(LD) -Tdata $(CONFIG_UBOOT_FLASH_ADDR) \ +                     -r -b binary $@ -o $@.o + +targets += uImage +$(obj)/uImage: $(obj)/image.gz +	$(call if_changed,uimage) +	$(call if_changed,uimage.o) +	@echo '  Image $@ is ready' + +endif -# Actual linking  $(obj)/image: vmlinux FORCE  	$(call if_changed,strip)  	@echo '  kernel: $@ is ready' -$(obj)/zImage: $(obj)/image -	$(call if_changed,gzip) - -$(obj)/tftpboot.img: $(obj)/image $(obj)/piggyback_64 System.map $(ROOT_IMG) FORCE +$(obj)/tftpboot.img: $(obj)/image $(obj)/piggyback 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 - diff --git a/arch/sparc/boot/btfixupprep.c b/arch/sparc/boot/btfixupprep.c deleted file mode 100644 index da031159e2b..00000000000 --- a/arch/sparc/boot/btfixupprep.c +++ /dev/null @@ -1,386 +0,0 @@ -/* -   Simple utility to prepare vmlinux image for sparc. -   Resolves all BTFIXUP uses and settings and creates -   a special .s object to link to the image. -    -   Copyright (C) 1998 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 <unistd.h> -#include <stdlib.h> -#include <malloc.h> - -#define MAXSYMS 1024 - -static char *symtab = "SYMBOL TABLE:"; -static char *relrec = "RELOCATION RECORDS FOR ["; -static int rellen; -static int symlen; -int mode; - -struct _btfixup; - -typedef struct _btfixuprel { -	char *sect; -	unsigned long offset; -	struct _btfixup *f; -	int frel; -	struct _btfixuprel *next; -} btfixuprel; - -typedef struct _btfixup { -	int type; -	int setinitval; -	unsigned int initval; -	char *initvalstr; -	char *name; -	btfixuprel *rel; -} btfixup; - -btfixup array[MAXSYMS]; -int last = 0; -char buffer[1024]; -unsigned long lastfoffset = -1; -unsigned long lastfrelno; -btfixup *lastf; - -static void fatal(void) __attribute__((noreturn)); -static void fatal(void) -{ -	fprintf(stderr, "Malformed output from objdump\n%s\n", buffer); -	exit(1); -} - -static btfixup *find(int type, char *name) -{ -	int i; -	for (i = 0; i < last; i++) { -		if (array[i].type == type && !strcmp(array[i].name, name)) -			return array + i; -	} -	array[last].type = type; -	array[last].name = strdup(name); -	array[last].setinitval = 0; -	if (!array[last].name) fatal(); -	array[last].rel = NULL; -	last++; -	if (last >= MAXSYMS) { -		fprintf(stderr, "Ugh. Something strange. More than %d different BTFIXUP symbols\n", MAXSYMS); -		exit(1); -	} -	return array + last - 1; -} - -static void set_mode (char *buffer) -{ -  	for (mode = 0;; mode++) -		if (buffer[mode] < '0' || buffer[mode] > '9') -			break; -	if (mode != 8 && mode != 16) -		fatal(); -} - - -int main(int argc,char **argv) -{ -	char *p, *q; -	char *sect; -	int i, j, k; -	unsigned int initval; -	int shift; -	btfixup *f; -	btfixuprel *r, **rr; -	unsigned long offset; -	char *initvalstr; - -	symlen = strlen(symtab); -	while (fgets (buffer, 1024, stdin) != NULL) -		if (!strncmp (buffer, symtab, symlen)) -			goto main0; -	fatal(); -main0: -	rellen = strlen(relrec); -	while (fgets (buffer, 1024, stdin) != NULL) -		if (!strncmp (buffer, relrec, rellen)) -			goto main1; -	fatal(); -main1: -	sect = malloc(strlen (buffer + rellen) + 1); -	if (!sect) fatal(); -	strcpy (sect, buffer + rellen); -	p = strchr (sect, ']'); -	if (!p) fatal(); -	*p = 0; -	if (fgets (buffer, 1024, stdin) == NULL) -		fatal(); -	while (fgets (buffer, 1024, stdin) != NULL) { -		int nbase; -		if (!strncmp (buffer, relrec, rellen)) -			goto main1; -		if (mode == 0) -			set_mode (buffer); -		p = strchr (buffer, '\n'); -		if (p) *p = 0; -		if (strlen (buffer) < 22+mode) -			continue; -		if (strncmp (buffer + mode, " R_SPARC_", 9)) -			continue; -		nbase = 27 - 8 + mode; -		if (buffer[nbase] != '_' || buffer[nbase+1] != '_' || buffer[nbase+2] != '_') -			continue; -		switch (buffer[nbase+3]) { -			case 'f':	/* CALL */ -			case 'b':	/* BLACKBOX */ -			case 's':	/* SIMM13 */ -			case 'a':	/* HALF */ -			case 'h':	/* SETHI */ -			case 'i':	/* INT */ -				break; -			default: -				continue; -		} -		p = strchr (buffer + nbase+5, '+'); -		if (p) *p = 0; -		shift = nbase + 5; -		if (buffer[nbase+4] == 's' && buffer[nbase+5] == '_') { -			shift = nbase + 6; -			if (strcmp (sect, ".init.text")) { -				fprintf(stderr, -				    "Wrong use of '%s' BTFIXUPSET in '%s' section.\n" -				    "BTFIXUPSET_CALL can be used only in" -				    " __init sections\n", -				    buffer + shift, sect); -				exit(1); -			} -		} else if (buffer[nbase+4] != '_') -			continue; -		if (!strcmp (sect, ".text.exit")) -			continue; -		if (strcmp (sect, ".text") && -		    strcmp (sect, ".init.text") && -		    strcmp (sect, ".fixup") && -		    (strcmp (sect, "__ksymtab") || buffer[nbase+3] != 'f')) { -			if (buffer[nbase+3] == 'f') -				fprintf(stderr, -				    "Wrong use of '%s' in '%s' section.\n" -				    " It can be used only in .text, .init.text," -				    " .fixup and __ksymtab\n", -				    buffer + shift, sect); -			else -				fprintf(stderr, -				    "Wrong use of '%s' in '%s' section.\n" -				    " It can be only used in .text, .init.text," -				    " and .fixup\n", buffer + shift, sect); -			exit(1); -		} -		p = strstr (buffer + shift, "__btset_"); -		if (p && buffer[nbase+4] == 's') { -			fprintf(stderr, "__btset_ in BTFIXUP name can only be used when defining the variable, not for setting\n%s\n", buffer); -			exit(1); -		} -		initval = 0; -		initvalstr = NULL; -		if (p) { -			if (p[8] != '0' || p[9] != 'x') { -				fprintf(stderr, "Pre-initialized values can be only initialized with hexadecimal constants starting 0x\n%s\n", buffer); -				exit(1); -			} -			initval = strtoul(p + 10, &q, 16); -			if (*q || !initval) { -				fprintf(stderr, "Pre-initialized values can be only in the form name__btset_0xXXXXXXXX where X are hex digits.\nThey cannot be name__btset_0x00000000 though. Use BTFIXUPDEF_XX instead of BTFIXUPDEF_XX_INIT then.\n%s\n", buffer); -				exit(1); -			} -			initvalstr = p + 10; -			*p = 0; -		} -		f = find(buffer[nbase+3], buffer + shift); -		if (buffer[nbase+4] == 's') -			continue; -		switch (buffer[nbase+3]) { -		case 'f': -			if (initval) { -				fprintf(stderr, "Cannot use pre-initialized fixups for calls\n%s\n", buffer); -				exit(1); -			} -			if (!strcmp (sect, "__ksymtab")) { -				if (strncmp (buffer + mode+9, "32        ", 10)) { -					fprintf(stderr, "BTFIXUP_CALL in EXPORT_SYMBOL results in relocation other than R_SPARC_32\n\%s\n", buffer); -					exit(1); -				} -			} else if (strncmp (buffer + mode+9, "WDISP30   ", 10) && -				   strncmp (buffer + mode+9, "HI22      ", 10) && -				   strncmp (buffer + mode+9, "LO10      ", 10)) { -				fprintf(stderr, "BTFIXUP_CALL results in relocation other than R_SPARC_WDISP30, R_SPARC_HI22 or R_SPARC_LO10\n%s\n", buffer); -				exit(1); -			} -			break; -		case 'b': -			if (initval) { -				fprintf(stderr, "Cannot use pre-initialized fixups for blackboxes\n%s\n", buffer); -				exit(1); -			} -			if (strncmp (buffer + mode+9, "HI22      ", 10)) { -				fprintf(stderr, "BTFIXUP_BLACKBOX results in relocation other than R_SPARC_HI22\n%s\n", buffer); -				exit(1); -			} -			break; -		case 's': -			if (initval + 0x1000 >= 0x2000) { -				fprintf(stderr, "Wrong initializer for SIMM13. Has to be from $fffff000 to $00000fff\n%s\n", buffer); -				exit(1); -			} -			if (strncmp (buffer + mode+9, "13        ", 10)) { -				fprintf(stderr, "BTFIXUP_SIMM13 results in relocation other than R_SPARC_13\n%s\n", buffer); -				exit(1); -			} -			break; -		case 'a': -			if (initval + 0x1000 >= 0x2000 && (initval & 0x3ff)) { -				fprintf(stderr, "Wrong initializer for HALF.\n%s\n", buffer); -				exit(1); -			} -			if (strncmp (buffer + mode+9, "13        ", 10)) { -				fprintf(stderr, "BTFIXUP_HALF results in relocation other than R_SPARC_13\n%s\n", buffer); -				exit(1); -			} -			break; -		case 'h': -			if (initval & 0x3ff) { -				fprintf(stderr, "Wrong initializer for SETHI. Cannot have set low 10 bits\n%s\n", buffer); -				exit(1); -			} -			if (strncmp (buffer + mode+9, "HI22      ", 10)) { -				fprintf(stderr, "BTFIXUP_SETHI results in relocation other than R_SPARC_HI22\n%s\n", buffer); -				exit(1); -			} -			break; -		case 'i': -			if (initval) { -				fprintf(stderr, "Cannot use pre-initialized fixups for INT\n%s\n", buffer); -				exit(1); -			} -			if (strncmp (buffer + mode+9, "HI22      ", 10) && strncmp (buffer + mode+9, "LO10      ", 10)) { -				fprintf(stderr, "BTFIXUP_INT results in relocation other than R_SPARC_HI22 and R_SPARC_LO10\n%s\n", buffer); -				exit(1); -			} -			break; -		} -		if (!f->setinitval) { -			f->initval = initval; -			if (initvalstr) { -				f->initvalstr = strdup(initvalstr); -				if (!f->initvalstr) fatal(); -			} -			f->setinitval = 1; -		} else if (f->initval != initval) { -			fprintf(stderr, "Btfixup %s previously used with initializer %s which doesn't match with current initializer\n%s\n", -					f->name, f->initvalstr ? : "0x00000000", buffer); -			exit(1); -		} else if (initval && strcmp(f->initvalstr, initvalstr)) { -			fprintf(stderr, "Btfixup %s previously used with initializer %s which doesn't match with current initializer.\n" -					"Initializers have to match literally as well.\n%s\n", -					f->name, f->initvalstr, buffer); -			exit(1); -		} -		offset = strtoul(buffer, &q, 16); -		if (q != buffer + mode || (!offset && (mode == 8 ? strncmp (buffer, "00000000 ", 9) : strncmp (buffer, "0000000000000000 ", 17)))) { -			fprintf(stderr, "Malformed relocation address in\n%s\n", buffer); -			exit(1); -		} -		for (k = 0, r = f->rel, rr = &f->rel; r; rr = &r->next, r = r->next, k++) -			if (r->offset == offset && !strcmp(r->sect, sect)) { -				fprintf(stderr, "Ugh. One address has two relocation records\n"); -				exit(1); -			} -		*rr = malloc(sizeof(btfixuprel)); -		if (!*rr) fatal(); -		(*rr)->offset = offset; -		(*rr)->f = NULL; -		if (buffer[nbase+3] == 'f') { -			lastf = f; -			lastfoffset = offset; -			lastfrelno = k; -		} else if (lastfoffset + 4 == offset) { -			(*rr)->f = lastf; -			(*rr)->frel = lastfrelno; -		} -		(*rr)->sect = sect; -		(*rr)->next = NULL; -	} -	printf("! Generated by btfixupprep. Do not edit.\n\n"); -	printf("\t.section\t\".data..init\",#alloc,#write\n\t.align\t4\n\n"); -	printf("\t.global\t___btfixup_start\n___btfixup_start:\n\n"); -	for (i = 0; i < last; i++) { -		f = array + i; -		printf("\t.global\t___%cs_%s\n", f->type, f->name); -		if (f->type == 'f') -			printf("___%cs_%s:\n\t.word 0x%08x,0,0,", f->type, f->name, f->type << 24); -		else -			printf("___%cs_%s:\n\t.word 0x%08x,0,", f->type, f->name, f->type << 24); -		for (j = 0, r = f->rel; r != NULL; j++, r = r->next); -		if (j) -			printf("%d\n\t.word\t", j * 2); -		else -			printf("0\n"); -		for (r = f->rel, j--; r != NULL; j--, r = r->next) { -			if (!strcmp (r->sect, ".text")) -				printf ("_stext+0x%08lx", r->offset); -			else if (!strcmp (r->sect, ".init.text")) -				printf ("__init_begin+0x%08lx", r->offset); -			else if (!strcmp (r->sect, "__ksymtab")) -				printf ("__start___ksymtab+0x%08lx", r->offset); -			else if (!strcmp (r->sect, ".fixup")) -				printf ("__start___fixup+0x%08lx", r->offset); -			else -				fatal(); -			if (f->type == 'f' || !r->f) -				printf (",0"); -			else -				printf (",___fs_%s+0x%08x", r->f->name, (4 + r->frel*2)*4 + 4); -			if (j) printf (","); -			else printf ("\n"); -		} -		printf("\n"); -	} -	printf("\n\t.global\t___btfixup_end\n___btfixup_end:\n"); -	printf("\n\n! Define undefined references\n\n"); -	for (i = 0; i < last; i++) { -		f = array + i; -		if (f->type == 'f') { -			printf("\t.global\t___f_%s\n", f->name); -			printf("___f_%s:\n", f->name); -		} -	} -	printf("\tretl\n\t nop\n\n"); -	for (i = 0; i < last; i++) { -		f = array + i; -		if (f->type != 'f') { -			if (!f->initval) { -				printf("\t.global\t___%c_%s\n", f->type, f->name); -				printf("___%c_%s = 0\n", f->type, f->name); -			} else { -				printf("\t.global\t___%c_%s__btset_0x%s\n", f->type, f->name, f->initvalstr); -				printf("___%c_%s__btset_0x%s = 0x%08x\n", f->type, f->name, f->initvalstr, f->initval); -			} -		} -	} -	printf("\n\n"); -    	exit(0); -} diff --git a/arch/sparc/boot/piggyback.c b/arch/sparc/boot/piggyback.c new file mode 100644 index 00000000000..bb7c95161d7 --- /dev/null +++ b/arch/sparc/boot/piggyback.c @@ -0,0 +1,272 @@ +/* +   Simple utility to make a single-image install kernel with initial ramdisk +   for Sparc tftpbooting without need to set up nfs. + +   Copyright (C) 1996,1997 Jakub Jelinek (jj@sunsite.mff.cuni.cz) +   Pete Zaitcev <zaitcev@yahoo.com> endian fixes for cross-compiles, 2000. +   Copyright (C) 2011 Sam Ravnborg <sam@ravnborg.org> + +   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 <dirent.h> +#include <stdlib.h> +#include <string.h> +#include <unistd.h> +#include <ctype.h> +#include <errno.h> +#include <fcntl.h> +#include <stdio.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 only. + */ + +#define AOUT_TEXT_OFFSET   32 + +static int is64bit = 0; + +/* align to power-of-two size */ +static int align(int n) +{ +	if (is64bit) +		return (n + 0x1fff) & ~0x1fff; +	else +		return (n + 0xfff) & ~0xfff; +} + +/* read two bytes as big endian */ +static unsigned short ld2(char *p) +{ +	return (p[0] << 8) | p[1]; +} + +/* save 4 bytes as big endian */ +static void st4(char *p, unsigned int x) +{ +	p[0] = x >> 24; +	p[1] = x >> 16; +	p[2] = x >> 8; +	p[3] = x; +} + +static void die(const char *str) +{ +	perror(str); +	exit(1); +} + +static void usage(void) +{ +	/* fs_img.gz is an image of initial ramdisk. */ +	fprintf(stderr, "Usage: piggyback bits vmlinux.aout System.map fs_img.gz\n"); +	fprintf(stderr, "\tKernel image will be modified in place.\n"); +	exit(1); +} + +static int start_line(const char *line) +{ +	if (strcmp(line + 10, " _start\n") == 0) +		return 1; +	else if (strcmp(line + 18, " _start\n") == 0) +		return 1; +	return 0; +} + +static int end_line(const char *line) +{ +	if (strcmp(line + 10, " _end\n") == 0) +		return 1; +	else if (strcmp (line + 18, " _end\n") == 0) +		return 1; +	return 0; +} + +/* + * Find address for start and end in System.map. + * The file looks like this: + * f0004000 ... _start + * f0379f79 ... _end + * 1234567890123456 + * ^coloumn 1 + * There is support for 64 bit addresses too. + * + * Return 0 if either start or end is not found + */ +static int get_start_end(const char *filename, unsigned int *start, +                                               unsigned int *end) +{ +	FILE *map; +	char buffer[1024]; + +	*start = 0; +	*end = 0; +	map = fopen(filename, "r"); +	if (!map) +		die(filename); +	while (fgets(buffer, 1024, map)) { +		if (start_line(buffer)) +			*start = strtoul(buffer, NULL, 16); +		else if (end_line(buffer)) +			*end = strtoul(buffer, NULL, 16); +	} +	fclose (map); + +	if (*start == 0 || *end == 0) +		return 0; + +	return 1; +} + +#define LOOKBACK (128 * 4) +#define BUFSIZE 1024 +/* + * Find the HdrS entry from head_32/head_64. + * We check if it is at the beginning of the file (sparc64 case) + * and if not we search for it. + * When we search do so in steps of 4 as HdrS is on a 4-byte aligned + * address (it is on same alignment as sparc instructions) + * Return the offset to the HdrS entry (as off_t) + */ +static off_t get_hdrs_offset(int kernelfd, const char *filename) +{ +	char buffer[BUFSIZE]; +	off_t offset; +	int i; + +	if (lseek(kernelfd, 0, SEEK_SET) < 0) +		die("lseek"); +	if (read(kernelfd, buffer, BUFSIZE) != BUFSIZE) +		die(filename); + +	if (buffer[40] == 'H' && buffer[41] == 'd' && +	    buffer[42] == 'r' && buffer[43] == 'S') { +		return 40; +	} else { +		/*  Find the gokernel label */ +		/* Decode offset from branch instruction */ +		offset = ld2(buffer + AOUT_TEXT_OFFSET + 2) << 2; +		/* Go back 512 bytes so we do not miss HdrS */ +		offset -= LOOKBACK; +		/* skip a.out header */ +		offset += AOUT_TEXT_OFFSET; +		if (lseek(kernelfd, offset, SEEK_SET) < 0) +			die("lseek"); +		if (read(kernelfd, buffer, BUFSIZE) != BUFSIZE) +			die(filename); + +		for (i = 0; i < LOOKBACK; i += 4) { +			if (buffer[i + 0] == 'H' && buffer[i + 1] == 'd' && +			    buffer[i + 2] == 'r' && buffer[i + 3] == 'S') { +				return offset + i; +			} +		} +	} +	fprintf (stderr, "Couldn't find headers signature in %s\n", filename); +	exit(1); +} + +int main(int argc,char **argv) +{ +	static char aout_magic[] = { 0x01, 0x03, 0x01, 0x07 }; +	char buffer[1024]; +	unsigned int i, start, end; +	off_t offset; +	struct stat s; +	int image, tail; + +	if (argc != 5) +		usage(); +	if (strcmp(argv[1], "64") == 0) +		is64bit = 1; +	if (stat (argv[4], &s) < 0) +		die(argv[4]); + +	if (!get_start_end(argv[3], &start, &end)) { +		fprintf(stderr, "Could not determine start and end from %s\n", +		        argv[3]); +		exit(1); +	} +	if ((image = open(argv[2], O_RDWR)) < 0) +		die(argv[2]); +	if (read(image, buffer, 512) != 512) +		die(argv[2]); +	if (memcmp(buffer, aout_magic, 4) != 0) { +		fprintf (stderr, "Not a.out. Don't blame me.\n"); +		exit(1); +	} +	/* +	 * We need to fill in values for +	 * sparc_ramdisk_image + sparc_ramdisk_size +	 * To locate these symbols search for the "HdrS" text which appear +	 * in the image a little before the gokernel symbol. +	 * See definition of these in init_32.S +	 */ + +	offset = get_hdrs_offset(image, argv[2]); +	/* skip HdrS + LINUX_VERSION_CODE + HdrS version */ +	offset += 10; + +	if (lseek(image, offset, 0) < 0) +		die("lseek"); + +	/* +	 * root_flags = 0 +	 * root_dev = 1 (RAMDISK_MAJOR) +	 * ram_flags = 0 +	 * sparc_ramdisk_image = "PAGE aligned address after _end") +	 * sparc_ramdisk_size = size of image +	 */ +	st4(buffer, 0); +	st4(buffer + 4, 0x01000000); +	st4(buffer + 8, align(end + 32)); +	st4(buffer + 12, s.st_size); + +	if (write(image, buffer + 2, 14) != 14) +		die(argv[2]); + +	/* For sparc64 update a_text and clear a_data + a_bss */ +	if (is64bit) +	{ +		if (lseek(image, 4, 0) < 0) +			die("lseek"); +		/* a_text */ +		st4(buffer, align(end + 32 + 8191) - (start & ~0x3fffffUL) + +		            s.st_size); +		/* a_data */ +		st4(buffer + 4, 0); +		/* a_bss */ +		st4(buffer + 8, 0); +		if (write(image, buffer, 12) != 12) +			die(argv[2]); +	} + +	/* seek page aligned boundary in the image file and add boot image */ +	if (lseek(image, AOUT_TEXT_OFFSET - start + align(end + 32), 0) < 0) +		die("lseek"); +	if ((tail = open(argv[4], O_RDONLY)) < 0) +		die(argv[4]); +	while ((i = read(tail, buffer, 1024)) > 0) +		if (write(image, buffer, i) != i) +			die(argv[2]); +	if (close(image) < 0) +		die("close"); +	if (close(tail) < 0) +		die("close"); +	return 0; +} diff --git a/arch/sparc/boot/piggyback_32.c b/arch/sparc/boot/piggyback_32.c deleted file mode 100644 index ac944aec730..00000000000 --- a/arch/sparc/boot/piggyback_32.c +++ /dev/null @@ -1,137 +0,0 @@ -/* -   Simple utility to make a single-image install kernel with initial ramdisk -   for Sparc tftpbooting without need to set up nfs. - -   Copyright (C) 1996 Jakub Jelinek (jj@sunsite.mff.cuni.cz) -   Pete Zaitcev <zaitcev@yahoo.com> endian fixes for cross-compiles, 2000. - -   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 only. - */ - -static unsigned short ld2(char *p) -{ -	return (p[0] << 8) | p[1]; -} - -static unsigned int ld4(char *p) -{ -	return (p[0] << 24) | (p[1] << 16) | (p[2] << 8) | p[3]; -} - -static void st4(char *p, unsigned int x) -{ -	p[0] = x >> 24; -	p[1] = x >> 16; -	p[2] = x >> 8; -	p[3] = x; -} - -static void usage(void) -{ -	/* fs_img.gz is an image of initial ramdisk. */ -	fprintf(stderr, "Usage: piggyback vmlinux.aout System.map fs_img.gz\n"); -	fprintf(stderr, "\tKernel image will be modified in place.\n"); -	exit(1); -} - -static void die(char *str) -{ -	perror (str); -	exit(1); -} - -int main(int argc,char **argv) -{ -	static char aout_magic[] = { 0x01, 0x03, 0x01, 0x07 }; -	char buffer[1024], *q, *r; -	unsigned int i, j, k, start, end, offset; -	FILE *map; -	struct stat s; -	int image, tail; - -	if (argc != 4) usage(); -	start = end = 0; -	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 + 8, " T start\n") || !strcmp (buffer + 16, " T start\n")) -			start = strtoul (buffer, NULL, 16); -		else if (!strcmp (buffer + 8, " A _end\n") || !strcmp (buffer + 16, " A _end\n")) -			end = strtoul (buffer, NULL, 16); -	} -	fclose (map); -	if (!start || !end) { -		fprintf (stderr, "Could not determine start and end from System.map\n"); -		exit(1); -	} -	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) == 0) { -		q = buffer + ld4(buffer + 28); -		i = ld4(q + 4) + ld4(buffer + 24) - ld4(q + 8); -		if (lseek(image,i,0) < 0) die("lseek"); -		if (read(image,buffer,512) != 512) die(argv[1]); -		j = 0; -	} else if (memcmp(buffer, aout_magic, 4) == 0) { -		i = j = 32; -	} else { -		fprintf (stderr, "Not ELF nor a.out. Don't blame me.\n"); -		exit(1); -	} -	k = i; -	i += (ld2(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"); - -	st4(buffer, 0); -	st4(buffer + 4, 0x01000000); -	st4(buffer + 8, (end + 32 + 4095) & ~4095); -	st4(buffer + 12, s.st_size); - -	if (write(image,buffer+2,14) != 14) die (argv[1]); -	if (lseek(image, k - start + ((end + 32 + 4095) & ~4095), 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; -} diff --git a/arch/sparc/boot/piggyback_64.c b/arch/sparc/boot/piggyback_64.c deleted file mode 100644 index a26a686cb5a..00000000000 --- a/arch/sparc/boot/piggyback_64.c +++ /dev/null @@ -1,110 +0,0 @@ -/* -   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 */ - -static 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; -	 -	start = end = 0; -	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; -}  | 
