diff options
| author | Jesse Gilles <jgilles@multitech.com> | 2011-01-05 12:29:04 -0600 |
|---|---|---|
| committer | Jesse Gilles <jgilles@multitech.com> | 2011-01-05 12:29:04 -0600 |
| commit | ceabee017dffb1aeabb66cd747cec2c7009ddf82 (patch) | |
| tree | bb322d158678999044b88a5344805747d1376985 /conf | |
| parent | 113236746e2de6e77dd93a2088e72604392a9ca9 (diff) | |
| parent | ee2042a17c2f85d7197ef834adbec1ae558b8ed5 (diff) | |
Merge branch 'multitech-corecdp-1.x' into multitech-corecdp-devmultitech-corecdp-dev
Diffstat (limited to 'conf')
| -rw-r--r-- | conf/distro/corecdp.conf | 2 | ||||
| -rw-r--r-- | conf/machine/mtcdp.conf | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/conf/distro/corecdp.conf b/conf/distro/corecdp.conf index 1acb1b6609..39ca74a170 100644 --- a/conf/distro/corecdp.conf +++ b/conf/distro/corecdp.conf @@ -11,7 +11,7 @@ require conf/amend-recipes.inc DISTRO_NAME = "CoreCDP" DISTRO = "corecdp" -DISTRO_VERSION = "1.1.0" +DISTRO_VERSION = "1.1.1" DISTRO_TYPE = "release" TARGET_VENDOR = "-corecdp" BUILDNAME = "${DISTRO_NAME} ${DISTRO_VERSION}" diff --git a/conf/machine/mtcdp.conf b/conf/machine/mtcdp.conf index c48d1cb70f..336e31b182 100644 --- a/conf/machine/mtcdp.conf +++ b/conf/machine/mtcdp.conf @@ -7,7 +7,7 @@ TARGET_ARCH = "arm" PREFERRED_PROVIDER_virtual/kernel = "linux" PREFERRED_VERSION_linux = "2.6.32" -PREFERRED_VERSION_mts-io ?= "0.4.0" +PREFERRED_VERSION_mts-io ?= "0.4.1" KERNEL_IMAGETYPE = "uImage" UBOOT_MACHINE = "at91sam9g20ek_nandflash_config" |