From 8e004499ac8115e8fd60e9e0f9855c55e9961dc4 Mon Sep 17 00:00:00 2001 From: juhosg Date: Mon, 19 May 2008 16:34:31 +0000 Subject: [etrax] refresh kernel patches git-svn-id: svn://svn.openwrt.org/openwrt/trunk@11215 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- target/linux/etrax/patches/201-flashsize.patch | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) (limited to 'target/linux/etrax/patches/201-flashsize.patch') diff --git a/target/linux/etrax/patches/201-flashsize.patch b/target/linux/etrax/patches/201-flashsize.patch index 4982963d3..0348bb049 100644 --- a/target/linux/etrax/patches/201-flashsize.patch +++ b/target/linux/etrax/patches/201-flashsize.patch @@ -1,18 +1,18 @@ -Index: linux-2.6.25.1/arch/cris/arch-v10/lib/hw_settings.S +Index: linux-2.6.25.4/arch/cris/arch-v10/lib/hw_settings.S =================================================================== ---- linux-2.6.25.1.orig/arch/cris/arch-v10/lib/hw_settings.S 2008-05-03 20:25:16.000000000 +0100 -+++ linux-2.6.25.1/arch/cris/arch-v10/lib/hw_settings.S 2008-05-03 20:25:35.000000000 +0100 +--- linux-2.6.25.4.orig/arch/cris/arch-v10/lib/hw_settings.S ++++ linux-2.6.25.4/arch/cris/arch-v10/lib/hw_settings.S @@ -60,3 +60,5 @@ .dword R_PORT_PB_SET .dword PB_SET_VALUE .dword 0 ; No more register values + .ascii "ACME_PART_MAGIC" + .dword 0xdeadc0de -Index: linux-2.6.25.1/arch/cris/arch-v10/drivers/axisflashmap.c +Index: linux-2.6.25.4/arch/cris/arch-v10/drivers/axisflashmap.c =================================================================== ---- linux-2.6.25.1.orig/arch/cris/arch-v10/drivers/axisflashmap.c 2008-05-03 20:27:28.000000000 +0100 -+++ linux-2.6.25.1/arch/cris/arch-v10/drivers/axisflashmap.c 2008-05-03 20:34:54.000000000 +0100 -@@ -113,7 +113,7 @@ +--- linux-2.6.25.4.orig/arch/cris/arch-v10/drivers/axisflashmap.c ++++ linux-2.6.25.4/arch/cris/arch-v10/drivers/axisflashmap.c +@@ -113,7 +113,7 @@ static struct map_info map_cse1 = { /* If no partition-table was found, we use this default-set. */ #define MAX_PARTITIONS 7 @@ -21,7 +21,7 @@ Index: linux-2.6.25.1/arch/cris/arch-v10/drivers/axisflashmap.c /* * Default flash size is 2MB. CONFIG_ETRAX_PTABLE_SECTOR is most likely the -@@ -122,19 +122,14 @@ +@@ -122,19 +122,14 @@ static struct map_info map_cse1 = { */ static struct mtd_partition axis_default_partitions[NUM_DEFAULT_PARTITIONS] = { { @@ -46,7 +46,7 @@ Index: linux-2.6.25.1/arch/cris/arch-v10/drivers/axisflashmap.c } }; -@@ -281,6 +276,11 @@ +@@ -281,6 +276,11 @@ static int __init init_axis_flash(void) struct partitiontable_entry *ptable; int use_default_ptable = 1; /* Until proven otherwise. */ const char pmsg[] = " /dev/flash%d at 0x%08x, size 0x%08x\n"; @@ -58,7 +58,7 @@ Index: linux-2.6.25.1/arch/cris/arch-v10/drivers/axisflashmap.c if (!(mymtd = flash_probe())) { /* There's no reason to use this module if no flash chip can -@@ -292,6 +292,31 @@ +@@ -292,6 +292,31 @@ static int __init init_axis_flash(void) mymtd->name, mymtd->size); axisflash_mtd = mymtd; } -- cgit v1.2.3