aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKoen Kooi <koen@openembedded.org>2011-07-07 19:26:54 +0200
committerKoen Kooi <koen@openembedded.org>2011-07-07 19:26:54 +0200
commit9895f559212369bc48c8aabd6d66aeea2fbdafc1 (patch)
treeb5c9ecec8b4e1c3435871fe2c50024b5c9c72a90
parent913512909cf99a9fd250acd126cc888b742c99df (diff)
downloadopenembedded-9895f559212369bc48c8aabd6d66aeea2fbdafc1.tar.gz
openembedded-9895f559212369bc48c8aabd6d66aeea2fbdafc1.tar.bz2
openembedded-9895f559212369bc48c8aabd6d66aeea2fbdafc1.zip
ti81xx: sync with meta-ti
Signed-off-by: Koen Kooi <koen@openembedded.org>
-rw-r--r--conf/machine/include/ti814x.inc2
-rw-r--r--conf/machine/include/ti816x.inc6
2 files changed, 4 insertions, 4 deletions
diff --git a/conf/machine/include/ti814x.inc b/conf/machine/include/ti814x.inc
index 8fa7ee9a49..3e7ee76367 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 ef562647e9..57bd89f00f 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"