hsist
/
freifunkist-firmware
6
1
Fork 0
Code Issues Pull Requests Releases Wiki Activity

adds several fixes to etrax, make openssl work on etrax

Browse Source 
SVN-Revision: 12393
master
John Crispin 17 years ago
parent 4d7f694c43
commit 974ad00cf3
5 changed files with 156 additions and 101 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 14
      package/openssl/patches/300-etrax_support.patch
  2. 1
      target/linux/etrax/Makefile
  3. 220
      target/linux/etrax/patches/100-compile_fixes.patch
  4. 11
      target/linux/etrax/patches/101-cris-eth-driver.patch
  5. 11
      target/linux/etrax/patches/102-missing_arch_include.patch

14
package/openssl/patches/300-etrax_support.patch
Unescape View File

@ -0,0 +1,14 @@
diff -urN openssl-0.9.8h.orig/Configure openssl-0.9.8h/Configure
--- openssl-0.9.8h.orig/Configure 2008-05-02 01:11:30.000000000 +0200
+++ openssl-0.9.8h/Configure 2008-06-19 13:27:42.000000000 +0200
@@ -385,6 +385,10 @@
"qnx4", "cc:-DL_ENDIAN -DTERMIO::(unknown):::${x86_gcc_des} ${x86_gcc_opts}:",
"qnx6", "cc:-DL_ENDIAN -DTERMIOS::(unknown)::-lsocket:${x86_gcc_des} ${x86_gcc_opts}:",
+# cris
+"linux-cris", "\$(TARGET_CC):-DL_ENDIAN -DTERMIO -fomit-frame-pointer::-D_REENTRANT::-ldl:BN_LLONG THIRTY_TWO_BIT RC4_CHAR::::::::::::dlfcn:linux-shared:-fpic::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)::",
+
+
#### SCO/Caldera targets.
#
# Originally we had like unixware-*, unixware-*-pentium, unixware-*-p6, etc.

1
target/linux/etrax/Makefile
Unescape View File

@ -15,7 +15,6 @@ LINUX_VERSION:=2.6.25.16
include $(INCLUDE_DIR)/target.mk include $(INCLUDE_DIR)/target.mk
KERNELNAME:="zImage" KERNELNAME:="zImage"
#DEFAULT_PACKAGES += foxboard-utils
define Target/Description define Target/Description
Build firmware images for the FOXBOARD made by acmesystems.it Build firmware images for the FOXBOARD made by acmesystems.it

220
target/linux/etrax/patches/100-compile_fixes.patch
Unescape View File

@ -1,14 +1,29 @@
--- a/arch/cris/arch-v10/boot/Makefile diff -urN linux-2.6.25.7/arch/cris/Makefile linux-2.6.25.7.cris/arch/cris/Makefile
+++ b/arch/cris/arch-v10/boot/Makefile --- linux-2.6.25.7/arch/cris/Makefile 2008-06-16 22:24:36.000000000 +0200
@@ -2,7 +2,6 @@ +++ linux-2.6.25.7.cris/arch/cris/Makefile 2008-06-24 13:22:48.000000000 +0200
@@ -33,7 +33,7 @@
LD = $(CROSS_COMPILE)ld -mcrislinux
-OBJCOPYFLAGS := -O binary -R .note -R .comment -S
+OBJCOPYFLAGS := -O binary -R .bss -R .note -R .note.gnu.build-id -R .comment -S
CPPFLAGS_vmlinux.lds = -DDRAM_VIRTUAL_BASE=0x$(CONFIG_ETRAX_DRAM_VIRTUAL_BASE)
diff -urN linux-2.6.25.7/arch/cris/arch-v10/boot/Makefile linux-2.6.25.7.cris/arch/cris/arch-v10/boot/Makefile
--- linux-2.6.25.7/arch/cris/arch-v10/boot/Makefile 2008-06-16 22:24:36.000000000 +0200
+++ linux-2.6.25.7.cris/arch/cris/arch-v10/boot/Makefile 2008-06-24 13:23:03.000000000 +0200
@@ -2,9 +2,6 @@
# arch/cris/arch-v10/boot/Makefile # arch/cris/arch-v10/boot/Makefile
# #
-OBJCOPY = objcopy-cris -OBJCOPY = objcopy-cris
OBJCOPYFLAGS = -O binary --remove-section=.bss -OBJCOPYFLAGS = -O binary --remove-section=.bss
-
subdir- := compressed rescue subdir- := compressed rescue
@@ -14,7 +13,6 @@ targets := Image
@@ -14,7 +11,6 @@
$(obj)/compressed/vmlinux: $(obj)/Image FORCE $(obj)/compressed/vmlinux: $(obj)/Image FORCE
$(Q)$(MAKE) $(build)=$(obj)/compressed $@ $(Q)$(MAKE) $(build)=$(obj)/compressed $@
@ -16,115 +31,48 @@
$(obj)/zImage: $(obj)/compressed/vmlinux $(obj)/zImage: $(obj)/compressed/vmlinux
@cp $< $@ @cp $< $@
--- a/arch/cris/arch-v10/boot/compressed/Makefile diff -urN linux-2.6.25.7/arch/cris/arch-v10/boot/compressed/Makefile linux-2.6.25.7.cris/arch/cris/arch-v10/boot/compressed/Makefile
+++ b/arch/cris/arch-v10/boot/compressed/Makefile --- linux-2.6.25.7/arch/cris/arch-v10/boot/compressed/Makefile 2008-06-16 22:24:36.000000000 +0200
@@ -2,12 +2,10 @@ +++ linux-2.6.25.7.cris/arch/cris/arch-v10/boot/compressed/Makefile 2008-06-24 13:23:14.000000000 +0200
@@ -2,13 +2,9 @@
# arch/cris/arch-v10/boot/compressed/Makefile # arch/cris/arch-v10/boot/compressed/Makefile
# #
-CC = gcc-cris -melf $(LINUXINCLUDE) -CC = gcc-cris -melf $(LINUXINCLUDE)
ccflags-y += -O2 ccflags-y += -O2
-LD = ld-cris -LD = ld-cris
+LD = $(CROSS_COMPILE)ld -m criself
ldflags-y += -T $(obj)/decompress.ld ldflags-y += -T $(obj)/decompress.ld
OBJECTS = $(obj)/head.o $(obj)/misc.o OBJECTS = $(obj)/head.o $(obj)/misc.o
-OBJCOPY = objcopy-cris -OBJCOPY = objcopy-cris
OBJCOPYFLAGS = -O binary --remove-section=.bss -OBJCOPYFLAGS = -O binary --remove-section=.bss
quiet_cmd_image = BUILD $@ quiet_cmd_image = BUILD $@
@@ -22,10 +20,10 @@ cmd_image = cat $(obj)/decompress.bin $(obj)/piggy.gz > $@
@@ -22,10 +18,10 @@
$(call if_changed,objcopy) $(call if_changed,objcopy)
$(obj)/head.o: $(obj)/head.S .config $(obj)/head.o: $(obj)/head.S .config
- @$(CC) -D__ASSEMBLY__ -traditional -c $< -o $@ - @$(CC) -D__ASSEMBLY__ -traditional -c $< -o $@
+ @$(CC) -D__ASSEMBLY__ -traditional -Wa,--em=criself -c $< -o $@ + @$(CC) -Iinclude -D__ASSEMBLY__ -traditional -Wa,--em=criself -c $< -o $@
$(obj)/misc.o: $(obj)/misc.c .config $(obj)/misc.o: $(obj)/misc.c .config
- @$(CC) -D__KERNEL__ -c $< -o $@ - @$(CC) -D__KERNEL__ -c $< -o $@
+ @$(CC) -D__KERNEL__ -Wa,--em=criself -c $< -o $@ + @$(CC) -Iinclude -D__KERNEL__ -Wa,--em=criself -c $< -o $@
$(obj)/vmlinux: $(obj)/piggy.gz $(obj)/decompress.bin FORCE $(obj)/vmlinux: $(obj)/piggy.gz $(obj)/decompress.bin FORCE
$(call if_changed,image) $(call if_changed,image)
--- a/arch/cris/arch-v10/boot/compressed/misc.c diff -urN linux-2.6.25.7/arch/cris/arch-v10/boot/compressed/decompress.ld linux-2.6.25.7.cris/arch/cris/arch-v10/boot/compressed/decompress.ld
+++ b/arch/cris/arch-v10/boot/compressed/misc.c --- linux-2.6.25.7/arch/cris/arch-v10/boot/compressed/decompress.ld 2008-06-16 22:24:36.000000000 +0200
@@ -5,7 +5,7 @@ +++ linux-2.6.25.7.cris/arch/cris/arch-v10/boot/compressed/decompress.ld 2008-06-24 12:57:25.000000000 +0200
* adapted for Linux. @@ -1,4 +1,4 @@
* -OUTPUT_FORMAT(elf32-us-cris)
* malloc by Hannu Savolainen 1993 and Matthias Urlichs 1994 +OUTPUT_FORMAT(elf32-cris)
- * puts by Nick Holloway 1993, better puts by Martin Mares 1995
+ * putstr by Nick Holloway 1993, better putstr by Martin Mares 1995
* adaptation for Linux/CRIS Axis Communications AB, 1999
*
*/
@@ -99,12 +99,12 @@
static void gzip_mark(void **);
static void gzip_release(void **);
-static void puts(const char *);
+static void putstr(const char *);
/* the "heap" is put directly after the BSS ends, at end */
-extern int end;
-static long free_mem_ptr = (long)&end;
+extern int _end;
+static long free_mem_ptr = (long)&_end;
#include "../../../../../lib/inflate.c"
@@ -139,7 +139,7 @@
/* decompressor info and error messages to serial console */
static void
-puts(const char *s)
+putstr(const char *s)
{
#ifndef CONFIG_ETRAX_DEBUG_PORT_NULL
while(*s) {
@@ -209,9 +209,9 @@
static void
error(char *x)
{
- puts("\n\n");
- puts(x);
- puts("\n\n -- System halted\n");
+ putstr("\n\n");
+ putstr(x);
+ putstr("\n\n -- System halted\n");
while(1); /* Halt */
}
@@ -257,14 +257,7 @@
makecrc();
- __asm__ volatile ("move vr,%0" : "=rm" (revision));
- if (revision < 10)
- {
- puts("You need an ETRAX 100LX to run linux 2.6\n");
- while(1);
- }
-
- puts("Uncompressing Linux...\n");
+ putstr("Uncompressing Linux...\n");
gunzip();
- puts("Done. Now booting the kernel.\n");
+ putstr("Done. Now booting the kernel.\n");
}
--- a/arch/cris/arch-v10/mm/init.c
+++ b/arch/cris/arch-v10/mm/init.c
@@ -184,6 +184,9 @@
free_area_init_node(0, &contig_page_data, zones_size, PAGE_OFFSET >> PAGE_SHIFT, 0);
}
+void free_initrd_mem(unsigned long start, unsigned long end)
+{
+}
/* Initialize remaps of some I/O-ports. It is important that this MEMORY
* is called before any driver is initialized. {
--- a/arch/cris/arch-v10/boot/compressed/head.S diff -urN linux-2.6.25.7/arch/cris/arch-v10/boot/compressed/head.S linux-2.6.25.7.cris/arch/cris/arch-v10/boot/compressed/head.S
+++ b/arch/cris/arch-v10/boot/compressed/head.S --- linux-2.6.25.7/arch/cris/arch-v10/boot/compressed/head.S 2008-06-16 22:24:36.000000000 +0200
+++ linux-2.6.25.7.cris/arch/cris/arch-v10/boot/compressed/head.S 2008-06-24 13:24:50.000000000 +0200
@@ -10,13 +10,14 @@ @@ -10,13 +10,14 @@
#define ASSEMBLER_MACROS_ONLY #define ASSEMBLER_MACROS_ONLY
@ -279,11 +227,83 @@
+cmd_line_addr: +cmd_line_addr:
.dword 0 .dword 0
#include "../../lib/hw_settings.S" #include "../../lib/hw_settings.S"
--- a/arch/cris/arch-v10/boot/compressed/decompress.ld diff -urN linux-2.6.25.7/arch/cris/arch-v10/boot/compressed/misc.c linux-2.6.25.7.cris/arch/cris/arch-v10/boot/compressed/misc.c
+++ b/arch/cris/arch-v10/boot/compressed/decompress.ld --- linux-2.6.25.7/arch/cris/arch-v10/boot/compressed/misc.c 2008-06-16 22:24:36.000000000 +0200
@@ -1,4 +1,4 @@ +++ linux-2.6.25.7.cris/arch/cris/arch-v10/boot/compressed/misc.c 2008-06-24 12:57:25.000000000 +0200
-OUTPUT_FORMAT(elf32-us-cris) @@ -5,7 +5,7 @@
+OUTPUT_FORMAT(elf32-cris) * adapted for Linux.
*
* malloc by Hannu Savolainen 1993 and Matthias Urlichs 1994
- * puts by Nick Holloway 1993, better puts by Martin Mares 1995
+ * putstr by Nick Holloway 1993, better putstr by Martin Mares 1995
* adaptation for Linux/CRIS Axis Communications AB, 1999
*
*/
@@ -99,12 +99,12 @@
static void gzip_mark(void **);
static void gzip_release(void **);
-static void puts(const char *);
+static void putstr(const char *);
MEMORY /* the "heap" is put directly after the BSS ends, at end */
{
-extern int end;
-static long free_mem_ptr = (long)&end;
+extern int _end;
+static long free_mem_ptr = (long)&_end;
#include "../../../../../lib/inflate.c"
@@ -139,7 +139,7 @@
/* decompressor info and error messages to serial console */
static void
-puts(const char *s)
+putstr(const char *s)
{
#ifndef CONFIG_ETRAX_DEBUG_PORT_NULL
while(*s) {
@@ -209,9 +209,9 @@
static void
error(char *x)
{
- puts("\n\n");
- puts(x);
- puts("\n\n -- System halted\n");
+ putstr("\n\n");
+ putstr(x);
+ putstr("\n\n -- System halted\n");
while(1); /* Halt */
}
@@ -257,14 +257,7 @@
makecrc();
- __asm__ volatile ("move vr,%0" : "=rm" (revision));
- if (revision < 10)
- {
- puts("You need an ETRAX 100LX to run linux 2.6\n");
- while(1);
- }
-
- puts("Uncompressing Linux...\n");
+ putstr("Uncompressing Linux...\n");
gunzip();
- puts("Done. Now booting the kernel.\n");
+ putstr("Done. Now booting the kernel.\n");
}
diff -urN linux-2.6.25.7/arch/cris/arch-v10/mm/init.c linux-2.6.25.7.cris/arch/cris/arch-v10/mm/init.c
--- linux-2.6.25.7/arch/cris/arch-v10/mm/init.c 2008-06-16 22:24:36.000000000 +0200
+++ linux-2.6.25.7.cris/arch/cris/arch-v10/mm/init.c 2008-06-24 12:57:25.000000000 +0200
@@ -184,6 +184,9 @@
free_area_init_node(0, &contig_page_data, zones_size, PAGE_OFFSET >> PAGE_SHIFT, 0);
}
+void free_initrd_mem(unsigned long start, unsigned long end)
+{
+}
/* Initialize remaps of some I/O-ports. It is important that this
* is called before any driver is initialized.

11
target/linux/etrax/patches/101-cris-eth-driver.patch
Unescape View File

@ -0,0 +1,11 @@
--- linux-2.6.25.7/drivers/net/cris/eth_v10.c.orig 2008-06-24 13:37:48.000000000 +0200
+++ linux-2.6.25.7/drivers/net/cris/eth_v10.c 2008-06-24 13:37:58.000000000 +0200
@@ -1707,7 +1707,7 @@
static void
e100_netpoll(struct net_device* netdev)
{
- e100rxtx_interrupt(NETWORK_DMA_TX_IRQ_NBR, netdev, NULL);
+ e100rxtx_interrupt(NETWORK_DMA_TX_IRQ_NBR, netdev);
}
#endif

11
target/linux/etrax/patches/102-missing_arch_include.patch
Unescape View File

@ -0,0 +1,11 @@
--- linux-2.6.25.7/include/asm-cris/Kbuild.orig 2008-06-23 12:24:03.000000000 +0200
+++ linux-2.6.25.7/include/asm-cris/Kbuild 2008-06-23 12:24:23.000000000 +0200
@@ -1,7 +1,6 @@
include include/asm-generic/Kbuild.asm
-header-$(CONFIG_ETRAX_ARCH_V10) += arch-v10/
-header-$(CONFIG_ETRAX_ARCH_V32) += arch-v32/
+header-y += arch-v10/ arch-v32/
header-y += ethernet.h
header-y += rtc.h
Write Preview
Loading…
Cancel
Save