From 75adfed2b963ebf24a8ea7789b3a81c05e225fb3 Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Thu, 4 Nov 2010 08:36:47 +0100 Subject: xorg: upgrade libxi 1.3.2->1.4.0, xproto 7.0.18->7.0.19 Signed-off-by: Martin Jansa --- conf/distro/include/preferred-xorg-versions-live.inc | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'conf') diff --git a/conf/distro/include/preferred-xorg-versions-live.inc b/conf/distro/include/preferred-xorg-versions-live.inc index c38580e81e..54f7d4c602 100644 --- a/conf/distro/include/preferred-xorg-versions-live.inc +++ b/conf/distro/include/preferred-xorg-versions-live.inc @@ -1,4 +1,4 @@ -#Mon Nov 1 07:54:05 CET 2010 +#Thu Nov 4 08:29:11 CET 2010 #app PREFERRED_VERSION_appres ?= "1.0.3" PREFERRED_VERSION_bdftopcf ?= "1.0.3" @@ -264,7 +264,7 @@ PREFERRED_VERSION_libxfont ?= "1.4.3" PREFERRED_VERSION_libxfont-native ?= "1.4.3" PREFERRED_VERSION_libxfontcache ?= "1.0.5" PREFERRED_VERSION_libxft ?= "2.2.0" -PREFERRED_VERSION_libxi ?= "1.3.2" +PREFERRED_VERSION_libxi ?= "1.4.0" PREFERRED_VERSION_libxinerama ?= "1.1.1" PREFERRED_VERSION_libxmu ?= "1.1.0" PREFERRED_VERSION_libxp ?= "1.0.0" @@ -340,8 +340,8 @@ PREFERRED_VERSION_xf86miscproto ?= "0.9.3" PREFERRED_VERSION_xf86rushproto ?= "1.1.2" PREFERRED_VERSION_xf86vidmodeproto ?= "2.3" PREFERRED_VERSION_xineramaproto ?= "1.2" -PREFERRED_VERSION_xproto ?= "7.0.18" -PREFERRED_VERSION_xproto-native ?= "7.0.18" +PREFERRED_VERSION_xproto ?= "7.0.19" +PREFERRED_VERSION_xproto-native ?= "7.0.19" PREFERRED_VERSION_xproxymanagementprotocol ?= "1.0.3" #util PREFERRED_VERSION_gccmakedep ?= "1.0.2" -- cgit 1.2.3-korg From 469fa13d39283af662907a7a8b5977f5f29f49ed Mon Sep 17 00:00:00 2001 From: Alex Ferguson Date: Thu, 4 Nov 2010 19:25:08 +0200 Subject: tune-mips32.inc: Add missing definitions. I added the FEED_ARCH and BASE_PACKAGE_ARCH definitions which are assigned the value of TARGET_ARCH (which is defined in the individual machine files). I used the TARGET_ARCH variable and not a static value since the value can be either "mipsel" (as in ben-nanonote) or "mips" (as in qemumips). Signed-off-by: Alex Ferguson Signed-off-by: Kristoffer Ericson --- conf/machine/include/tune-mips32.inc | 2 ++ 1 file changed, 2 insertions(+) (limited to 'conf') diff --git a/conf/machine/include/tune-mips32.inc b/conf/machine/include/tune-mips32.inc index 93da66b158..67edca2530 100644 --- a/conf/machine/include/tune-mips32.inc +++ b/conf/machine/include/tune-mips32.inc @@ -1 +1,3 @@ TARGET_CC_ARCH = "-march=mips32" +FEED_ARCH = "${TARGET_ARCH}" +BASE_PACKAGE_ARCH = "${TARGET_ARCH}" -- cgit 1.2.3-korg From 96ca3fe593ec56b3e06b5ea36c0ee5fb8a6386d7 Mon Sep 17 00:00:00 2001 From: Alex Ferguson Date: Thu, 4 Nov 2010 19:25:09 +0200 Subject: jlime-2010.1.conf: Remove parted from DISTRO_EXTRA_RDEPENDS. parted is obsolete and takes up space, so we remove it. Signed-off-by: Alex Ferguson Signed-off-by: Kristoffer Ericson --- conf/distro/jlime-2010.1.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'conf') diff --git a/conf/distro/jlime-2010.1.conf b/conf/distro/jlime-2010.1.conf index 39b1a95335..9741026b98 100644 --- a/conf/distro/jlime-2010.1.conf +++ b/conf/distro/jlime-2010.1.conf @@ -24,7 +24,7 @@ OVERRIDES .= ":jlime" # What we want on the bootstrap image (extra) # DISTRO_EXTRA_RDEPENDS = "wireless-tools nano keymaps tslib-calibrate \ - console-tools tslib-tests parted dialog" + console-tools tslib-tests dialog" # # Our Image files should look abit better. -- cgit 1.2.3-korg From 1222591ed2f8950047ba18cdd0fb3d81ea875178 Mon Sep 17 00:00:00 2001 From: Vitus Jensen Date: Fri, 16 Apr 2010 06:51:37 +0000 Subject: tb5200l: add machine configuration for TQ TB5200L 'tinyBox' MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit [PATCH 1/5] tb5200l: add machine configuration for TQ TB5200L 'tinyBox' Signed-off-by: Vitus Jensen Acked-by: Marco Cavallini Signed-off-by: Eric Bénard --- conf/machine/tb5200l.conf | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) create mode 100644 conf/machine/tb5200l.conf (limited to 'conf') diff --git a/conf/machine/tb5200l.conf b/conf/machine/tb5200l.conf new file mode 100644 index 0000000000..5601397aa0 --- /dev/null +++ b/conf/machine/tb5200l.conf @@ -0,0 +1,28 @@ +#@TYPE: Machine +#@NAME: TQ Components' Tiny Box TB5200L +#@DESCRIPTION: Mini industrial control + +TARGET_ARCH = "powerpc" +PACKAGE_EXTRA_ARCHS = "ppc" + +MACHINE_FEATURES = "kernel26 usbhost ext2" +MACHINE_TASK_PROVIDER = "task-base" +MACHINE_EXTRA_RRECOMMENDS = "u-boot-utils iproute2 canutils" + +USE_DEVFS = "0" + +PREFERRED_PROVIDER_virtual/kernel = "linux" +PREFERRED_VERSION_linux = "2.6.32" +PREFERRED_VERSION_linux-libc-headers = "2.6.32" + +# don't try to access tty1 (used for application code) +USE_VT = "0" + +SERIAL_CONSOLE = "115200 ttyPSC0" +KERNEL_DEVICETREE_tb5200l = "arch/${ARCH}/boot/dts/tqm5200.dts" +EXTRA_IMAGECMD_jffs2 = "--big-endian -e 0x20000" + +# TB5200L carries kernel in separate flash partition +ROOTFS_POSTPROCESS_COMMAND += "rm -f ${IMAGE_ROOTFS}/boot/*Image*" + +require conf/machine/include/tune-ppc603e.inc -- cgit 1.2.3-korg From b6532031c62e4d3c1ff25820283fe325f9b263ab Mon Sep 17 00:00:00 2001 From: Vitus Jensen Date: Fri, 16 Apr 2010 07:10:33 +0000 Subject: bluepro: add machine configuration for TQ BluePro MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Vitus Jensen Signed-off-by: Eric Bénard --- conf/machine/bluepro.conf | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) create mode 100644 conf/machine/bluepro.conf (limited to 'conf') diff --git a/conf/machine/bluepro.conf b/conf/machine/bluepro.conf new file mode 100644 index 0000000000..e9d928c611 --- /dev/null +++ b/conf/machine/bluepro.conf @@ -0,0 +1,28 @@ +#@TYPE: Machine +#@NAME: TQ Components' BluePro +#@DESCRIPTION: Blue IPC Series + +TARGET_ARCH = "powerpc" +PACKAGE_EXTRA_ARCHS = "ppc" + +MACHINE_FEATURES = "kernel26 usbhost ext2" +MACHINE_TASK_PROVIDER = "task-base" +MACHINE_EXTRA_RRECOMMENDS = "u-boot-utils iproute2 canutils" + +USE_DEVFS = "0" + +PREFERRED_PROVIDER_virtual/kernel = "linux" +#PREFERRED_VERSION_linux = "2.6.32" +PREFERRED_VERSION_linux-libc-headers = "2.6.32" + +# don't try to access tty1 (used for application code) +USE_VT = "0" + +SERIAL_CONSOLE = "115200 ttyPSC0" +KERNEL_DEVICETREE_tb5200l = "arch/${ARCH}/boot/dts/tqm5200.dts" +EXTRA_IMAGECMD_jffs2 = "--big-endian -e 0x20000" + +# BluePro carries kernel in separate flash partition +ROOTFS_POSTPROCESS_COMMAND += "rm -f ${IMAGE_ROOTFS}/boot/*Image*;" + +require conf/machine/include/tune-ppc603e.inc -- cgit 1.2.3-korg From a6151b231154f9cc39bb82e85b916ffa29bcfa58 Mon Sep 17 00:00:00 2001 From: Eric Bénard Date: Wed, 10 Nov 2010 14:17:10 +0100 Subject: mx25-3-stack: add machine's configuration file MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit this file was forgotten in commit : 50ea5378c92557b609324a962fea56c076783edf Signed-off-by: Eric Bénard --- conf/machine/mx25-3stack.conf | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) create mode 100644 conf/machine/mx25-3stack.conf (limited to 'conf') diff --git a/conf/machine/mx25-3stack.conf b/conf/machine/mx25-3stack.conf new file mode 100644 index 0000000000..89b12a5b7f --- /dev/null +++ b/conf/machine/mx25-3stack.conf @@ -0,0 +1,23 @@ +#@TYPE: Machine +#@Name: Freescale i.MX25_3stack +#@DESCRIPTION: Machine configuration for Freescale i.MX25_3stack +#@Homepage: http://www.freescale.com/webapp/sps/site/prod_summary.jsp?code=IMX25PDK&fsrch=1 + +TARGET_ARCH = "arm" + +MACHINE_FEATURES = "kernel26 apm alsa ext2 usbhost usbgadget touchscreen" + +GUI_MACHINE_CLASS = "smallscreen" + +PREFERRED_PROVIDER_virtual/kernel = "linux" +PREFERRED_PROVIDER_virtual/bootloader = "u-boot" +UBOOT_MACHINE="mx25_3stack_config" + +UBOOT_ENTRYPOINT = "0x80008000" +UBOOT_LOADADDRESS = "0x80008000" +KERNEL_IMAGETYPE = "uImage" + +require conf/machine/include/tune-arm926ejs.inc + +SERIAL_CONSOLE = "115200 ttymxc0" + -- cgit 1.2.3-korg From 13a0c4a2f19a68436f9fa9a493968c4c4a72621d Mon Sep 17 00:00:00 2001 From: Michael Smith Date: Wed, 10 Nov 2010 15:04:03 -0500 Subject: preferred-xorg-versions: use git release of xf86-input-mutouch The latest source release, 1.2.1, fails to build with X11R7.5. Signed-off-by: Michael Smith --- conf/distro/include/preferred-xorg-versions-X11R7.5-latest.inc | 2 +- conf/distro/include/preferred-xorg-versions-live.inc | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'conf') diff --git a/conf/distro/include/preferred-xorg-versions-X11R7.5-latest.inc b/conf/distro/include/preferred-xorg-versions-X11R7.5-latest.inc index 634265e893..39cd4e6f58 100644 --- a/conf/distro/include/preferred-xorg-versions-X11R7.5-latest.inc +++ b/conf/distro/include/preferred-xorg-versions-X11R7.5-latest.inc @@ -78,7 +78,7 @@ PREFERRED_VERSION_xf86-input-jamstudio ?= "1.2.0" PREFERRED_VERSION_xf86-input-magellan ?= "1.2.0" PREFERRED_VERSION_xf86-input-magictouch ?= "1.0.0.5" PREFERRED_VERSION_xf86-input-microtouch ?= "1.2.0" -PREFERRED_VERSION_xf86-input-mutouch ?= "1.2.1" +PREFERRED_VERSION_xf86-input-mutouch ?= "1.2.1+gitr%" PREFERRED_VERSION_xf86-input-palmax ?= "1.2.0" PREFERRED_VERSION_xf86-input-penmount ?= "1.4.0" PREFERRED_VERSION_xf86-input-spaceorb ?= "1.1.1" diff --git a/conf/distro/include/preferred-xorg-versions-live.inc b/conf/distro/include/preferred-xorg-versions-live.inc index 54f7d4c602..06662e371c 100644 --- a/conf/distro/include/preferred-xorg-versions-live.inc +++ b/conf/distro/include/preferred-xorg-versions-live.inc @@ -130,7 +130,7 @@ PREFERRED_VERSION_xf86-input-magellan ?= "1.2.0" PREFERRED_VERSION_xf86-input-magictouch ?= "1.0.0.5" PREFERRED_VERSION_xf86-input-microtouch ?= "1.2.0" PREFERRED_VERSION_xf86-input-mouse ?= "1.6.0" -PREFERRED_VERSION_xf86-input-mutouch ?= "1.2.1" +PREFERRED_VERSION_xf86-input-mutouch ?= "1.2.1+gitr%" PREFERRED_VERSION_xf86-input-palmax ?= "1.2.0" PREFERRED_VERSION_xf86-input-penmount ?= "1.4.1" PREFERRED_VERSION_xf86-input-spaceorb ?= "1.1.1" -- cgit 1.2.3-korg