More Orion bits.

7 files changed, 329 insertions, 67 deletions

diff --git a/arch/mips/orion/.cvsignore b/arch/mips/orion/.cvsignore
index 857dd22e9..6f7026473 100644
--- a/arch/mips/orion/.cvsignore
+++ b/arch/mips/orion/.cvsignore
@@ -1,2 +1,3 @@
 .depend
 .*.flags
+piggyback initrd.c
diff --git a/arch/mips/orion/Makefile b/arch/mips/orion/Makefile
index 60ac12423..bf1a9ab92 100644
--- a/arch/mips/orion/Makefile
+++ b/arch/mips/orion/Makefile
@@ -13,14 +13,12 @@
 .S.o:
 	$(CC) $(CFLAGS) -c $< -o $*.o
 
-OBJS = promcon.o char.o serial.8530.o orion.hw.init.o setup.o irq.o \
-       int-handler.o zs.o
+O_TARGET = orion.o
+O_OBJS = promcon.o char.o serial.8530.o orion.hw.init.o setup.o int-handler.o \
+	 zs.o initrd.o #no_initrd.o
+OX_OBJS = irq.o
 
-all: orionkern.a
-
-orionkern.a: $(OBJS) initrd.o #no_initrd.o
-	$(AR) rcs orionkern.a $(OBJS) initrd.o #no_initrd.o
-	sync
+all: orion.o
 
 #
 # I usually have this mounted through loopback so I can
@@ -40,9 +38,9 @@ piggyback: piggyback.c
 orionboot: orion.ctl
 
 patchapp: patchapp.c
-	$(HOSTCC) -o $@ $^
+	$(HOSTCC) $(HOSTCFLAGS) -o $@ $^
 
-orion.ctl: patchapp ../../../vmlinux
+orion.ctl: ../../../vmlinux patchapp
 	$(OBJCOPY) -Obinary ../../../vmlinux orion.nosym
 	./patchapp orion.nosym orion
 	cp -f orion.bin orion.ctl
diff --git a/arch/mips/orion/irq.c b/arch/mips/orion/irq.c
index ef7ca082f..b8fc38686 100644
--- a/arch/mips/orion/irq.c
+++ b/arch/mips/orion/irq.c
@@ -199,10 +199,8 @@ asmlinkage void do_IRQ(int irq, struct pt_regs * regs)
 
 	irq_exit(cpu);
 
-	if (softirq_state[cpu].active&softirq_state[cpu].mask)
+	if (softirq_active(cpu) & softirq_mask(cpu))
 		do_softirq();
-
-	/* unmasking and bottom half handling is done magically for us. */
 }
 
 int request_irq(unsigned int irq, void (*handler)(int, void *, struct pt_regs *),
diff --git a/arch/mips/orion/ld.script.orion b/arch/mips/orion/ld.script.orion
index 1c9faa3f3..b9f16dbbf 100644
--- a/arch/mips/orion/ld.script.orion
+++ b/arch/mips/orion/ld.script.orion
@@ -93,6 +93,15 @@ SECTIONS
   _end = . ;
   PROVIDE (end = .);
   }
+
+  /* Sections to be discarded */
+  /DISCARD/ :
+  {
+   *(.text.exit)
+   *(.data.exit)
+   *(.exitcall.exit)
+  }
+
   /* These are needed for ELF backends which have not yet been
      converted to the new style linker.  */
   .stab 0 : { *(.stab) }
diff --git a/arch/mips/orion/patchapp.c b/arch/mips/orion/patchapp.c
new file mode 100644
index 000000000..2dc435f8a
--- /dev/null
+++ b/arch/mips/orion/patchapp.c
@@ -0,0 +1,253 @@
+#include <stdio.h>
+#include <stdlib.h>
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <sys/fcntl.h>
+#include <errno.h>
+#include <unistd.h>
+
+unsigned long crctab[] = {
+	0x00000000, 0x77073096, 0xee0e612c, 0x990951ba,
+	0x076dc419, 0x706cf48f, 0xe963a535, 0x9e6495a3,
+	0x0edb8832, 0x79dcb8a4, 0xe0d5e91e, 0x97d2d988,
+	0x09b64c2b, 0x7eb17cbd, 0xe7b82d07, 0x90bf1d91,
+	0x1db71064, 0x6ab020f2, 0xf3b97148, 0x84be41de,
+	0x1adad47d, 0x6ddde4eb, 0xf4d4b551, 0x83d385c7,
+	0x136c9856, 0x646ba8c0, 0xfd62f97a, 0x8a65c9ec,
+	0x14015c4f, 0x63066cd9, 0xfa0f3d63, 0x8d080df5,
+	0x3b6e20c8, 0x4c69105e, 0xd56041e4, 0xa2677172,
+	0x3c03e4d1, 0x4b04d447, 0xd20d85fd, 0xa50ab56b,
+	0x35b5a8fa, 0x42b2986c, 0xdbbbc9d6, 0xacbcf940,
+	0x32d86ce3, 0x45df5c75, 0xdcd60dcf, 0xabd13d59,
+	0x26d930ac, 0x51de003a, 0xc8d75180, 0xbfd06116,
+	0x21b4f4b5, 0x56b3c423, 0xcfba9599, 0xb8bda50f,
+	0x2802b89e, 0x5f058808, 0xc60cd9b2, 0xb10be924,
+	0x2f6f7c87, 0x58684c11, 0xc1611dab, 0xb6662d3d,
+	0x76dc4190, 0x01db7106, 0x98d220bc, 0xefd5102a,
+	0x71b18589, 0x06b6b51f, 0x9fbfe4a5, 0xe8b8d433,
+	0x7807c9a2, 0x0f00f934, 0x9609a88e, 0xe10e9818,
+	0x7f6a0dbb, 0x086d3d2d, 0x91646c97, 0xe6635c01,
+	0x6b6b51f4, 0x1c6c6162, 0x856530d8, 0xf262004e,
+	0x6c0695ed, 0x1b01a57b, 0x8208f4c1, 0xf50fc457,
+	0x65b0d9c6, 0x12b7e950, 0x8bbeb8ea, 0xfcb9887c,
+	0x62dd1ddf, 0x15da2d49, 0x8cd37cf3, 0xfbd44c65,
+	0x4db26158, 0x3ab551ce, 0xa3bc0074, 0xd4bb30e2,
+	0x4adfa541, 0x3dd895d7, 0xa4d1c46d, 0xd3d6f4fb,
+	0x4369e96a, 0x346ed9fc, 0xad678846, 0xda60b8d0,
+	0x44042d73, 0x33031de5, 0xaa0a4c5f, 0xdd0d7cc9,
+	0x5005713c, 0x270241aa, 0xbe0b1010, 0xc90c2086,
+	0x5768b525, 0x206f85b3, 0xb966d409, 0xce61e49f,
+	0x5edef90e, 0x29d9c998, 0xb0d09822, 0xc7d7a8b4,
+	0x59b33d17, 0x2eb40d81, 0xb7bd5c3b, 0xc0ba6cad,
+	0xedb88320, 0x9abfb3b6, 0x03b6e20c, 0x74b1d29a,
+	0xead54739, 0x9dd277af, 0x04db2615, 0x73dc1683,
+	0xe3630b12, 0x94643b84, 0x0d6d6a3e, 0x7a6a5aa8,
+	0xe40ecf0b, 0x9309ff9d, 0x0a00ae27, 0x7d079eb1,
+	0xf00f9344, 0x8708a3d2, 0x1e01f268, 0x6906c2fe,
+	0xf762575d, 0x806567cb, 0x196c3671, 0x6e6b06e7,
+	0xfed41b76, 0x89d32be0, 0x10da7a5a, 0x67dd4acc,
+	0xf9b9df6f, 0x8ebeeff9, 0x17b7be43, 0x60b08ed5,
+	0xd6d6a3e8, 0xa1d1937e, 0x38d8c2c4, 0x4fdff252,
+	0xd1bb67f1, 0xa6bc5767, 0x3fb506dd, 0x48b2364b,
+	0xd80d2bda, 0xaf0a1b4c, 0x36034af6, 0x41047a60,
+	0xdf60efc3, 0xa867df55, 0x316e8eef, 0x4669be79,
+	0xcb61b38c, 0xbc66831a, 0x256fd2a0, 0x5268e236,
+	0xcc0c7795, 0xbb0b4703, 0x220216b9, 0x5505262f,
+	0xc5ba3bbe, 0xb2bd0b28, 0x2bb45a92, 0x5cb36a04,
+	0xc2d7ffa7, 0xb5d0cf31, 0x2cd99e8b, 0x5bdeae1d,
+	0x9b64c2b0, 0xec63f226, 0x756aa39c, 0x026d930a,
+	0x9c0906a9, 0xeb0e363f, 0x72076785, 0x05005713,
+	0x95bf4a82, 0xe2b87a14, 0x7bb12bae, 0x0cb61b38,
+	0x92d28e9b, 0xe5d5be0d, 0x7cdcefb7, 0x0bdbdf21,
+	0x86d3d2d4, 0xf1d4e242, 0x68ddb3f8, 0x1fda836e,
+	0x81be16cd, 0xf6b9265b, 0x6fb077e1, 0x18b74777,
+	0x88085ae6, 0xff0f6a70, 0x66063bca, 0x11010b5c,
+	0x8f659eff, 0xf862ae69, 0x616bffd3, 0x166ccf45,
+	0xa00ae278, 0xd70dd2ee, 0x4e048354, 0x3903b3c2,
+	0xa7672661, 0xd06016f7, 0x4969474d, 0x3e6e77db,
+	0xaed16a4a, 0xd9d65adc, 0x40df0b66, 0x37d83bf0,
+	0xa9bcae53, 0xdebb9ec5, 0x47b2cf7f, 0x30b5ffe9,
+	0xbdbdf21c, 0xcabac28a, 0x53b39330, 0x24b4a3a6,
+	0xbad03605, 0xcdd70693, 0x54de5729, 0x23d967bf,
+	0xb3667a2e, 0xc4614ab8, 0x5d681b02, 0x2a6f2b94,
+	0xb40bbe37, 0xc30c8ea1, 0x5a05df1b, 0x2d02ef8d
+};
+
+typedef unsigned long crc_t;
+
+static void calc_crc(crc_t * crc, unsigned char *buf, int size)
+{
+	int i;
+
+	for (i = 0; i < size; i++) {
+		*crc = crctab[(int) ((*crc) ^ (buf[i])) & 0xff] ^
+		    (((*crc) >> 8) & 0x00FFFFFFL);
+	}
+}
+
+struct app_header_s {
+	unsigned long MAGIC_JMP;
+	unsigned long MAGIC_NOP;
+	unsigned long header_tag;
+	unsigned long header_flags;
+	unsigned long header_length;
+	unsigned long header_cksum;
+
+	void *load_addr;
+	void *end_addr;
+	void *start_addr;
+	char *app_name_p;
+	char *version_p;
+	char *date_p;
+	char *time_p;
+	unsigned long type;
+	unsigned long crc;
+	unsigned long reserved;
+};
+
+typedef struct app_header_s app_header_t;
+
+static char *ipsx_filename_extensions[] = {
+	".bin", ".ctl", ".eth", ".prc", ".srh", ".crp", ".d3c", ".d3u",
+	".o3p", ".o3p", ".o3a", ".o3a", ".pre", ".e3c", ".e3u"
+};
+
+int main(int argc, char **argv)
+{
+	int fd, wfd, nbytes, len, adjust, totbytes;
+	char wfilename[255];
+	char *filename;
+	app_header_t app_head;
+	unsigned char buf[4096];
+	unsigned char *data_p;
+	unsigned long end_addr, load_addr;
+	unsigned long pe_type;
+	crc_t crc;
+
+	if (argc != 3) {
+		fprintf(stderr, "Usage: %s inputfile outputfile\n",
+		        argv[0]);
+		exit(EXIT_FAILURE);
+	}
+
+	filename = argv[1];
+	printf("got filename %s\n", filename);
+	len = strlen(argv[2]);
+	memcpy(wfilename, argv[2], len);
+	fd = open(filename, 0);
+	if (fd < 0) {
+		printf("patchapp: Could not open input file, %s\n",
+		       filename);
+		exit(EXIT_FAILURE);
+	}
+	printf("opened file\n");
+
+	nbytes = read(fd, &app_head, sizeof(app_header_t));
+	if (nbytes != sizeof(app_header_t)) {
+		printf("patchapp: Problem reading header\n");
+		exit(EXIT_FAILURE);
+	}
+#ifdef LITTLE_ENDIAN
+	pe_type =
+	    (unsigned
+	     long) ((((unsigned long) app_head.type & 0xff000000) >> 24) |
+		    (((unsigned long) app_head.type & 0x00ff0000) >> 8) |
+		    (((unsigned long) app_head.type & 0x0000ff00) << 8) |
+		    (((unsigned long) app_head.type & 0x000000ff) << 24));
+#else
+	pe_type = (unsigned long) app_head.type;
+#endif
+
+	strcpy(&wfilename[len], &ipsx_filename_extensions[pe_type][0]);;
+
+#ifdef LITTLE_ENDIAN
+	load_addr = (unsigned long)
+		(((((unsigned long) app_head.load_addr) & 0xff000000) >> 24) |
+		((((unsigned long) app_head.load_addr)  & 0x00ff0000) >>  8) |
+		((((unsigned long) app_head.load_addr)  & 0x0000ff00) <<  8) |
+		((((unsigned long) app_head.load_addr)  & 0x000000ff) << 24));
+	end_addr = (unsigned long)
+		(((((unsigned long) app_head.end_addr) & 0xff000000) >> 24) |
+		((((unsigned long) app_head.end_addr)  & 0x00ff0000) >>  8) |
+		((((unsigned long) app_head.end_addr) & 0x0000ff00) <<   8) |
+		((((unsigned long) app_head.end_addr) & 0x000000ff) <<  24));
+#else
+	load_addr = app_head.load_addr;
+	end_addr = app_head.end_addr;
+#endif
+
+	totbytes = nbytes;
+	crc = 0;
+	while ((end_addr - load_addr) > totbytes) {
+		nbytes = read(fd, &buf[0], 4096);
+		totbytes += nbytes;
+
+		adjust = (end_addr - load_addr) - totbytes;
+		if (adjust > 0) {
+			adjust = 0;
+		}
+		totbytes += adjust;
+
+		data_p = &buf[0];
+		calc_crc(&crc, data_p, nbytes + adjust);
+	}
+	if (nbytes < 0) {
+		fprintf(stderr, "patchapp: Problem reading file\n");
+		perror("");
+	}
+#ifdef LITTLE_ENDIAN
+	app_head.crc = (unsigned long)
+		(((crc & 0xff000000) >> 24) | ((crc & 0x00ff0000) >>  8) |
+		((crc & 0x0000ff00)  <<  8) | ((crc & 0x000000ff) << 24));
+#else
+	app_head.crc = crc;
+#endif
+	close(fd);
+	if ((totbytes) != (end_addr - load_addr)) {
+		fprintf(stderr, "patchapp: Warning, actual size did not match "
+		       "calculated size\n");
+		fprintf(stderr, "patchapp: actual size 0x%08x, calculated "
+		        "size 0x%08lx\n", totbytes, end_addr - load_addr);
+	}
+
+	fd = open(filename, 0);
+	if (fd < 0) {
+		fprintf(stderr, "patchapp: Could not open input file2, %s\n",
+		       filename);
+		exit(EXIT_FAILURE);
+	}
+
+	wfd = open(wfilename, 0100 | 1, 0644);
+	if (wfd < 0) {
+		fprintf(stderr, "patchapp: Could not open output file, %s, "
+		        "errno %d\n", &wfilename[0], errno);
+		exit(EXIT_FAILURE);
+	}
+
+	nbytes = write(wfd, &app_head, sizeof(app_header_t));
+	if (nbytes != sizeof(app_header_t)) {
+		fprintf(stderr, "patchapp: Problem writing header2\n");
+		exit(EXIT_FAILURE);
+	}
+
+	nbytes = read(fd, &buf[0], sizeof(app_header_t));
+	if (nbytes != sizeof(app_header_t)) {
+		fprintf(stderr, "patchapp: Problem reading header2\n");
+		exit(EXIT_FAILURE);
+	}
+
+	while ((nbytes = read(fd, &buf[0], 4096)) > 0) {
+
+		int wbytes;
+
+		wbytes = write(wfd, &buf[0], nbytes);
+		if (wbytes != nbytes) {
+			fprintf(stderr, "patchapp: Problem writing data\n");
+			exit(EXIT_FAILURE);
+		}
+
+	}
+	close(fd);
+
+	return 0;
+}
diff --git a/arch/mips/orion/promcon.c b/arch/mips/orion/promcon.c
index de5b0ea00..564d6cfae 100644
--- a/arch/mips/orion/promcon.c
+++ b/arch/mips/orion/promcon.c
@@ -181,55 +181,3 @@ int prom_getchar(void)
 {
 	return 0;
 }
-
-struct app_header_s {
-  unsigned long    MAGIC_JMP;
-  unsigned long    MAGIC_NOP;
-  unsigned long    header_tag;    
-  unsigned long    header_flags;
-  unsigned long    header_length;
-  unsigned long    header_cksum;
-     
-  void             *load_addr;
-  void             *end_addr;
-  void             *start_addr;
-  char             *app_name_p;
-  char             *version_p;
-  char             *date_p;
-  char             *time_p;
-  unsigned long    type;
-  unsigned long    crc;
-  unsigned long    reserved;
-};
-
-typedef struct app_header_s app_header_t;
-char linked_app_name[]="linux";
-char *linked_app_name_p=&linked_app_name[0];
-
-char linked_app_ver[]="2.4 -test1";
-char *linked_app_ver_p=&linked_app_ver[0];
-
-char linked_app_date[]="today";
-char *linked_app_date_p=&linked_app_date[0];
-
-char linked_app_time[]="now";
-char *linked_app_time_p=&linked_app_time[0];
-extern void *__bss_start;
-extern void *kernel_entry;
-
-app_header_t app_header __attribute__ ((section (".app_header"))) = {
-  (0x10000000 | (((sizeof(app_header_t)>>2)-1) & 0xffff)) ,
-  0 ,
-  (((( 0x4321  ) & 0xFFFF) << 16) | ((  0x0100  ) & 0xFFFF))  ,
-  0x80000000 ,
-  sizeof(app_header_t),
-  0,
-  &app_header,
-  &__bss_start,
-  &kernel_entry,
-  linked_app_name,
-  linked_app_ver,
-  linked_app_date,
-  linked_app_time,
-  0
-};
diff --git a/arch/mips/orion/setup.c b/arch/mips/orion/setup.c
index b9af10c47..af95c3b4c 100644
--- a/arch/mips/orion/setup.c
+++ b/arch/mips/orion/setup.c
@@ -43,6 +43,58 @@
 #include <asm/mc146818rtc.h>
 #include <asm/orion.h>
 
+struct app_header_s {
+	unsigned long    MAGIC_JMP;
+	unsigned long    MAGIC_NOP;
+	unsigned long    header_tag;    
+	unsigned long    header_flags;
+	unsigned long    header_length;
+	unsigned long    header_cksum;
+     
+	void             *load_addr;
+	void             *end_addr;
+	void             *start_addr;
+	char             *app_name_p;
+	char             *version_p;
+	char             *date_p;
+	char             *time_p;
+	unsigned long    type;
+	unsigned long    crc;
+	unsigned long    reserved;
+};
+
+typedef struct app_header_s app_header_t;
+char linked_app_name[] = "linux";
+char *linked_app_name_p = &linked_app_name[0];
+
+char linked_app_ver[] = "2.4 -test1";
+char *linked_app_ver_p = &linked_app_ver[0];
+
+char linked_app_date[] = "today";
+char *linked_app_date_p = &linked_app_date[0];
+
+char linked_app_time[] = "now";
+char *linked_app_time_p = &linked_app_time[0];
+extern void *__bss_start;
+extern void *kernel_entry;
+
+app_header_t app_header __attribute__ ((section (".app_header"))) = {
+	(0x10000000 | (((sizeof(app_header_t)>>2)-1) & 0xffff)) ,
+	0 ,
+	(((( 0x4321  ) & 0xFFFF) << 16) | ((  0x0100  ) & 0xFFFF))  ,
+	0x80000000 ,
+	sizeof(app_header_t),
+	0,
+	&app_header,
+	&__bss_start,
+	&kernel_entry,
+	linked_app_name,
+	linked_app_ver,
+	linked_app_date,
+	linked_app_time,
+	0
+};
+
 char arcs_cmdline[CL_SIZE] = { "console=ttyS0,19200" };
 extern int _end;
 
@@ -88,6 +140,7 @@ void __init orion_setup(void)
 #define PFN_ALIGN(x)	(((unsigned long)(x) + (PAGE_SIZE - 1)) & PAGE_MASK)
 
 unsigned long mem_size;
+
 int __init prom_init(int a, char **b, char **c, int *d)
 {
 	unsigned long free_start, free_end, start_pfn, bootmap_size;
@@ -120,16 +173,18 @@ int __init prom_init(int a, char **b, char **c, int *d)
 	 *  -- Cort <cort@fsmlabs.com>
 	 */
 	rd_size = 22<<10;
+
 	return 0;
 }
 
-void prom_free_prom_memory (void)
+void __init prom_free_prom_memory (void)
 {
 }
 
-int page_is_ram(unsigned long pagenr)
+int __init page_is_ram(unsigned long pagenr)
 {
-	if ( pagenr < (mem_size >> PAGE_SHIFT) )
+	if (pagenr < (mem_size >> PAGE_SHIFT))
 		return 1;
+
 	return 0;
 }