diff options
author | Cliff Brake <cbrake@bec-systems.com> | 2010-11-12 00:00:20 -0500 |
---|---|---|
committer | Cliff Brake <cbrake@bec-systems.com> | 2010-11-12 00:00:20 -0500 |
commit | 3c6efe8f8abc16668ca5e9cdf7a46665dac87172 (patch) | |
tree | 642c13416b99e80f0871cdc6668e832e635dfb48 /conf | |
parent | c400c874f2ac9233b8a43a73309b6e7907289c54 (diff) | |
parent | 13fbe7253c95881ede787004a4c3a1c31502e5c6 (diff) | |
download | openembedded-3c6efe8f8abc16668ca5e9cdf7a46665dac87172.tar.gz |
Merge branch 'master' into testing-nexttested_2010-11-12testing
Diffstat (limited to 'conf')
-rw-r--r-- | conf/distro/include/preferred-xorg-versions-X11R7.5-latest.inc | 2 | ||||
-rw-r--r-- | conf/distro/include/preferred-xorg-versions-live.inc | 10 | ||||
-rw-r--r-- | conf/distro/jlime-2010.1.conf | 2 | ||||
-rw-r--r-- | conf/machine/bluepro.conf | 28 | ||||
-rw-r--r-- | conf/machine/include/tune-mips32.inc | 2 | ||||
-rw-r--r-- | conf/machine/mx25-3stack.conf | 23 | ||||
-rw-r--r-- | conf/machine/tb5200l.conf | 28 |
7 files changed, 88 insertions, 7 deletions
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 c38580e81e..06662e371c 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" @@ -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" @@ -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" 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. 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 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}" 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" + 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 |