diff options
Diffstat (limited to 'conf')
| -rw-r--r-- | conf/distro/include/opie-users-are-too-stupid-to-put-this-in-local.conf.inc | 6 | ||||
| -rw-r--r-- | conf/machine/devkitidp-pxa255.conf | 12 | ||||
| -rw-r--r-- | conf/machine/h3600.conf | 2 | ||||
| -rw-r--r-- | conf/machine/h5000.conf | 1 | ||||
| -rw-r--r-- | conf/machine/hx4700.conf | 3 |
5 files changed, 19 insertions, 5 deletions
diff --git a/conf/distro/include/opie-users-are-too-stupid-to-put-this-in-local.conf.inc b/conf/distro/include/opie-users-are-too-stupid-to-put-this-in-local.conf.inc new file mode 100644 index 0000000000..7898f7b349 --- /dev/null +++ b/conf/distro/include/opie-users-are-too-stupid-to-put-this-in-local.conf.inc @@ -0,0 +1,6 @@ +# Opie +#use 1337 mt version of opie to have a webbrowser +PALMTOP_USE_MULTITHREADED_QT = "yes" +QTE_VERSION = "2.3.10" +OPIE_VERSION = "1.2.2" +require conf/distro/include/preferred-opie-versions.inc diff --git a/conf/machine/devkitidp-pxa255.conf b/conf/machine/devkitidp-pxa255.conf index 029246a8c2..468c2ebd7d 100644 --- a/conf/machine/devkitidp-pxa255.conf +++ b/conf/machine/devkitidp-pxa255.conf @@ -5,12 +5,12 @@ TARGET_ARCH = "arm" GUI_MACHINE_CLASS = "bigscreen" -PACKAGE_EXTRA_ARCHS = "armv5te" +PACKAGE_EXTRA_ARCHS = "armv4 armv5te" -PREFERRED_PROVIDER_virtual/bootloader = "uboot-${MACHINE}" -PREFERRED_PROVIDER_virtual/kernel = "${MACHINE}-kernel" - -BOOTSTRAP_EXTRA_RDEPENDS += "uboot-${MACHINE} ${MACHINE}-kernel" +PREFERRED_PROVIDER_virtual/bootloader = "u-boot" +PREFERRED_PROVIDER_virtual/kernel = "${MACHINE}" +PREFERRED_VERSION_u-boot = "1.1.6" +UBOOT_MACHINE = "pxa255_idp_config" require conf/machine/include/tune-xscale.conf @@ -20,4 +20,6 @@ SERIAL_CONSOLE = "115200 ttyS0" # used by opie-collections.inc ROOT_FLASH_SIZE = "32" +MACHINE_FEATURES = "kernel26 pcmcia usbhost usbgadget pcmcia touchscreen alsa" +MACHINE_TASK_PROVIDER = "task-base" diff --git a/conf/machine/h3600.conf b/conf/machine/h3600.conf index eb0b6d40e6..cd451d3dfe 100644 --- a/conf/machine/h3600.conf +++ b/conf/machine/h3600.conf @@ -32,6 +32,8 @@ MACHINE_EXTRA_RRECOMMENDS = "kernel-module-nls-cp437 \ EXTRA_IMAGECMD_h3600_jffs2 = "-e 0x40000 -p" +EXTRA_IMAGECMD_h3600_jffs2_append = "; echo "${IMAGE_NAME} ${IMAGE_NAME}.rootfs.jffs2 - root" >> ${DEPLOY_DIR_IMAGE}/reflash.ctl" + # TODO: see if any of these modules have 2.6 counterparts diff --git a/conf/machine/h5000.conf b/conf/machine/h5000.conf index c0c9b2fefe..00e6495274 100644 --- a/conf/machine/h5000.conf +++ b/conf/machine/h5000.conf @@ -21,6 +21,7 @@ MACHINE_FEATURES = "kernel26 touchscreen apm alsa pcmcia bluetooth irda wifi usb PREFERRED_PROVIDER_virtual/kernel = "linux-handhelds-2.6" PREFERRED_PROVIDER_xserver = "xserver-kdrive" EXTRA_IMAGECMD_h5000_jffs2 = "-e 0x40000 -p" +EXTRA_IMAGECMD_h5000_jffs2_append = "; 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 \ diff --git a/conf/machine/hx4700.conf b/conf/machine/hx4700.conf index 53903f7982..19c3f37ead 100644 --- a/conf/machine/hx4700.conf +++ b/conf/machine/hx4700.conf @@ -44,6 +44,9 @@ EXTRA_IMAGECMD_jffs2 = "; sumtool -i ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.jf -o ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs-summary.jffs2 \ -e 256KiB -p" +#write out a reflash.ctl with the appriate entries for the rootfs, the ones for the kernel should already be there +EXTRA_IMAGECMD_jffs2_append = "; echo "${IMAGE_NAME} ${IMAGE_NAME}.rootfs.jffs2 - root" >> ${DEPLOY_DIR_IMAGE}/reflash.ctl" + # # Modules autoload and other boot properties # |