Skip to contentSkip to conversation

linux-yocto_3.4: move MTD common options to zaurus-hardware.cfg

PATCH In review Andrea Adami 2 participants 4 messages Dec 6, 2012 – Dec 10, 2012

lore
Share & tools
lore
#0 lore raw

PATCH 1/3 linux-yocto_3.4: move MTD common options to zaurus-hardware.cfg

---
 .../linux/linux-yocto-3.4/akita/akita.cfg          |    6 ------
 recipes-kernel/linux/linux-yocto-3.4/c7x0/c7x0.cfg |    6 ------
 .../linux/linux-yocto-3.4/collie/collie.cfg        |    6 ------
 .../linux/linux-yocto-3.4/poodle/poodle.cfg        |    6 ------
 .../linux/linux-yocto-3.4/spitz/spitz.cfg          |    6 ------
 recipes-kernel/linux/linux-yocto-3.4/tosa/tosa.cfg |    6 ------
 .../linux/linux-yocto-3.4/zaurus-hardware.cfg      |    6 ++++++
 7 files changed, 6 insertions(+), 36 deletions(-)
recipes-kernel/linux/linux-yocto-3.4/akita/akita.cfg +0 -6
index 6abee5d..59feb2d 100644
@@ -28,12 +28,6 @@ CONFIG_SHARPSL_PM_MAX1111=y
 CONFIG_CMDLINE="console=ttyS0,115200n8 console=tty1 fbcon=rotate:1 loglevel=3"
 
 #
-# Mapping drivers for chip access
-#
-CONFIG_MTD_COMPLEX_MAPPINGS=y
-CONFIG_MTD_PHYSMAP=y
-
-#
 # Disk-On-Chip Device Drivers
 #
 CONFIG_MTD_NAND_SHARPSL=y
recipes-kernel/linux/linux-yocto-3.4/c7x0/c7x0.cfg +0 -6
index 4898aa3..2d12380 100644
@@ -22,12 +22,6 @@ CONFIG_SHARPSL_PM_MAX1111=y
 CONFIG_CMDLINE="console=ttyS0,115200n8 console=tty1 loglevel=3"
 
 #
-# Mapping drivers for chip access
-#
-CONFIG_MTD_COMPLEX_MAPPINGS=y
-CONFIG_MTD_PHYSMAP=y
-
-#
 # Disk-On-Chip Device Drivers
 #
 CONFIG_MTD_NAND_SHARPSL=y
recipes-kernel/linux/linux-yocto-3.4/collie/collie.cfg +0 -6
index d223b35..ed3d507 100644
@@ -36,12 +36,6 @@ CONFIG_SPARSEMEM_EXTREME=y
 CONFIG_CMDLINE="console=ttySA0,115200n8 console=tty1 mem=64M fbcon=rotate:1 loglevel=3"
 
 #
-# Mapping drivers for chip access
-#
-CONFIG_MTD_COMPLEX_MAPPINGS=y
-CONFIG_MTD_PHYSMAP=y
-
-#
 # Multimedia Capabilities Port drivers
 #
 CONFIG_MCP=y
recipes-kernel/linux/linux-yocto-3.4/poodle/poodle.cfg +0 -6
index 5b983ef..0da402d 100644
@@ -22,12 +22,6 @@ CONFIG_PXA25x=y
 CONFIG_CMDLINE="console=ttyS0,115200n8 console=tty1 fbcon=rotate:1 loglevel=3"
 
 #
-# Mapping drivers for chip access
-#
-CONFIG_MTD_COMPLEX_MAPPINGS=y
-CONFIG_MTD_PHYSMAP=y
-
-#
 # Disk-On-Chip Device Drivers
 #
 CONFIG_MTD_NAND_SHARPSL=y
recipes-kernel/linux/linux-yocto-3.4/spitz/spitz.cfg +0 -6
index a7173f0..be1f9a0 100644
@@ -27,12 +27,6 @@ CONFIG_SHARPSL_PM_MAX1111=y
 CONFIG_CMDLINE="console=ttyS0,115200n8 console=tty1 fbcon=rotate:1 loglevel=3"
 
 #
-# Mapping drivers for chip access
-#
-CONFIG_MTD_COMPLEX_MAPPINGS=y
-CONFIG_MTD_PHYSMAP=y
-
-#
 # Disk-On-Chip Device Drivers
 #
 CONFIG_MTD_NAND_SHARPSL=y
recipes-kernel/linux/linux-yocto-3.4/tosa/tosa.cfg +0 -6
index e339e91..75786b6 100644
@@ -25,12 +25,6 @@ CONFIG_MFD_TMIO=y
 CONFIG_MFD_TC6393XB=y
 
 #
-# Mapping drivers for chip access
-#
-CONFIG_MTD_COMPLEX_MAPPINGS=y
-CONFIG_MTD_PHYSMAP=y
-
-#
 # Disk-On-Chip Device Drivers
 #
 CONFIG_MTD_NAND_TMIO=y
recipes-kernel/linux/linux-yocto-3.4/zaurus-hardware.cfg +6 -0
index 09c900c..554faa8 100644
@@ -58,6 +58,12 @@ CONFIG_MTD_BLKDEVS=y
 CONFIG_MTD_BLOCK=y
 
 #
+# Mapping drivers for chip access
+#
+CONFIG_MTD_COMPLEX_MAPPINGS=y
+CONFIG_MTD_PHYSMAP=y
+
+#
 # Disk-On-Chip Device Drivers
 #
 CONFIG_MTD_NAND_ECC=y
Signature · 1 line
1.7.8.6
#1 lore raw

PATCH 2/3 linux-yocto_3.4: remove superseded patch for collie and fix do_patch

* there have been two commits fixing drivers/pcmcia/pxa2xx-sharpsl.c

* PCMCIA: pxa: convert PXA socket drivers to use new irq/gpio managemen
* a9bb5a4bf9f84256499c802fd397d56d55227e4f
*
* pcmcia: sharpsl: don't discard sharpsl_pcmcia_ops
* fdc858a466b738d35d3492bc7cf77b1dac98bf7c

---
 ...xx_sharpsl-retain-ops-structure-on-collie.patch |   34 --------------------
 .../linux/linux-yocto-3.4/collie/collie.scc        |    1 -
 2 files changed, 0 insertions(+), 35 deletions(-)
 delete mode 100644 recipes-kernel/linux/linux-yocto-3.4/collie/0001-pcmcia-pxa2xx_sharpsl-retain-ops-structure-on-collie.patch
recipes-kernel/linux/linux-yocto-3.4/collie/0001-pcmcia-pxa2xx_sharpsl-retain-ops-structure-on-collie.patch deleted +0 -34
deleted file mode 100644
index d86b47d..0000000
@@ -1,34 +0,0 @@
-From 31d99c4c9f14e571ca0e22c5862dd5b6a871e2dd Mon Sep 17 00:00:00 2001
-From: Dmitry Eremin-Solenikov <[email protected]>
-Date: Fri, 5 Aug 2011 15:32:23 +0400
-Subject: [PATCH] pcmcia/pxa2xx_sharpsl: retain ops structure on collie
-
-The pxa2xx_sharpsl driver part is also used on collie, which (as
-a StrongARM board) has different expectations for PCMCIA drivers.
-So, on collie place sharpsl_pcmcia_ops in .data section rather than
-in __initdata.
-
-Signed-off-by: Dmitry Eremin-Solenikov <[email protected]>
----
- drivers/pcmcia/pxa2xx_sharpsl.c |    4 ++++
- 1 files changed, 4 insertions(+), 0 deletions(-)
-
-diff --git a/drivers/pcmcia/pxa2xx_sharpsl.c b/drivers/pcmcia/pxa2xx_sharpsl.c
-index 81af2b3..1b5b749 100644
---- a/drivers/pcmcia/pxa2xx_sharpsl.c
-+++ b/drivers/pcmcia/pxa2xx_sharpsl.c
-@@ -222,7 +222,11 @@ static void sharpsl_pcmcia_socket_suspend(struct soc_pcmcia_socket *skt)
- 	sharpsl_pcmcia_init_reset(skt);
- }
- 
-+#ifdef CONFIG_SA1100_COLLIE
-+static struct pcmcia_low_level sharpsl_pcmcia_ops = {
-+#else
- static struct pcmcia_low_level sharpsl_pcmcia_ops __initdata = {
-+#endif
- 	.owner                  = THIS_MODULE,
- 	.hw_init                = sharpsl_pcmcia_hw_init,
- 	.hw_shutdown            = sharpsl_pcmcia_hw_shutdown,
--- 
-1.7.2.5
-
recipes-kernel/linux/linux-yocto-3.4/collie/collie.scc +0 -1
index 45ac852..b7c11fa 100644
@@ -3,4 +3,3 @@ kconf hardware collie.cfg
 include ../zaurus-common.scc
 
 patch locomo_kbd_tweak-r2.patch
-patch 0001-pcmcia-pxa2xx_sharpsl-retain-ops-structure-on-collie.patch
Signature · 1 line
1.7.8.6
#2 lore raw

PATCH 3/3 linux-yocto_3.4: use a single copy of the locomo keymap patch

In reply to Andrea Adami

* shared by collie and poodle

---
 .../{collie => }/locomo_kbd_tweak-r2.patch         |    0
 .../poodle/locomo_kbd_tweak-r2.patch               |   80 --------------------
 2 files changed, 0 insertions(+), 80 deletions(-)
 rename recipes-kernel/linux/linux-yocto-3.4/{collie => }/locomo_kbd_tweak-r2.patch (100%)
 delete mode 100644 recipes-kernel/linux/linux-yocto-3.4/poodle/locomo_kbd_tweak-r2.patch
recipes-kernel/linux/linux-yocto-3.4/locomo_kbd_tweak-r2.patch renamed from recipes-kernel/linux/linux-yocto-3.4/collie/locomo_kbd_tweak-r2.patch +0 -0
similarity index 100%
rename from recipes-kernel/linux/linux-yocto-3.4/collie/locomo_kbd_tweak-r2.patch
rename to recipes-kernel/linux/linux-yocto-3.4/locomo_kbd_tweak-r2.patch
recipes-kernel/linux/linux-yocto-3.4/poodle/locomo_kbd_tweak-r2.patch deleted +0 -80

80 lines not on this page · raw message

Signature · 1 line
1.7.8.6
#3 lore raw
In reply to Andrea Adami
Quoted 10 lines · On Thursday 06 December 2012 01:07:08 Andrea Adami wrote:
---
 .../linux/linux-yocto-3.4/akita/akita.cfg          |    6 ------
 recipes-kernel/linux/linux-yocto-3.4/c7x0/c7x0.cfg |    6 ------
 .../linux/linux-yocto-3.4/collie/collie.cfg        |    6 ------
 .../linux/linux-yocto-3.4/poodle/poodle.cfg        |    6 ------
 .../linux/linux-yocto-3.4/spitz/spitz.cfg          |    6 ------
 recipes-kernel/linux/linux-yocto-3.4/tosa/tosa.cfg |    6 ------
 .../linux/linux-yocto-3.4/zaurus-hardware.cfg      |    6 ++++++
 7 files changed, 6 insertions(+), 36 deletions(-)

Merged these three to meta-handheld master, thanks.

Cheers,
Paul

Signature · 2 lines
Paul Eggleton
Intel Open Source Technology Centre