[oe-commits] Koen Kooi : ti81xx: sync with meta-ti

[git version control]

Module: openembedded.git
Branch: slugos/slugos6.0-beta
Commit: 9895f559212369bc48c8aabd6d66aeea2fbdafc1
URL:    http://git.openembedded.org/?p=openembedded.git&a=commit;h=9895f559212369bc48c8aabd6d66aeea2fbdafc1

Author: Koen Kooi <koen at openembedded.org>
Date:   Thu Jul  7 19:26:54 2011 +0200

ti81xx: sync with meta-ti

Signed-off-by: Koen Kooi <koen at openembedded.org>

---

 conf/machine/include/ti814x.inc |    2 +-
 conf/machine/include/ti816x.inc |    6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/conf/machine/include/ti814x.inc b/conf/machine/include/ti814x.inc
index 8fa7ee9..3e7ee76 100644
--- a/conf/machine/include/ti814x.inc
+++ b/conf/machine/include/ti814x.inc
@@ -3,7 +3,7 @@ SOC_FAMILY = "ti814x"
 
 require conf/machine/include/tune-cortexa8.inc
 
-PREFERRED_PROVIDER_virtual/kernel = "linux-omap3"
+PREFERRED_PROVIDER_virtual/kernel = "linux-ti81xx-psp"
 PREFERRED_PROVIDER_virtual/bootloader = "u-boot"
 
 # Increase this everytime you change something in the kernel
diff --git a/conf/machine/include/ti816x.inc b/conf/machine/include/ti816x.inc
index ef56264..57bd89f 100644
--- a/conf/machine/include/ti816x.inc
+++ b/conf/machine/include/ti816x.inc
@@ -3,16 +3,16 @@ SOC_FAMILY = "ti816x"
 
 require conf/machine/include/tune-cortexa8.inc
 
-PREFERRED_PROVIDER_virtual/kernel = "linux-omap3"
+PREFERRED_PROVIDER_virtual/kernel = "linux-ti81xx-psp"
 PREFERRED_PROVIDER_virtual/bootloader = "u-boot"
 
 # Increase this everytime you change something in the kernel
-MACHINE_KERNEL_PR = "r1"
+MACHINE_KERNEL_PR = "r2"
 
 KERNEL_IMAGETYPE = "uImage"
 
 UBOOT_ARCH = "arm"
-UBOOT_MACHINE = "ti816x_evm_config"
+UBOOT_MACHINE = "ti8168_evm_config"
 UBOOT_ENTRYPOINT = "0x80008000"
 UBOOT_LOADADDRESS = "0x80008000"