diff options
Diffstat (limited to 'meta/packages')
-rw-r--r-- | meta/packages/linux/linux-rp-2.6.20/defconfig-qemuarm | 2 | ||||
-rw-r--r-- | meta/packages/linux/linux-rp-2.6.20/defconfig-qemux86 | 7 | ||||
-rw-r--r-- | meta/packages/linux/linux-rp-2.6.21/defconfig-qemuarm | 2 | ||||
-rw-r--r-- | meta/packages/linux/linux-rp-2.6.21/defconfig-qemux86 | 5 | ||||
-rw-r--r-- | meta/packages/linux/linux-rp.inc | 1 | ||||
-rw-r--r-- | 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 e34fe5c090..d381e8b380 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 | |||
415 | # CONFIG_BLK_DEV_UB is not set | 415 | # CONFIG_BLK_DEV_UB is not set |
416 | CONFIG_BLK_DEV_RAM=y | 416 | CONFIG_BLK_DEV_RAM=y |
417 | CONFIG_BLK_DEV_RAM_COUNT=16 | 417 | CONFIG_BLK_DEV_RAM_COUNT=16 |
418 | CONFIG_BLK_DEV_RAM_SIZE=8192 | 418 | CONFIG_BLK_DEV_RAM_SIZE=51200 |
419 | CONFIG_BLK_DEV_INITRD=y | 419 | CONFIG_BLK_DEV_INITRD=y |
420 | # CONFIG_CDROM_PKTCDVD is not set | 420 | # CONFIG_CDROM_PKTCDVD is not set |
421 | # CONFIG_ATA_OVER_ETH is not set | 421 | # 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 6fe280985f..85b84cb69b 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 | |||
428 | # CONFIG_BLK_DEV_NBD is not set | 428 | # CONFIG_BLK_DEV_NBD is not set |
429 | # CONFIG_BLK_DEV_SX8 is not set | 429 | # CONFIG_BLK_DEV_SX8 is not set |
430 | # CONFIG_BLK_DEV_UB is not set | 430 | # CONFIG_BLK_DEV_UB is not set |
431 | # CONFIG_BLK_DEV_RAM is not set | 431 | CONFIG_BLK_DEV_RAM=y |
432 | # CONFIG_BLK_DEV_INITRD is not set | 432 | CONFIG_BLK_DEV_RAM_COUNT=16 |
433 | CONFIG_BLK_DEV_RAM_SIZE=8192 | ||
434 | CONFIG_BLK_DEV_RAM_SIZE=51200 | ||
435 | CONFIG_BLK_DEV_INITRD=y | ||
433 | # CONFIG_CDROM_PKTCDVD is not set | 436 | # CONFIG_CDROM_PKTCDVD is not set |
434 | # CONFIG_ATA_OVER_ETH is not set | 437 | # CONFIG_ATA_OVER_ETH is not set |
435 | 438 | ||
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 e34fe5c090..d381e8b380 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 | |||
415 | # CONFIG_BLK_DEV_UB is not set | 415 | # CONFIG_BLK_DEV_UB is not set |
416 | CONFIG_BLK_DEV_RAM=y | 416 | CONFIG_BLK_DEV_RAM=y |
417 | CONFIG_BLK_DEV_RAM_COUNT=16 | 417 | CONFIG_BLK_DEV_RAM_COUNT=16 |
418 | CONFIG_BLK_DEV_RAM_SIZE=8192 | 418 | CONFIG_BLK_DEV_RAM_SIZE=51200 |
419 | CONFIG_BLK_DEV_INITRD=y | 419 | CONFIG_BLK_DEV_INITRD=y |
420 | # CONFIG_CDROM_PKTCDVD is not set | 420 | # CONFIG_CDROM_PKTCDVD is not set |
421 | # CONFIG_ATA_OVER_ETH is not set | 421 | # 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 6fe280985f..b6b84aa872 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 | |||
429 | # CONFIG_BLK_DEV_SX8 is not set | 429 | # CONFIG_BLK_DEV_SX8 is not set |
430 | # CONFIG_BLK_DEV_UB is not set | 430 | # CONFIG_BLK_DEV_UB is not set |
431 | # CONFIG_BLK_DEV_RAM is not set | 431 | # CONFIG_BLK_DEV_RAM is not set |
432 | # CONFIG_BLK_DEV_INITRD is not set | 432 | CONFIG_BLK_DEV_RAM=y |
433 | CONFIG_BLK_DEV_RAM_COUNT=16 | ||
434 | CONFIG_BLK_DEV_RAM_SIZE=51200 | ||
435 | CONFIG_BLK_DEV_INITRD=y | ||
433 | # CONFIG_CDROM_PKTCDVD is not set | 436 | # CONFIG_CDROM_PKTCDVD is not set |
434 | # CONFIG_ATA_OVER_ETH is not set | 437 | # CONFIG_ATA_OVER_ETH is not set |
435 | 438 | ||
diff --git a/meta/packages/linux/linux-rp.inc b/meta/packages/linux/linux-rp.inc index 4d97a7047e..5d4e3b79e1 100644 --- a/meta/packages/linux/linux-rp.inc +++ b/meta/packages/linux/linux-rp.inc | |||
@@ -27,6 +27,7 @@ KERNEL_IMAGETYPE_qemux86 = "bzImage" | |||
27 | KERNEL_IMAGETYPE_bootcdx86 = "bzImage" | 27 | KERNEL_IMAGETYPE_bootcdx86 = "bzImage" |
28 | 28 | ||
29 | CMDLINE_CON = "console=ttyS0,115200n8 console=tty1 noinitrd" | 29 | CMDLINE_CON = "console=ttyS0,115200n8 console=tty1 noinitrd" |
30 | CMDLINE_CON_qemuarm = "console=ttyAMA0,115200n8 console=tty1 noinitrd" | ||
30 | CMDLINE_ROOT = "root=/dev/mtdblock2 rootfstype=jffs2" | 31 | CMDLINE_ROOT = "root=/dev/mtdblock2 rootfstype=jffs2" |
31 | CMDLINE_ROOT_spitz = "root=/dev/hda1 rootfstype=ext3 rootdelay=1 rw" | 32 | CMDLINE_ROOT_spitz = "root=/dev/hda1 rootfstype=ext3 rootdelay=1 rw" |
32 | CMDLINE_OTHER = "dyntick=enable" | 33 | 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 8fb46eef46..2bdb022e56 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 @@ | |||
1 | require linux-rp.inc | 1 | require linux-rp.inc |
2 | 2 | ||
3 | PR = "r3" | 3 | PR = "r4" |
4 | 4 | ||
5 | # Handy URLs | 5 | # Handy URLs |
6 | # git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git;protocol=git;tag=ef7d1b244fa6c94fb76d5f787b8629df64ea4046 | 6 | # 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 \ | |||
37 | ${RPSRC}/pxa27x_overlay-r5.patch;patch=1 \ | 37 | ${RPSRC}/pxa27x_overlay-r5.patch;patch=1 \ |
38 | ${RPSRC}/w100_extaccel-r0.patch;patch=1 \ | 38 | ${RPSRC}/w100_extaccel-r0.patch;patch=1 \ |
39 | ${RPSRC}/asoc_fix_typo-r0.patch;patch=1 \ | 39 | ${RPSRC}/asoc_fix_typo-r0.patch;patch=1 \ |
40 | ${RPSRC}/qemuarm_scsi_fix-r0.patch;patch=1 \ | ||
40 | file://hostap-monitor-mode.patch;patch=1 \ | 41 | file://hostap-monitor-mode.patch;patch=1 \ |
41 | file://serial-add-support-for-non-standard-xtals-to-16c950-driver.patch;patch=1 \ | 42 | file://serial-add-support-for-non-standard-xtals-to-16c950-driver.patch;patch=1 \ |
42 | ${RPSRC}/logo_oh-r0.patch.bz2;patch=1;status=unmergable \ | 43 | ${RPSRC}/logo_oh-r0.patch.bz2;patch=1;status=unmergable \ |