diff options
| author | Paul Sokolovsky <pmiscml@gmail.com> | 2007-01-06 20:43:38 +0000 |
|---|---|---|
| committer | Paul Sokolovsky <pmiscml@gmail.com> | 2007-01-06 20:43:38 +0000 |
| commit | 271c9e5762efadf4865dd5813ddaefc3bf55ec1e (patch) | |
| tree | 4f99155131b98dc20b1fcf79b9308f7c320270ee /conf | |
| parent | e4acd15efd9ab07619960d7c8eaaf720308f5cc0 (diff) | |
| parent | d7088faa1bee47c4ad987c24a76db38316606b75 (diff) | |
merge of '75de3114c40a44451af2c6d7f40334d41425ff61'
and '806fe4d016a4ba9669539e4b9ededde428d2e610'
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 |
2 files changed, 13 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" |