From c8dfa8bf1bb04eecdd7be0c428af4aaafcbd68b1 Mon Sep 17 00:00:00 2001 From: Michael Lauer Date: Tue, 15 Jan 2008 16:23:48 +0000 Subject: sane-srcrevs.inc: add gsm0710muxd entry --- conf/distro/include/sane-srcrevs.inc | 1 + 1 file changed, 1 insertion(+) (limited to 'conf') diff --git a/conf/distro/include/sane-srcrevs.inc b/conf/distro/include/sane-srcrevs.inc index fb369a8ea3..b612b2ffdf 100644 --- a/conf/distro/include/sane-srcrevs.inc +++ b/conf/distro/include/sane-srcrevs.inc @@ -25,6 +25,7 @@ SRCREV_pn-fbgrab-viewer-native ?= "1943" SRCREV_pn-fstests ?= "204" SRCREV_pn-gconf-dbus ?= "606" SRCREV_pn-gnuradio ?= "6377" +SRCREV_pn-gsm0710muxd ?= "40" SRCREV_pn-gypsy ?= "56" SRCREV_pn-hildon-1 ?= "14429" SRCREV_pn-kismet ?= "2285" -- cgit v1.2.3 From 8e9b42bba2459171ab1e96691a446ae2cc86e0fa Mon Sep 17 00:00:00 2001 From: Rod Whitby Date: Wed, 16 Jan 2008 00:15:44 +0000 Subject: linux-ixp4xx: Updated to 2.6.23.14 --- conf/distro/include/sane-srcrevs.inc | 2 +- conf/machine/include/ixp4xx.inc | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'conf') diff --git a/conf/distro/include/sane-srcrevs.inc b/conf/distro/include/sane-srcrevs.inc index b612b2ffdf..29c04437dd 100644 --- a/conf/distro/include/sane-srcrevs.inc +++ b/conf/distro/include/sane-srcrevs.inc @@ -43,7 +43,7 @@ SRCREV_pn-libowl ?= "277" SRCREV_pn-libxosd ?= "627" SRCREV_pn-linux-bfin ?= "3758" SRCREV_pn-linux-hackndev-2.6 ?= "1308" -SRCREV_pn-linux-ixp4xx ?= "957" +SRCREV_pn-linux-ixp4xx ?= "983" SRCREV_pn-linux-openmoko ?= "3801" SRCREV_pn-llvm-gcc4 ?= "374" SRCREV_pn-llvm-gcc4-cross ?= "374" diff --git a/conf/machine/include/ixp4xx.inc b/conf/machine/include/ixp4xx.inc index bdf00d15c9..924fb54f1e 100644 --- a/conf/machine/include/ixp4xx.inc +++ b/conf/machine/include/ixp4xx.inc @@ -7,7 +7,7 @@ MACHINE_FEATURES ?= "kernel26 usbhost ext2 vfat redboot apex" # Select an appropriate default kernel PREFERRED_PROVIDER_virtual/kernel ?= "linux-ixp4xx" -PREFERRED_VERSION_linux-ixp4xx ?= "2.6.21.7+svnr${SRCREV}" +PREFERRED_VERSION_linux-ixp4xx ?= "2.6.23.14+svnr${SRCREV}" # Add packages required for basic networking support MACHINE_ESSENTIAL_EXTRA_RDEPENDS ?= "ixp4xx-npe" -- cgit v1.2.3 From 4d103ef9501c08f53646ce3a99057cb1d6f0af99 Mon Sep 17 00:00:00 2001 From: Andrew Wilcox Date: Wed, 16 Jan 2008 01:32:39 +0000 Subject: bump storcenter kernel to 2.6.15.7, improved config, much smaller kernel patch. --- conf/machine/storcenter.conf | 26 +++++++++++++++----------- 1 file changed, 15 insertions(+), 11 deletions(-) (limited to 'conf') diff --git a/conf/machine/storcenter.conf b/conf/machine/storcenter.conf index 519c565061..5b69bbdc9a 100644 --- a/conf/machine/storcenter.conf +++ b/conf/machine/storcenter.conf @@ -1,23 +1,27 @@ TARGET_ARCH = "powerpc" -TARGET_OS = "linux" TARGET_FPU = "hard" -PACKAGE_EXTRA_ARCHS = "ppc ppc603e" - -INHERIT += "storcenter-image" +PACKAGE_EXTRA_ARCHS = "ppc603e" # terminal specs - console, but no other ports -SERIAL_CONSOLE="115200 console" +SERIAL_CONSOLE="115200 ttyS0" USE_VT="0" -MODUTILS=26 -MACHINE_FEATURES= "kernel26 usbhost pci ext2 uboot" +# uboot switches +UBOOT_MACHINE="Sandpoint8240_config" + +# plug in other tasks - not "really" used unless we are using task-boot +MACHINE_FEATURES= "kernel26 usbhost pci ext2" PREFERRED_PROVIDER_virtual/kernel = "linux-storcenter" +PREFERRED_VERSION_udev = "115" -# We want udev support in the image -udevdir = "/dev" +# the StorCenter Control Daemon provides cmdline fan and light control +MACHINE_EXTRA_RDEPENDS = "sccd" -EXTRA_IMAGECMD = "--big-endian" -ERASEBLOCK_SIZE = "0x10000" IMAGE_FSTYPES = "jffs2" +KERNEL_IMAGETYPE ?= uImage +EXTRA_IMAGECMD_jffs2 += "--pad --big-endian --eraseblock=0x10000" +# must be in HEX +FLASH_KERNEL_SIZE=0x170000 +FLASH_ROOT_SIZE=0x590000 require conf/machine/include/tune-ppc603e.inc -- cgit v1.2.3 From 9d00af25ddaebf2151f6dadbb48e1635d57ba16a Mon Sep 17 00:00:00 2001 From: Andrew Wilcox Date: Wed, 16 Jan 2008 01:42:45 +0000 Subject: Numerous openprotium fixes as we transition to udev based root and task based build --- conf/distro/openprotium.conf | 100 ++++++++++++++++++++++++------------------- 1 file changed, 57 insertions(+), 43 deletions(-) (limited to 'conf') diff --git a/conf/distro/openprotium.conf b/conf/distro/openprotium.conf index 928817d815..03115118ed 100644 --- a/conf/distro/openprotium.conf +++ b/conf/distro/openprotium.conf @@ -1,69 +1,83 @@ # -# Open Iomega distribution - based on openslug and generic confs +# OpenProtium distribution - based upon openslug and generic confs # DISTRO_NAME = "openprotium" -DISTRO_VERSION = ".dev-snapshot-${SRCDATE}" -DISTRO_TYPE = "alpha" +DISTRO_VERSION = "1.3" +DISTRO_TYPE ?= "alpha" +TARGET_OS = "linux" +# +# Basic configuration +# +DISTRO_DEV_MANAGER = "udev" +DISTRO_SSH_DAEMON = "dropbear" +DISTRO_INIT_MANAGER = "sysvinit" +DISTRO_LOGIN_MANAGER = "tinylogin" +MACHINE_TASK_PROVIDER = "task-openprotium" # # Naming schemes # -INHERIT += "debian" +INHERIT += "debian multimachine" # # Packaging and output format # INHERIT += "package_ipk" -IMAGE_BASENAME = "openprotium" -IMAGE_FSTYPES = "jffs2" -FEED_URIS = "openprotium##http://www.openprotium.org/ipkg.ppc.v1.0" +IMAGE_FSTYPES = "jffs2 tar.gz" +OPENPROTIUM_URI = "http://www.openprotium.org" +FEED_ARCH ?= ${PACKAGE_ARCH} +FEED_URIS = "\ + no-arch##${OPENPROTIUM_URI}/releases/${DISTRO_VERSION}/all \ + base##${OPENPROTIUM_URI}/releases/${DISTRO_VERSION}/${FEED_ARCH} \ + ${MACHINE}##${OPENPROTIUM_URI}/releases/${DISTRO_VERSION}/${MACHINE} \ + " # For protium on the turbostation +IMAGE_BASENAME = "openprotium" IMAGE_BASENAME_turbostation = "openprotium-ts" -# -# binutils and compilers -# -PREFERRED_PROVIDERS += "virtual/${TARGET_PREFIX}gcc-initial:gcc-cross-initial" -PREFERRED_PROVIDERS += "virtual/${TARGET_PREFIX}gcc:gcc-cross" -PREFERRED_PROVIDERS += "virtual/${TARGET_PREFIX}g++:gcc-cross" -#conflict between this and the last below. -#PREFERRED_PROVIDERS += "virtual/${TARGET_PREFIX}libc-for-gcc:glibc" -# Select 2.6 versions of the depmod support -PREFERRED_PROVIDERS += "virtual/${TARGET_PREFIX}depmod:module-init-tools-cross" -PREFERRED_PROVIDERS += "virtual/${TARGET_PREFIX}libc-for-gcc:glibc-intermediate" +# versions +PREFERRED_VERSION_binutils ?= "2.18" +PREFERRED_VERSION_binutils-cross ?= "2.18" -PREFERRED_VERSION_binutils = "2.16" -PREFERRED_VERSION_binutils-cross = "2.16" +PREFERRED_VERSION_gcc ?= "4.1.1" +PREFERRED_VERSION_gcc-cross ?= "4.1.2" +PREFERRED_VERSION_gcc-cross-sdk ?= "4.1.2" +PREFERRED_VERSION_gcc-cross-initial ?= "4.1.2" -PREFERRED_VERSION_gcc = "4.1.1" -PREFERRED_VERSION_gcc-cross = "4.1.1" -PREFERRED_VERSION_gcc-cross-initial = "4.1.1" +PREFERRED_VERSION_glibc = "2.6.1" +PREFERRED_VERSION_glibc-intermediate = "2.6.1" +PREFERRED_VERSION_glibc-initial = "2.6.1" -PREFERRED_VERSION_glibc = "2.5" -PREFERRED_VERSION_glibc-intermediate = "2.5" -PREFERRED_VERSION_glibc-initial = "2.3.2" +PREFERRED_VERSION_linux-libc-headers = "2.6.11.1" -# -# Target OS & FPU system # -USE_NLS ?= "no" -TARGET_OS = "linux" -HOTPLUG = "udev" -PREFERRED_PROVIDER_virtual/libiconv = "glibc" -PREFERRED_PROVIDER_virtual/libintl = "glibc" - +# Providers... # -# Bootstrap & Init +# binutils and compilers # -#PREFERRED_PROVIDER_task-bootstrap = "task-bootstrap" -require conf/distro/include/sane-srcdates.inc +PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}binutils = "binutils-cross" +PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}gcc-initial = "gcc-cross-initial" +PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}gcc = "gcc-cross" +PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}g++ = "gcc-cross" + +PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}libc-for-gcc = "glibc-intermediate" +PREFERRED_PROVIDER_virtual/powerpc-linux-libc-for-gcc = "glibc-intermediate" +PREFERRED_PROVIDER_virtual/powerpc-linux-libc-initial = "glibc-initial" + +PREFERRED_PROVIDER_virtual/libc = "glibc" +PREFERRED_PROVIDER_virtual/libiconv = "glibc" +PREFERRED_PROVIDER_virtual/libintl = "glibc" + +#silence a warning message... +PREFERRED_PROVIDER_linux-libc-headers = "linux-libc-headers" + # +# Misc items. # -# Ensure consistency across all SlugOS builds for the provider of a -# relational database - use the latest version of the SleepyCat -# Berkeley database -PREFERRED_PROVIDER_virtual/db = "db" -PREFERRED_PROVIDER_virtual/db-native = "db-native" +PREFERRED_PROVIDER_virtual/db ?= "db" +PREFERRED_PROVIDER_virtual/db-native ?= "db-native" +PREFERRED_PROVIDER_gconf ?= "gconf" -CMDLINE_DEBUG = "noirqdebug" +require conf/distro/include/sane-srcdates.inc +require conf/distro/include/sane-srcrevs.inc -- cgit v1.2.3 From d66b9c244831981f0bec4d6a9593d807d3807188 Mon Sep 17 00:00:00 2001 From: Michael Lauer Date: Wed, 16 Jan 2008 12:51:37 +0000 Subject: sane-srcdates.inc: bump EFL --- conf/distro/include/sane-srcdates.inc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'conf') diff --git a/conf/distro/include/sane-srcdates.inc b/conf/distro/include/sane-srcdates.inc index 23e3ed3243..cff6d7316b 100644 --- a/conf/distro/include/sane-srcdates.inc +++ b/conf/distro/include/sane-srcdates.inc @@ -53,7 +53,7 @@ SRCDATE_gtkhtml2 ?= "20060323" # Enlightenment Foundation Libraries # Caution: This is not alphabetically, but (roughly) dependency-sorted. # Please leave it like that. -EFL_SRCDATE = "20080110" +EFL_SRCDATE = "20080117" SRCDATE_edb-native ?= "${EFL_SRCDATE}" SRCDATE_edb ?= "${EFL_SRCDATE}" SRCDATE_eet-native ?= "${EFL_SRCDATE}" @@ -107,7 +107,7 @@ SRCDATE_entice ?= "${EFL_SRCDATE}" SRCDATE_entrance ?= "${EFL_SRCDATE}" SRCDATE_e-utils ?= "${EFL_SRCDATE}" SRCDATE_e-wm ?= "${EFL_SRCDATE}" -SRCDATE_enna = "20080116" +SRCDATE_enna = "${EFL_SRCDATE}" #SRCDATE_enna ?= "${EFL_SRCDATE}" SRCDATE_exquisite ?= "${EFL_SRCDATE}" -- cgit v1.2.3 From 357976448f85ffff8a011309c86b3966d9d130e9 Mon Sep 17 00:00:00 2001 From: Andrew Wilcox Date: Wed, 16 Jan 2008 18:35:53 +0000 Subject: Make the FEED_ARCH selection a bit more intelligent. --- conf/distro/openprotium.conf | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'conf') diff --git a/conf/distro/openprotium.conf b/conf/distro/openprotium.conf index 03115118ed..533b41526b 100644 --- a/conf/distro/openprotium.conf +++ b/conf/distro/openprotium.conf @@ -25,7 +25,8 @@ INHERIT += "debian multimachine" INHERIT += "package_ipk" IMAGE_FSTYPES = "jffs2 tar.gz" OPENPROTIUM_URI = "http://www.openprotium.org" -FEED_ARCH ?= ${PACKAGE_ARCH} +FEED_ARCH_storcenter = ppc603e +FEED_ARCH_turbostation = ppc603e FEED_URIS = "\ no-arch##${OPENPROTIUM_URI}/releases/${DISTRO_VERSION}/all \ base##${OPENPROTIUM_URI}/releases/${DISTRO_VERSION}/${FEED_ARCH} \ -- cgit v1.2.3 From 4e05ad99d4d4f11c9b3021a031a21689025ffec4 Mon Sep 17 00:00:00 2001 From: Robert Schuster Date: Wed, 16 Jan 2008 19:04:22 +0000 Subject: nokia800: Add screen size. nokia770: Add screen size. --- conf/machine/nokia770.conf | 2 ++ conf/machine/nokia800.conf | 2 ++ 2 files changed, 4 insertions(+) (limited to 'conf') diff --git a/conf/machine/nokia770.conf b/conf/machine/nokia770.conf index 45fc16dc29..4e36c6d38a 100644 --- a/conf/machine/nokia770.conf +++ b/conf/machine/nokia770.conf @@ -12,6 +12,8 @@ XSERVER = "xserver-kdrive-xomap" # 800x480 is big enough for me GUI_MACHINE_CLASS = "bigscreen" +MACHINE_DISPLAY_WIDTH_PIXELS = "800" +MACHINE_DISPLAY_HEIGHT_PIXELS = "480" # Use tune-arm926 per default. Machine independent feeds should be built with tune-strongarm. require conf/machine/include/tune-arm926ejs.inc diff --git a/conf/machine/nokia800.conf b/conf/machine/nokia800.conf index 58ddb25744..144df2ed08 100644 --- a/conf/machine/nokia800.conf +++ b/conf/machine/nokia800.conf @@ -8,6 +8,8 @@ PREFERRED_PROVIDER_virtual/xserver = "xserver-kdrive-xomap" XSERVER = "xserver-kdrive-xomap" GUI_MACHINE_CLASS = "bigscreen" +MACHINE_DISPLAY_WIDTH_PIXELS = "800" +MACHINE_DISPLAY_HEIGHT_PIXELS = "480" TARGET_FPU = "hard" include conf/machine/include/tune-arm1136jf-s.inc -- cgit v1.2.3 From c180a9628b2ec991073df824c47b4347d5c78146 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan=20L=C3=BCbbe?= Date: Wed, 16 Jan 2008 19:50:33 +0000 Subject: chumby: Add machine definition and kernel recipe --- conf/machine/chumby.conf | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) create mode 100644 conf/machine/chumby.conf (limited to 'conf') diff --git a/conf/machine/chumby.conf b/conf/machine/chumby.conf new file mode 100644 index 0000000000..1e36ddcfc7 --- /dev/null +++ b/conf/machine/chumby.conf @@ -0,0 +1,20 @@ +#@TYPE: Machine +#@Name: Chumby +#@DESCRIPTION: Machine configuration for the Chumby + +TARGET_ARCH = "arm" + +MACHINE_FEATURES = "kernel26 apm alsa bluetooth ext2 vfat touchscreen usbhost usbgadget wifi" + +GUI_MACHINE_CLASS = "smallscreen" +PACKAGE_EXTRA_ARCHS = "arm armv4t armv5te" + +PREFERRED_PROVIDER_virtual/kernel = "${MACHINE}-kernel" + +require conf/machine/include/tune-arm926ejs.inc + +# used by sysvinit_2 +SERIAL_CONSOLE = "38400 ttyS0" + +# used by opie-collections.inc +ROOT_FLASH_SIZE = "22" -- cgit v1.2.3 From eb3a771f4dc6adab8b752af93f04ea6d442b63f8 Mon Sep 17 00:00:00 2001 From: Michael Lauer Date: Wed, 16 Jan 2008 22:58:33 +0000 Subject: gsm0710muxd svn fix dependencies, bump rev --- conf/distro/include/sane-srcrevs.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'conf') diff --git a/conf/distro/include/sane-srcrevs.inc b/conf/distro/include/sane-srcrevs.inc index 29c04437dd..51fff86c0e 100644 --- a/conf/distro/include/sane-srcrevs.inc +++ b/conf/distro/include/sane-srcrevs.inc @@ -25,7 +25,7 @@ SRCREV_pn-fbgrab-viewer-native ?= "1943" SRCREV_pn-fstests ?= "204" SRCREV_pn-gconf-dbus ?= "606" SRCREV_pn-gnuradio ?= "6377" -SRCREV_pn-gsm0710muxd ?= "40" +SRCREV_pn-gsm0710muxd ?= "42" SRCREV_pn-gypsy ?= "56" SRCREV_pn-hildon-1 ?= "14429" SRCREV_pn-kismet ?= "2285" -- cgit v1.2.3 From 357ee099c60ddf4fe162b8e24aeeba52edf4099a Mon Sep 17 00:00:00 2001 From: John Lee Date: Thu, 17 Jan 2008 09:03:38 +0000 Subject: (Merge OM mtn modification back into mainline) Integrate mainstream to build meta-toolchain-openmoko packages/meta/meta-toolchain-openmoko.bb: will install task-openmoko-toolchain-{target,host} task-openmoko-toolchain-target: specific to target arch. task-openmoko-toolchain-host: for host and all, such as openmoko-sample2-src moko-autorev.inc, sane-srcrevs.inc: add SRCREV_pn-openmoko-toolchain-scripts openmoko-toolchain-scripts_svn.bb: will not install sample code now. openmoko-sample2_svn.bb: update PACKAGE_ARCH_${PN}-src to be used by ipkg-sdk.conf --- conf/distro/include/moko-autorev.inc | 1 + conf/distro/include/sane-srcrevs.inc | 1 + 2 files changed, 2 insertions(+) (limited to 'conf') diff --git a/conf/distro/include/moko-autorev.inc b/conf/distro/include/moko-autorev.inc index 87fea8d622..eb0a403fb3 100644 --- a/conf/distro/include/moko-autorev.inc +++ b/conf/distro/include/moko-autorev.inc @@ -39,6 +39,7 @@ SRCREV_pn-openmoko-theme-standard2 ?= "${AUTOREV}" SRCREV_pn-openmoko-theme-standard2-qvga ?= "${AUTOREV}" SRCREV_pn-openmoko-today2 ?= "${AUTOREV}" SRCREV_pn-openmoko-today2-folders ?= "${AUTOREV}" +SRCREV_pn-openmoko-toolchain-scripts ?= "${AUTOREV}" SRCREV_pn-openmoko-worldclock2 ?= "${AUTOREV}" SRCREV_pn-openocd ?= "${AUTOREV}" diff --git a/conf/distro/include/sane-srcrevs.inc b/conf/distro/include/sane-srcrevs.inc index 51fff86c0e..cdcf35d928 100644 --- a/conf/distro/include/sane-srcrevs.inc +++ b/conf/distro/include/sane-srcrevs.inc @@ -113,6 +113,7 @@ SRCREV_pn-openmoko-theme-standard2-qvga ?= "3425" SRCREV_pn-openmoko-today ?= "3056" SRCREV_pn-openmoko-today2 ?= "3609" SRCREV_pn-openmoko-today2-folders ?= "3414" +SRCREV_pn-openmoko-toolchain-scripts ?= "3767" SRCREV_pn-openmoko-worldclock2 ?= "3365" SRCREV_pn-openocd ?= "206" SRCREV_pn-openocd-native ?= "206" -- cgit v1.2.3 From e8a60c1e518ddfeb5b5b913c3631b5daa56f6dad Mon Sep 17 00:00:00 2001 From: Rolf Leggewie Date: Thu, 17 Jan 2008 09:08:34 +0000 Subject: conf/machine: general machine config clean-up for Zaurus as discussed on oe-devel --- conf/machine/collie.conf | 7 +------ conf/machine/include/collie-2.6.inc | 33 ------------------------------- conf/machine/include/poodle-2.6.inc | 1 - conf/machine/include/zaurus-2.6.inc | 12 ++++------- conf/machine/include/zaurus-clamshell.inc | 3 +++ 5 files changed, 8 insertions(+), 48 deletions(-) delete mode 100644 conf/machine/include/collie-2.6.inc delete mode 100644 conf/machine/include/poodle-2.6.inc (limited to 'conf') diff --git a/conf/machine/collie.conf b/conf/machine/collie.conf index b9e6f6e6aa..04e0e83051 100644 --- a/conf/machine/collie.conf +++ b/conf/machine/collie.conf @@ -6,18 +6,13 @@ TARGET_ARCH = "arm" TARGET_CC_ARCH = "-march=armv4 -mtune=strongarm1110" MACHINE_KERNEL_VERSION ?= "2.6" -require conf/machine/include/collie-${MACHINE_KERNEL_VERSION}.inc +require conf/machine/include/zaurus-${MACHINE_KERNEL_VERSION}.inc PREFERRED_PROVIDER_xserver = "xserver-kdrive" -# This is needed for the ramdisk script to work -MACHINE_EXTRA_RDEPENDS += "e2fsprogs-mke2fs" - EXTRA_IMAGECMD_jffs2 = "--pad=14680064 --little-endian --eraseblock=0x20000 -n" IMAGE_LINGUAS = "" IMAGE_FSTYPES ?= "jffs2 tar.gz" ROOT_FLASH_SIZE = "14" # actually 14680064, see EXTRA_IMAGECMD above - -GUI_MACHINE_CLASS_poodle = "smallscreen" diff --git a/conf/machine/include/collie-2.6.inc b/conf/machine/include/collie-2.6.inc deleted file mode 100644 index 8f8ccafeb1..0000000000 --- a/conf/machine/include/collie-2.6.inc +++ /dev/null @@ -1,33 +0,0 @@ -PREFERRED_PROVIDER_virtual/kernel = "linux-rp" - -SERIAL_CONSOLE = "115200 ttySA0" -MACHINE_FEATURES = "kernel26 apm pcmcia screen irda usbgadget keyboard touchscreen wifi vfat" - -MACHINE_EXTRA_RDEPENDS = "kernel-modules" - -MACHINE_POSTPROCESS_COMMAND = "zaurus_make_installkit" - -zaurus_make_installkit () { - cd ${DEPLOY_DIR_IMAGE} - rm -rf ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}-installkit/ - mkdir ${IMAGE_NAME}-installkit/ - # Get the latest kernel using the zImage-.bin symlink - cp zImage-${MACHINE}.bin ${IMAGE_NAME}-installkit/zImage - if [ "${MACHINE}" = "spitz" ]; then - cp gnu-tar ${IMAGE_NAME}-installkit/ - cp ${IMAGE_NAME}.rootfs.tar.gz ${IMAGE_NAME}-installkit/hdimage1.tgz - else - [ -f ${IMAGE_NAME}.rootfs.jffs2 ] && cp ${IMAGE_NAME}.rootfs.jffs2 ${IMAGE_NAME}-installkit/initrd.bin - fi - - # All zaurus machines except collie need updater.sh - if [ "${MACHINE}" != "collie" ]; then - cp updater.sh.${MACHINE} ${IMAGE_NAME}-installkit/updater.sh - fi - - tar czf ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}-installkit.tgz ${IMAGE_NAME}-installkit/ - md5sum ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}-installkit.tgz > ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}-installkit.tgz.md5 - rm -rf ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}-installkit/ -} - - diff --git a/conf/machine/include/poodle-2.6.inc b/conf/machine/include/poodle-2.6.inc deleted file mode 100644 index fa24a3281b..0000000000 --- a/conf/machine/include/poodle-2.6.inc +++ /dev/null @@ -1 +0,0 @@ -require conf/machine/include/zaurus-2.6.inc diff --git a/conf/machine/include/zaurus-2.6.inc b/conf/machine/include/zaurus-2.6.inc index eb020dbcba..a0a71a2969 100644 --- a/conf/machine/include/zaurus-2.6.inc +++ b/conf/machine/include/zaurus-2.6.inc @@ -1,8 +1,9 @@ -# Zaurus Clamshell specific configuration for kernel 2.6 -# Don't forget to include zaurus-clamshell.inc as well +# Zaurus specific configuration for kernel 2.6 +# Additionally, clamshell specific stuff in zaurus-clamshell.inc TARGET_ARCH = "arm" PACKAGE_EXTRA_ARCHS = "armv4 armv4t armv5e armv5te" +PACKAGE_EXTRA_ARCHS_collie = "" MACHINE_KERNEL_VERSION = "2.6" @@ -10,20 +11,15 @@ ERASEBLOCKSIZE = "0x4000" ERASEBLOCKSIZE_akita = "0x20000" EXTRA_IMAGECMD_jffs2 = "--little-endian --eraseblock=${ERASEBLOCKSIZE} --pad --faketime -n" - IMAGE_CMD_jffs2 = "mkfs.jffs2 -x lzo --root=${IMAGE_ROOTFS} --output=${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.jffs2 ${EXTRA_IMAGECMD}" - EXTRA_IMAGEDEPENDS += "zaurus-updater" -# Use tune-xscale per default. Machine independent feeds should be built with tune-strongarm. -include conf/machine/include/tune-xscale.inc - SERIAL_CONSOLE = "115200 ttyS0" +SERIAL_CONSOLE_collie = "115200 ttySA0" PREFERRED_PROVIDER_virtual/kernel = "linux-rp" PREFERRED_PROVIDER_virtual/xserver = "xserver-kdrive" - PCMCIA_MANAGER ?= "pcmciautils" MACHINE_FEATURES = "kernel26 apm alsa pcmcia irda usbgadget keyboard touchscreen screen vfat" diff --git a/conf/machine/include/zaurus-clamshell.inc b/conf/machine/include/zaurus-clamshell.inc index f66502eff1..43c77d42da 100644 --- a/conf/machine/include/zaurus-clamshell.inc +++ b/conf/machine/include/zaurus-clamshell.inc @@ -1,3 +1,6 @@ +# Use tune-xscale per default. Machine independent feeds should be built with tune-strongarm. +include conf/machine/include/tune-xscale.inc + EXTRA_IMAGEDEPENDS += "sharp-flash-header-c700" IMAGE_CMD_jffs2 = "mkfs.jffs2 --root=${IMAGE_ROOTFS} --faketime -m favourlzo \ -- cgit v1.2.3