summaryrefslogtreecommitdiff
path: root/packages
diff options
context:
space:
mode:
authorDaniel Willmann <daniel@totalueberwachung.de>2008-01-17 23:22:21 +0000
committerDaniel Willmann <daniel@totalueberwachung.de>2008-01-17 23:22:21 +0000
commit5a47ec1835998c7c02a8397a043a83e7fc010096 (patch)
treeabacc6d20e7fb5748a039876242a84d3ac0bb5e2 /packages
parent1d9c29e807e87cca8690d1a6515ae03dc2eeb779 (diff)
chumby-kernel: Ignore cmdline from bootloader since we can't change it
(This is needed to ignore rootfstype=cramfs passed by the bootloader) chumby.conf: Add options for jffs2 generation
Diffstat (limited to 'packages')
-rw-r--r--packages/linux/chumby-kernel/chumby-override-cmdline.patch13
-rw-r--r--packages/linux/chumby-kernel/defconfig14
-rw-r--r--packages/linux/chumby-kernel_2.6.16-chumby-1.2.bb12
3 files changed, 30 insertions, 9 deletions
diff --git a/packages/linux/chumby-kernel/chumby-override-cmdline.patch b/packages/linux/chumby-kernel/chumby-override-cmdline.patch
new file mode 100644
index 0000000000..4ff29f9007
--- /dev/null
+++ b/packages/linux/chumby-kernel/chumby-override-cmdline.patch
@@ -0,0 +1,13 @@
+Index: linux-2.6.16/arch/arm/kernel/setup.c
+===================================================================
+--- linux-2.6.16.orig/arch/arm/kernel/setup.c 2008-01-17 21:49:50.000000000 +0100
++++ linux-2.6.16/arch/arm/kernel/setup.c 2008-01-17 22:20:40.000000000 +0100
+@@ -660,7 +660,7 @@
+
+ static int __init parse_tag_cmdline(const struct tag *tag)
+ {
+- strlcpy(default_command_line, tag->u.cmdline.cmdline, COMMAND_LINE_SIZE);
++ //strlcpy(default_command_line, tag->u.cmdline.cmdline, COMMAND_LINE_SIZE);
+ return 0;
+ }
+
diff --git a/packages/linux/chumby-kernel/defconfig b/packages/linux/chumby-kernel/defconfig
index 0fa62db9f8..db836c1561 100644
--- a/packages/linux/chumby-kernel/defconfig
+++ b/packages/linux/chumby-kernel/defconfig
@@ -766,7 +766,7 @@ CONFIG_FB_IMX=y
#
# CONFIG_VGA_CONSOLE is not set
CONFIG_DUMMY_CONSOLE=y
-CONFIG_FRAMEBUFFER_CONSOLE=m
+CONFIG_FRAMEBUFFER_CONSOLE=y
CONFIG_FRAMEBUFFER_CONSOLE_ROTATION=y
CONFIG_FONTS=y
CONFIG_FONT_8x8=y
@@ -783,8 +783,8 @@ CONFIG_FONT_MINI_4x6=y
#
# Logo configuration
#
-CONFIG_LOGO=y
-CONFIG_LOGO_LINUX_MONO=y
+# CONFIG_LOGO is not set
+# CONFIG_LOGO_LINUX_MONO is not set
# CONFIG_LOGO_LINUX_VGA16 is not set
# CONFIG_LOGO_LINUX_CLUT224 is not set
# CONFIG_LOGO_TURBOCHEF_CLUT224 is not set
@@ -895,7 +895,7 @@ CONFIG_USB_LIBUSUAL=y
#
# USB Input Devices
#
-CONFIG_USB_HID=m
+CONFIG_USB_HID=y
CONFIG_USB_HIDINPUT=y
# CONFIG_USB_HIDINPUT_POWERBOOK is not set
# CONFIG_HID_FF is not set
@@ -1033,9 +1033,9 @@ CONFIG_UDF_NLS=y
#
# DOS/FAT/NT Filesystems
#
-CONFIG_FAT_FS=y
-CONFIG_MSDOS_FS=y
-CONFIG_VFAT_FS=y
+CONFIG_FAT_FS=m
+CONFIG_MSDOS_FS=m
+CONFIG_VFAT_FS=m
CONFIG_FAT_DEFAULT_CODEPAGE=437
CONFIG_FAT_DEFAULT_IOCHARSET="iso8859-1"
# CONFIG_NTFS_FS is not set
diff --git a/packages/linux/chumby-kernel_2.6.16-chumby-1.2.bb b/packages/linux/chumby-kernel_2.6.16-chumby-1.2.bb
index d85f001c78..89546e0bf9 100644
--- a/packages/linux/chumby-kernel_2.6.16-chumby-1.2.bb
+++ b/packages/linux/chumby-kernel_2.6.16-chumby-1.2.bb
@@ -3,10 +3,11 @@ require linux.inc
SECTION = "kernel"
DESCRIPTION = "Linux kernel for the Chumby"
LICENSE = "GPL"
-PR = "r2"
+PR = "r3"
SRC_URI = "http://files.chumby.com/source/ironforge/build396/linux-2.6.16-chumby-1.2.tar.gz \
http://files.chumby.com/source/ironforge/build396/align.pl \
+ file://chumby-override-cmdline.patch;patch=1 \
file://defconfig \
"
@@ -21,10 +22,17 @@ ARCH = "arm"
#CMDLINE_ROOT = "root=/dev/ram0 rw rootfstype=ext2,jffs2 initrd=0x01000000,10M init=/linuxrc mem=32M@0x00000000"
#CMDLINE_ROOT = "root=/dev/mtdblock2 rootfstype=jffs2 console=ttyS0,115200 mem=64M"
#CMDLINE = "${CMDLINE_ROOT} ${CMDLINE_CONSOLE}"
-#CMDLINE = "console=ttyS0,38400 root=/dev/mtdblock5 rootfstype=cramfs psplash=false"
+CMDLINE = "console=ttyS0,38400 root=/dev/mtdblock5 rootfstype=jffs2 psplash=false"
COMPATIBLE_MACHINE = "chumby"
+module_autoload_chumby_accel = "chumby_accel"
+module_autoload_chumby_emma = "chumby_emma"
+module_autoload_chumby_sense1 = "chumby_sense1"
+module_autoload_chumby_timer = "chumby_timer"
+module_autoload_chumby_udma = "chumby_udma"
+module_autoload_chumby-tsc2100 = "chumby-tsc2100"
+
do_deploy_prepend() {
perl ../align.pl arch/arm/boot/zImage
}