diff options
| -rw-r--r-- | conf/machine/gcw0.conf | 7 | ||||
| -rw-r--r-- | recipes-kernel/linux/linux-gcw0-3.12/gcw0/defconfig | 1 | ||||
| -rw-r--r-- | recipes-kernel/linux/linux-gcw0-kexecboot-3.12/gcw0/defconfig | 2 | ||||
| -rw-r--r-- | recipes-kernel/linux/linux-gcw0-kexecboot_3.12.bb | 3 |
4 files changed, 11 insertions, 2 deletions
diff --git a/conf/machine/gcw0.conf b/conf/machine/gcw0.conf index 801f634..e1cfa1d 100644 --- a/conf/machine/gcw0.conf +++ b/conf/machine/gcw0.conf @@ -9,9 +9,14 @@ require conf/machine/include/tune-mips32r2.inc # IMAGE_FEATURES += "read-only-rootfs" IMAGE_FSTYPES ?= "tar.gz squashfs squashfs-xz" +INITRAMFS_FSTYPES = "cpio.gz cpio.xz" + PREFERRED_PROVIDER_virtual/kernel = "linux-gcw0" -KERNEL_IMAGETYPE = "vmlinuz.bin" +# ELF for kexec (kernel to be put in /boot) +KERNEL_IMAGETYPE = "vmlinuz" +# RAW for ubiboot (only for linux-gcw0-kexecboot) +#KERNEL_IMAGETYPE = "vmlinuz.bin" KERNEL_OUTPUT = "${KERNEL_IMAGETYPE}" MACHINE_GUI_CLASS = "smallscreen" diff --git a/recipes-kernel/linux/linux-gcw0-3.12/gcw0/defconfig b/recipes-kernel/linux/linux-gcw0-3.12/gcw0/defconfig index a2a0db4..70f6f41 100644 --- a/recipes-kernel/linux/linux-gcw0-3.12/gcw0/defconfig +++ b/recipes-kernel/linux/linux-gcw0-3.12/gcw0/defconfig @@ -4,6 +4,7 @@ CONFIG_HIGHMEM=y # CONFIG_COMPACTION is not set # CONFIG_CROSS_MEMORY_ATTACH is not set CONFIG_PREEMPT_VOLUNTARY=y +CONFIG_KEXEC=y # CONFIG_SECCOMP is not set CONFIG_LOCALVERSION="-dingux" CONFIG_DEFAULT_HOSTNAME="gcw-zero" diff --git a/recipes-kernel/linux/linux-gcw0-kexecboot-3.12/gcw0/defconfig b/recipes-kernel/linux/linux-gcw0-kexecboot-3.12/gcw0/defconfig index ca4b4be..e5c5d7e 100644 --- a/recipes-kernel/linux/linux-gcw0-kexecboot-3.12/gcw0/defconfig +++ b/recipes-kernel/linux/linux-gcw0-kexecboot-3.12/gcw0/defconfig @@ -203,7 +203,7 @@ CONFIG_NLS_UTF8=y # CONFIG_SCHED_DEBUG is not set # CONFIG_FTRACE is not set CONFIG_CMDLINE_BOOL=y -CONFIG_CMDLINE="panic=5 rdinit=/usr/bin/kexecboot console=ttyS2,57600 console=tty0 rfkill.default_state=0" +CONFIG_CMDLINE="panic=55 rdinit=/usr/bin/kexecboot console=ttyS2,57600 console=tty0 rfkill.default_state=0" # CONFIG_CRYPTO_ANSI_CPRNG is not set # CONFIG_CRYPTO_HW is not set CONFIG_FONTS=y diff --git a/recipes-kernel/linux/linux-gcw0-kexecboot_3.12.bb b/recipes-kernel/linux/linux-gcw0-kexecboot_3.12.bb index 5094035..45a18c0 100644 --- a/recipes-kernel/linux/linux-gcw0-kexecboot_3.12.bb +++ b/recipes-kernel/linux/linux-gcw0-kexecboot_3.12.bb @@ -7,6 +7,9 @@ PROVIDES = "" KERNEL_IMAGE_BASE_NAME = "${KERNEL_IMAGETYPE}-gcw0-kexecboot-${PV}-${MACHINE}" KERNEL_IMAGE_SYMLINK_NAME = "${KERNEL_IMAGETYPE}-gcw0-kexecboot-${MACHINE}" +# RAW for ubiboot +KERNEL_IMAGETYPE = "vmlinuz.bin" + INITRAMFS_IMAGE = "initramfs-kexecboot-klibc-image" INITRAMFS_TASK = "${INITRAMFS_IMAGE}:do_rootfs" |