diff options
| author | OpenEmbedded Project <openembedded-devel@lists.openembedded.org> | 2008-02-21 23:33:58 +0000 |
|---|---|---|
| committer | OpenEmbedded Project <openembedded-devel@lists.openembedded.org> | 2008-02-21 23:33:58 +0000 |
| commit | ef4e691479b47bf34d0816ddf063c2e282182880 (patch) | |
| tree | a88bf3cf10e5b3031a821ba2cb61ff2e88e22a5f | |
| parent | 25d8d3285f2bce8a6d63f9f3a1e7aca2a4a55a25 (diff) | |
| parent | 355bcc65fe217907a468c2754f85639109a59ff7 (diff) | |
merge of '135f1243bae7b8d2761f12a5ee4792c0fdd61cd7'
and '4eb5b005a1da43a766a4d6f77af48d3ba0a994a4'
| -rw-r--r-- | classes/kernel.bbclass | 2 | ||||
| -rw-r--r-- | packages/ipaq-boot-params/files/h5000/params | 2 | ||||
| -rw-r--r-- | packages/ipaq-boot-params/files/params | 2 | ||||
| -rw-r--r-- | packages/ipaq-boot-params/ipaq-boot-params.bb | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/classes/kernel.bbclass b/classes/kernel.bbclass index 1e325323df..459c553ffe 100644 --- a/classes/kernel.bbclass +++ b/classes/kernel.bbclass @@ -70,7 +70,7 @@ INITRAMFS_IMAGE_TARGET ?= "initramfs-image" do_builtin_initramfs() { unset CFLAGS CPPFLAGS CXXFLAGS LDFLAGS MACHINE - cp "${DEPLOY_DIR_IMAME}/${INITRAMFS_SYMLINK_NAME}" usr/initramfs_data.cpio.gz + cp "${DEPLOY_DIR_IMAGE}/${INITRAMFS_SYMLINK_NAME}" usr/initramfs_data.cpio.gz oe_runmake ${KERNEL_IMAGETYPE} CC="${KERNEL_CC}" LD="${KERNEL_LD}" install -d ${DEPLOY_DIR_IMAGE} install -m 0644 ${KERNEL_OUTPUT} ${DEPLOY_DIR_IMAGE}/${KERNEL_IMAGE_BASE_NAME}-initramfs.bin diff --git a/packages/ipaq-boot-params/files/h5000/params b/packages/ipaq-boot-params/files/h5000/params index a1a1f4e6e9..fb42935fd5 100644 --- a/packages/ipaq-boot-params/files/h5000/params +++ b/packages/ipaq-boot-params/files/h5000/params @@ -1 +1 @@ -set linuxargs "root=/dev/mtdblock1 noinitrd console=tty0 console=ttyS0,115200" +set linuxargs "root=mtd1 noinitrd console=ttyS0,115200 console=tty0" diff --git a/packages/ipaq-boot-params/files/params b/packages/ipaq-boot-params/files/params index a1a1f4e6e9..fb42935fd5 100644 --- a/packages/ipaq-boot-params/files/params +++ b/packages/ipaq-boot-params/files/params @@ -1 +1 @@ -set linuxargs "root=/dev/mtdblock1 noinitrd console=tty0 console=ttyS0,115200" +set linuxargs "root=mtd1 noinitrd console=ttyS0,115200 console=tty0" diff --git a/packages/ipaq-boot-params/ipaq-boot-params.bb b/packages/ipaq-boot-params/ipaq-boot-params.bb index 7b73df1d34..216811ab56 100644 --- a/packages/ipaq-boot-params/ipaq-boot-params.bb +++ b/packages/ipaq-boot-params/ipaq-boot-params.bb @@ -1,6 +1,6 @@ DESCRIPTION = "Kernel boot parameters for HH.org bootldr" LICENSE = "MIT" -PR = "r4" +PR = "r5" COMPATIBLE_MACHINE = "(h3600|h3800|h3900|h5000|simpad)" |