Date:2010-07-19 13:28:20 (13 years 8 months ago)
Author:kaloz
Commit:ac576eb648841227b09ba18ba266e56049ba82c4
Message:remove unneeded patches

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@22287 3c298f89-4303-0410-b956-a3cf2f4a3e73
Files: target/linux/mx2/patches-2.6.34/020-fix-usb-ioresource.patch (1 diff)
target/linux/mx2/patches-2.6.34/030-lzma.patch (1 diff)

Change Details

target/linux/mx2/patches-2.6.34/020-fix-usb-ioresource.patch
1+++ b/arch/arm/mach-mx2/devices.c
2@@ -304,7 +304,7 @@ DEFINE_MXC_MMC_DEVICE(1, MX2x_SDHC2_BASE
3 #ifdef CONFIG_MACH_MX27
4 static struct resource otg_resources[] = {
5     {
6- .start = MX27_USBOTG_BASE_ADDR,
7+ .start = MX27_usbotg_BASE_ADDR,
8         .end = MX27_USBOTG_BASE_ADDR + 0x1ff,
9         .flags = IORESOURCE_MEM,
10     }, {
11@@ -483,8 +483,8 @@ int __init mxc_register_gpios(void)
12 #ifdef CONFIG_MACH_MX21
13 static struct resource mx21_usbhc_resources[] = {
14     {
15- .start = MX21_BASE_ADDR,
16- .end = MX21_BASE_ADDR + 0x1FFF,
17+ .start = MX21_USBOTG_BASE_ADDR,
18+ .end = MX21_USBOTG_BASE_ADDR + 0x1FFF,
19         .flags = IORESOURCE_MEM,
20     },
21     {
target/linux/mx2/patches-2.6.34/030-lzma.patch
1This patch allows using a kernel image compressed with LZMA on ARM.
2Extracting the image is fairly slow, but it might be useful on machines
3with a very limited amount of storage, as the size benefit is quite
4significant:
5Gzip: Data Size: 1586352 Bytes = 1549.17 kB = 1.51 MB
6LZMA: Data Size: 2135916 Bytes = 2085.86 kB = 2.04 MB
7
8Signed-off-by: Albin Tonnerre <albin.tonnerre <at> free-electrons.com>
9Tested-by: Martin Michlmayr <tbm <at> cyrius.com>
10v2: Updated to apply on top of 2.6.34-rc1
11
12 arch/arm/Kconfig | 1 +
13 arch/arm/boot/compressed/Makefile | 1 +
14 arch/arm/boot/compressed/decompress.c | 4 ++++
15 arch/arm/boot/compressed/piggy.lzma.S | 6 ++++++
16 4 files changed, 12 insertions(+), 0 deletions(-)
17 create mode 100644 arch/arm/boot/compressed/piggy.lzma.S
18
19+++ b/arch/arm/Kconfig
20@@ -21,6 +21,7 @@ config ARM
21     select HAVE_GENERIC_DMA_COHERENT
22     select HAVE_KERNEL_GZIP
23     select HAVE_KERNEL_LZO
24+ select HAVE_KERNEL_LZMA
25     select HAVE_PERF_EVENTS
26     select PERF_USE_VMALLOC
27     help
28+++ b/arch/arm/boot/compressed/Makefile
29@@ -65,6 +65,7 @@ SEDFLAGS = s/TEXT_START/$(ZTEXTADDR)/;s/
30
31 suffix_$(CONFIG_KERNEL_GZIP) = gzip
32 suffix_$(CONFIG_KERNEL_LZO) = lzo
33+suffix_$(CONFIG_KERNEL_LZMA) = lzma
34
35 targets := vmlinux vmlinux.lds \
36          piggy.$(suffix_y) piggy.$(suffix_y).o \
37+++ b/arch/arm/boot/compressed/decompress.c
38@@ -40,6 +40,10 @@ extern void error(char *);
39 #include "../../../../lib/decompress_unlzo.c"
40 #endif
41
42+#ifdef CONFIG_KERNEL_LZMA
43+#include "../../../../lib/decompress_unlzma.c"
44+#endif
45+
46 void do_decompress(u8 *input, int len, u8 *output, void (*error)(char *x))
47 {
48     decompress(input, len, NULL, NULL, output, NULL, error);
49+++ b/arch/arm/boot/compressed/piggy.lzma.S
50@@ -0,0 +1,6 @@
51+ .section .piggydata,#alloc
52+ .globl input_data
53+input_data:
54+ .incbin "arch/arm/boot/compressed/piggy.lzma"
55+ .globl input_data_end
56+input_data_end:

Archive Download the corresponding diff file



interactive