diff options
| author | Philipp Zabel <philipp.zabel@gmail.com> | 2007-02-08 11:44:06 +0000 |
|---|---|---|
| committer | Philipp Zabel <philipp.zabel@gmail.com> | 2007-02-08 11:44:06 +0000 |
| commit | b27b36c41fb203aff008cd35a37bb3f4ef1a0ed2 (patch) | |
| tree | 4c874aef6e084a8bf579b05de86443ff7d7c1944 /conf | |
| parent | 9f8c8ce6db7bb1ae55636b85cef0698656b5aa9c (diff) | |
| parent | 94f17152702e554ed343d673cf75de800860361a (diff) | |
merge of '34b95284d8caffb64aa40f9e36e92e2c5950ba26'
and 'e29bb666531e645143bf0e0a07e299be93d1ce1a'
Diffstat (limited to 'conf')
| -rw-r--r-- | conf/machine/h5000.conf | 4 | ||||
| -rw-r--r-- | conf/machine/include/zaurus-clamshell.conf | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/conf/machine/h5000.conf b/conf/machine/h5000.conf index ecc2e679d9..8645df3555 100644 --- a/conf/machine/h5000.conf +++ b/conf/machine/h5000.conf @@ -23,8 +23,8 @@ PREFERRED_PROVIDER_xserver = "xserver-kdrive" EXTRA_IMAGECMD_jffs2 = "-e 0x40000 -p ; echo '${IMAGE_NAME} ${IMAGE_NAME}.rootfs.jffs2 - root' >> ${DEPLOY_DIR_IMAGE}/reflash.ctl" MACHINE_EXTRA_RDEPENDS = "kernel ipaq-boot-params" -MACHINE_EXTRA_RRECOMMENDS = " kernel-module-h5400_lcd \ - kernel-module-h5400_battery" +MACHINE_EXTRA_RRECOMMENDS = " kernel-module-h5400-lcd \ + kernel-module-h5400-battery" # # Modules autoload and other boot properties diff --git a/conf/machine/include/zaurus-clamshell.conf b/conf/machine/include/zaurus-clamshell.conf index 5e51566484..93325d253b 100644 --- a/conf/machine/include/zaurus-clamshell.conf +++ b/conf/machine/include/zaurus-clamshell.conf @@ -9,5 +9,5 @@ IMAGE_CMD_jffs2 = "mkfs.jffs2 --root=${IMAGE_ROOTFS} --faketime \ ${T}/${IMAGE_NAME}.rootfs.jffs2 > ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.jffs2; \ rm ${T}/${IMAGE_NAME}.rootfs.jffs2; \ cat ${STAGING_LIBDIR}/sharp-flash-header/header-c700.bin \ - ${T}/${IMAGE_NAME}.rootfs.jffs2.summary > ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.summary.jffs2 \ + ${T}/${IMAGE_NAME}.rootfs.jffs2.summary > ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.summary.jffs2; \ rm ${T}/${IMAGE_NAME}.rootfs.jffs2.summary;" |