From 28de1eb77fd0e1e71075edd7facb65173ebe81cb Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Tue, 26 Jun 2007 16:39:28 +0000 Subject: [PATCH] linux-rp: Add qemuarm scsi fix/workaround, set default qemu ramdisk to reasonable size, adjust qemuarm kernel commandline git-svn-id: https://svn.o-hand.com/repos/poky/trunk@2010 311d38ba-8fff-0310-9ca6-ca027cbcb966 --- meta/packages/linux/linux-rp-2.6.20/defconfig-qemuarm | 2 +- meta/packages/linux/linux-rp-2.6.20/defconfig-qemux86 | 7 +++++-- meta/packages/linux/linux-rp-2.6.21/defconfig-qemuarm | 2 +- meta/packages/linux/linux-rp-2.6.21/defconfig-qemux86 | 5 ++++- meta/packages/linux/linux-rp.inc | 1 + meta/packages/linux/linux-rp_2.6.21.bb | 3 ++- 6 files changed, 14 insertions(+), 6 deletions(-) diff --git a/meta/packages/linux/linux-rp-2.6.20/defconfig-qemuarm b/meta/packages/linux/linux-rp-2.6.20/defconfig-qemuarm index e34fe5c..d381e8b 100644 --- a/meta/packages/linux/linux-rp-2.6.20/defconfig-qemuarm +++ b/meta/packages/linux/linux-rp-2.6.20/defconfig-qemuarm @@ -415,7 +415,7 @@ CONFIG_BLK_DEV_LOOP=y # CONFIG_BLK_DEV_UB is not set CONFIG_BLK_DEV_RAM=y CONFIG_BLK_DEV_RAM_COUNT=16 -CONFIG_BLK_DEV_RAM_SIZE=8192 +CONFIG_BLK_DEV_RAM_SIZE=51200 CONFIG_BLK_DEV_INITRD=y # CONFIG_CDROM_PKTCDVD is not set # CONFIG_ATA_OVER_ETH is not set diff --git a/meta/packages/linux/linux-rp-2.6.20/defconfig-qemux86 b/meta/packages/linux/linux-rp-2.6.20/defconfig-qemux86 index 6fe2809..85b84cb 100644 --- a/meta/packages/linux/linux-rp-2.6.20/defconfig-qemux86 +++ b/meta/packages/linux/linux-rp-2.6.20/defconfig-qemux86 @@ -428,8 +428,11 @@ CONFIG_BLK_DEV_FD=y # CONFIG_BLK_DEV_NBD is not set # CONFIG_BLK_DEV_SX8 is not set # CONFIG_BLK_DEV_UB is not set -# CONFIG_BLK_DEV_RAM is not set -# CONFIG_BLK_DEV_INITRD is not set +CONFIG_BLK_DEV_RAM=y +CONFIG_BLK_DEV_RAM_COUNT=16 +CONFIG_BLK_DEV_RAM_SIZE=8192 +CONFIG_BLK_DEV_RAM_SIZE=51200 +CONFIG_BLK_DEV_INITRD=y # CONFIG_CDROM_PKTCDVD is not set # CONFIG_ATA_OVER_ETH is not set diff --git a/meta/packages/linux/linux-rp-2.6.21/defconfig-qemuarm b/meta/packages/linux/linux-rp-2.6.21/defconfig-qemuarm index e34fe5c..d381e8b 100644 --- a/meta/packages/linux/linux-rp-2.6.21/defconfig-qemuarm +++ b/meta/packages/linux/linux-rp-2.6.21/defconfig-qemuarm @@ -415,7 +415,7 @@ CONFIG_BLK_DEV_LOOP=y # CONFIG_BLK_DEV_UB is not set CONFIG_BLK_DEV_RAM=y CONFIG_BLK_DEV_RAM_COUNT=16 -CONFIG_BLK_DEV_RAM_SIZE=8192 +CONFIG_BLK_DEV_RAM_SIZE=51200 CONFIG_BLK_DEV_INITRD=y # CONFIG_CDROM_PKTCDVD is not set # CONFIG_ATA_OVER_ETH is not set diff --git a/meta/packages/linux/linux-rp-2.6.21/defconfig-qemux86 b/meta/packages/linux/linux-rp-2.6.21/defconfig-qemux86 index 6fe2809..b6b84aa 100644 --- a/meta/packages/linux/linux-rp-2.6.21/defconfig-qemux86 +++ b/meta/packages/linux/linux-rp-2.6.21/defconfig-qemux86 @@ -429,7 +429,10 @@ CONFIG_BLK_DEV_FD=y # CONFIG_BLK_DEV_SX8 is not set # CONFIG_BLK_DEV_UB is not set # CONFIG_BLK_DEV_RAM is not set -# CONFIG_BLK_DEV_INITRD is not set +CONFIG_BLK_DEV_RAM=y +CONFIG_BLK_DEV_RAM_COUNT=16 +CONFIG_BLK_DEV_RAM_SIZE=51200 +CONFIG_BLK_DEV_INITRD=y # CONFIG_CDROM_PKTCDVD is not set # CONFIG_ATA_OVER_ETH is not set diff --git a/meta/packages/linux/linux-rp.inc b/meta/packages/linux/linux-rp.inc index 4d97a70..5d4e3b7 100644 --- a/meta/packages/linux/linux-rp.inc +++ b/meta/packages/linux/linux-rp.inc @@ -27,6 +27,7 @@ KERNEL_IMAGETYPE_qemux86 = "bzImage" KERNEL_IMAGETYPE_bootcdx86 = "bzImage" CMDLINE_CON = "console=ttyS0,115200n8 console=tty1 noinitrd" +CMDLINE_CON_qemuarm = "console=ttyAMA0,115200n8 console=tty1 noinitrd" CMDLINE_ROOT = "root=/dev/mtdblock2 rootfstype=jffs2" CMDLINE_ROOT_spitz = "root=/dev/hda1 rootfstype=ext3 rootdelay=1 rw" CMDLINE_OTHER = "dyntick=enable" diff --git a/meta/packages/linux/linux-rp_2.6.21.bb b/meta/packages/linux/linux-rp_2.6.21.bb index 8fb46ee..2bdb022 100644 --- a/meta/packages/linux/linux-rp_2.6.21.bb +++ b/meta/packages/linux/linux-rp_2.6.21.bb @@ -1,6 +1,6 @@ require linux-rp.inc -PR = "r3" +PR = "r4" # Handy URLs # git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git;protocol=git;tag=ef7d1b244fa6c94fb76d5f787b8629df64ea4046 @@ -37,6 +37,7 @@ SRC_URI = "http://www.kernel.org/pub/linux/kernel/v2.6/linux-2.6.21.tar.bz2 \ ${RPSRC}/pxa27x_overlay-r5.patch;patch=1 \ ${RPSRC}/w100_extaccel-r0.patch;patch=1 \ ${RPSRC}/asoc_fix_typo-r0.patch;patch=1 \ + ${RPSRC}/qemuarm_scsi_fix-r0.patch;patch=1 \ file://hostap-monitor-mode.patch;patch=1 \ file://serial-add-support-for-non-standard-xtals-to-16c950-driver.patch;patch=1 \ ${RPSRC}/logo_oh-r0.patch.bz2;patch=1;status=unmergable \ -- 2.7.4