linux-yocto(-tiny-kexecboot)_3.2: Zaurus collie MTD fixes
PATCH 1/1 linux-yocto(-tiny-kexecboot)_3.2: Zaurus collie MTD fixes
* experimental patches to fix mtd partitions detection
* kexecboot now finds cramfs
* mount of orig. cramfs partition tested for fun :)
* collie's NOR is still READ-ONLY on boot
*
* while there, add a patch to mcp.h to fix
* collie_battery.c compilation
--- .../linux/linux-yocto-3.2/collie/collie-eraseinfo.patch | 11 +++++++++++ .../linux/linux-yocto-3.2/collie/collie-jedec-probe.patch | 11 +++++++++++ .../linux/linux-yocto-3.2/collie/collie-mtd-rw.patch | 12 ++++++++++++ recipes-kernel/linux/linux-yocto-3.2/collie/collie.cfg | 2 +- .../linux/linux-yocto-3.2/collie/mcp-device.patch | 13 +++++++++++++ .../collie/collie-eraseinfo.patch | 11 +++++++++++ .../collie/collie-jedec-probe.patch | 11 +++++++++++ .../collie/collie-mtd-rw.patch | 12 ++++++++++++ .../linux-yocto-tiny-kexecboot-3.2/collie/mcp-device.patch | 13 +++++++++++++ .../linux/linux-yocto-tiny-kexecboot_3.2.bbappend | 6 +++++- recipes-kernel/linux/linux-yocto_3.2.bbappend | 4 ++++ 11 files changed, 104 insertions(+), 2 deletions(-) create mode 100644 recipes-kernel/linux/linux-yocto-3.2/collie/collie-eraseinfo.patch create mode 100644 recipes-kernel/linux/linux-yocto-3.2/collie/collie-jedec-probe.patch create mode 100644 recipes-kernel/linux/linux-yocto-3.2/collie/collie-mtd-rw.patch create mode 100644 recipes-kernel/linux/linux-yocto-3.2/collie/mcp-device.patch create mode 100644 recipes-kernel/linux/linux-yocto-tiny-kexecboot-3.2/collie/collie-eraseinfo.patch create mode 100644 recipes-kernel/linux/linux-yocto-tiny-kexecboot-3.2/collie/collie-jedec-probe.patch create mode 100644 recipes-kernel/linux/linux-yocto-tiny-kexecboot-3.2/collie/collie-mtd-rw.patch create mode 100644 recipes-kernel/linux/linux-yocto-tiny-kexecboot-3.2/collie/mcp-device.patch
recipes-kernel/linux/linux-yocto-3.2/collie/collie-eraseinfo.patch new file +11 -0
@@ -0,0 +1,11 @@ +--- a/drivers/mtd/chips/jedec_probe.c ++++ b/drivers/mtd/chips/jedec_probe.c +@@ -1305,7 +1305,7 @@ + .cmd_set = P_ID_INTEL_STD, + .nr_regions = 1, + .regions = { +- ERASEINFO(0x40000,16), ++ ERASEINFO(0x08000,128), + } + }, { + .mfr_id = CFI_MFR_SST,
recipes-kernel/linux/linux-yocto-3.2/collie/collie-jedec-probe.patch new file +11 -0
@@ -0,0 +1,11 @@ +--- a/arch/arm/mach-sa1100/collie.c ++++ b/arch/arm/mach-sa1100/collie.c +@@ -289,7 +289,7 @@ + } + + static struct flash_platform_data collie_flash_data = { +- .map_name = "cfi_probe", ++ .map_name = "jedec_probe", + .init = collie_flash_init, + .set_vpp = collie_set_vpp, + .exit = collie_flash_exit,
recipes-kernel/linux/linux-yocto-3.2/collie/collie-mtd-rw.patch new file +12 -0
@@ -0,0 +1,12 @@ +diff --git a/drivers/mtd/maps/sa1100-flash.c b/drivers/mtd/maps/sa1100-flash.c +index fa9c0a9..bf6b04f 100644 +--- a/drivers/mtd/maps/sa1100-flash.c ++++ b/drivers/mtd/maps/sa1100-flash.c +@@ -206,6 +206,7 @@ static int sa1100_probe_subdev(struct sa_subdev_info *subdev, struct resource *r + goto err; + } + subdev->mtd->owner = THIS_MODULE; ++ subdev->mtd->unlock(subdev->mtd, 0xc0000, subdev->mtd->size - 0xc0000); + + printk(KERN_INFO "SA1100 flash: CFI device at 0x%08lx, %uMiB, %d-bit\n", + phys, (unsigned)(subdev->mtd->size >> 20),
recipes-kernel/linux/linux-yocto-3.2/collie/collie.cfg +1 -1
@@ -1473,7 +1473,7 @@ CONFIG_APM_POWER=y # CONFIG_TEST_POWER is not set # CONFIG_BATTERY_DS2780 is not set # CONFIG_BATTERY_DS2782 is not set -# CONFIG_BATTERY_COLLIE is not set +CONFIG_BATTERY_COLLIE=y # CONFIG_BATTERY_BQ20Z75 is not set # CONFIG_BATTERY_BQ27x00 is not set # CONFIG_BATTERY_MAX17040 is not set
recipes-kernel/linux/linux-yocto-3.2/collie/mcp-device.patch new file +13 -0
@@ -0,0 +1,13 @@ +--- a/include/linux/mfd/mcp.h 2013-02-18 00:14:09.000000000 +0100 ++++ b/include/linux/mfd/mcp.h 2013-02-17 23:55:52.000000000 +0100 +@@ -10,6 +10,8 @@ + #ifndef MCP_H + #define MCP_H + ++#include <linux/device.h> ++ + struct mcp_ops; + + struct mcp { + +
recipes-kernel/linux/linux-yocto-tiny-kexecboot-3.2/collie/collie-eraseinfo.patch new file +11 -0
@@ -0,0 +1,11 @@ +--- a/drivers/mtd/chips/jedec_probe.c ++++ b/drivers/mtd/chips/jedec_probe.c +@@ -1305,7 +1305,7 @@ + .cmd_set = P_ID_INTEL_STD, + .nr_regions = 1, + .regions = { +- ERASEINFO(0x40000,16), ++ ERASEINFO(0x08000,128), + } + }, { + .mfr_id = CFI_MFR_SST,
recipes-kernel/linux/linux-yocto-tiny-kexecboot-3.2/collie/collie-jedec-probe.patch new file +11 -0
@@ -0,0 +1,11 @@ +--- a/arch/arm/mach-sa1100/collie.c ++++ b/arch/arm/mach-sa1100/collie.c +@@ -289,7 +289,7 @@ + } + + static struct flash_platform_data collie_flash_data = { +- .map_name = "cfi_probe", ++ .map_name = "jedec_probe", + .init = collie_flash_init, + .set_vpp = collie_set_vpp, + .exit = collie_flash_exit,
recipes-kernel/linux/linux-yocto-tiny-kexecboot-3.2/collie/collie-mtd-rw.patch new file +12 -0
@@ -0,0 +1,12 @@ +diff --git a/drivers/mtd/maps/sa1100-flash.c b/drivers/mtd/maps/sa1100-flash.c +index fa9c0a9..bf6b04f 100644 +--- a/drivers/mtd/maps/sa1100-flash.c ++++ b/drivers/mtd/maps/sa1100-flash.c +@@ -206,6 +206,7 @@ static int sa1100_probe_subdev(struct sa_subdev_info *subdev, struct resource *r + goto err; + } + subdev->mtd->owner = THIS_MODULE; ++ subdev->mtd->unlock(subdev->mtd, 0xc0000, subdev->mtd->size - 0xc0000); + + printk(KERN_INFO "SA1100 flash: CFI device at 0x%08lx, %uMiB, %d-bit\n", + phys, (unsigned)(subdev->mtd->size >> 20),
recipes-kernel/linux/linux-yocto-tiny-kexecboot-3.2/collie/mcp-device.patch new file +13 -0
@@ -0,0 +1,13 @@ +--- a/include/linux/mfd/mcp.h 2013-02-18 00:14:09.000000000 +0100 ++++ b/include/linux/mfd/mcp.h 2013-02-17 23:55:52.000000000 +0100 +@@ -10,6 +10,8 @@ + #ifndef MCP_H + #define MCP_H + ++#include <linux/device.h> ++ + struct mcp_ops; + + struct mcp { + +
recipes-kernel/linux/linux-yocto-tiny-kexecboot_3.2.bbappend +5 -1
@@ -34,12 +34,16 @@ SRC_URI_append_c7x0 = " \ SRC_URI_append_collie = " \ file://collie-tiny.scc \ file://collie-kexecboot.cfg \ - file://qvga/logo_linux_clut224.ppm.bz2 \ file://0001-pcmcia-pxa2xx_sharpsl-retain-ops-structure-on-collie.patch \ file://locomo_kbd_tweak-r2.patch \ file://collie_remove_irq_to_gpio.patch \ + file://mcp-device.patch \ + file://collie-jedec-probe.patch \ + file://collie-eraseinfo.patch \ + file://qvga/logo_linux_clut224.ppm.bz2 \ file://revert-check-on-console-device.patch \ " +# file://collie-mtd-rw.patch SRC_URI_append_poodle = " \ file://poodle-tiny.scc \
recipes-kernel/linux/linux-yocto_3.2.bbappend +4 -0
@@ -27,8 +27,12 @@ SRC_URI_append_collie = " \ file://qvga/logo_linux_clut224.ppm.bz2 \ file://0001-pcmcia-pxa2xx_sharpsl-retain-ops-structure-on-collie.patch \ file://collie_remove_irq_to_gpio.patch \ + file://mcp-device.patch \ + file://collie-jedec-probe.patch \ + file://collie-eraseinfo.patch \ file://locomo_kbd_tweak-r2.patch \ " +# file://collie-mtd-rw.patch SRC_URI_append_poodle = " \ file://poodle-standard.scc \
Signature · 1 line
1.7.12.4
PATCH 1/1 zaurus.inc: reflect packaging changes of mtd-utils
* and add the mtd tools for collie as well
* (mtd2 is atm not writeable, locked at boot)
--- conf/machine/include/zaurus.inc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
conf/machine/include/zaurus.inc +2 -2
@@ -100,8 +100,8 @@ MACHINE_FEATURES_append_akita = " usbhost" MACHINE_FEATURES_append_spitz = " usbhost" MACHINE_FEATURES_append_tosa = " usbhost wifi " -MACHINE_EXTRA_RDEPENDS = "zaurusd mtd-utils nandlogical" -MACHINE_EXTRA_RDEPENDS_collie = "zaurusd" +MACHINE_EXTRA_RDEPENDS = "zaurusd mtd-utils mtd-utils-jffs2 mtd-utils-ubifs nandlogical" +MACHINE_EXTRA_RDEPENDS_collie = "zaurusd mtd-utils mtd-utils-jffs2 mtd-utils-ubifs" ################################## # Zaurus rootfs are booted by
Signature · 1 line
1.7.12.4
Quoted 259 lines · On Friday 01 March 2013 00:57:51 Andrea Adami wrote:
* experimental patches to fix mtd partitions detection
* kexecboot now finds cramfs
* mount of orig. cramfs partition tested for fun :)
* collie's NOR is still READ-ONLY on boot
*
* while there, add a patch tomcp.hto fix
*collie_battery.ccompilationSigned-off-by Andrea Adami <[email protected]>--- .../linux/linux-yocto-3.2/collie/collie-eraseinfo.patch | 11 +++++++++++ .../linux/linux-yocto-3.2/collie/collie-jedec-probe.patch | 11 +++++++++++ .../linux/linux-yocto-3.2/collie/collie-mtd-rw.patch | 12 ++++++++++++ recipes-kernel/linux/linux-yocto-3.2/collie/collie.cfg | 2 +- .../linux/linux-yocto-3.2/collie/mcp-device.patch | 13+++++++++++++
.../collie/collie-eraseinfo.patch|
11 +++++++++++.../collie/collie-jedec-probe.patch
| 11 +++++++++++.../collie/collie-mtd-rw.patch
| 12 ++++++++++++.../linux-yocto-tiny-kexecboot-3.2/collie/mcp-device.patch| 13
+++++++++++++ .../linux/linux-yocto-tiny-kexecboot_3.2.bbappend |6 +++++- recipes-kernel/linux/linux-yocto_3.2.bbappend | 4 ++++ 11 files changed, 104 insertions(+), 2 deletions(-) create mode 100644
recipes-kernel/linux/linux-yocto-3.2/collie/collie-eraseinfo.patchcreate mode 100644recipes-kernel/linux/linux-yocto-3.2/collie/collie-jedec-probe.patchcreate mode 100644recipes-kernel/linux/linux-yocto-3.2/collie/collie-mtd-rw.patchcreate mode 100644recipes-kernel/linux/linux-yocto-3.2/collie/mcp-device.patchcreate mode 100644 recipes-kernel/linux/linux-yocto-tiny-kexecboot-3.2/collie/collie-eraseinfo .patch create mode 100644 recipes-kernel/linux/linux-yocto-tiny-kexecboot-3.2/collie/collie-jedec-pro be.patch create mode 100644 recipes-kernel/linux/linux-yocto-tiny-kexecboot-3.2/collie/collie-mtd-rw.pa tch create mode 100644recipes-kernel/linux/linux-yocto-tiny-kexecboot-3.2/collie/mcp-device.patchdiff --git
a/recipes-kernel/linux/linux-yocto-3.2/collie/collie-eraseinfo.patchb/recipes-kernel/linux/linux-yocto-3.2/collie/collie-eraseinfo.patchnew file mode 100644
index 0000000..47e814drecipes-kernel/linux/linux-yocto-3.2/collie/collie-eraseinfo.patch new file +11
-0@@ -0,0 +1,11 @@ +--- a/drivers/mtd/chips/jedec_probe.c ++++ b/drivers/mtd/chips/jedec_probe.c +@@ -1305,7 +1305,7 @@ + .cmd_set = P_ID_INTEL_STD, + .nr_regions = 1, + .regions = { +- ERASEINFO(0x40000,16), ++ ERASEINFO(0x08000,128), + } + }, { + .mfr_id = CFI_MFR_SST,diff --git
a/recipes-kernel/linux/linux-yocto-3.2/collie/collie-jedec-probe.patchb/recipes-kernel/linux/linux-yocto-3.2/collie/collie-jedec-probe.patchnew file mode 100644
index 0000000..530643erecipes-kernel/linux/linux-yocto-3.2/collie/collie-jedec-probe.patch new file +11
-0@@ -0,0 +1,11 @@ +--- a/arch/arm/mach-sa1100/collie.c ++++ b/arch/arm/mach-sa1100/collie.c +@@ -289,7 +289,7 @@ + } + + static struct flash_platform_data collie_flash_data = { +- .map_name = "cfi_probe", ++ .map_name = "jedec_probe", + .init = collie_flash_init, + .set_vpp = collie_set_vpp, + .exit = collie_flash_exit,(quoted diff) +0
-0
b/recipes-kernel/linux/linux-yocto-3.2/collie/collie-mtd-rw.patchnew file mode 100644
index 0000000..193004drecipes-kernel/linux/linux-yocto-3.2/collie/collie-mtd-rw.patch new file +1
-0@@ -0,0 +1,12 @@ +diff --git a/drivers/mtd/maps/sa1100-flash.c
b/drivers/mtd/maps/sa1100-flash.c+index fa9c0a9..bf6b04f 100644 +---a/drivers/mtd/maps/sa1100-flash.c
++++b/drivers/mtd/maps/sa1100-flash.c
+@@ -206,6 +206,7 @@ static int sa1100_probe_subdev(structsa_subdev_info
*subdev, struct resource *r + goto err;recipes-kernel/linux/linux-yocto-3.2/collie/collie-mtd-rw.patch new file +6
-0+ } + subdev->mtd->owner = THIS_MODULE; ++ subdev->mtd->unlock(subdev->mtd, 0xc0000, subdev->mtd->size - 0xc0000); + + printk(KERN_INFO "SA1100 flash: CFI device at 0x%08lx, %uMiB, %d-bit\n", + phys, (unsigned)(subdev->mtd->size >> 20),(quoted diff) +0
-0b/recipes-kernel/linux/linux-yocto-3.2/collie/collie.cfg index 2f5ead7..a47461e 100644
recipes-kernel/linux/linux-yocto-3.2/collie/collie.cfg +1
-1@@ -1473,7 +1473,7 @@ CONFIG_APM_POWER=y # CONFIG_TEST_POWER is not set # CONFIG_BATTERY_DS2780 is not set # CONFIG_BATTERY_DS2782 is not set -# CONFIG_BATTERY_COLLIE is not set +CONFIG_BATTERY_COLLIE=y # CONFIG_BATTERY_BQ20Z75 is not set # CONFIG_BATTERY_BQ27x00 is not set # CONFIG_BATTERY_MAX17040 is not set(quoted diff) +0
-0
b/recipes-kernel/linux/linux-yocto-3.2/collie/mcp-device.patchnew file mode 100644
index 0000000..9a0a8barecipes-kernel/linux/linux-yocto-3.2/collie/mcp-device.patch new file +13
-0@@ -0,0 +1,13 @@ +--- a/include/linux/mfd/mcp.h 2013-02-18 00:14:09.000000000 +0100 ++++ b/include/linux/mfd/mcp.h 2013-02-17 23:55:52.000000000 +0100 +@@ -10,6 +10,8 @@ + #ifndef MCP_H + #define MCP_H + ++#include <linux/device.h> ++ + struct mcp_ops; + + struct mcp { + +diff --git a/recipes-kernel/linux/linux-yocto-tiny-kexecboot-3.2/collie/collie-erasein fo.patch b/recipes-kernel/linux/linux-yocto-tiny-kexecboot-3.2/collie/collie-erasein fo.patch new file mode 100644
index 0000000..47e814d
---/dev/null
+++
b/recipes-kernel/linux/linux-yocto-tiny-kexecboot-3.2/collie/collie-erasein fo.patch @@ -0,0 +1,11 @@
+---a/drivers/mtd/chips/jedec_probe.c
++++b/drivers/mtd/chips/jedec_probe.c
+@@ -1305,7 +1305,7 @@recipes-kernel/linux/linux-yocto-3.2/collie/mcp-device.patch new file +8
-0+ .cmd_set = P_ID_INTEL_STD, + .nr_regions = 1, + .regions = { +- ERASEINFO(0x40000,16), ++ ERASEINFO(0x08000,128), + } + }, { + .mfr_id = CFI_MFR_SST,diff --git a/recipes-kernel/linux/linux-yocto-tiny-kexecboot-3.2/collie/collie-jedec-p robe.patch b/recipes-kernel/linux/linux-yocto-tiny-kexecboot-3.2/collie/collie-jedec-p robe.patch new file mode 100644
index 0000000..530643e
---/dev/null
+++
b/recipes-kernel/linux/linux-yocto-tiny-kexecboot-3.2/collie/collie-jedec-p robe.patch @@ -0,0 +1,11 @@
+---a/arch/arm/mach-sa1100/collie.c
++++b/arch/arm/mach-sa1100/collie.c
+@@ -289,7 +289,7 @@
+ }recipes-kernel/linux/linux-yocto-3.2/collie/mcp-device.patch new file +7
-0+ + static struct flash_platform_data collie_flash_data = { +- .map_name = "cfi_probe", ++ .map_name = "jedec_probe", + .init = collie_flash_init, + .set_vpp = collie_set_vpp, + .exit = collie_flash_exit,diff --git a/recipes-kernel/linux/linux-yocto-tiny-kexecboot-3.2/collie/collie-mtd-rw. patch b/recipes-kernel/linux/linux-yocto-tiny-kexecboot-3.2/collie/collie-mtd-rw. patch new file mode 100644
index 0000000..193004d
---/dev/null
+++
b/recipes-kernel/linux/linux-yocto-tiny-kexecboot-3.2/collie/collie-mtd-rw. patch @@ -0,0 +1,12 @@
+diff --gita/drivers/mtd/maps/sa1100-flash.cb/drivers/mtd/maps/sa1100-flash.c+index fa9c0a9..bf6b04f 100644 +---a/drivers/mtd/maps/sa1100-flash.c
++++b/drivers/mtd/maps/sa1100-flash.c
+@@ -206,6 +206,7 @@ static int sa1100_probe_subdev(structsa_subdev_info
*subdev, struct resource *r + goto err;recipes-kernel/linux/linux-yocto-3.2/collie/mcp-device.patch new file +6
-0+ } + subdev->mtd->owner = THIS_MODULE; ++ subdev->mtd->unlock(subdev->mtd, 0xc0000, subdev->mtd->size - 0xc0000); + + printk(KERN_INFO "SA1100 flash: CFI device at 0x%08lx, %uMiB, %d-bit\n", + phys, (unsigned)(subdev->mtd->size >> 20),diff --git a/recipes-kernel/linux/linux-yocto-tiny-kexecboot-3.2/collie/mcp-device.pat ch b/recipes-kernel/linux/linux-yocto-tiny-kexecboot-3.2/collie/mcp-device.pat ch new file mode 100644
index 0000000..9a0a8ba
---/dev/null
+++
b/recipes-kernel/linux/linux-yocto-tiny-kexecboot-3.2/collie/mcp-device.pat ch @@ -0,0 +1,13 @@
+---a/include/linux/mfd/mcp.h2013-02-18 00:14:09.000000000 +0100
++++b/include/linux/mfd/mcp.h2013-02-17 23:55:52.000000000 +0100
+@@ -10,6 +10,8 @@
+ #ifndefMCP_H
+ #defineMCP_Hrecipes-kernel/linux/linux-yocto-3.2/collie/mcp-device.patch new file +8
-0+ ++#include <linux/device.h> ++ + struct mcp_ops; + + struct mcp { + +(quoted diff) +0
-0b/recipes-kernel/linux/linux-yocto-tiny-kexecboot_3.2.bbappend index 6ab9f2f..7f03732 100644
recipes-kernel/linux/linux-yocto-tiny-kexecboot_3.2.bbappend +5
-1@@ -34,12 +34,16 @@ SRC_URI_append_c7x0 = " \ SRC_URI_append_collie = " \ file://collie-tiny.scc \ file://collie-kexecboot.cfg \ - file://qvga/logo_linux_clut224.ppm.bz2 \ file://0001-pcmcia-pxa2xx_sharpsl-retain-ops-structure-on-collie.patch \ file://locomo_kbd_tweak-r2.patch \ file://collie_remove_irq_to_gpio.patch \ + file://mcp-device.patch \ + file://collie-jedec-probe.patch \ + file://collie-eraseinfo.patch \ + file://qvga/logo_linux_clut224.ppm.bz2 \ file://revert-check-on-console-device.patch \ " +# file://collie-mtd-rw.patch SRC_URI_append_poodle = " \file://poodle-tiny.scc \(quoted diff) +0
-0b/recipes-kernel/linux/linux-yocto_3.2.bbappend index a4ff596..6b765d5 100644
recipes-kernel/linux/linux-yocto_3.2.bbappend +4
-0@@ -27,8 +27,12 @@ SRC_URI_append_collie = " \ file://qvga/logo_linux_clut224.ppm.bz2 \ file://0001-pcmcia-pxa2xx_sharpsl-retain-ops-structure-on-collie.patch \ file://collie_remove_irq_to_gpio.patch \ + file://mcp-device.patch \ + file://collie-jedec-probe.patch \ + file://collie-eraseinfo.patch \ file://locomo_kbd_tweak-r2.patch \ " +# file://collie-mtd-rw.patch SRC_URI_append_poodle = " \
Quoted 1 line
file://poodle-standard.scc \
This two have been applied, thanks.
Cheers,
Paul
Signature · 2 lines
Paul Eggleton Intel Open Source Technology Centre