projects
/
openwrt.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[tools] cleanup imagetag
[openwrt.git]
/
target
/
linux
/
etrax
/
patches
/
100-compile_fixes.patch
diff --git
a/target/linux/etrax/patches/100-compile_fixes.patch
b/target/linux/etrax/patches/100-compile_fixes.patch
index
ea6d08e
..
2a9fc65
100644
(file)
--- a/
target/linux/etrax/patches/100-compile_fixes.patch
+++ b/
target/linux/etrax/patches/100-compile_fixes.patch
@@
-1,6
+1,6
@@
--- a/arch/cris/Makefile
+++ b/arch/cris/Makefile
--- a/arch/cris/Makefile
+++ b/arch/cris/Makefile
-@@ -33,7 +33,7 @@
+@@ -33,7 +33,7 @@
endif
LD = $(CROSS_COMPILE)ld -mcrislinux
LD = $(CROSS_COMPILE)ld -mcrislinux
@@
-21,7
+21,7
@@
subdir- := compressed rescue
targets := Image
subdir- := compressed rescue
targets := Image
-@@ -14,7 +11,6 @@
+@@ -14,7 +11,6 @@
$(obj)/Image: vmlinux FORCE
$(obj)/compressed/vmlinux: $(obj)/Image FORCE
$(Q)$(MAKE) $(build)=$(obj)/compressed $@
$(obj)/compressed/vmlinux: $(obj)/Image FORCE
$(Q)$(MAKE) $(build)=$(obj)/compressed $@
@@
-45,19
+45,19
@@
quiet_cmd_image = BUILD $@
cmd_image = cat $(obj)/decompress.bin $(obj)/piggy.gz > $@
quiet_cmd_image = BUILD $@
cmd_image = cat $(obj)/decompress.bin $(obj)/piggy.gz > $@
-@@ -22,10 +18,10 @@
+@@ -21,12 +17,6 @@
+ $(obj)/decompress.bin: $(obj)/decompress.o FORCE
$(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) -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) -Iinclude -D__KERNEL__ -Wa,--em=criself -c $< -o $@
-
+-
$(obj)/vmlinux: $(obj)/piggy.gz $(obj)/decompress.bin FORCE
$(call if_changed,image)
$(obj)/vmlinux: $(obj)/piggy.gz $(obj)/decompress.bin FORCE
$(call if_changed,image)
+
--- a/arch/cris/arch-v10/boot/compressed/decompress.ld
+++ b/arch/cris/arch-v10/boot/compressed/decompress.ld
@@ -1,4 +1,4 @@
--- a/arch/cris/arch-v10/boot/compressed/decompress.ld
+++ b/arch/cris/arch-v10/boot/compressed/decompress.ld
@@ -1,4 +1,4 @@
@@
-93,7
+93,7
@@
beq dram_init_finished
nop
beq dram_init_finished
nop
-@@ -36,91 +37,91 @@
+@@ -36,91 +37,91 @@
dram_init_finished:
;; Initiate the PA and PB ports
;; Initiate the PA and PB ports
@@
-233,7
+233,7
@@
* adaptation for Linux/CRIS Axis Communications AB, 1999
*
*/
* adaptation for Linux/CRIS Axis Communications AB, 1999
*
*/
-@@ -99,12 +99,12 @@
+@@ -99,12 +99,12 @@
static void error(char *m);
static void gzip_mark(void **);
static void gzip_release(void **);
static void gzip_mark(void **);
static void gzip_release(void **);
@@
-249,7
+249,7
@@
#include "../../../../../lib/inflate.c"
#include "../../../../../lib/inflate.c"
-@@ -139,7 +139,7 @@
+@@ -139,7 +139,7 @@
static void gzip_release(void **ptr)
/* decompressor info and error messages to serial console */
static void
/* decompressor info and error messages to serial console */
static void
@@
-258,7
+258,7
@@
{
#ifndef CONFIG_ETRAX_DEBUG_PORT_NULL
while(*s) {
{
#ifndef CONFIG_ETRAX_DEBUG_PORT_NULL
while(*s) {
-@@ -209,9 +209,9 @@
+@@ -209,9 +209,9 @@
flush_window()
static void
error(char *x)
{
static void
error(char *x)
{
@@
-271,7
+271,7
@@
while(1); /* Halt */
}
while(1); /* Halt */
}
-@@ -257,14 +257,7 @@
+@@ -257,14 +257,7 @@
decompress_kernel()
makecrc();
makecrc();
@@
-290,7
+290,7
@@
}
--- a/arch/cris/arch-v10/mm/init.c
+++ b/arch/cris/arch-v10/mm/init.c
}
--- a/arch/cris/arch-v10/mm/init.c
+++ b/arch/cris/arch-v10/mm/init.c
-@@ -184,6 +184,9 @@
+@@ -184,6 +184,9 @@
paging_init(void)
free_area_init_node(0, &contig_page_data, zones_size, PAGE_OFFSET >> PAGE_SHIFT, 0);
}
free_area_init_node(0, &contig_page_data, zones_size, PAGE_OFFSET >> PAGE_SHIFT, 0);
}
This page took
0.041176 seconds
and
4
git commands to generate.