Skip to contentSkip to conversation

linux-kexecboot: remove recipes, we use linux-yocto-tiny-kexecboot

PATCH In review Andrea Adami 2 participants 3 messages Jun 18, 2012 – Jun 19, 2012

lore
Share & tools
lore
#0 lore raw

PATCH 1/2 linux-kexecboot: remove recipes, we use linux-yocto-tiny-kexecboot

* this patch matches the corresponding one in meta-initramfs
* and removes stale .bbappends and obsolete recipes

---
 ...xx_sharpsl-retain-ops-structure-on-collie.patch |   34 -----
 .../linux/linux-kexecboot-3.1/akita/defconfig      |  134 ------------------
 .../linux/linux-kexecboot-3.1/c7x0/defconfig       |  135 ------------------
 .../linux/linux-kexecboot-3.1/collie/defconfig     |  145 --------------------
 .../linux-kexecboot-3.1/locomo_kbd_tweak-r2.patch  |   66 ---------
 .../linux/linux-kexecboot-3.1/poodle/defconfig     |  137 ------------------
 .../linux/linux-kexecboot-3.1/spitz/defconfig      |  133 ------------------
 .../linux/linux-kexecboot-3.1/tosa/defconfig       |  135 ------------------
 ...xx_sharpsl-retain-ops-structure-on-collie.patch |   34 -----
 .../linux/linux-kexecboot-3.2/akita/defconfig      |  131 ------------------
 .../linux/linux-kexecboot-3.2/c7x0/defconfig       |  132 ------------------
 .../linux/linux-kexecboot-3.2/collie/defconfig     |  143 -------------------
 .../collie_remove_irq_to_gpio.patch                |   31 ----
 .../linux-kexecboot-3.2/locomo_kbd_tweak-r2.patch  |   66 ---------
 .../linux/linux-kexecboot-3.2/poodle/defconfig     |  135 ------------------
 .../linux/linux-kexecboot-3.2/spitz/defconfig      |  130 ------------------
 .../linux/linux-kexecboot-3.2/tosa/defconfig       |  134 ------------------
 .../linux/linux-kexecboot/spitz/defconfig          |  127 -----------------
 recipes-kernel/linux/linux-kexecboot_3.1.bbappend  |   37 -----
 recipes-kernel/linux/linux-kexecboot_3.2.bbappend  |   38 -----
 recipes-kernel/linux/linux-kexecboot_git.bbappend  |   40 ------
 21 files changed, 0 insertions(+), 2097 deletions(-)
 delete mode 100644 recipes-kernel/linux/linux-kexecboot-3.1/0001-pcmcia-pxa2xx_sharpsl-retain-ops-structure-on-collie.patch
 delete mode 100644 recipes-kernel/linux/linux-kexecboot-3.1/akita/defconfig
 delete mode 100644 recipes-kernel/linux/linux-kexecboot-3.1/c7x0/defconfig
 delete mode 100644 recipes-kernel/linux/linux-kexecboot-3.1/collie/defconfig
 delete mode 100644 recipes-kernel/linux/linux-kexecboot-3.1/locomo_kbd_tweak-r2.patch
 delete mode 100644 recipes-kernel/linux/linux-kexecboot-3.1/poodle/defconfig
 delete mode 100644 recipes-kernel/linux/linux-kexecboot-3.1/spitz/defconfig
 delete mode 100644 recipes-kernel/linux/linux-kexecboot-3.1/tosa/defconfig
 delete mode 100644 recipes-kernel/linux/linux-kexecboot-3.2/0001-pcmcia-pxa2xx_sharpsl-retain-ops-structure-on-collie.patch
 delete mode 100644 recipes-kernel/linux/linux-kexecboot-3.2/akita/defconfig
 delete mode 100644 recipes-kernel/linux/linux-kexecboot-3.2/c7x0/defconfig
 delete mode 100644 recipes-kernel/linux/linux-kexecboot-3.2/collie/defconfig
 delete mode 100644 recipes-kernel/linux/linux-kexecboot-3.2/collie_remove_irq_to_gpio.patch
 delete mode 100644 recipes-kernel/linux/linux-kexecboot-3.2/locomo_kbd_tweak-r2.patch
 delete mode 100644 recipes-kernel/linux/linux-kexecboot-3.2/poodle/defconfig
 delete mode 100644 recipes-kernel/linux/linux-kexecboot-3.2/spitz/defconfig
 delete mode 100644 recipes-kernel/linux/linux-kexecboot-3.2/tosa/defconfig
 delete mode 100644 recipes-kernel/linux/linux-kexecboot/spitz/defconfig
 delete mode 100644 recipes-kernel/linux/linux-kexecboot_3.1.bbappend
 delete mode 100644 recipes-kernel/linux/linux-kexecboot_3.2.bbappend
 delete mode 100644 recipes-kernel/linux/linux-kexecboot_git.bbappend
recipes-kernel/linux/linux-kexecboot-3.1/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-kexecboot-3.1/akita/defconfig deleted +0 -134

134 lines not on this page · raw message

recipes-kernel/linux/linux-kexecboot-3.1/c7x0/defconfig deleted +0 -135

135 lines not on this page · raw message

recipes-kernel/linux/linux-kexecboot-3.1/collie/defconfig deleted +0 -145

145 lines not on this page · raw message

recipes-kernel/linux/linux-kexecboot-3.1/locomo_kbd_tweak-r2.patch deleted +0 -66

66 lines not on this page · raw message

recipes-kernel/linux/linux-kexecboot-3.1/poodle/defconfig deleted +0 -137

137 lines not on this page · raw message

recipes-kernel/linux/linux-kexecboot-3.1/spitz/defconfig deleted +0 -133

133 lines not on this page · raw message

recipes-kernel/linux/linux-kexecboot-3.1/tosa/defconfig deleted +0 -135

135 lines not on this page · raw message

recipes-kernel/linux/linux-kexecboot-3.2/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-kexecboot-3.2/akita/defconfig deleted +0 -131

131 lines not on this page · raw message

recipes-kernel/linux/linux-kexecboot-3.2/c7x0/defconfig deleted +0 -132

132 lines not on this page · raw message

recipes-kernel/linux/linux-kexecboot-3.2/collie/defconfig deleted +0 -143

143 lines not on this page · raw message

recipes-kernel/linux/linux-kexecboot-3.2/collie_remove_irq_to_gpio.patch deleted +0 -31
deleted file mode 100644
index 0c277e0..0000000
@@ -1,31 +0,0 @@
-From 629bcb4b72d49b3631ae3dd0fe1d345820fadfcc Mon Sep 17 00:00:00 2001
-From: Jochen Friedrich <[email protected]>
-Date: Sat, 19 Nov 2011 19:26:37 +0100
-Subject: [PATCH] collie_battery: Get rid of irq_to_gpio usage
-
-Since 9d08d5d77a355510c2f5657c86b0a4b25acfe72c, irq_to_gpio() is no
-longer available but still in use by collie_battery.c. As it's just
-for a debug message, just get rid of this call.
-
-Signed-off-by: Jochen Friedrich <[email protected]>
-Signed-off-by: Anton Vorontsov <[email protected]>
----
- drivers/power/collie_battery.c |    2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-diff --git a/drivers/power/collie_battery.c b/drivers/power/collie_battery.c
-index 548d263..7a40fce 100644
---- a/drivers/power/collie_battery.c
-+++ b/drivers/power/collie_battery.c
-@@ -146,7 +146,7 @@ static void collie_bat_external_power_changed(struct power_supply *psy)
- 
- static irqreturn_t collie_bat_gpio_isr(int irq, void *data)
- {
--	pr_info("collie_bat_gpio irq: %d\n", gpio_get_value(irq_to_gpio(irq)));
-+	pr_info("collie_bat_gpio irq\n");
- 	schedule_work(&bat_work);
- 	return IRQ_HANDLED;
- }
--- 
-1.7.6.5
-
recipes-kernel/linux/linux-kexecboot-3.2/locomo_kbd_tweak-r2.patch deleted +0 -66

66 lines not on this page · raw message

recipes-kernel/linux/linux-kexecboot-3.2/poodle/defconfig deleted +0 -135

135 lines not on this page · raw message

recipes-kernel/linux/linux-kexecboot-3.2/spitz/defconfig deleted +0 -130

130 lines not on this page · raw message

recipes-kernel/linux/linux-kexecboot-3.2/tosa/defconfig deleted +0 -134

134 lines not on this page · raw message

recipes-kernel/linux/linux-kexecboot/spitz/defconfig deleted +0 -127

127 lines not on this page · raw message

recipes-kernel/linux/linux-kexecboot_3.1.bbappend deleted +0 -37
deleted file mode 100644
index d4911b6..0000000
@@ -1,37 +0,0 @@
-FILESEXTRAPATHS_prepend := "${THISDIR}/linux-kexecboot-${PV}:${THISDIR}/files:"
-
-PR = "${INC_PR}.1"
-COMPATIBLE_MACHINE = "(akita|c7x0|collie|poodle|tosa|spitz)"
-
-# Note we set loglevel=3 and master console on serial to protect bootlogo.
-CMDLINE_c7x0 = "console=tty1 console=ttyS0,115200n8"
-CMDLINE_tosa = "console=tty1 console=ttyS0,115200n8"
-CMDLINE_poodle = "console=tty1 console=ttyS0,115200n8 fbcon=rotate:1"
-CMDLINE_akita = "console=tty1 console=ttyS0,115200n8 fbcon=rotate:1"
-CMDLINE_collie = "console=tty1 console=ttySA0,115200n8 fbcon=rotate:1 mem=64M"
-CMDLINE_spitz = "console=tty1 console=ttyS0,115200n8 fbcon=rotate:1"
-
-# Zaurus machines need kernel size-check.
-KERNEL_IMAGE_MAXSIZE_akita = "1294336"
-KERNEL_IMAGE_MAXSIZE_c7x0 = "1294336"
-KERNEL_IMAGE_MAXSIZE_collie = "1048576"
-KERNEL_IMAGE_MAXSIZE_poodle = "1294336"
-KERNEL_IMAGE_MAXSIZE_tosa = "1294336"
-KERNEL_IMAGE_MAXSIZE_spitz = "1294336"
-
-LOGO_SIZE ?= "."
-
-SRC_URI += "file://defconfig \
-           file://${LOGO_SIZE}/logo_linux_clut224.ppm.bz2 \
-           "
-
-SRC_URI_append_collie = " \
-                         file://0001-pcmcia-pxa2xx_sharpsl-retain-ops-structure-on-collie.patch \
-                         file://locomo_kbd_tweak-r2.patch \
-                         "
-
-SRC_URI_append_poodle = " \
-                         file://locomo_kbd_tweak-r2.patch \
-                         "
-
-
recipes-kernel/linux/linux-kexecboot_3.2.bbappend deleted +0 -38
deleted file mode 100644
index 6ea2a00..0000000
@@ -1,38 +0,0 @@
-FILESEXTRAPATHS_prepend := "${THISDIR}/linux-kexecboot-${PV}:${THISDIR}/files:"
-
-PR = "${INC_PR}.1"
-COMPATIBLE_MACHINE = "(akita|c7x0|collie|poodle|tosa|spitz)"
-
-# Note we set loglevel=3 and master console on serial to protect bootlogo.
-CMDLINE_c7x0 = "console=tty1 console=ttyS0,115200n8"
-CMDLINE_tosa = "console=tty1 console=ttyS0,115200n8"
-CMDLINE_poodle = "console=tty1 console=ttyS0,115200n8 fbcon=rotate:1"
-CMDLINE_akita = "console=tty1 console=ttyS0,115200n8 fbcon=rotate:1"
-CMDLINE_collie = "console=tty1 console=ttySA0,115200n8 fbcon=rotate:1 mem=64M"
-CMDLINE_spitz = "console=tty1 console=ttyS0,115200n8 fbcon=rotate:1"
-
-# Zaurus machines need kernel size-check.
-KERNEL_IMAGE_MAXSIZE_akita = "1294336"
-KERNEL_IMAGE_MAXSIZE_c7x0 = "1294336"
-KERNEL_IMAGE_MAXSIZE_collie = "1048576"
-KERNEL_IMAGE_MAXSIZE_poodle = "1294336"
-KERNEL_IMAGE_MAXSIZE_tosa = "1294336"
-KERNEL_IMAGE_MAXSIZE_spitz = "1294336"
-
-LOGO_SIZE ?= "."
-
-SRC_URI += "file://defconfig \
-           file://${LOGO_SIZE}/logo_linux_clut224.ppm.bz2 \
-           "
-
-SRC_URI_append_collie = " \
-                         file://0001-pcmcia-pxa2xx_sharpsl-retain-ops-structure-on-collie.patch \
-                         file://locomo_kbd_tweak-r2.patch \
-                         file://collie_remove_irq_to_gpio.patch \
-                         "
-
-SRC_URI_append_poodle = " \
-                         file://locomo_kbd_tweak-r2.patch \
-                         "
-
-
recipes-kernel/linux/linux-kexecboot_git.bbappend deleted +0 -40
deleted file mode 100644
index 49dd75f..0000000
@@ -1,40 +0,0 @@
-FILESEXTRAPATHS_prepend := "${THISDIR}/linux-kexecboot-${PV}:${THISDIR}/files:"
-
-DEFAULT_PREFERENCE = "-2"
-
-PR = "${INC_PR}.1"
-#COMPATIBLE_MACHINE = "(akita|c7x0|collie|poodle|tosa|spitz)"
-COMPATIBLE_MACHINE = "(spitz)"
-
-# Note we set loglevel=3 and master console on serial to protect bootlogo.
-CMDLINE_c7x0 = "console=tty1 console=ttyS0,115200n8"
-CMDLINE_tosa = "console=tty1 console=ttyS0,115200n8"
-CMDLINE_poodle = "console=tty1 console=ttyS0,115200n8 fbcon=rotate:1"
-CMDLINE_akita = "console=tty1 console=ttyS0,115200n8 fbcon=rotate:1"
-CMDLINE_collie = "console=tty1 console=ttySA0,115200n8 fbcon=rotate:1 mem=64M"
-CMDLINE_spitz = "console=tty1 console=ttyS0,115200n8 fbcon=rotate:1"
-
-# Zaurus machines need kernel size-check.
-KERNEL_IMAGE_MAXSIZE_akita = "1294336"
-KERNEL_IMAGE_MAXSIZE_c7x0 = "1294336"
-KERNEL_IMAGE_MAXSIZE_collie = "1048576"
-KERNEL_IMAGE_MAXSIZE_poodle = "1294336"
-KERNEL_IMAGE_MAXSIZE_tosa = "1294336"
-KERNEL_IMAGE_MAXSIZE_spitz = "1294336"
-
-LOGO_SIZE ?= "."
-
-SRC_URI += "file://defconfig \
-           file://${LOGO_SIZE}/logo_linux_clut224.ppm.bz2 \
-           "
-
-SRC_URI_append_collie = " \
-                         file://0001-pcmcia-pxa2xx_sharpsl-retain-ops-structure-on-collie.patch \
-                         file://locomo_kbd_tweak-r2.patch \
-                         "
-
-SRC_URI_append_poodle = " \
-                         file://locomo_kbd_tweak-r2.patch \
-                         "
-
-
Signature · 1 line
1.7.3.4
#1 lore raw

PATCH 2/2 zaurus.inc: redefine XZ compression level

* xz -7 makes sense if your vmlinux is much larger than 16 MiB uncompressed

---
 conf/machine/include/zaurus.inc |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
conf/machine/include/zaurus.inc +1 -1
index 268b9fd..45c82d3 100644
@@ -38,7 +38,7 @@ PREFERRED_PROVIDER_virtual/kernel = "linux-yocto"
 KERNEL_IMAGETYPE ?= "zImage"
 
 # sane defaults for devices with only 32Mb RAM (see man xz)
-XZ_COMPRESSION_LEVEL = "-e -7"
+XZ_COMPRESSION_LEVEL = "-2e"
 
 # kernel bootlogo
 LOGO_SIZE = '${@base_conditional("MACHINE_GUI_CLASS", "bigscreen", "vga", "qvga", d)}'
Signature · 1 line
1.7.3.4
#2 lore raw

Re: [meta-handheld][PATCH 2/2] zaurus.inc: redefine XZ compression level

Quoted 20 lines · On Tuesday 19 June 2012 00:57:17 Andrea Adami wrote:

* xz -7 makes sense if your vmlinux is much larger than 16 MiB uncompressed

---
 conf/machine/include/zaurus.inc |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
(quoted diff) +0 -0

b/conf/machine/include/zaurus.inc index 268b9fd..45c82d3 100644

conf/machine/include/zaurus.inc +1 -1
@@ -38,7 +38,7 @@ PREFERRED_PROVIDER_virtual/kernel = "linux-yocto"
 KERNEL_IMAGETYPE ?= "zImage"
 
 # sane defaults for devices with only 32Mb RAM (see man xz)
-XZ_COMPRESSION_LEVEL = "-e -7"
+XZ_COMPRESSION_LEVEL = "-2e"
 
 # kernel bootlogo
 LOGO_SIZE = '${@base_conditional("MACHINE_GUI_CLASS", "bigscreen", "vga",
Quoted 1 line

"qvga", d)}'

Merged both of these to meta-handheld master, thanks.

Cheers,
Paul

Signature · 2 lines
Paul Eggleton
Intel Open Source Technology Centre