From 1d324ed486925a0f12cd90435346946464e1a2f6 Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Sat, 6 Jan 2007 19:53:21 +0000 Subject: add an .inc for those poor clueless users that demand opie support but surprisingly do not want to do anything to support it --- .../opie-users-are-too-stupid-too-put-this-in-local.conf.inc | 7 +++++++ 1 file changed, 7 insertions(+) create mode 100644 conf/distro/include/opie-users-are-too-stupid-too-put-this-in-local.conf.inc (limited to 'conf') diff --git a/conf/distro/include/opie-users-are-too-stupid-too-put-this-in-local.conf.inc b/conf/distro/include/opie-users-are-too-stupid-too-put-this-in-local.conf.inc new file mode 100644 index 0000000000..978a0ab73e --- /dev/null +++ b/conf/distro/include/opie-users-are-too-stupid-too-put-this-in-local.conf.inc @@ -0,0 +1,7 @@ +# 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 +- -- cgit v1.2.3 From 1b187b9967c3f9cb057b6beed4fa35f2382aebb2 Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Sat, 6 Jan 2007 19:59:46 +0000 Subject: make include zecke compliant --- .../opie-users-are-too-stupid-to-put-this-in-local.conf.inc | 6 ++++++ .../opie-users-are-too-stupid-too-put-this-in-local.conf.inc | 7 ------- 2 files changed, 6 insertions(+), 7 deletions(-) create mode 100644 conf/distro/include/opie-users-are-too-stupid-to-put-this-in-local.conf.inc delete mode 100644 conf/distro/include/opie-users-are-too-stupid-too-put-this-in-local.conf.inc (limited to 'conf') 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/distro/include/opie-users-are-too-stupid-too-put-this-in-local.conf.inc b/conf/distro/include/opie-users-are-too-stupid-too-put-this-in-local.conf.inc deleted file mode 100644 index 978a0ab73e..0000000000 --- a/conf/distro/include/opie-users-are-too-stupid-too-put-this-in-local.conf.inc +++ /dev/null @@ -1,7 +0,0 @@ -# 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 -- -- cgit v1.2.3 From 0a5d6e6d97f345848ee3cd44e6d49ecfb65f543f Mon Sep 17 00:00:00 2001 From: Cliff Brake Date: Sat, 6 Jan 2007 20:35:13 +0000 Subject: devkitidp-pxa255 2.6.11: drop this version --- conf/machine/devkitidp-pxa255.conf | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) (limited to 'conf') 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" -- cgit v1.2.3 From 6d9a04839968cfee92609191b904c9b8ba28ea34 Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Sat, 6 Jan 2007 23:51:17 +0000 Subject: h3600 (and h3800 by inclusion), h5000, hx4700: add support from writing reflash.ctl files containing instruction to flash the rootfs using bootldr --- conf/machine/h3600.conf | 2 ++ conf/machine/h5000.conf | 1 + conf/machine/hx4700.conf | 3 +++ 3 files changed, 6 insertions(+) (limited to 'conf') 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 # -- cgit v1.2.3 From 725b7aeac7588ff4f00c2d46419e75c5eeb79209 Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Sun, 7 Jan 2007 09:53:43 +0000 Subject: lots of machines: remove bogus architecture --- conf/machine/h1910.conf | 2 +- conf/machine/h2200.conf | 2 +- conf/machine/h3600.conf | 2 +- conf/machine/h3900.conf | 2 +- conf/machine/h4000.conf | 2 +- conf/machine/h5000.conf | 2 +- conf/machine/htcblueangel.conf | 2 +- conf/machine/htchimalaya.conf | 2 +- conf/machine/htcuniversal.conf | 2 +- conf/machine/hx2000.conf | 2 +- conf/machine/hx4700.conf | 2 +- conf/machine/magician.conf | 2 +- 12 files changed, 12 insertions(+), 12 deletions(-) (limited to 'conf') diff --git a/conf/machine/h1910.conf b/conf/machine/h1910.conf index 0f18728087..72c2d33713 100644 --- a/conf/machine/h1910.conf +++ b/conf/machine/h1910.conf @@ -6,7 +6,7 @@ # Hardware-based properties # TARGET_ARCH = "arm" -PACKAGE_EXTRA_ARCHS = "armv4 armv4t armv5e armv5te ipaqpxa" +PACKAGE_EXTRA_ARCHS = "armv4 armv4t armv5e armv5te " require conf/machine/include/tune-xscale.conf diff --git a/conf/machine/h2200.conf b/conf/machine/h2200.conf index da8a58329a..6c43e75625 100644 --- a/conf/machine/h2200.conf +++ b/conf/machine/h2200.conf @@ -6,7 +6,7 @@ # Hardware-based properties # TARGET_ARCH = "arm" -PACKAGE_EXTRA_ARCHS = "armv4 armv4t armv5e armv5te ipaqpxa" +PACKAGE_EXTRA_ARCHS = "armv4 armv4t armv5e armv5te " #Compile with armv5te optimizations, incompatible with armv4(t) cpus require conf/machine/include/tune-xscale.conf diff --git a/conf/machine/h3600.conf b/conf/machine/h3600.conf index cd451d3dfe..a766b5abb5 100644 --- a/conf/machine/h3600.conf +++ b/conf/machine/h3600.conf @@ -6,7 +6,7 @@ # Hardware-based properties # TARGET_ARCH = "arm" -PACKAGE_EXTRA_ARCHS = "armv4 ipaqsa" +PACKAGE_EXTRA_ARCHS = "armv4 " require conf/machine/include/tune-strongarm.conf diff --git a/conf/machine/h3900.conf b/conf/machine/h3900.conf index 323aa8f061..32b6a8ea8a 100644 --- a/conf/machine/h3900.conf +++ b/conf/machine/h3900.conf @@ -6,7 +6,7 @@ # Hardware-based properties # TARGET_ARCH = "arm" -PACKAGE_EXTRA_ARCHS = "armv4 armv4t armv5e armv5te ipaqpxa" +PACKAGE_EXTRA_ARCHS = "armv4 armv4t armv5e armv5te " require conf/machine/include/tune-xscale.conf diff --git a/conf/machine/h4000.conf b/conf/machine/h4000.conf index 3eaa96b327..2a34333bac 100644 --- a/conf/machine/h4000.conf +++ b/conf/machine/h4000.conf @@ -6,7 +6,7 @@ # Hardware-based properties # TARGET_ARCH = "arm" -PACKAGE_EXTRA_ARCHS = "armv4 armv4t armv5e armv5te ipaqpxa" +PACKAGE_EXTRA_ARCHS = "armv4 armv4t armv5e armv5te " require conf/machine/include/tune-xscale.conf diff --git a/conf/machine/h5000.conf b/conf/machine/h5000.conf index 00e6495274..f95b78cd4a 100644 --- a/conf/machine/h5000.conf +++ b/conf/machine/h5000.conf @@ -6,7 +6,7 @@ # Hardware-based properties # TARGET_ARCH = "arm" -PACKAGE_EXTRA_ARCHS = "armv4 armv4t armv5e armv5te ipaqpxa h5xxx" +PACKAGE_EXTRA_ARCHS = "armv4 armv4t armv5e armv5te h5xxx" require conf/machine/include/tune-xscale.conf diff --git a/conf/machine/htcblueangel.conf b/conf/machine/htcblueangel.conf index a61656ab5c..11f0e7e54f 100644 --- a/conf/machine/htcblueangel.conf +++ b/conf/machine/htcblueangel.conf @@ -6,7 +6,7 @@ # Hardware-based properties # TARGET_ARCH = "arm" -PACKAGE_EXTRA_ARCHS = "armv4 armv4t armv5e armv5te ipaqpxa" +PACKAGE_EXTRA_ARCHS = "armv4 armv4t armv5e armv5te " require conf/machine/include/tune-xscale.conf diff --git a/conf/machine/htchimalaya.conf b/conf/machine/htchimalaya.conf index 0cb51ce383..d75a573f65 100644 --- a/conf/machine/htchimalaya.conf +++ b/conf/machine/htchimalaya.conf @@ -6,7 +6,7 @@ # Hardware-based properties # TARGET_ARCH = "arm" -PACKAGE_EXTRA_ARCHS = "armv4 armv4t armv5e armv5te ipaqpxa" +PACKAGE_EXTRA_ARCHS = "armv4 armv4t armv5e armv5te " require conf/machine/include/tune-xscale.conf diff --git a/conf/machine/htcuniversal.conf b/conf/machine/htcuniversal.conf index 0f8ed6ed82..843e26bed0 100644 --- a/conf/machine/htcuniversal.conf +++ b/conf/machine/htcuniversal.conf @@ -6,7 +6,7 @@ # Hardware-based properties # TARGET_ARCH = "arm" -PACKAGE_EXTRA_ARCHS = "ipaqpxa armv4t armv5te iwmmxt" +PACKAGE_EXTRA_ARCHS = " armv4t armv5te iwmmxt" # Use tune-xscale per default. Machine independent feeds should be built with tune-strongarm. require conf/machine/include/tune-xscale.conf diff --git a/conf/machine/hx2000.conf b/conf/machine/hx2000.conf index 900da400b0..ffffc3a569 100644 --- a/conf/machine/hx2000.conf +++ b/conf/machine/hx2000.conf @@ -3,7 +3,7 @@ #@DESCRIPTION: Machine configuration for the hx2000 iPAQs with a pxa27x CPU TARGET_ARCH = "arm" -PACKAGE_EXTRA_ARCHS = "armv4 armv4t armv5te iwmmxt ipaqpxa ipaq-pxa270" +PACKAGE_EXTRA_ARCHS = "armv4 armv4t armv5te iwmmxt " PREFERRED_PROVIDER_virtual/kernel = "linux-rp" diff --git a/conf/machine/hx4700.conf b/conf/machine/hx4700.conf index 19c3f37ead..b6b8db68c3 100644 --- a/conf/machine/hx4700.conf +++ b/conf/machine/hx4700.conf @@ -6,7 +6,7 @@ # Hardware-based properties # TARGET_ARCH = "arm" -PACKAGE_EXTRA_ARCHS = "armv4 armv4t armv5te iwmmxt ipaqpxa ipaq-pxa270" +PACKAGE_EXTRA_ARCHS = "armv4 armv4t armv5te iwmmxt " # Use tune-xscale per default. Machine independent feeds should be built with tune-strongarm. require conf/machine/include/tune-xscale.conf diff --git a/conf/machine/magician.conf b/conf/machine/magician.conf index e16a46c619..4e6c9a625a 100644 --- a/conf/machine/magician.conf +++ b/conf/machine/magician.conf @@ -6,7 +6,7 @@ # Hardware-based properties # TARGET_ARCH = "arm" -PACKAGE_EXTRA_ARCHS = "armv4 armv4t armv5te iwmmxt ipaqpxa ipaq-pxa270" +PACKAGE_EXTRA_ARCHS = "armv4 armv4t armv5te iwmmxt " # Use tune-xscale per default. Machine independent feeds should be built with tune-strongarm. require conf/machine/include/tune-xscale.conf -- cgit v1.2.3 From cb16d37cdee753f5ddea2c9836fc52eb6b39172c Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Sun, 7 Jan 2007 13:01:03 +0000 Subject: h3600, h5000, hx4700: fix quoting of EXTRA_IMAGECMD --- conf/machine/h3600.conf | 4 +--- conf/machine/h5000.conf | 3 +-- conf/machine/hx4700.conf | 6 ++---- 3 files changed, 4 insertions(+), 9 deletions(-) (limited to 'conf') diff --git a/conf/machine/h3600.conf b/conf/machine/h3600.conf index a766b5abb5..a440078cb7 100644 --- a/conf/machine/h3600.conf +++ b/conf/machine/h3600.conf @@ -30,9 +30,7 @@ MACHINE_EXTRA_RDEPENDS = "ipaq-boot-params" MACHINE_EXTRA_RRECOMMENDS = "kernel-module-nls-cp437 \ kernel-module-micro" -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" +EXTRA_IMAGECMD_jffs2 = "-e 0x40000 -p ; echo '${IMAGE_NAME} ${IMAGE_NAME}.rootfs.jffs2 - root' >> ${DEPLOY_DIR_IMAGE}/reflash.ctl" diff --git a/conf/machine/h5000.conf b/conf/machine/h5000.conf index f95b78cd4a..ecc2e679d9 100644 --- a/conf/machine/h5000.conf +++ b/conf/machine/h5000.conf @@ -20,8 +20,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" +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 \ diff --git a/conf/machine/hx4700.conf b/conf/machine/hx4700.conf index b6b8db68c3..482c8c0d8a 100644 --- a/conf/machine/hx4700.conf +++ b/conf/machine/hx4700.conf @@ -39,13 +39,11 @@ MACHINE_EXTRA_RRECOMMENDS = "kernel-module-nls-cp437 \ kernel-module-hx4700-acx \ 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 \ -o ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs-summary.jffs2 \ - -e 256KiB -p" + -e 256KiB -p ; echo '${IMAGE_NAME} ${IMAGE_NAME}.rootfs.jffs2 - root' >> ${DEPLOY_DIR_IMAGE}/reflash.ctl" -#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 -- cgit v1.2.3