From 3f84f7432b678ab6d503bf5c67ad9792b4c61c47 Mon Sep 17 00:00:00 2001 From: Graeme Gregory Date: Sat, 6 Oct 2007 18:59:28 +0000 Subject: distro/angstrom-2008.1.conf : update to udev 115 for speed and fun --- conf/distro/angstrom-2008.1.conf | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/conf/distro/angstrom-2008.1.conf b/conf/distro/angstrom-2008.1.conf index 60557325a9..cdf2970201 100644 --- a/conf/distro/angstrom-2008.1.conf +++ b/conf/distro/angstrom-2008.1.conf @@ -8,7 +8,7 @@ # Use Xorg R7.3 release -require conf/distro/include/preferred-xorg-versions-X11R7.3.inc +require conf/distro/include/preferred-xorg-versions-X11R7.2.inc # This is a testbed for unstable and/or untested things, while angstrom-2007.1 @@ -42,3 +42,6 @@ PREFERRED_VERSION_gtk+ = "2.12.0" PREFERRED_VERSION_glib-2.0 = "2.14.0" PREFERRED_VERSION_pango = "1.18.1" +# prefer newest for speed and fun +PREFERRED_VERSION_udev = "115" + -- cgit v1.2.3 From e30afac76793f8ac3b4a5d3bf077408bfa82c34a Mon Sep 17 00:00:00 2001 From: Cliff Brake Date: Sat, 6 Oct 2007 19:05:10 +0000 Subject: rename compulab-pxa270 machine to cm-x270 --- conf/machine/cm-x270.conf | 59 ++++++++++++++++++ conf/machine/compulab-pxa270.conf | 59 ------------------ .../uclibc/uclibc-0.9.29/cm-x270/.mtn2git_empty | 0 .../uclibc/uclibc-0.9.29/cm-x270/uClibc.machine | 70 ++++++++++++++++++++++ .../uclibc-0.9.29/compulab-pxa270/.mtn2git_empty | 0 .../uclibc-0.9.29/compulab-pxa270/uClibc.machine | 70 ---------------------- 6 files changed, 129 insertions(+), 129 deletions(-) create mode 100644 conf/machine/cm-x270.conf delete mode 100644 conf/machine/compulab-pxa270.conf create mode 100644 packages/uclibc/uclibc-0.9.29/cm-x270/.mtn2git_empty create mode 100644 packages/uclibc/uclibc-0.9.29/cm-x270/uClibc.machine delete mode 100644 packages/uclibc/uclibc-0.9.29/compulab-pxa270/.mtn2git_empty delete mode 100644 packages/uclibc/uclibc-0.9.29/compulab-pxa270/uClibc.machine diff --git a/conf/machine/cm-x270.conf b/conf/machine/cm-x270.conf new file mode 100644 index 0000000000..c712c3728e --- /dev/null +++ b/conf/machine/cm-x270.conf @@ -0,0 +1,59 @@ +#@TYPE: Machine +#@Name: Compulab cm-x270 +#@DESCRIPTION: Machine configuration for Compulab cm-x270 computer module +#OLDEST_KERNEL = "2.6.16" +TARGET_ARCH = "arm" +PREFERRED_VERSION_compulab-pxa270 = "2.6.22" +GUI_MACHINE_CLASS ?= "bigscreen" + +PREFERRED_PROVIDER_virtual/kernel = "compulab-pxa270" +PACKAGE_EXTRA_ARCHS = "armv4 armv5te" + +require conf/machine/include/tune-xscale.inc + +# console serial port. If you have a L module +# the below works. If you have a W module, add +# the following line to your local.conf: +# CMX270_CONSOLE_SERIAL_PORT = "ttyS0" + +# the following is for the cm-x270 L module +CMX270_CONSOLE_SERIAL_PORT ?= "ttyS1" + +# used by sysvinit_2 package, so rebuild this +# package if you change the SERIAL_CONSOLE setting +# the following is the port for the cm-x270 L module +# I think the W module would use ttyS0, but has +# not been tested. This can be overwritten in +# local.conf +SERIAL_CONSOLE ?= "38400 ${CMX270_CONSOLE_SERIAL_PORT}" + +# used by opie-collections.inc +ROOT_FLASH_SIZE ?= "32" + +# for NAND flash. +EXTRA_IMAGECMD_jffs2 = "--little-endian --eraseblock=0x20000 --pad --no-cleanmarkers;\ + sumtool -i ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.jffs2 \ + -o ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs-summary.jffs2 \ + -e 0x20000 -p; \ + cd ${DEPLOY_DIR_IMAGE}; \ + rm -f ${DEPLOY_DIR_IMAGE}/${IMAGE_LINK_NAME}.rootfs-summary.jffs2; \ + ln -s ${IMAGE_NAME}.rootfs-summary.jffs2 ${IMAGE_LINK_NAME}.rootfs-summary.jffs2 \ + " + +MACHINE_FEATURES = "kernel26 pcmcia usbhost usbgadget pcmcia touchscreen alsa" + +# to program the compulab NAND flash, the following scheme is suggested. Create +# a small rootfs that can fit in NOR flash using the following config: +# - Angstrom distro +# - uclibc (set ANGSTROM_MODE = "uclibc" in local.conf) +# - angstrom-minimal-image-with-mtd-utils bitbake target +# - put the following in your local.conf +# - IMAGE_FSTYPES = "jffs2 tar cpio.gz" +# now, when you build the image, a cpio.gz will be generated +# that can be used as an initramfs. You can boot into this image and then +# program the main rootfs jffs2 image in NAND flash using mtd-utils +# you can select booting the initramfs, or the main nand rootfs by using +# the "ramdisk on", or "ramdisk off" commands in the bootloader +# + + diff --git a/conf/machine/compulab-pxa270.conf b/conf/machine/compulab-pxa270.conf deleted file mode 100644 index ff0eb42a11..0000000000 --- a/conf/machine/compulab-pxa270.conf +++ /dev/null @@ -1,59 +0,0 @@ -#@TYPE: Machine -#@Name: Compulab PXA270 system -#@DESCRIPTION: Machine configuration for Compulab PXA270 system -#OLDEST_KERNEL = "2.6.16" -TARGET_ARCH = "arm" -PREFERRED_VERSION_compulab-pxa270 = "2.6.22" -GUI_MACHINE_CLASS ?= "bigscreen" - -PREFERRED_PROVIDER_virtual/kernel = "${MACHINE}" -PACKAGE_EXTRA_ARCHS = "armv4 armv5te" - -require conf/machine/include/tune-xscale.inc - -# console serial port. If you have a L module -# the below works. If you have a W module, add -# the following line to your local.conf: -# CMX270_CONSOLE_SERIAL_PORT = "ttyS0" - -# the following is for the cm-x270 L module -CMX270_CONSOLE_SERIAL_PORT ?= "ttyS1" - -# used by sysvinit_2 package, so rebuild this -# package if you change the SERIAL_CONSOLE setting -# the following is the for the cm-x270 L module -# I think the W module would use ttyS0, but has -# not been tested. This can be overwritten in -# local.conf -SERIAL_CONSOLE ?= "38400 ${CMX270_CONSOLE_SERIAL_PORT}" - -# used by opie-collections.inc -ROOT_FLASH_SIZE ?= "32" - -# for NAND flash. -EXTRA_IMAGECMD_jffs2 = "--little-endian --eraseblock=0x20000 --pad --no-cleanmarkers;\ - sumtool -i ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.jffs2 \ - -o ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs-summary.jffs2 \ - -e 0x20000 -p; \ - cd ${DEPLOY_DIR_IMAGE}; \ - rm -f ${DEPLOY_DIR_IMAGE}/${IMAGE_LINK_NAME}.rootfs-summary.jffs2; \ - ln -s ${IMAGE_NAME}.rootfs-summary.jffs2 ${IMAGE_LINK_NAME}.rootfs-summary.jffs2 \ - " - -MACHINE_FEATURES = "kernel26 pcmcia usbhost usbgadget pcmcia touchscreen alsa" - -# to program the compulab NAND flash, the following scheme is suggested. Create -# a small rootfs that can fit in NOR flash using the following config: -# - Angstrom distro -# - uclibc (set ANGSTROM_MODE = "uclibc" in local.conf) -# - angstrom-minimal-image-with-mtd-utils bitbake target -# - put the following in your local.conf -# - IMAGE_FSTYPES = "jffs2 tar cpio.gz" -# now, when you build the image, a cpio.gz will be generated -# that can be used as an initramfs. You can boot into this image and then -# program the main rootfs jffs2 image in NAND flash using mtd-utils -# you can select booting the initramfs, or the main nand rootfs by using -# the "ramdisk on", or "ramdisk off" commands in the bootloader -# - - diff --git a/packages/uclibc/uclibc-0.9.29/cm-x270/.mtn2git_empty b/packages/uclibc/uclibc-0.9.29/cm-x270/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 diff --git a/packages/uclibc/uclibc-0.9.29/cm-x270/uClibc.machine b/packages/uclibc/uclibc-0.9.29/cm-x270/uClibc.machine new file mode 100644 index 0000000000..e27931cf6b --- /dev/null +++ b/packages/uclibc/uclibc-0.9.29/cm-x270/uClibc.machine @@ -0,0 +1,70 @@ +# +# Automatically generated make config: don't edit +# Sat May 12 23:18:41 2007 +# +# TARGET_alpha is not set +TARGET_arm=y +# TARGET_bfin is not set +# TARGET_cris is not set +# TARGET_e1 is not set +# TARGET_frv is not set +# TARGET_h8300 is not set +# TARGET_hppa is not set +# TARGET_i386 is not set +# TARGET_i960 is not set +# TARGET_ia64 is not set +# TARGET_m68k is not set +# TARGET_microblaze is not set +# TARGET_mips is not set +# TARGET_nios is not set +# TARGET_nios2 is not set +# TARGET_powerpc is not set +# TARGET_sh is not set +# TARGET_sh64 is not set +# TARGET_sparc is not set +# TARGET_v850 is not set +# TARGET_vax is not set +# TARGET_x86_64 is not set + +# +# Target Architecture Features and Options +# +TARGET_ARCH="arm" +FORCE_OPTIONS_FOR_ARCH=y +# CONFIG_ARM_OABI is not set +CONFIG_ARM_EABI=y +USE_BX=y +# CONFIG_GENERIC_ARM is not set +# CONFIG_ARM610 is not set +# CONFIG_ARM710 is not set +# CONFIG_ARM7TDMI is not set +# CONFIG_ARM720T is not set +# CONFIG_ARM920T is not set +# CONFIG_ARM922T is not set +# CONFIG_ARM926T is not set +# CONFIG_ARM10T is not set +# CONFIG_ARM1136JF_S is not set +# CONFIG_ARM1176JZ_S is not set +# CONFIG_ARM1176JZF_S is not set +# CONFIG_ARM_SA110 is not set +# CONFIG_ARM_SA1100 is not set +# CONFIG_ARM_XSCALE is not set +CONFIG_ARM_IWMMXT=y +TARGET_SUBARCH="" + +# +# Using ELF file format +# +ARCH_ANY_ENDIAN=y +ARCH_LITTLE_ENDIAN=y +# ARCH_WANTS_BIG_ENDIAN is not set +ARCH_WANTS_LITTLE_ENDIAN=y +ARCH_HAS_MMU=y +ARCH_USE_MMU=y +UCLIBC_HAS_FLOATS=y +# UCLIBC_HAS_FPU is not set +UCLIBC_HAS_SOFT_FLOAT=y +DO_C99_MATH=y +KERNEL_HEADERS="/usr/include" +HAVE_DOT_CONFIG=y + diff --git a/packages/uclibc/uclibc-0.9.29/compulab-pxa270/.mtn2git_empty b/packages/uclibc/uclibc-0.9.29/compulab-pxa270/.mtn2git_empty deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/packages/uclibc/uclibc-0.9.29/compulab-pxa270/uClibc.machine b/packages/uclibc/uclibc-0.9.29/compulab-pxa270/uClibc.machine deleted file mode 100644 index e27931cf6b..0000000000 --- a/packages/uclibc/uclibc-0.9.29/compulab-pxa270/uClibc.machine +++ /dev/null @@ -1,70 +0,0 @@ -# -# Automatically generated make config: don't edit -# Sat May 12 23:18:41 2007 -# -# TARGET_alpha is not set -TARGET_arm=y -# TARGET_bfin is not set -# TARGET_cris is not set -# TARGET_e1 is not set -# TARGET_frv is not set -# TARGET_h8300 is not set -# TARGET_hppa is not set -# TARGET_i386 is not set -# TARGET_i960 is not set -# TARGET_ia64 is not set -# TARGET_m68k is not set -# TARGET_microblaze is not set -# TARGET_mips is not set -# TARGET_nios is not set -# TARGET_nios2 is not set -# TARGET_powerpc is not set -# TARGET_sh is not set -# TARGET_sh64 is not set -# TARGET_sparc is not set -# TARGET_v850 is not set -# TARGET_vax is not set -# TARGET_x86_64 is not set - -# -# Target Architecture Features and Options -# -TARGET_ARCH="arm" -FORCE_OPTIONS_FOR_ARCH=y -# CONFIG_ARM_OABI is not set -CONFIG_ARM_EABI=y -USE_BX=y -# CONFIG_GENERIC_ARM is not set -# CONFIG_ARM610 is not set -# CONFIG_ARM710 is not set -# CONFIG_ARM7TDMI is not set -# CONFIG_ARM720T is not set -# CONFIG_ARM920T is not set -# CONFIG_ARM922T is not set -# CONFIG_ARM926T is not set -# CONFIG_ARM10T is not set -# CONFIG_ARM1136JF_S is not set -# CONFIG_ARM1176JZ_S is not set -# CONFIG_ARM1176JZF_S is not set -# CONFIG_ARM_SA110 is not set -# CONFIG_ARM_SA1100 is not set -# CONFIG_ARM_XSCALE is not set -CONFIG_ARM_IWMMXT=y -TARGET_SUBARCH="" - -# -# Using ELF file format -# -ARCH_ANY_ENDIAN=y -ARCH_LITTLE_ENDIAN=y -# ARCH_WANTS_BIG_ENDIAN is not set -ARCH_WANTS_LITTLE_ENDIAN=y -ARCH_HAS_MMU=y -ARCH_USE_MMU=y -UCLIBC_HAS_FLOATS=y -# UCLIBC_HAS_FPU is not set -UCLIBC_HAS_SOFT_FLOAT=y -DO_C99_MATH=y -KERNEL_HEADERS="/usr/include" -HAVE_DOT_CONFIG=y - -- cgit v1.2.3 From 7ae4083ff59936fc79fbcfa0791f211244f34ce1 Mon Sep 17 00:00:00 2001 From: Marcin Juszkiewicz Date: Sat, 6 Oct 2007 19:06:37 +0000 Subject: task-boot: include keymaps for devices with keyboard (taken from Poky) --- packages/tasks/task-boot.bb | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/packages/tasks/task-boot.bb b/packages/tasks/task-boot.bb index 40c5bd530b..fb09ad1a83 100644 --- a/packages/tasks/task-boot.bb +++ b/packages/tasks/task-boot.bb @@ -1,5 +1,5 @@ DESCRIPTION = "Basic task to get a device booting" -PR = "r40" +PR = "r41" inherit task @@ -40,6 +40,7 @@ RDEPENDS_task-boot = "\ base-passwd \ busybox \ initscripts \ + ${@base_contains("MACHINE_FEATURES", "keyboard", "keymaps", "", d)} \ modutils-initscripts \ netbase \ update-alternatives \ -- cgit v1.2.3 From adecb539d2fdcca398f31e7220dc15d13633994d Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Sat, 6 Oct 2007 19:09:49 +0000 Subject: hal: enable pci when available --- packages/hal/hal_0.5.9.bb | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/packages/hal/hal_0.5.9.bb b/packages/hal/hal_0.5.9.bb index 72d5dc4e2d..03c45623a4 100644 --- a/packages/hal/hal_0.5.9.bb +++ b/packages/hal/hal_0.5.9.bb @@ -5,28 +5,28 @@ RDEPENDS += "udev hal-info" #RDEPENDS_hal-device-manager = "python hal python-pygnome" RRECOMMENDS = "udev-utils" -PR = "r2" +PR = "r3" SRC_URI += "file://99_hal \ file://20hal \ " +# machines with pci and acpi get a machine dependant hal EXTRA_OECONF = "--with-hwdata=${datadir}/hwdata \ --with-expat=${STAGING_LIBDIR}/.. \ --with-dbus-sys=${sysconfdir}/dbus-1/system.d \ --with-hotplug=${sysconfdir}/hotplug.d \ --disable-docbook-docs \ --disable-policy-kit \ - --disable-acpi --disable-pmu --disable-pci \ - --disable-pci-ids --disable-pnp-ids \ - " - -# work around autoconf >2.59 deps... -do_configure() { - gnu-configize - libtoolize --force - oe_runconf -} + --disable-pmu \ + --disable-pnp-ids \ + ${@base_contains('COMBINED_FEATURES', 'pci', '--enable-pci --enable-pci-ids', '--disable-pci --disable-pci-ids',d)} \ + ${@base_contains('MACHINE_FEATURES', 'acpi', '--enable-acpi', '--disable-acpi',d)} \ + " + +MY_ARCH := "${PACKAGE_ARCH}" +PACKAGE_ARCH = "${@base_contains('MACHINE_FEATURES', 'acpi', '${MACHINE_ARCH}', '${MY_ARCH}',d)}" +PACKAGE_ARCH = "${@base_contains('MACHINE_FEATURES', 'pci', '${MACHINE_ARCH}', '${MY_ARCH}',d)}" do_install_append() { install -d ${D}/etc/default/volatiles -- cgit v1.2.3 From b4c25abff2ced8801f5b09c6b2be26ce672e323a Mon Sep 17 00:00:00 2001 From: Cliff Brake Date: Sat, 6 Oct 2007 21:06:11 +0000 Subject: compulab-px270 kernel: set compatible machine to cm-x270 (machine name change) --- packages/linux/compulab-pxa270_2.6.16.bb | 2 +- packages/linux/compulab-pxa270_2.6.22.bb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/linux/compulab-pxa270_2.6.16.bb b/packages/linux/compulab-pxa270_2.6.16.bb index ce6748149b..bd3135510f 100644 --- a/packages/linux/compulab-pxa270_2.6.16.bb +++ b/packages/linux/compulab-pxa270_2.6.16.bb @@ -68,5 +68,5 @@ do_deploy[dirs] = "${S}" addtask deploy before do_install after do_compile addtask compulab_image before do_install after do_deploy -COMPATIBLE_MACHINE = "compulab-pxa270" +COMPATIBLE_MACHINE = "cm-x270" diff --git a/packages/linux/compulab-pxa270_2.6.22.bb b/packages/linux/compulab-pxa270_2.6.22.bb index 86a7626d8a..84c1c63367 100644 --- a/packages/linux/compulab-pxa270_2.6.22.bb +++ b/packages/linux/compulab-pxa270_2.6.22.bb @@ -28,7 +28,7 @@ SRC_URI = "ftp://ftp.kernel.org/pub/linux/kernel/v2.6/linux-${PV}.tar.bz2 \ S = "${WORKDIR}/linux-${PV}" COMPATIBLE_HOST = 'arm.*-linux' -COMPATIBLE_MACHINE = "compulab-pxa270" +COMPATIBLE_MACHINE = "cm-x270" CMDLINE = "console=${CMX270_CONSOLE_SERIAL_PORT},38400 monitor=8 bpp=16 mem=64M mtdparts=physmap-flash.0:256k(boot)ro,0x180000(kernel),-(root);cm-x270-nand:64m(app),-(data) rdinit=/sbin/init root=mtd3 rootfstype=jffs2" -- cgit v1.2.3