diff options
| author | Paul Sokolovsky <pmiscml@gmail.com> | 2007-12-15 22:40:53 +0000 |
|---|---|---|
| committer | Paul Sokolovsky <pmiscml@gmail.com> | 2007-12-15 22:40:53 +0000 |
| commit | c78ae6dfcdb274326a7ee8b2bf2db0c2132cd334 (patch) | |
| tree | ac6468cb0c44a17c49b4397e2be21761760cdbc0 | |
| parent | ed5dd718ef6bf4e32c091dc4663ad65b18880465 (diff) | |
| parent | 4e8136255b37ef73e1e513edfee977e8d93db235 (diff) | |
merge of '0d28663b1cddb7ffeb3f2c43b300935b7b432b98'
and '673818154cbb2b32a756188c27a827021f5d81f5'
| -rw-r--r-- | conf/machine/hx4700.conf | 20 | ||||
| -rw-r--r-- | conf/machine/magician.conf | 17 |
2 files changed, 16 insertions, 21 deletions
diff --git a/conf/machine/hx4700.conf b/conf/machine/hx4700.conf index daa74866b2..ce8aab0d84 100644 --- a/conf/machine/hx4700.conf +++ b/conf/machine/hx4700.conf @@ -1,5 +1,5 @@ #@TYPE: Machine -#@NAME: iPAQ hx47xx +#@NAME: HP iPAQ hx47xx #@DESCRIPTION: Machine configuration for the hx4700 iPAQ with a pxa27x CPU # @@ -19,7 +19,9 @@ VOLATILE_STORAGE_SIZE = "64" MACHINE_GUI_CLASS = "bigscreen" MACHINE_DISPLAY_WIDTH_PIXELS = "480" MACHINE_DISPLAY_HEIGHT_PIXELS = "640" -MACHINE_FEATURES = "kernel26 touchscreen apm alsa pcmcia bluetooth irda wifi usbgadget screen" +MACHINE_DISPLAY_ORIENTATION = "0" +MACHINE_DISPLAY_PPI = "200" +MACHINE_FEATURES = "alsa apm bluetooth irda pcmcia screen touchscreen usbgadget wifi" MACHINE_FEATURES += "iwmmxt" # @@ -35,13 +37,13 @@ PREFERRED_VERSION_orinoco-modules = "0.15rc1" MACHINE_EXTRA_RDEPENDS = "tiinit acx-firmware" MACHINE_EXTRA_RRECOMMENDS = "\ - kernel-module-i2c-pxa \ - kernel-module-pxa27x-voltage \ - kernel-module-pxa27x-voltage-max158xx \ - kernel-module-acx \ - kernel-module-hx4700-acx \ - kernel-module-hx4700-bt \ - kernel-module-snd-hx4700-audio" + kernel-module-i2c-pxa \ + kernel-module-pxa27x-voltage \ + kernel-module-pxa27x-voltage-max158xx \ + kernel-module-acx \ + kernel-module-hx4700-acx \ + kernel-module-hx4700-bt \ + kernel-module-snd-hx4700-audio" #write out a reflash.ctl with the appriate entries for the rootfs, the ones for the kernel should already be there EXTRA_IMAGECMD_jffs2 = "; sumtool -i ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.jffs2 \ diff --git a/conf/machine/magician.conf b/conf/machine/magician.conf index e099825a40..e605001406 100644 --- a/conf/machine/magician.conf +++ b/conf/machine/magician.conf @@ -24,12 +24,6 @@ MACHINE_DISPLAY_PPI = "142" MACHINE_FEATURES = "alsa apm bluetooth irda kernel26 phone screen touchscreen usbgadget usbhost" MACHINE_FEATURES += "iwmmxt" - -# -# We don't support jffs2 installations (yet). -# -IMAGE_FSTYPES = "tar.bz2" - # # Software/packages selection # @@ -44,16 +38,17 @@ MACHINE_EXTRA_RRECOMMENDS = " \ kernel-module-i2c-pxa \ kernel-module-pxa27x-voltage \ kernel-module-pxa27x-voltage-max158xx \ - kernel-module-leds-magician \ kernel-module-magician-ts \ - kernel-module-magician-flash \ - kernel-module-magician-ds1wm \ - kernel-module-magician-battery \ kernel-module-magician-phone \ kernel-module-magician-pm \ kernel-module-n-tihtc \ kernel-module-snd-soc-magician" +#write out a reflash.ctl with the appriate entries for the rootfs, the ones for the kernel should already be there +EXTRA_IMAGECMD_jffs2 = "; sumtool -i ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.jffs2 \ + -o ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs-summary.jffs2 \ + -e 256KiB -p ; echo '${IMAGE_NAME} ${IMAGE_NAME}.rootfs.jffs2 - root' >> ${DEPLOY_DIR_IMAGE}/reflash.ctl" + # # Modules autoload and other boot properties @@ -63,8 +58,6 @@ module_autoload_leds-magician = "leds-magician" module_autoload_snd-pcm-oss = "snd-pcm-oss" module_autoload_snd-mixer-oss = "snd-mixer-oss" module_autoload_pxa27x_udc = "pxa27x_udc" -module_autoload_magician_ds1wm = "magician_ds1wm" -module_autoload_magician-battery = "magician-battery" module_autoload_magician_phone = "magician_phone" module_autoload_magician_pm = "magician_pm" module_autoload_n_tihtc = "n_tihtc" |