Root/
Source at commit 48cc63a8540276d65746e82334550430da417b3f created 13 years 4 months ago. By Xiangfu Liu, some cleanup about xburst target - make zImage compile fine - set the ip addr to 192.168.254.101 - add more tty - format nand partition to 3 - cleanup keyboard - cleanup gmp940b driver - add color font patch, use setfont2 in userspace - add FPU in config, change font to 6x11 - add default CMDLINE, which is for zImage | |
---|---|
1 | From 4939c63a61175f87d93ac0164c7adb40e8410a47 Mon Sep 17 00:00:00 2001 |
2 | From: Xiangfu Liu <xiangfu@qi-hardware.com> |
3 | Date: Sun, 17 Jan 2010 23:38:35 +0800 |
4 | Subject: [PATCH] ix upload zImage |
5 | |
6 | --- |
7 | arch/mips/boot/compressed/head.S | 1 - |
8 | arch/mips/boot/compressed/misc.c | 22 ---------------------- |
9 | 2 files changed, 0 insertions(+), 23 deletions(-) |
10 | |
11 | diff --git a/arch/mips/boot/compressed/head.S b/arch/mips/boot/compressed/head.S |
12 | index d9700eb..6a4e685 100644 |
13 | --- a/arch/mips/boot/compressed/head.S |
14 | +++ b/arch/mips/boot/compressed/head.S |
15 | @@ -5,7 +5,6 @@ |
16 | */ |
17 | |
18 | #include <asm/asm.h> |
19 | -#include <asm/cacheops.h> |
20 | #include <asm/cachectl.h> |
21 | #include <asm/regdef.h> |
22 | |
23 | diff --git a/arch/mips/boot/compressed/misc.c b/arch/mips/boot/compressed/misc.c |
24 | index 2309fee..c0b041b 100644 |
25 | --- a/arch/mips/boot/compressed/misc.c |
26 | +++ b/arch/mips/boot/compressed/misc.c |
27 | @@ -103,28 +103,6 @@ static unsigned long free_mem_end_ptr; |
28 | |
29 | #include "../../../../lib/inflate.c" |
30 | |
31 | -static void *malloc(int size) |
32 | -{ |
33 | - void *p; |
34 | - |
35 | - if (size <0) error("Malloc error\n"); |
36 | - if (free_mem_ptr == 0) error("Memory error\n"); |
37 | - |
38 | - free_mem_ptr = (free_mem_ptr + 3) & ~3; /* Align */ |
39 | - |
40 | - p = (void *)free_mem_ptr; |
41 | - free_mem_ptr += size; |
42 | - |
43 | - if (free_mem_ptr >= free_mem_end_ptr) |
44 | - error("\nOut of memory\n"); |
45 | - |
46 | - return p; |
47 | -} |
48 | - |
49 | -static void free(void *where) |
50 | -{ /* Don't care */ |
51 | -} |
52 | - |
53 | static void gzip_mark(void **ptr) |
54 | { |
55 | *ptr = (void *) free_mem_ptr; |
56 | -- |
57 | 1.6.3.3 |
58 | |
59 |