* [PATCH 01/14] linux-kexecboot.inc: revert 71d21c5e379ab3f5d754a967a52240963552a71c
2009-01-18 2:24 [PATCH 00/14] [RFC] kexecboot and implementation on Zaurus Andrea Adami
@ 2009-01-18 2:24 ` Andrea Adami
2009-01-18 2:24 ` [PATCH 02/14] linux-kexecboot_2.6.26: revert 71dade0cdaef0220d31a309d8b6d28b99eb25b29 Andrea Adami
` (12 subsequent siblings)
13 siblings, 0 replies; 26+ messages in thread
From: Andrea Adami @ 2009-01-18 2:24 UTC (permalink / raw)
To: openembedded-devel
- setting "console=tty0" for c7x0 doesn't work...
---
packages/kexecboot/linux-kexecboot.inc | 1 -
1 files changed, 0 insertions(+), 1 deletions(-)
diff --git a/packages/kexecboot/linux-kexecboot.inc b/packages/kexecboot/linux-kexecboot.inc
index 7a899f1..924a83a 100644
--- a/packages/kexecboot/linux-kexecboot.inc
+++ b/packages/kexecboot/linux-kexecboot.inc
@@ -10,7 +10,6 @@ CMDLINE_poodle = "console=ttyS0,115200n8 console=tty1 fbcon=rotate:1"
CMDLINE_akita = "console=ttyS0,115200n8 console=tty1 fbcon=rotate:1"
CMDLINE_collie = "console=ttySA0,115200n8 console=tty1 mem=64M fbcon=rotate:1"
CMDLINE_spitz = "console=ttyS0,115200n8 console=tty1 fbcon=rotate:1"
-CMDLINE_c7x0 = "console=tty0"
PACKAGES = ""
PROVIDES = ""
--
1.6.0.6
^ permalink raw reply related [flat|nested] 26+ messages in thread* [PATCH 02/14] linux-kexecboot_2.6.26: revert 71dade0cdaef0220d31a309d8b6d28b99eb25b29
2009-01-18 2:24 [PATCH 00/14] [RFC] kexecboot and implementation on Zaurus Andrea Adami
2009-01-18 2:24 ` [PATCH 01/14] linux-kexecboot.inc: revert 71d21c5e379ab3f5d754a967a52240963552a71c Andrea Adami
@ 2009-01-18 2:24 ` Andrea Adami
2009-01-18 2:24 ` [PATCH 03/14] linux-kexecboot-2.6.26: defconfig fixes Andrea Adami
` (11 subsequent siblings)
13 siblings, 0 replies; 26+ messages in thread
From: Andrea Adami @ 2009-01-18 2:24 UTC (permalink / raw)
To: openembedded-devel
- set default preference = 1 for c7x0
---
packages/kexecboot/linux-kexecboot_2.6.26.bb | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/packages/kexecboot/linux-kexecboot_2.6.26.bb b/packages/kexecboot/linux-kexecboot_2.6.26.bb
index 4ddc7c8..a0d00ab 100644
--- a/packages/kexecboot/linux-kexecboot_2.6.26.bb
+++ b/packages/kexecboot/linux-kexecboot_2.6.26.bb
@@ -6,7 +6,7 @@ DEFAULT_PREFERENCE_qemuarm = "-1"
DEFAULT_PREFERENCE_qemux86 = "-1"
DEFAULT_PREFERENCE_spitz = "1"
DEFAULT_PREFERENCE_collie = "1"
-DEFAULT_PREFERENCE_c7x0 = "-1"
+DEFAULT_PREFERENCE_c7x0 = "1"
DEFAULT_PREFERENCE_akita = "1"
# Handy URLs
--
1.6.0.6
^ permalink raw reply related [flat|nested] 26+ messages in thread* [PATCH 03/14] linux-kexecboot-2.6.26: defconfig fixes
2009-01-18 2:24 [PATCH 00/14] [RFC] kexecboot and implementation on Zaurus Andrea Adami
2009-01-18 2:24 ` [PATCH 01/14] linux-kexecboot.inc: revert 71d21c5e379ab3f5d754a967a52240963552a71c Andrea Adami
2009-01-18 2:24 ` [PATCH 02/14] linux-kexecboot_2.6.26: revert 71dade0cdaef0220d31a309d8b6d28b99eb25b29 Andrea Adami
@ 2009-01-18 2:24 ` Andrea Adami
2009-01-18 2:24 ` [PATCH 04/14] kexecboot: add new recipe for kexecboot-0.4 Andrea Adami
` (10 subsequent siblings)
13 siblings, 0 replies; 26+ messages in thread
From: Andrea Adami @ 2009-01-18 2:24 UTC (permalink / raw)
To: openembedded-devel
- enable boot from nand for spitz
- enable boot from CF for c7x0 and akita
- bump PR
---
.../linux-kexecboot-2.6.26/akita/defconfig | 8 +++---
.../linux-kexecboot-2.6.26/c7x0/defconfig | 8 +++---
.../linux-kexecboot-2.6.26/spitz/defconfig | 29 ++++++++++---------
packages/kexecboot/linux-kexecboot_2.6.26.bb | 2 +-
4 files changed, 24 insertions(+), 23 deletions(-)
diff --git a/packages/kexecboot/linux-kexecboot-2.6.26/akita/defconfig b/packages/kexecboot/linux-kexecboot-2.6.26/akita/defconfig
index 0c9d323..80daecd 100644
--- a/packages/kexecboot/linux-kexecboot-2.6.26/akita/defconfig
+++ b/packages/kexecboot/linux-kexecboot-2.6.26/akita/defconfig
@@ -226,16 +226,16 @@ CONFIG_SHARP_SCOOP=y
#
# CONFIG_PCI_SYSCALL is not set
# CONFIG_ARCH_SUPPORTS_MSI is not set
-CONFIG_PCCARD=m
+CONFIG_PCCARD=y
# CONFIG_PCMCIA_DEBUG is not set
-CONFIG_PCMCIA=m
+CONFIG_PCMCIA=y
CONFIG_PCMCIA_LOAD_CIS=y
CONFIG_PCMCIA_IOCTL=y
#
# PC-card bridges
#
-CONFIG_PCMCIA_PXA2XX=m
+CONFIG_PCMCIA_PXA2XX=y
#
# Kernel Features
@@ -430,7 +430,7 @@ CONFIG_BLK_DEV_IDE=y
# CONFIG_BLK_DEV_IDE_SATA is not set
CONFIG_BLK_DEV_IDEDISK=y
# CONFIG_IDEDISK_MULTI_MODE is not set
-CONFIG_BLK_DEV_IDECS=m
+CONFIG_BLK_DEV_IDECS=y
# CONFIG_BLK_DEV_IDECD is not set
# CONFIG_BLK_DEV_IDETAPE is not set
# CONFIG_BLK_DEV_IDEFLOPPY is not set
diff --git a/packages/kexecboot/linux-kexecboot-2.6.26/c7x0/defconfig b/packages/kexecboot/linux-kexecboot-2.6.26/c7x0/defconfig
index 7724d61..3196f89 100644
--- a/packages/kexecboot/linux-kexecboot-2.6.26/c7x0/defconfig
+++ b/packages/kexecboot/linux-kexecboot-2.6.26/c7x0/defconfig
@@ -228,16 +228,16 @@ CONFIG_SHARP_SCOOP=y
#
# CONFIG_PCI_SYSCALL is not set
# CONFIG_ARCH_SUPPORTS_MSI is not set
-CONFIG_PCCARD=m
+CONFIG_PCCARD=y
# CONFIG_PCMCIA_DEBUG is not set
-CONFIG_PCMCIA=m
+CONFIG_PCMCIA=y
CONFIG_PCMCIA_LOAD_CIS=y
CONFIG_PCMCIA_IOCTL=y
#
# PC-card bridges
#
-CONFIG_PCMCIA_PXA2XX=m
+CONFIG_PCMCIA_PXA2XX=y
#
# Kernel Features
@@ -447,7 +447,7 @@ CONFIG_BLK_DEV_IDE=y
# CONFIG_BLK_DEV_IDE_SATA is not set
CONFIG_BLK_DEV_IDEDISK=y
# CONFIG_IDEDISK_MULTI_MODE is not set
-CONFIG_BLK_DEV_IDECS=m
+CONFIG_BLK_DEV_IDECS=y
# CONFIG_BLK_DEV_IDECD is not set
# CONFIG_BLK_DEV_IDETAPE is not set
# CONFIG_BLK_DEV_IDEFLOPPY is not set
diff --git a/packages/kexecboot/linux-kexecboot-2.6.26/spitz/defconfig b/packages/kexecboot/linux-kexecboot-2.6.26/spitz/defconfig
index c7c6442..9de4245 100644
--- a/packages/kexecboot/linux-kexecboot-2.6.26/spitz/defconfig
+++ b/packages/kexecboot/linux-kexecboot-2.6.26/spitz/defconfig
@@ -328,20 +328,21 @@ CONFIG_FW_LOADER=y
# CONFIG_DEBUG_DRIVER is not set
# CONFIG_DEBUG_DEVRES is not set
# CONFIG_SYS_HYPERVISOR is not set
-CONFIG_MTD=m
+CONFIG_MTD=y
# CONFIG_MTD_DEBUG is not set
# CONFIG_MTD_CONCAT is not set
CONFIG_MTD_PARTITIONS=y
# CONFIG_MTD_REDBOOT_PARTS is not set
+CONFIG_MTD_CMDLINE_PARTS=y
# CONFIG_MTD_AFS_PARTS is not set
# CONFIG_MTD_AR7_PARTS is not set
#
# User Modules And Translation Layers
#
-CONFIG_MTD_CHAR=m
-CONFIG_MTD_BLKDEVS=m
-CONFIG_MTD_BLOCK=m
+CONFIG_MTD_CHAR=y
+CONFIG_MTD_BLKDEVS=y
+CONFIG_MTD_BLOCK=y
# CONFIG_MTD_BLOCK_RO is not set
# CONFIG_FTL is not set
# CONFIG_NFTL is not set
@@ -366,7 +367,7 @@ CONFIG_MTD_CFI_I2=y
# CONFIG_MTD_CFI_I4 is not set
# CONFIG_MTD_CFI_I8 is not set
# CONFIG_MTD_RAM is not set
-CONFIG_MTD_ROM=m
+CONFIG_MTD_ROM=y
# CONFIG_MTD_ABSENT is not set
#
@@ -374,7 +375,7 @@ CONFIG_MTD_ROM=m
#
CONFIG_MTD_COMPLEX_MAPPINGS=y
# CONFIG_MTD_PHYSMAP is not set
-CONFIG_MTD_SHARP_SL=m
+CONFIG_MTD_SHARP_SL=y
# CONFIG_MTD_PLATRAM is not set
#
@@ -391,14 +392,14 @@ CONFIG_MTD_SHARP_SL=m
# CONFIG_MTD_DOC2000 is not set
# CONFIG_MTD_DOC2001 is not set
# CONFIG_MTD_DOC2001PLUS is not set
-CONFIG_MTD_NAND=m
+CONFIG_MTD_NAND=y
CONFIG_MTD_NAND_VERIFY_WRITE=y
# CONFIG_MTD_NAND_ECC_SMC is not set
# CONFIG_MTD_NAND_MUSEUM_IDS is not set
# CONFIG_MTD_NAND_H1900 is not set
-CONFIG_MTD_NAND_IDS=m
+CONFIG_MTD_NAND_IDS=y
# CONFIG_MTD_NAND_DISKONCHIP is not set
-CONFIG_MTD_NAND_SHARPSL=m
+CONFIG_MTD_NAND_SHARPSL=y
# CONFIG_MTD_NAND_NANDSIM is not set
# CONFIG_MTD_NAND_PLATFORM is not set
# CONFIG_MTD_ALAUDA is not set
@@ -1233,7 +1234,7 @@ CONFIG_TMPFS=y
# CONFIG_BEFS_FS is not set
# CONFIG_BFS_FS is not set
# CONFIG_EFS_FS is not set
-CONFIG_JFFS2_FS=m
+CONFIG_JFFS2_FS=y
CONFIG_JFFS2_FS_DEBUG=0
CONFIG_JFFS2_FS_WRITEBUFFER=y
# CONFIG_JFFS2_FS_WBUF_VERIFY is not set
@@ -1465,10 +1466,10 @@ CONFIG_CRC_CCITT=y
CONFIG_CRC32=y
# CONFIG_CRC7 is not set
CONFIG_LIBCRC32C=m
-CONFIG_ZLIB_INFLATE=m
-CONFIG_ZLIB_DEFLATE=m
-CONFIG_LZO_COMPRESS=m
-CONFIG_LZO_DECOMPRESS=m
+CONFIG_ZLIB_INFLATE=y
+CONFIG_ZLIB_DEFLATE=y
+CONFIG_LZO_COMPRESS=y
+CONFIG_LZO_DECOMPRESS=y
CONFIG_PLIST=y
CONFIG_HAS_IOMEM=y
CONFIG_HAS_IOPORT=y
diff --git a/packages/kexecboot/linux-kexecboot_2.6.26.bb b/packages/kexecboot/linux-kexecboot_2.6.26.bb
index a0d00ab..2fa0e6c 100644
--- a/packages/kexecboot/linux-kexecboot_2.6.26.bb
+++ b/packages/kexecboot/linux-kexecboot_2.6.26.bb
@@ -1,6 +1,6 @@
require linux-kexecboot.inc
-PR = "r6"
+PR = "r7"
DEFAULT_PREFERENCE = "-1"
DEFAULT_PREFERENCE_qemuarm = "-1"
DEFAULT_PREFERENCE_qemux86 = "-1"
--
1.6.0.6
^ permalink raw reply related [flat|nested] 26+ messages in thread* [PATCH 04/14] kexecboot: add new recipe for kexecboot-0.4
2009-01-18 2:24 [PATCH 00/14] [RFC] kexecboot and implementation on Zaurus Andrea Adami
` (2 preceding siblings ...)
2009-01-18 2:24 ` [PATCH 03/14] linux-kexecboot-2.6.26: defconfig fixes Andrea Adami
@ 2009-01-18 2:24 ` Andrea Adami
2009-01-18 2:24 ` [PATCH 05/14] kexecboot: remove kexecboot-0.3 Andrea Adami
` (9 subsequent siblings)
13 siblings, 0 replies; 26+ messages in thread
From: Andrea Adami @ 2009-01-18 2:24 UTC (permalink / raw)
To: openembedded-devel
- kexecboot can now be used as init
---
conf/checksums.ini | 3 ++
packages/kexecboot/kexecboot_0.4.bb | 37 +++++++++++++++++++++++++++++++++++
2 files changed, 40 insertions(+), 0 deletions(-)
create mode 100644 packages/kexecboot/kexecboot_0.4.bb
diff --git a/conf/checksums.ini b/conf/checksums.ini
index 5467494..abb74ef 100644
--- a/conf/checksums.ini
+++ b/conf/checksums.ini
@@ -24622,3 +24622,6 @@ sha256=5cc1a53bb909922596bdd0fa967b654fe1bfbe0dcf1d34608f0b7c90e0c27867
md5=5f7b88ebb2bcd7e8044328482d079661
sha256=f57c4e33eb2cdd87a6c2f01bfa4794340fbe61ea1a1cfc7dac3b6671e1dd22af
+[http://projects.linuxtogo.org/~jay7/kexecboot-0.4.tar.gz]
+md5=b4a4509ca3f546cfedd23aa6f99ab81d
+sha256=b8c9d3a51f04bdecabbb4135079d408e02c98cdf3156bab8418a6830cb64b890
diff --git a/packages/kexecboot/kexecboot_0.4.bb b/packages/kexecboot/kexecboot_0.4.bb
new file mode 100644
index 0000000..19c2372
--- /dev/null
+++ b/packages/kexecboot/kexecboot_0.4.bb
@@ -0,0 +1,37 @@
+LICENSE = "GPL"
+PR = "r0"
+DEPENDS = "klibc"
+RDEPENDS = "kexec-static"
+
+inherit autotools
+
+# You can create your own *-img.h by doing
+# ./make-image-header.sh <file>.png HAND
+
+SRC_URI = "http://projects.linuxtogo.org/~jay7/kexecboot-${PV}.tar.gz"
+
+S = "${WORKDIR}/kexecboot-${PV}"
+
+export CC=${TARGET_PREFIX}klcc
+
+# standard oe cflags don't work with klcc
+export CFLAGS = ""
+export CPPFLAGS = ""
+export LDFLAGS = ""
+
+do_install () {
+
+# hard way
+# install -d ${D}
+# install -m 0755 kexecboot ${D}/init
+
+ install -d ${D}${bindir}
+ install -m 0755 kexecboot ${D}${bindir}/
+ install -d ${D}
+ ln -sf ${bindir}/kexecboot ${D}/init
+
+ install -d ${D}/proc
+ install -d ${D}/mnt
+}
+
+FILES_${PN} = "/init /usr/bin/kexecboot /proc /mnt"
--
1.6.0.6
^ permalink raw reply related [flat|nested] 26+ messages in thread* [PATCH 05/14] kexecboot: remove kexecboot-0.3
2009-01-18 2:24 [PATCH 00/14] [RFC] kexecboot and implementation on Zaurus Andrea Adami
` (3 preceding siblings ...)
2009-01-18 2:24 ` [PATCH 04/14] kexecboot: add new recipe for kexecboot-0.4 Andrea Adami
@ 2009-01-18 2:24 ` Andrea Adami
2009-01-18 2:24 ` [PATCH 06/14] kexecboot: delete initramfs-kexecboot Andrea Adami
` (8 subsequent siblings)
13 siblings, 0 replies; 26+ messages in thread
From: Andrea Adami @ 2009-01-18 2:24 UTC (permalink / raw)
To: openembedded-devel
- now broken as kexec is now used as init with 0.4
---
packages/kexecboot/files/kexecboot-rewrite.patch | 344 ----------------------
packages/kexecboot/kexecboot_0.3.bb | 21 --
2 files changed, 0 insertions(+), 365 deletions(-)
delete mode 100644 packages/kexecboot/files/kexecboot-rewrite.patch
delete mode 100644 packages/kexecboot/kexecboot_0.3.bb
diff --git a/packages/kexecboot/files/kexecboot-rewrite.patch b/packages/kexecboot/files/kexecboot-rewrite.patch
deleted file mode 100644
index 4f25206..0000000
--- a/packages/kexecboot/files/kexecboot-rewrite.patch
+++ /dev/null
@@ -1,344 +0,0 @@
---- kexecboot-0.3.orig/kexecboot.h 2008-09-03 02:35:40.000000000 +0400
-+++ kexecboot-0.3/kexecboot.h 2008-09-03 02:36:04.000000000 +0400
-@@ -24,6 +24,10 @@
- #include <string.h>
- #include <linux/input.h>
- #include <termios.h>
-+#include <unistd.h>
-+#include <signal.h>
-+#include <sys/wait.h>
-+#include <ctype.h>
- #include "fb.h"
- #include "devicescan.h"
- #include "res/logo-img.h"
-@@ -33,4 +37,14 @@
- #include "res/memory-img.h"
- #include "res/radeon-font.h"
-
-+/* Macro for dealing with NULL strings */
-+#define strlenn(s) ( (NULL != s) ? (strlen(s)) : 0 )
-+
-+/* Tags we want from /proc/cmdline */
-+char *wanted_tags[] = {
-+ "mtdparts",
-+ NULL
-+};
-+
-+
- #endif
---- kexecboot-0.3.orig/kexecboot.c 2008-09-03 02:35:40.000000000 +0400
-+++ kexecboot-0.3/kexecboot.c 2008-09-03 03:33:05.000000000 +0400
-@@ -78,20 +78,293 @@
- fb_render(fb);
- }
-
-+/*
-+ * Function: get_extra_cmdline()
-+ * It gets wanted tags from original cmdline.
-+ * Takes 2 args:
-+ * - extra_cmdline - buffer to store cmdline parameters;
-+ * - extra_cmdline_size - size of buffer
-+ * (inc. terminating '\0').
-+ * Return values:
-+ * - length of extra_cmdline on success (w/o term. zero);
-+ * - -1 on error;
-+ * - (- length of extra_cmdline - 1) on insufficient buffer space.
-+ */
-+
-+int get_extra_cmdline(char *const extra_cmdline, const size_t extra_cmdline_size)
-+{
-+ char *p, *t, *tag = NULL;
-+ char line[COMMAND_LINE_SIZE];
-+ int i, len, sp_size;
-+ int sum_len = 0;
-+ int wanted_tag_found = 0;
-+ int overflow = 0;
-+
-+ const char proc_cmdline_path[] = "/proc/cmdline";
-+
-+ /* Open /proc/cmdline and read cmdline */
-+ FILE *f = fopen(proc_cmdline_path, "r");
-+ if (NULL == f) {
-+ perror("Can't open /proc/cmdline");
-+ return -1;
-+ }
-+
-+ if ( NULL == fgets(line, sizeof(line), f) ) {
-+ perror("Can't read /proc/cmdline");
-+ fclose(f);
-+ return -1;
-+ }
-+
-+ fclose(f);
-+
-+ /* clean up buffer before parsing */
-+ t = extra_cmdline;
-+ *t = '\0';
-+
-+ p = line-1; /* because of ++p below */
-+
-+ sp_size = 0; /* size of (first) space */
-+
-+ do {
-+ ++p;
-+
-+ if ( (NULL == tag) && (isalnum(*p)) ) {
-+ /* new tag found */
-+ tag = p;
-+ } else if (tag) {
-+ /* we are working on some tag */
-+
-+ if (isspace(*p) || ('\0' == *p) || ('=' == *p) ) {
-+ /* end of tag or '=' found */
-+
-+ if (!wanted_tag_found) {
-+ /* search in wanted_tags */
-+ for (i = 0; wanted_tags[i] != NULL; i++) {
-+ if ( 0 == strncmp(wanted_tags[i], tag, p-tag) ) {
-+ /* match found */
-+ wanted_tag_found = 1;
-+ break;
-+ }
-+ }
-+ }
-+
-+ if ( ('=' != *p) && wanted_tag_found ) {
-+ /* end of wanted tag found -> copy */
-+
-+ len = p - tag;
-+ if ( (sum_len + len + sp_size) < extra_cmdline_size ) {
-+ if (sp_size) {
-+ /* prepend space when have tags already */
-+ *t = ' ';
-+ ++t;
-+ *t = '\0';
-+ ++sum_len;
-+ } else {
-+ sp_size = sizeof(char);
-+ }
-+
-+ /* NOTE: tag is not null-terminated so copy only
-+ * len chars and terminate it directly
-+ */
-+ strncpy(t, tag, len);
-+ /* move pointer to position after copied tag */
-+ t += len ;
-+ /* null-terminate */
-+ *t = '\0';
-+ /* update summary length */
-+ sum_len += len;
-+ } else {
-+ /* we have no space - skip this tag */
-+ overflow = 1;
-+ }
-+
-+ /* reset wanted_tag_found */
-+ wanted_tag_found = 0;
-+ }
-+
-+ /* reset tag */
-+ if (!wanted_tag_found) tag = NULL;
-+
-+ }
-+ }
-+
-+ } while ('\0' != *p);
-+
-+ if (overflow) return -sum_len-1;
-+ return sum_len;
-+}
-+
-+/*
-+ * Function: kexec_execw()
-+ * (execve and wait)
-+ * kexecboot's replace of system() call without /bin/sh invocation.
-+ * During execution of the command, SIGCHLD will be blocked,
-+ * and SIGINT and SIGQUIT will be ignored (like system() does).
-+ * Takes 2 args (execve()-like):
-+ * - path - full path to executable file
-+ * - argv[] - array of args for executed file (command options e.g.)
-+ * - envp[] - array of environment strings ("key=value")
-+ * Return value:
-+ * - command exit status on success
-+ * - -1 on error (e.g. fork() failed)
-+ */
-+int kexec_execw(const char *path, char *const argv[], char *const envp[])
-+{
-+ pid_t pid;
-+ struct sigaction ignore, old_int, old_quit;
-+ sigset_t masked, oldmask;
-+ int status;
-+
-+ /* Block SIGCHLD and ignore SIGINT and SIGQUIT */
-+ /* Do this before the fork() to avoid races */
-+
-+ ignore.sa_handler = SIG_IGN;
-+ sigemptyset(&ignore.sa_mask);
-+ ignore.sa_flags = 0;
-+ sigaction(SIGINT, &ignore, &old_int);
-+ sigaction(SIGQUIT, &ignore, &old_quit);
-+
-+ sigemptyset(&masked);
-+ sigaddset(&masked, SIGCHLD);
-+ sigprocmask(SIG_BLOCK, &masked, &oldmask);
-+
-+ pid = fork();
-+
-+ if (pid < 0)
-+ /* can't fork */
-+ return -1;
-+ else if (pid == 0) {
-+ /* it is child */
-+ sigaction(SIGINT, &old_int, NULL);
-+ sigaction(SIGQUIT, &old_quit, NULL);
-+ sigprocmask(SIG_SETMASK, &oldmask, NULL);
-+
-+ /* replace child with executed file */
-+ execve(path, (char *const *)argv, (char *const *)envp);
-+ /* should not happens but... */
-+ _exit(127);
-+ }
-+
-+ /* it is parent */
-+
-+ /* wait for our child and store status */
-+ waitpid(pid, &status, 0);
-+
-+ /* restore signal handlers */
-+ sigaction(SIGINT, &old_int, NULL);
-+ sigaction(SIGQUIT, &old_quit, NULL);
-+ sigprocmask(SIG_SETMASK, &oldmask, NULL);
-+
-+ return status;
-+}
-+
- void start_kernel(struct boot *boot)
- {
-- //kexec --command-line="CMDLINE" -l /mnt/boot/zImage
-- char command[COMMAND_LINE_SIZE + 60];
-- mount(boot->device, "/mnt", boot->fstype, MS_RDONLY, NULL);
-- if( boot->cmdline )
-- sprintf(command,"/usr/sbin/kexec --command-line=\"%s root=%s rootfstype=%s\" -l %s",
-- boot->cmdline, boot->device, boot->fstype, boot->kernelpath);
-- else
-- sprintf(command,"kexec -l %s", boot->kernelpath);
-- system(command);
--// puts(command);
-- umount("/mnt");
-- system("/usr/sbin/kexec -e");
-+ /* we use var[] instead of *var because sizeof(var) using */
-+ const char mount_point[] = "/mnt";
-+ const char kexec_path[] = "/usr/sbin/kexec";
-+
-+ const char str_cmdline_start[] = "--command-line=";
-+ const char str_root[] = " root=";
-+ const char str_rootfstype[] = " rootfstype=";
-+ const char str_rootwait[] = " rootwait";
-+
-+ /* empty environment */
-+ char *const envp[] = { NULL };
-+
-+ const char *kexec_load_argv[] = { NULL, "-l", NULL, NULL, NULL };
-+ const char *kexec_exec_argv[] = { NULL, "-e", NULL};
-+
-+ char extra_cmdline_buffer[COMMAND_LINE_SIZE];
-+ char *extra_cmdline, *cmdline_arg = NULL;
-+ int n, idx;
-+
-+ kexec_exec_argv[0] = kexec_path;
-+ kexec_load_argv[0] = kexec_path;
-+
-+ /* --command-line arg generation */
-+ idx = 2; /* kexec_load_argv current option index */
-+
-+ /* get some parts of cmdline from boot loader (e.g. mtdparts) */
-+ n = get_extra_cmdline( extra_cmdline_buffer,
-+ sizeof(extra_cmdline_buffer) );
-+ if ( -1 == n ) {
-+ /* clean up extra_cmdline on error */
-+ extra_cmdline = NULL;
-+/* } else if ( n < -1 ) { */
-+ /* Do something when we have no space to get all wanted tags */
-+ /* Now do nothing ;) */
-+ } else {
-+ extra_cmdline = extra_cmdline_buffer;
-+ }
-+
-+ /* fill '--command-line' option */
-+ if (boot->cmdline || extra_cmdline || boot->device) {
-+ /* allocate space */
-+ n = strlenn(str_cmdline_start) + strlenn(boot->cmdline) +
-+ sizeof(char) + strlenn(extra_cmdline) +
-+ strlenn(str_root) + strlenn(boot->device) +
-+ strlenn(str_rootfstype) + strlenn(boot->fstype) +
-+ strlenn(str_rootwait) + sizeof(char);
-+
-+ cmdline_arg = (char *)malloc(n);
-+ if (NULL == cmdline_arg) {
-+ perror("Can't allocate memory for cmdline_arg");
-+ /* Should we exit?
-+ exit(-1);
-+ */
-+ } else {
-+ strcat(cmdline_arg, str_cmdline_start);
-+ if (extra_cmdline)
-+ strcat(cmdline_arg, extra_cmdline);
-+ if (boot->cmdline && extra_cmdline)
-+ strcat(cmdline_arg, " ");
-+ if (boot->cmdline)
-+ strcat(cmdline_arg, boot->cmdline);
-+ if (boot->device) {
-+ strcat(cmdline_arg, str_root);
-+ strcat(cmdline_arg, boot->device);
-+ if (boot->fstype) {
-+ strcat(cmdline_arg, str_rootfstype);
-+ strcat(cmdline_arg, boot->fstype);
-+ }
-+ }
-+ strcat(cmdline_arg, str_rootwait);
-+
-+ kexec_load_argv[idx] = cmdline_arg;
-+ ++idx;
-+ }
-+ }
-+
-+ /* Append kernelpath as last arg of kexec */
-+ kexec_load_argv[idx] = boot->kernelpath;
-+
-+ /* Debug
-+ fprintf(stderr, "%s\n%s\n%s\n%s\n", kexec_load_argv[0],
-+ kexec_load_argv[1], kexec_load_argv[2],
-+ kexec_load_argv[3]); */
-+
-+ /* Mount boot device */
-+ if ( -1 == mount(boot->device, mount_point, boot->fstype,
-+ MS_RDONLY, NULL) ) {
-+ perror("Can't mount boot device");
-+ exit(-1);
-+ }
-+
-+ /* Load kernel */
-+ n = kexec_execw(kexec_path, (char *const *)kexec_load_argv, envp);
-+ if (-1 == n) {
-+ perror("Kexec can't load kernel");
-+ exit(-1);
-+ }
-+
-+ if (cmdline_arg)
-+ free(cmdline_arg);
-+
-+ umount(mount_point);
-+
-+ /* Boot new kernel */
-+ execve(kexec_path, (char *const *)kexec_exec_argv, envp);
- }
-
- int main(int argc, char **argv)
-@@ -219,5 +492,6 @@
- tcsetattr(fileno(stdin), TCSANOW, &old);
- fb_destroy(fb);
- start_kernel(bl->list[choice]);
-- return 0;
-+ /* When we reach this point then some error was occured */
-+ return -1;
- }
diff --git a/packages/kexecboot/kexecboot_0.3.bb b/packages/kexecboot/kexecboot_0.3.bb
deleted file mode 100644
index f94e31b..0000000
--- a/packages/kexecboot/kexecboot_0.3.bb
+++ /dev/null
@@ -1,21 +0,0 @@
-LICENSE = "GPL"
-PR = "r2"
-DEPENDS = "klibc"
-RDEPENDS = "kexec-static"
-
-inherit autotools
-
-# You can create your own *-img.h by doing
-# ./make-image-header.sh <file>.png HAND
-
-SRC_URI = "http://projects.linuxtogo.org/frs/download.php/221/kexecboot-${PV}.tar.gz \
- file://kexecboot-rewrite.patch;patch=1"
-
-S = "${WORKDIR}/kexecboot-${PV}"
-
-export CC=${TARGET_PREFIX}klcc
-
-# standart oe cflags don't work with klcc
-export CFLAGS = ""
-export CPPFLAGS = ""
-export LDFLAGS = ""
--
1.6.0.6
^ permalink raw reply related [flat|nested] 26+ messages in thread* [PATCH 06/14] kexecboot: delete initramfs-kexecboot
2009-01-18 2:24 [PATCH 00/14] [RFC] kexecboot and implementation on Zaurus Andrea Adami
` (4 preceding siblings ...)
2009-01-18 2:24 ` [PATCH 05/14] kexecboot: remove kexecboot-0.3 Andrea Adami
@ 2009-01-18 2:24 ` Andrea Adami
2009-01-18 2:24 ` [PATCH 07/14] kexecboot: use custom device table with mmc and event0 Andrea Adami
` (7 subsequent siblings)
13 siblings, 0 replies; 26+ messages in thread
From: Andrea Adami @ 2009-01-18 2:24 UTC (permalink / raw)
To: openembedded-devel
- initramfs-kexecboot image only installs kexecboot
---
packages/kexecboot/initramfs-kexecboot-image.bb | 2 +-
packages/kexecboot/initramfs-kexecboot_1.0.bb | 28 -----------------------
2 files changed, 1 insertions(+), 29 deletions(-)
delete mode 100644 packages/kexecboot/initramfs-kexecboot_1.0.bb
diff --git a/packages/kexecboot/initramfs-kexecboot-image.bb b/packages/kexecboot/initramfs-kexecboot-image.bb
index 3fd1088..6c3a76b 100644
--- a/packages/kexecboot/initramfs-kexecboot-image.bb
+++ b/packages/kexecboot/initramfs-kexecboot-image.bb
@@ -6,5 +6,5 @@ inherit image
export IMAGE_BASENAME = "initramfs-kexecboot-image"
-IMAGE_INSTALL = "initramfs-kexecboot"
+IMAGE_INSTALL = "kexecboot"
IMAGE_LINGUAS = ""
diff --git a/packages/kexecboot/initramfs-kexecboot_1.0.bb b/packages/kexecboot/initramfs-kexecboot_1.0.bb
deleted file mode 100644
index a6450b0..0000000
--- a/packages/kexecboot/initramfs-kexecboot_1.0.bb
+++ /dev/null
@@ -1,28 +0,0 @@
-DESCRIPTON = "A init script that mounts a device and kexecs a new kernel from it."
-PR = "r8"
-RDEPENDS = "kexecboot klibc-utils-static-mount klibc-utils-static-sh klibc-utils-static-sleep"
-
-FBANGLE = "270"
-FBANGLE_c7x0 = "0"
-INPUTDEV = "/dev/event0"
-
-
-do_compile() {
- cat > init.sh << EOF
-#!/bin/sh
-/bin/sleep 3
-/bin/mount -t proc proc /proc
-echo "0 4 1 7" > /proc/sys/kernel/printk
-/usr/bin/kexecboot -a ${FBANGLE} -i ${INPUTDEV}
-EOF
-}
-
-do_install() {
- install -m 0755 ${S}/init.sh ${D}/init
- install -d ${D}/proc
- install -d ${D}/mnt
-}
-
-PACKAGE_ARCH = "all"
-
-FILES_${PN} = "/init /proc /mnt"
--
1.6.0.6
^ permalink raw reply related [flat|nested] 26+ messages in thread* [PATCH 07/14] kexecboot: use custom device table with mmc and event0
2009-01-18 2:24 [PATCH 00/14] [RFC] kexecboot and implementation on Zaurus Andrea Adami
` (5 preceding siblings ...)
2009-01-18 2:24 ` [PATCH 06/14] kexecboot: delete initramfs-kexecboot Andrea Adami
@ 2009-01-18 2:24 ` Andrea Adami
2009-01-18 2:54 ` Tom Rini
2009-01-18 8:49 ` Koen Kooi
2009-01-18 2:24 ` [PATCH 08/14] zaurus-2.6.inc: switch to kexecboot and deploy kernel in /boot Andrea Adami
` (6 subsequent siblings)
13 siblings, 2 replies; 26+ messages in thread
From: Andrea Adami @ 2009-01-18 2:24 UTC (permalink / raw)
To: openembedded-devel
- revert 98e9985edab2eb072795a443e6d193fac7c048eb
- revert 5c1a421f73d9688341ace9c4dd4db59c3ef4b988
- add mmc devices mmcblk0p4 - mmcblk0p10
- fix 'cannot boot from logical partitions on SD'
---
conf/machine/include/kexecboot.inc | 3 +++
files/device_table-kexecboot.txt | 4 ++++
files/device_table-minimal.txt | 7 -------
3 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/conf/machine/include/kexecboot.inc b/conf/machine/include/kexecboot.inc
index 7e22008..8158f3c 100644
--- a/conf/machine/include/kexecboot.inc
+++ b/conf/machine/include/kexecboot.inc
@@ -10,3 +10,6 @@ RDEPENDS_kernel-base = "kernel-image"
# we store kernel images in rootfs and only a minimal initramfs kernel in mtd1 for booting other kernels
DONT_CHECK_KERNELSIZE ?= "1"
+IMAGE_DEVICE_TABLES ?= "files/device_table-minimal.txt"
+#add some device nodes for kexecboot
+IMAGE_DEVICE_TABLES_append = " files/device_table-kexecboot.txt"
diff --git a/files/device_table-kexecboot.txt b/files/device_table-kexecboot.txt
index ff17a8e..5d37afa 100644
--- a/files/device_table-kexecboot.txt
+++ b/files/device_table-kexecboot.txt
@@ -3,5 +3,9 @@
/dev/mmcblk0p1 b 660 0 6 179 1 - - -
/dev/mmcblk0p2 b 660 0 6 179 2 - - -
/dev/mmcblk0p3 b 660 0 6 179 3 - - -
+/dev/mmcblk0p4 b 660 0 6 179 4 - - -
+/dev/mmcblk0p5 b 660 0 6 179 5 - - -
+/dev/mmcblk0p6 b 660 0 6 179 6 - - -
+/dev/mmcblk0p7 b 660 0 6 179 7 - - -
/dev/event0 c 660 0 0 13 64 - - -
/dev/fb0 c 660 0 0 29 0 - - -
diff --git a/files/device_table-minimal.txt b/files/device_table-minimal.txt
index e75db89..1d15b09 100644
--- a/files/device_table-minimal.txt
+++ b/files/device_table-minimal.txt
@@ -29,10 +29,3 @@
/dev/random c 644 0 0 1 8 - - -
/dev/urandom c 644 0 0 1 9 - - -
/dev/ptmx c 644 0 0 5 2 - - -
-
-# mmc numbers are assigned dynamicly so if you have other dynamic assigned block devices it may be wrong
-/dev/mmcblk0 b 660 0 6 179 0 - - -
-/dev/mmcblk0p1 b 660 0 6 179 1 - - -
-/dev/mmcblk0p2 b 660 0 6 179 2 - - -
-/dev/mmcblk0p3 b 660 0 6 179 3 - - -
-/dev/event0 c 660 0 0 13 64 - - -
--
1.6.0.6
^ permalink raw reply related [flat|nested] 26+ messages in thread* Re: [PATCH 07/14] kexecboot: use custom device table with mmc and event0
2009-01-18 2:24 ` [PATCH 07/14] kexecboot: use custom device table with mmc and event0 Andrea Adami
@ 2009-01-18 2:54 ` Tom Rini
2009-01-18 8:49 ` Koen Kooi
1 sibling, 0 replies; 26+ messages in thread
From: Tom Rini @ 2009-01-18 2:54 UTC (permalink / raw)
To: openembedded-devel
On Sun, Jan 18, 2009 at 03:24:27AM +0100, Andrea Adami wrote:
> - revert 98e9985edab2eb072795a443e6d193fac7c048eb
> - revert 5c1a421f73d9688341ace9c4dd4db59c3ef4b988
> - add mmc devices mmcblk0p4 - mmcblk0p10
> - fix 'cannot boot from logical partitions on SD'
As a general thing, I have some problems with what we throw into the
static dev and think we need to get things sorted out "better" for the
various cases. That said, can you please confirm that the nodes being
removed from -minimal.txt were put there explicitly for the kexecboot
case?
--
Tom Rini
^ permalink raw reply [flat|nested] 26+ messages in thread
* Re: [PATCH 07/14] kexecboot: use custom device table with mmc and event0
2009-01-18 2:24 ` [PATCH 07/14] kexecboot: use custom device table with mmc and event0 Andrea Adami
2009-01-18 2:54 ` Tom Rini
@ 2009-01-18 8:49 ` Koen Kooi
2009-01-18 10:29 ` Andrea Adami
1 sibling, 1 reply; 26+ messages in thread
From: Koen Kooi @ 2009-01-18 8:49 UTC (permalink / raw)
To: openembedded-devel
On 18-01-09 03:24, Andrea Adami wrote:
> --- a/files/device_table-minimal.txt
> +++ b/files/device_table-minimal.txt
> @@ -29,10 +29,3 @@
> /dev/random c 644 0 0 1 8 - - -
> /dev/urandom c 644 0 0 1 9 - - -
> /dev/ptmx c 644 0 0 5 2 - - -
> -
> -# mmc numbers are assigned dynamicly so if you have other dynamic assigned block devices it may be wrong
> -/dev/mmcblk0 b 660 0 6 179 0 - - -
> -/dev/mmcblk0p1 b 660 0 6 179 1 - - -
> -/dev/mmcblk0p2 b 660 0 6 179 2 - - -
> -/dev/mmcblk0p3 b 660 0 6 179 3 - - -
> -/dev/event0 c 660 0 0 13 64 - - -
NACK
^ permalink raw reply [flat|nested] 26+ messages in thread
* Re: [PATCH 07/14] kexecboot: use custom device table with mmc and event0
2009-01-18 8:49 ` Koen Kooi
@ 2009-01-18 10:29 ` Andrea Adami
2009-01-18 10:47 ` Koen Kooi
0 siblings, 1 reply; 26+ messages in thread
From: Andrea Adami @ 2009-01-18 10:29 UTC (permalink / raw)
To: openembedded-devel
> NACK
I did not want to bloat device_table-minimal too much...
Users were asking for boot from logical partitions so I have to add
the device somehow.
Initially I wanted to add 10 but then I found out:
http://wiki.openmoko.org/wiki/Booting_from_SD
* The device nodes numbering schema provides minor numbers from 1 to 7
(/dev/mmcblk0p1 ... /dev/mmcblk0p7). Minor number 8 is the next
physical device (/dev/mmcblk1). So we're restricted to a maximum of 7
accessible partitions.
Discussing with Yuri we already found an alternative, at least for
kexecboot: parsing '/proc/partitions' in kexecboot code and
dinamically creating the nodes...probably in the next version...
Regards
Andrea
^ permalink raw reply [flat|nested] 26+ messages in thread
* Re: [PATCH 07/14] kexecboot: use custom device table with mmc and event0
2009-01-18 10:29 ` Andrea Adami
@ 2009-01-18 10:47 ` Koen Kooi
0 siblings, 0 replies; 26+ messages in thread
From: Koen Kooi @ 2009-01-18 10:47 UTC (permalink / raw)
To: openembedded-devel
On 18-01-09 11:29, Andrea Adami wrote:
>> NACK
>
> I did not want to bloat device_table-minimal too much...
You are removing devnodes other non-kexecboot people need. And yes,
non-kexecboot people exist. I think they probably outnumber kexecboot
people at least 1000 to 1.
regards,
Koen
^ permalink raw reply [flat|nested] 26+ messages in thread
* [PATCH 08/14] zaurus-2.6.inc: switch to kexecboot and deploy kernel in /boot
2009-01-18 2:24 [PATCH 00/14] [RFC] kexecboot and implementation on Zaurus Andrea Adami
` (6 preceding siblings ...)
2009-01-18 2:24 ` [PATCH 07/14] kexecboot: use custom device table with mmc and event0 Andrea Adami
@ 2009-01-18 2:24 ` Andrea Adami
2009-01-31 1:01 ` Yuri Bushmelev
2009-01-18 2:24 ` [PATCH 09/14] linux-rp: unlock 2.6.24 and 2.6.26 for Zaurus clamshells Andrea Adami
` (5 subsequent siblings)
13 siblings, 1 reply; 26+ messages in thread
From: Andrea Adami @ 2009-01-18 2:24 UTC (permalink / raw)
To: openembedded-devel
---
conf/machine/include/zaurus-2.6.inc | 4 ++++
1 files changed, 4 insertions(+), 0 deletions(-)
diff --git a/conf/machine/include/zaurus-2.6.inc b/conf/machine/include/zaurus-2.6.inc
index eee7631..8adb3d5 100644
--- a/conf/machine/include/zaurus-2.6.inc
+++ b/conf/machine/include/zaurus-2.6.inc
@@ -83,3 +83,7 @@ zaurus_make_installkit () {
RDEPENDS_kernel-base = ""
KERNEL_IMAGETYPE ?= "zImage"
+
+# uncomment this if you want to override the legacy layout
+# and deploy kernel in /boot
+require conf/machine/include/kexecboot.inc
--
1.6.0.6
^ permalink raw reply related [flat|nested] 26+ messages in thread* Re: [PATCH 08/14] zaurus-2.6.inc: switch to kexecboot and deploy kernel in /boot
2009-01-18 2:24 ` [PATCH 08/14] zaurus-2.6.inc: switch to kexecboot and deploy kernel in /boot Andrea Adami
@ 2009-01-31 1:01 ` Yuri Bushmelev
2009-01-31 2:13 ` Graeme Gregory
0 siblings, 1 reply; 26+ messages in thread
From: Yuri Bushmelev @ 2009-01-31 1:01 UTC (permalink / raw)
To: openembedded-devel
Hello!
> ---
> conf/machine/include/zaurus-2.6.inc | 4 ++++
> 1 files changed, 4 insertions(+), 0 deletions(-)
>
> diff --git a/conf/machine/include/zaurus-2.6.inc
> b/conf/machine/include/zaurus-2.6.inc index eee7631..8adb3d5 100644
> --- a/conf/machine/include/zaurus-2.6.inc
> +++ b/conf/machine/include/zaurus-2.6.inc
> @@ -83,3 +83,7 @@ zaurus_make_installkit () {
> RDEPENDS_kernel-base = ""
>
> KERNEL_IMAGETYPE ?= "zImage"
> +
> +# uncomment this if you want to override the legacy layout
> +# and deploy kernel in /boot
> +require conf/machine/include/kexecboot.inc
IMHO, we are ready now to switch on kexecboot by default for all supported
zauruses (at least) in .dev branch.
Kexecboot is stable enough (except some issues with SD/MMC-cards) and
usable. Updating/Flashing procedure is still the same as before.
Why not? :)
Is there any other opinions? :)
BTW, I'll upload screenshots of kexecboot running in qemu in akita emulation
to my picasaweb: http://picasaweb.google.ru/yuri.bushmelev/Kexecboot
--
Yuri Bushmelev
^ permalink raw reply [flat|nested] 26+ messages in thread* Re: [PATCH 08/14] zaurus-2.6.inc: switch to kexecboot and deploy kernel in /boot
2009-01-31 1:01 ` Yuri Bushmelev
@ 2009-01-31 2:13 ` Graeme Gregory
2009-01-31 8:02 ` Koen Kooi
0 siblings, 1 reply; 26+ messages in thread
From: Graeme Gregory @ 2009-01-31 2:13 UTC (permalink / raw)
To: openembedded-devel
Yuri Bushmelev wrote:
> Hello!
>
>> ---
>> conf/machine/include/zaurus-2.6.inc | 4 ++++
>> 1 files changed, 4 insertions(+), 0 deletions(-)
>>
>> diff --git a/conf/machine/include/zaurus-2.6.inc
>> b/conf/machine/include/zaurus-2.6.inc index eee7631..8adb3d5 100644
>> --- a/conf/machine/include/zaurus-2.6.inc
>> +++ b/conf/machine/include/zaurus-2.6.inc
>> @@ -83,3 +83,7 @@ zaurus_make_installkit () {
>> RDEPENDS_kernel-base = ""
>>
>> KERNEL_IMAGETYPE ?= "zImage"
>> +
>> +# uncomment this if you want to override the legacy layout
>> +# and deploy kernel in /boot
>> +require conf/machine/include/kexecboot.inc
>>
>
> IMHO, we are ready now to switch on kexecboot by default for all supported
> zauruses (at least) in .dev branch.
>
I think we are now as well, kexecboot makes zaurus booting a dream
compared to what it used to be. Haven't had any problems at all on the tosa.
Graeme (XorA)
^ permalink raw reply [flat|nested] 26+ messages in thread* Re: [PATCH 08/14] zaurus-2.6.inc: switch to kexecboot and deploy kernel in /boot
2009-01-31 2:13 ` Graeme Gregory
@ 2009-01-31 8:02 ` Koen Kooi
0 siblings, 0 replies; 26+ messages in thread
From: Koen Kooi @ 2009-01-31 8:02 UTC (permalink / raw)
To: openembedded-devel
On 31-01-09 03:13, Graeme Gregory wrote:
> Yuri Bushmelev wrote:
>> Hello!
>>
>>> ---
>>> conf/machine/include/zaurus-2.6.inc | 4 ++++
>>> 1 files changed, 4 insertions(+), 0 deletions(-)
>>>
>>> diff --git a/conf/machine/include/zaurus-2.6.inc
>>> b/conf/machine/include/zaurus-2.6.inc index eee7631..8adb3d5 100644
>>> --- a/conf/machine/include/zaurus-2.6.inc
>>> +++ b/conf/machine/include/zaurus-2.6.inc
>>> @@ -83,3 +83,7 @@ zaurus_make_installkit () {
>>> RDEPENDS_kernel-base = ""
>>>
>>> KERNEL_IMAGETYPE ?= "zImage"
>>> +
>>> +# uncomment this if you want to override the legacy layout
>>> +# and deploy kernel in /boot
>>> +require conf/machine/include/kexecboot.inc
>>>
>> IMHO, we are ready now to switch on kexecboot by default for all supported
>> zauruses (at least) in .dev branch.
>>
> I think we are now as well, kexecboot makes zaurus booting a dream
> compared to what it used to be. Haven't had any problems at all on the tosa.
This all has been RFC'ed to death and noone objected against the idea,
so let's make kexecboot the default for the zaurus family. If time
permits I'll do the same for ipaqs.
regards,
Koen
^ permalink raw reply [flat|nested] 26+ messages in thread
* [PATCH 09/14] linux-rp: unlock 2.6.24 and 2.6.26 for Zaurus clamshells
2009-01-18 2:24 [PATCH 00/14] [RFC] kexecboot and implementation on Zaurus Andrea Adami
` (7 preceding siblings ...)
2009-01-18 2:24 ` [PATCH 08/14] zaurus-2.6.inc: switch to kexecboot and deploy kernel in /boot Andrea Adami
@ 2009-01-18 2:24 ` Andrea Adami
2009-01-18 2:24 ` [PATCH 10/14] linux-rp: update defconfig for spitz Andrea Adami
` (4 subsequent siblings)
13 siblings, 0 replies; 26+ messages in thread
From: Andrea Adami @ 2009-01-18 2:24 UTC (permalink / raw)
To: openembedded-devel
---
packages/linux/linux-rp_2.6.24.bb | 3 +++
packages/linux/linux-rp_2.6.26.bb | 2 ++
2 files changed, 5 insertions(+), 0 deletions(-)
diff --git a/packages/linux/linux-rp_2.6.24.bb b/packages/linux/linux-rp_2.6.24.bb
index c498708..3cc4df8 100644
--- a/packages/linux/linux-rp_2.6.24.bb
+++ b/packages/linux/linux-rp_2.6.24.bb
@@ -6,6 +6,9 @@ DEFAULT_PREFERENCE = "-1"
DEFAULT_PREFERENCE_collie = "1"
DEFAULT_PREFERENCE_qemux86 = "1"
DEFAULT_PREFERENCE_tosa = "1"
+DEFAULT_PREFERENCE_akita = "1"
+DEFAULT_PREFERENCE_c7x0 = "1"
+DEFAULT_PREFERENCE_spitz = "1"
# Handy URLs
# git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git;protocol=git;tag=ef7d1b244fa6c94fb76d5f787b8629df64ea4046
diff --git a/packages/linux/linux-rp_2.6.26.bb b/packages/linux/linux-rp_2.6.26.bb
index dd12628..b977cf3 100644
--- a/packages/linux/linux-rp_2.6.26.bb
+++ b/packages/linux/linux-rp_2.6.26.bb
@@ -7,6 +7,8 @@ DEFAULT_PREFERENCE_qemuarm = "-1"
DEFAULT_PREFERENCE_qemux86 = "-1"
DEFAULT_PREFERENCE_spitz = "1"
DEFAULT_PREFERENCE_collie = "1"
+DEFAULT_PREFERENCE_akita = "1"
+DEFAULT_PREFERENCE_c7x0 = "1"
# Handy URLs
# git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git;protocol=git;tag=ef7d1b244fa6c94fb76d5f787b8629df64ea4046
--
1.6.0.6
^ permalink raw reply related [flat|nested] 26+ messages in thread* [PATCH 10/14] linux-rp: update defconfig for spitz
2009-01-18 2:24 [PATCH 00/14] [RFC] kexecboot and implementation on Zaurus Andrea Adami
` (8 preceding siblings ...)
2009-01-18 2:24 ` [PATCH 09/14] linux-rp: unlock 2.6.24 and 2.6.26 for Zaurus clamshells Andrea Adami
@ 2009-01-18 2:24 ` Andrea Adami
2009-01-18 2:24 ` [PATCH 11/14] linux-rp: update defconfigs for c7x0 and akita Andrea Adami
` (3 subsequent siblings)
13 siblings, 0 replies; 26+ messages in thread
From: Andrea Adami @ 2009-01-18 2:24 UTC (permalink / raw)
To: openembedded-devel
- enable boot from nand
- for both 2.6.24 and 2.6.26 kernels
- bump PR
---
packages/linux/linux-rp-2.6.24/defconfig-spitz | 29 ++++++++++++-----------
packages/linux/linux-rp-2.6.26/defconfig-spitz | 29 ++++++++++++-----------
packages/linux/linux-rp_2.6.24.bb | 2 +-
packages/linux/linux-rp_2.6.26.bb | 2 +-
4 files changed, 32 insertions(+), 30 deletions(-)
diff --git a/packages/linux/linux-rp-2.6.24/defconfig-spitz b/packages/linux/linux-rp-2.6.24/defconfig-spitz
index d97e13f..cc7f17e 100644
--- a/packages/linux/linux-rp-2.6.24/defconfig-spitz
+++ b/packages/linux/linux-rp-2.6.24/defconfig-spitz
@@ -544,19 +544,20 @@ CONFIG_FW_LOADER=y
# CONFIG_DEBUG_DEVRES is not set
# CONFIG_SYS_HYPERVISOR is not set
# CONFIG_CONNECTOR is not set
-CONFIG_MTD=m
+CONFIG_MTD=y
# CONFIG_MTD_DEBUG is not set
# CONFIG_MTD_CONCAT is not set
CONFIG_MTD_PARTITIONS=y
# CONFIG_MTD_REDBOOT_PARTS is not set
+CONFIG_MTD_CMDLINE_PARTS=y
# CONFIG_MTD_AFS_PARTS is not set
#
# User Modules And Translation Layers
#
-CONFIG_MTD_CHAR=m
-CONFIG_MTD_BLKDEVS=m
-CONFIG_MTD_BLOCK=m
+CONFIG_MTD_CHAR=y
+CONFIG_MTD_BLKDEVS=y
+CONFIG_MTD_BLOCK=y
# CONFIG_MTD_BLOCK_RO is not set
# CONFIG_FTL is not set
# CONFIG_NFTL is not set
@@ -581,7 +582,7 @@ CONFIG_MTD_CFI_I2=y
# CONFIG_MTD_CFI_I4 is not set
# CONFIG_MTD_CFI_I8 is not set
# CONFIG_MTD_RAM is not set
-CONFIG_MTD_ROM=m
+CONFIG_MTD_ROM=y
# CONFIG_MTD_ABSENT is not set
#
@@ -589,7 +590,7 @@ CONFIG_MTD_ROM=m
#
CONFIG_MTD_COMPLEX_MAPPINGS=y
# CONFIG_MTD_PHYSMAP is not set
-CONFIG_MTD_SHARP_SL=m
+CONFIG_MTD_SHARP_SL=y
# CONFIG_MTD_PLATRAM is not set
#
@@ -606,14 +607,14 @@ CONFIG_MTD_SHARP_SL=m
# CONFIG_MTD_DOC2000 is not set
# CONFIG_MTD_DOC2001 is not set
# CONFIG_MTD_DOC2001PLUS is not set
-CONFIG_MTD_NAND=m
+CONFIG_MTD_NAND=y
CONFIG_MTD_NAND_VERIFY_WRITE=y
# CONFIG_MTD_NAND_ECC_SMC is not set
# CONFIG_MTD_NAND_MUSEUM_IDS is not set
# CONFIG_MTD_NAND_H1900 is not set
-CONFIG_MTD_NAND_IDS=m
+CONFIG_MTD_NAND_IDS=y
# CONFIG_MTD_NAND_DISKONCHIP is not set
-CONFIG_MTD_NAND_SHARPSL=m
+CONFIG_MTD_NAND_SHARPSL=y
# CONFIG_MTD_NAND_NANDSIM is not set
# CONFIG_MTD_NAND_PLATFORM is not set
# CONFIG_MTD_ALAUDA is not set
@@ -1502,7 +1503,7 @@ CONFIG_TMPFS=y
# CONFIG_BEFS_FS is not set
# CONFIG_BFS_FS is not set
# CONFIG_EFS_FS is not set
-CONFIG_JFFS2_FS=m
+CONFIG_JFFS2_FS=y
CONFIG_JFFS2_FS_DEBUG=0
CONFIG_JFFS2_FS_WRITEBUFFER=y
# CONFIG_JFFS2_FS_WBUF_VERIFY is not set
@@ -1731,10 +1732,10 @@ CONFIG_CRC_CCITT=y
CONFIG_CRC32=y
# CONFIG_CRC7 is not set
CONFIG_LIBCRC32C=m
-CONFIG_ZLIB_INFLATE=m
-CONFIG_ZLIB_DEFLATE=m
-CONFIG_LZO_COMPRESS=m
-CONFIG_LZO_DECOMPRESS=m
+CONFIG_ZLIB_INFLATE=y
+CONFIG_ZLIB_DEFLATE=y
+CONFIG_LZO_COMPRESS=y
+CONFIG_LZO_DECOMPRESS=y
CONFIG_PLIST=y
CONFIG_HAS_IOMEM=y
CONFIG_HAS_IOPORT=y
diff --git a/packages/linux/linux-rp-2.6.26/defconfig-spitz b/packages/linux/linux-rp-2.6.26/defconfig-spitz
index 775efaf..587b2e6 100644
--- a/packages/linux/linux-rp-2.6.26/defconfig-spitz
+++ b/packages/linux/linux-rp-2.6.26/defconfig-spitz
@@ -563,20 +563,21 @@ CONFIG_FW_LOADER=y
# CONFIG_DEBUG_DEVRES is not set
# CONFIG_SYS_HYPERVISOR is not set
# CONFIG_CONNECTOR is not set
-CONFIG_MTD=m
+CONFIG_MTD=y
# CONFIG_MTD_DEBUG is not set
# CONFIG_MTD_CONCAT is not set
CONFIG_MTD_PARTITIONS=y
# CONFIG_MTD_REDBOOT_PARTS is not set
# CONFIG_MTD_AFS_PARTS is not set
+CONFIG_MTD_CMDLINE_PARTS=y
# CONFIG_MTD_AR7_PARTS is not set
#
# User Modules And Translation Layers
#
-CONFIG_MTD_CHAR=m
-CONFIG_MTD_BLKDEVS=m
-CONFIG_MTD_BLOCK=m
+CONFIG_MTD_CHAR=y
+CONFIG_MTD_BLKDEVS=y
+CONFIG_MTD_BLOCK=y
# CONFIG_MTD_BLOCK_RO is not set
# CONFIG_FTL is not set
# CONFIG_NFTL is not set
@@ -601,7 +602,7 @@ CONFIG_MTD_CFI_I2=y
# CONFIG_MTD_CFI_I4 is not set
# CONFIG_MTD_CFI_I8 is not set
# CONFIG_MTD_RAM is not set
-CONFIG_MTD_ROM=m
+CONFIG_MTD_ROM=y
# CONFIG_MTD_ABSENT is not set
#
@@ -609,7 +610,7 @@ CONFIG_MTD_ROM=m
#
CONFIG_MTD_COMPLEX_MAPPINGS=y
# CONFIG_MTD_PHYSMAP is not set
-CONFIG_MTD_SHARP_SL=m
+CONFIG_MTD_SHARP_SL=y
# CONFIG_MTD_PLATRAM is not set
#
@@ -626,14 +627,14 @@ CONFIG_MTD_SHARP_SL=m
# CONFIG_MTD_DOC2000 is not set
# CONFIG_MTD_DOC2001 is not set
# CONFIG_MTD_DOC2001PLUS is not set
-CONFIG_MTD_NAND=m
+CONFIG_MTD_NAND=y
CONFIG_MTD_NAND_VERIFY_WRITE=y
# CONFIG_MTD_NAND_ECC_SMC is not set
# CONFIG_MTD_NAND_MUSEUM_IDS is not set
# CONFIG_MTD_NAND_H1900 is not set
-CONFIG_MTD_NAND_IDS=m
+CONFIG_MTD_NAND_IDS=y
# CONFIG_MTD_NAND_DISKONCHIP is not set
-CONFIG_MTD_NAND_SHARPSL=m
+CONFIG_MTD_NAND_SHARPSL=y
# CONFIG_MTD_NAND_NANDSIM is not set
# CONFIG_MTD_NAND_PLATFORM is not set
# CONFIG_MTD_ALAUDA is not set
@@ -1561,7 +1562,7 @@ CONFIG_TMPFS=y
# CONFIG_BEFS_FS is not set
# CONFIG_BFS_FS is not set
# CONFIG_EFS_FS is not set
-CONFIG_JFFS2_FS=m
+CONFIG_JFFS2_FS=y
CONFIG_JFFS2_FS_DEBUG=0
CONFIG_JFFS2_FS_WRITEBUFFER=y
# CONFIG_JFFS2_FS_WBUF_VERIFY is not set
@@ -1824,10 +1825,10 @@ CONFIG_CRC_CCITT=y
CONFIG_CRC32=y
# CONFIG_CRC7 is not set
CONFIG_LIBCRC32C=m
-CONFIG_ZLIB_INFLATE=m
-CONFIG_ZLIB_DEFLATE=m
-CONFIG_LZO_COMPRESS=m
-CONFIG_LZO_DECOMPRESS=m
+CONFIG_ZLIB_INFLATE=y
+CONFIG_ZLIB_DEFLATE=y
+CONFIG_LZO_COMPRESS=y
+CONFIG_LZO_DECOMPRESS=y
CONFIG_PLIST=y
CONFIG_HAS_IOMEM=y
CONFIG_HAS_IOPORT=y
diff --git a/packages/linux/linux-rp_2.6.24.bb b/packages/linux/linux-rp_2.6.24.bb
index 3cc4df8..6bd53fb 100644
--- a/packages/linux/linux-rp_2.6.24.bb
+++ b/packages/linux/linux-rp_2.6.24.bb
@@ -1,6 +1,6 @@
require linux-rp.inc
-PR = "r17"
+PR = "r18"
DEFAULT_PREFERENCE = "-1"
DEFAULT_PREFERENCE_collie = "1"
diff --git a/packages/linux/linux-rp_2.6.26.bb b/packages/linux/linux-rp_2.6.26.bb
index b977cf3..55161a2 100644
--- a/packages/linux/linux-rp_2.6.26.bb
+++ b/packages/linux/linux-rp_2.6.26.bb
@@ -1,6 +1,6 @@
require linux-rp.inc
-PR = "r5"
+PR = "r6"
DEFAULT_PREFERENCE = "-1"
DEFAULT_PREFERENCE_qemuarm = "-1"
--
1.6.0.6
^ permalink raw reply related [flat|nested] 26+ messages in thread* [PATCH 11/14] linux-rp: update defconfigs for c7x0 and akita
2009-01-18 2:24 [PATCH 00/14] [RFC] kexecboot and implementation on Zaurus Andrea Adami
` (9 preceding siblings ...)
2009-01-18 2:24 ` [PATCH 10/14] linux-rp: update defconfig for spitz Andrea Adami
@ 2009-01-18 2:24 ` Andrea Adami
2009-01-18 2:24 ` [PATCH 12/14] zaurus-2.6.inc: modules fixes Andrea Adami
` (2 subsequent siblings)
13 siblings, 0 replies; 26+ messages in thread
From: Andrea Adami @ 2009-01-18 2:24 UTC (permalink / raw)
To: openembedded-devel
- enable boot from EXT3
- enable boot from CF
- for both 2.6.24 and 2.6.26 kernels
- bump PR
---
packages/linux/linux-rp-2.6.24/defconfig-akita | 12 ++++++------
packages/linux/linux-rp-2.6.24/defconfig-c7x0 | 12 ++++++------
packages/linux/linux-rp-2.6.26/defconfig-akita | 12 ++++++------
packages/linux/linux-rp-2.6.26/defconfig-c7x0 | 12 ++++++------
packages/linux/linux-rp_2.6.24.bb | 2 +-
packages/linux/linux-rp_2.6.26.bb | 2 +-
6 files changed, 26 insertions(+), 26 deletions(-)
diff --git a/packages/linux/linux-rp-2.6.24/defconfig-akita b/packages/linux/linux-rp-2.6.24/defconfig-akita
index 32bfa9d..141be08 100644
--- a/packages/linux/linux-rp-2.6.24/defconfig-akita
+++ b/packages/linux/linux-rp-2.6.24/defconfig-akita
@@ -203,16 +203,16 @@ CONFIG_SHARP_SCOOP=y
#
# CONFIG_PCI_SYSCALL is not set
# CONFIG_ARCH_SUPPORTS_MSI is not set
-CONFIG_PCCARD=m
+CONFIG_PCCARD=y
# CONFIG_PCMCIA_DEBUG is not set
-CONFIG_PCMCIA=m
+CONFIG_PCMCIA=y
CONFIG_PCMCIA_LOAD_CIS=y
CONFIG_PCMCIA_IOCTL=y
#
# PC-card bridges
#
-CONFIG_PCMCIA_PXA2XX=m
+CONFIG_PCMCIA_PXA2XX=y
#
# Kernel Features
@@ -645,7 +645,7 @@ CONFIG_BLK_DEV_IDE=y
# CONFIG_BLK_DEV_IDE_SATA is not set
CONFIG_BLK_DEV_IDEDISK=y
# CONFIG_IDEDISK_MULTI_MODE is not set
-CONFIG_BLK_DEV_IDECS=m
+CONFIG_BLK_DEV_IDECS=y
# CONFIG_BLK_DEV_IDECD is not set
# CONFIG_BLK_DEV_IDETAPE is not set
# CONFIG_BLK_DEV_IDEFLOPPY is not set
@@ -1444,10 +1444,10 @@ CONFIG_RTC_DRV_SA1100=y
CONFIG_EXT2_FS=y
# CONFIG_EXT2_FS_XATTR is not set
# CONFIG_EXT2_FS_XIP is not set
-CONFIG_EXT3_FS=m
+CONFIG_EXT3_FS=y
# CONFIG_EXT3_FS_XATTR is not set
# CONFIG_EXT4DEV_FS is not set
-CONFIG_JBD=m
+CONFIG_JBD=y
# CONFIG_REISERFS_FS is not set
# CONFIG_JFS_FS is not set
# CONFIG_FS_POSIX_ACL is not set
diff --git a/packages/linux/linux-rp-2.6.24/defconfig-c7x0 b/packages/linux/linux-rp-2.6.24/defconfig-c7x0
index 4b54f9f..5abf790 100644
--- a/packages/linux/linux-rp-2.6.24/defconfig-c7x0
+++ b/packages/linux/linux-rp-2.6.24/defconfig-c7x0
@@ -205,16 +205,16 @@ CONFIG_SHARP_SCOOP=y
#
# CONFIG_PCI_SYSCALL is not set
# CONFIG_ARCH_SUPPORTS_MSI is not set
-CONFIG_PCCARD=m
+CONFIG_PCCARD=y
# CONFIG_PCMCIA_DEBUG is not set
-CONFIG_PCMCIA=m
+CONFIG_PCMCIA=y
CONFIG_PCMCIA_LOAD_CIS=y
CONFIG_PCMCIA_IOCTL=y
#
# PC-card bridges
#
-CONFIG_PCMCIA_PXA2XX=m
+CONFIG_PCMCIA_PXA2XX=y
#
# Kernel Features
@@ -661,7 +661,7 @@ CONFIG_BLK_DEV_IDE=y
# CONFIG_BLK_DEV_IDE_SATA is not set
CONFIG_BLK_DEV_IDEDISK=y
# CONFIG_IDEDISK_MULTI_MODE is not set
-CONFIG_BLK_DEV_IDECS=m
+CONFIG_BLK_DEV_IDECS=y
# CONFIG_BLK_DEV_IDECD is not set
# CONFIG_BLK_DEV_IDETAPE is not set
# CONFIG_BLK_DEV_IDEFLOPPY is not set
@@ -1450,10 +1450,10 @@ CONFIG_RTC_DRV_SA1100=y
CONFIG_EXT2_FS=y
# CONFIG_EXT2_FS_XATTR is not set
# CONFIG_EXT2_FS_XIP is not set
-CONFIG_EXT3_FS=m
+CONFIG_EXT3_FS=y
# CONFIG_EXT3_FS_XATTR is not set
# CONFIG_EXT4DEV_FS is not set
-CONFIG_JBD=m
+CONFIG_JBD=y
# CONFIG_REISERFS_FS is not set
# CONFIG_JFS_FS is not set
# CONFIG_FS_POSIX_ACL is not set
diff --git a/packages/linux/linux-rp-2.6.26/defconfig-akita b/packages/linux/linux-rp-2.6.26/defconfig-akita
index 0106fa5..a98dc48 100644
--- a/packages/linux/linux-rp-2.6.26/defconfig-akita
+++ b/packages/linux/linux-rp-2.6.26/defconfig-akita
@@ -203,16 +203,16 @@ CONFIG_SHARP_SCOOP=y
#
# CONFIG_PCI_SYSCALL is not set
# CONFIG_ARCH_SUPPORTS_MSI is not set
-CONFIG_PCCARD=m
+CONFIG_PCCARD=y
# CONFIG_PCMCIA_DEBUG is not set
-CONFIG_PCMCIA=m
+CONFIG_PCMCIA=y
CONFIG_PCMCIA_LOAD_CIS=y
CONFIG_PCMCIA_IOCTL=y
#
# PC-card bridges
#
-CONFIG_PCMCIA_PXA2XX=m
+CONFIG_PCMCIA_PXA2XX=y
#
# Kernel Features
@@ -646,7 +646,7 @@ CONFIG_BLK_DEV_IDE=y
# CONFIG_BLK_DEV_IDE_SATA is not set
CONFIG_BLK_DEV_IDEDISK=y
# CONFIG_IDEDISK_MULTI_MODE is not set
-CONFIG_BLK_DEV_IDECS=m
+CONFIG_BLK_DEV_IDECS=y
# CONFIG_BLK_DEV_IDECD is not set
# CONFIG_BLK_DEV_IDETAPE is not set
# CONFIG_BLK_DEV_IDEFLOPPY is not set
@@ -1445,10 +1445,10 @@ CONFIG_RTC_DRV_SA1100=y
CONFIG_EXT2_FS=y
# CONFIG_EXT2_FS_XATTR is not set
# CONFIG_EXT2_FS_XIP is not set
-CONFIG_EXT3_FS=m
+CONFIG_EXT3_FS=y
# CONFIG_EXT3_FS_XATTR is not set
# CONFIG_EXT4DEV_FS is not set
-CONFIG_JBD=m
+CONFIG_JBD=y
# CONFIG_REISERFS_FS is not set
# CONFIG_JFS_FS is not set
# CONFIG_FS_POSIX_ACL is not set
diff --git a/packages/linux/linux-rp-2.6.26/defconfig-c7x0 b/packages/linux/linux-rp-2.6.26/defconfig-c7x0
index b9b653c..380af6b 100644
--- a/packages/linux/linux-rp-2.6.26/defconfig-c7x0
+++ b/packages/linux/linux-rp-2.6.26/defconfig-c7x0
@@ -205,16 +205,16 @@ CONFIG_SHARP_SCOOP=y
#
# CONFIG_PCI_SYSCALL is not set
# CONFIG_ARCH_SUPPORTS_MSI is not set
-CONFIG_PCCARD=m
+CONFIG_PCCARD=y
# CONFIG_PCMCIA_DEBUG is not set
-CONFIG_PCMCIA=m
+CONFIG_PCMCIA=y
CONFIG_PCMCIA_LOAD_CIS=y
CONFIG_PCMCIA_IOCTL=y
#
# PC-card bridges
#
-CONFIG_PCMCIA_PXA2XX=m
+CONFIG_PCMCIA_PXA2XX=y
#
# Kernel Features
@@ -662,7 +662,7 @@ CONFIG_BLK_DEV_IDE=y
# CONFIG_BLK_DEV_IDE_SATA is not set
CONFIG_BLK_DEV_IDEDISK=y
# CONFIG_IDEDISK_MULTI_MODE is not set
-CONFIG_BLK_DEV_IDECS=m
+CONFIG_BLK_DEV_IDECS=y
# CONFIG_BLK_DEV_IDECD is not set
# CONFIG_BLK_DEV_IDETAPE is not set
# CONFIG_BLK_DEV_IDEFLOPPY is not set
@@ -1451,10 +1451,10 @@ CONFIG_RTC_DRV_SA1100=y
CONFIG_EXT2_FS=y
# CONFIG_EXT2_FS_XATTR is not set
# CONFIG_EXT2_FS_XIP is not set
-CONFIG_EXT3_FS=m
+CONFIG_EXT3_FS=y
# CONFIG_EXT3_FS_XATTR is not set
# CONFIG_EXT4DEV_FS is not set
-CONFIG_JBD=m
+CONFIG_JBD=y
# CONFIG_REISERFS_FS is not set
# CONFIG_JFS_FS is not set
# CONFIG_FS_POSIX_ACL is not set
diff --git a/packages/linux/linux-rp_2.6.24.bb b/packages/linux/linux-rp_2.6.24.bb
index 6bd53fb..a1ad351 100644
--- a/packages/linux/linux-rp_2.6.24.bb
+++ b/packages/linux/linux-rp_2.6.24.bb
@@ -1,6 +1,6 @@
require linux-rp.inc
-PR = "r18"
+PR = "r19"
DEFAULT_PREFERENCE = "-1"
DEFAULT_PREFERENCE_collie = "1"
diff --git a/packages/linux/linux-rp_2.6.26.bb b/packages/linux/linux-rp_2.6.26.bb
index 55161a2..7a6ee08 100644
--- a/packages/linux/linux-rp_2.6.26.bb
+++ b/packages/linux/linux-rp_2.6.26.bb
@@ -1,6 +1,6 @@
require linux-rp.inc
-PR = "r6"
+PR = "r7"
DEFAULT_PREFERENCE = "-1"
DEFAULT_PREFERENCE_qemuarm = "-1"
--
1.6.0.6
^ permalink raw reply related [flat|nested] 26+ messages in thread* [PATCH 12/14] zaurus-2.6.inc: modules fixes
2009-01-18 2:24 [PATCH 00/14] [RFC] kexecboot and implementation on Zaurus Andrea Adami
` (10 preceding siblings ...)
2009-01-18 2:24 ` [PATCH 11/14] linux-rp: update defconfigs for c7x0 and akita Andrea Adami
@ 2009-01-18 2:24 ` Andrea Adami
2009-01-18 8:50 ` Koen Kooi
2009-01-18 2:24 ` [PATCH 13/14] base-files: fix fstab for multiboot on Zaurus clamshells Andrea Adami
2009-01-18 2:24 ` [PATCH 14/14] zaurus-clamshell.inc: remove 16 bytes Sharp header Andrea Adami
13 siblings, 1 reply; 26+ messages in thread
From: Andrea Adami @ 2009-01-18 2:24 UTC (permalink / raw)
To: openembedded-devel
- only load snd-soc-*
- pcmcia and pxa2xx-cs are now built in kernel
---
conf/machine/include/zaurus-2.6.inc | 6 ++++--
1 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/conf/machine/include/zaurus-2.6.inc b/conf/machine/include/zaurus-2.6.inc
index 8adb3d5..089437d 100644
--- a/conf/machine/include/zaurus-2.6.inc
+++ b/conf/machine/include/zaurus-2.6.inc
@@ -31,8 +31,10 @@ MACHINE_FEATURES_append_akita = " usbhost "
MACHINE_FEATURES_append_spitz = " usbhost ext2 "
MACHINE_EXTRA_RDEPENDS = "zaurusd"
-MACHINE_EXTRA_RRECOMMENDS_c7x0 = "kernel-module-snd-soc-corgi kernel-module-pxa2xx-cs kernel-module-pcmcia"
-MACHINE_EXTRA_RRECOMMENDS_akita = "kernel-module-snd-soc-spitz kernel-module-pxa2xx-cs kernel-module-pcmcia"
+#MACHINE_EXTRA_RRECOMMENDS_c7x0 = "kernel-module-snd-soc-corgi kernel-module-pxa2xx-cs kernel-module-pcmcia"
+#MACHINE_EXTRA_RRECOMMENDS_akita = "kernel-module-snd-soc-spitz kernel-module-pxa2xx-cs kernel-module-pcmcia"
+MACHINE_EXTRA_RRECOMMENDS_c7x0 = "kernel-module-snd-soc-corgi"
+MACHINE_EXTRA_RRECOMMENDS_akita = "kernel-module-snd-soc-spitz"
MACHINE_EXTRA_RRECOMMENDS_spitz = "kernel-module-snd-soc-spitz"
MACHINE_EXTRA_RRECOMMENDS_poodle = "kernel-module-snd-soc-poodle kernel-module-pxa2xx-cs kernel-module-pcmcia"
MACHINE_EXTRA_RRECOMMENDS_collie = "kernel-module-locomo-spi kernel-module-sa1100-cs kernel-module-mmc-block \
--
1.6.0.6
^ permalink raw reply related [flat|nested] 26+ messages in thread* Re: [PATCH 12/14] zaurus-2.6.inc: modules fixes
2009-01-18 2:24 ` [PATCH 12/14] zaurus-2.6.inc: modules fixes Andrea Adami
@ 2009-01-18 8:50 ` Koen Kooi
2009-01-18 10:40 ` Andrea Adami
0 siblings, 1 reply; 26+ messages in thread
From: Koen Kooi @ 2009-01-18 8:50 UTC (permalink / raw)
To: openembedded-devel
On 18-01-09 03:24, Andrea Adami wrote:
> - only load snd-soc-*
> - pcmcia and pxa2xx-cs are now built in kernel
> ---
> conf/machine/include/zaurus-2.6.inc | 6 ++++--
> 1 files changed, 4 insertions(+), 2 deletions(-)
>
> diff --git a/conf/machine/include/zaurus-2.6.inc b/conf/machine/include/zaurus-2.6.inc
> index 8adb3d5..089437d 100644
> --- a/conf/machine/include/zaurus-2.6.inc
> +++ b/conf/machine/include/zaurus-2.6.inc
> @@ -31,8 +31,10 @@ MACHINE_FEATURES_append_akita = " usbhost "
> MACHINE_FEATURES_append_spitz = " usbhost ext2 "
>
> MACHINE_EXTRA_RDEPENDS = "zaurusd"
> -MACHINE_EXTRA_RRECOMMENDS_c7x0 = "kernel-module-snd-soc-corgi kernel-module-pxa2xx-cs kernel-module-pcmcia"
> -MACHINE_EXTRA_RRECOMMENDS_akita = "kernel-module-snd-soc-spitz kernel-module-pxa2xx-cs kernel-module-pcmcia"
> +#MACHINE_EXTRA_RRECOMMENDS_c7x0 = "kernel-module-snd-soc-corgi kernel-module-pxa2xx-cs kernel-module-pcmcia"
> +#MACHINE_EXTRA_RRECOMMENDS_akita = "kernel-module-snd-soc-spitz kernel-module-pxa2xx-cs kernel-module-pcmcia"
> +MACHINE_EXTRA_RRECOMMENDS_c7x0 = "kernel-module-snd-soc-corgi"
> +MACHINE_EXTRA_RRECOMMENDS_akita = "kernel-module-snd-soc-spitz"
> MACHINE_EXTRA_RRECOMMENDS_spitz = "kernel-module-snd-soc-spitz"
> MACHINE_EXTRA_RRECOMMENDS_poodle = "kernel-module-snd-soc-poodle kernel-module-pxa2xx-cs kernel-module-pcmcia"
> MACHINE_EXTRA_RRECOMMENDS_collie = "kernel-module-locomo-spi kernel-module-sa1100-cs kernel-module-mmc-block \
NACK, not every kernel has those built-in for those machines.
^ permalink raw reply [flat|nested] 26+ messages in thread
* [PATCH 13/14] base-files: fix fstab for multiboot on Zaurus clamshells
2009-01-18 2:24 [PATCH 00/14] [RFC] kexecboot and implementation on Zaurus Andrea Adami
` (11 preceding siblings ...)
2009-01-18 2:24 ` [PATCH 12/14] zaurus-2.6.inc: modules fixes Andrea Adami
@ 2009-01-18 2:24 ` Andrea Adami
2009-01-18 2:24 ` [PATCH 14/14] zaurus-clamshell.inc: remove 16 bytes Sharp header Andrea Adami
13 siblings, 0 replies; 26+ messages in thread
From: Andrea Adami @ 2009-01-18 2:24 UTC (permalink / raw)
To: openembedded-devel
- using kexecboot we have root and home on bootable media
---
packages/base-files/base-files/akita/fstab | 2 +-
packages/base-files/base-files/c7x0/fstab | 2 +-
packages/base-files/base-files/spitz/fstab | 4 ++--
3 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/packages/base-files/base-files/akita/fstab b/packages/base-files/base-files/akita/fstab
index 41f14a8..3b488cf 100644
--- a/packages/base-files/base-files/akita/fstab
+++ b/packages/base-files/base-files/akita/fstab
@@ -1,5 +1,5 @@
rootfs / auto defaults 1 1
-/dev/mtdblock3 /home jffs2 defaults,noatime 1 2
+#/dev/mtdblock3 /home jffs2 defaults,noatime 1 2
proc /proc proc defaults 0 0
/dev/hda1 /media/cf auto defaults,sync,noauto 0 0
diff --git a/packages/base-files/base-files/c7x0/fstab b/packages/base-files/base-files/c7x0/fstab
index ca93b03..ea38eab 100644
--- a/packages/base-files/base-files/c7x0/fstab
+++ b/packages/base-files/base-files/c7x0/fstab
@@ -1,5 +1,5 @@
rootfs / auto defaults 1 1
-/dev/mtdblock3 /home jffs2 defaults,noatime 1 2
+#/dev/mtdblock3 /home jffs2 defaults,noatime 1 2
proc /proc proc defaults 0 0
/dev/hda1 /media/cf auto defaults,sync,noauto 0 0
diff --git a/packages/base-files/base-files/spitz/fstab b/packages/base-files/base-files/spitz/fstab
index dc419e6..324fb78 100644
--- a/packages/base-files/base-files/spitz/fstab
+++ b/packages/base-files/base-files/spitz/fstab
@@ -26,5 +26,5 @@ usbfs /proc/bus/usb usbfs defaults 0 0
#
# Harddisk
#
-/dev/hda2 /home ext3 defaults 0 0
-/dev/hda3 /media/hdd vfat defaults 0 0
+##/dev/hda2 /home ext3 defaults 0 0
+##/dev/hda3 /media/hdd vfat defaults 0 0
--
1.6.0.6
^ permalink raw reply related [flat|nested] 26+ messages in thread* [PATCH 14/14] zaurus-clamshell.inc: remove 16 bytes Sharp header
2009-01-18 2:24 [PATCH 00/14] [RFC] kexecboot and implementation on Zaurus Andrea Adami
` (12 preceding siblings ...)
2009-01-18 2:24 ` [PATCH 13/14] base-files: fix fstab for multiboot on Zaurus clamshells Andrea Adami
@ 2009-01-18 2:24 ` Andrea Adami
13 siblings, 0 replies; 26+ messages in thread
From: Andrea Adami @ 2009-01-18 2:24 UTC (permalink / raw)
To: openembedded-devel
- updater.sh would refuse the kernel (size too big)
- we can flash using nandwrite /dev/mtd[2|3] img.bin
---
conf/machine/include/zaurus-clamshell.inc | 8 +++++---
1 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/conf/machine/include/zaurus-clamshell.inc b/conf/machine/include/zaurus-clamshell.inc
index 4fa9f75..0ac44f0 100644
--- a/conf/machine/include/zaurus-clamshell.inc
+++ b/conf/machine/include/zaurus-clamshell.inc
@@ -1,15 +1,17 @@
include conf/machine/include/tune-xscale.inc
-EXTRA_IMAGEDEPENDS += "sharp-flash-header-c700"
+#EXTRA_IMAGEDEPENDS += "sharp-flash-header-c700"
IMAGE_CMD_jffs2 = "mkfs.jffs2 --root=${IMAGE_ROOTFS} --faketime -m favourlzo \
--output=${T}/${IMAGE_NAME}.rootfs.jffs2 --pad --little-endian --eraseblock=${ERASEBLOCKSIZE} -n \
&& sumtool -i ${T}/${IMAGE_NAME}.rootfs.jffs2 \
-o ${T}/${IMAGE_NAME}.rootfs.jffs2.summary \
--eraseblock=${ERASEBLOCKSIZE} -l -p; \
- cat ${STAGING_LIBDIR}/sharp-flash-header/header-c700.bin \
+# cat ${STAGING_LIBDIR}/sharp-flash-header/header-c700.bin \
+ cat \
${T}/${IMAGE_NAME}.rootfs.jffs2 > ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.jffs2; \
rm ${T}/${IMAGE_NAME}.rootfs.jffs2; \
- cat ${STAGING_LIBDIR}/sharp-flash-header/header-c700.bin \
+# cat ${STAGING_LIBDIR}/sharp-flash-header/header-c700.bin \
+ cat \
${T}/${IMAGE_NAME}.rootfs.jffs2.summary > ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.summary.jffs2; \
rm ${T}/${IMAGE_NAME}.rootfs.jffs2.summary;"
--
1.6.0.6
^ permalink raw reply related [flat|nested] 26+ messages in thread