[oe-commits] Ulf Samuelsson : SOC_FAMILY: Change from SOC_CLASS

[git version control]

Module: openembedded.git
Branch: ulf/linux-2.6.30-at91sam9g45_m10
Commit: ea76631875b01d361a03422fd4c59321816ba274
URL:    http://gitweb.openembedded.net/?p=openembedded.git&a=commit;h=ea76631875b01d361a03422fd4c59321816ba274

Author: Ulf Samuelsson <ulf.samuelsson at atmel.com>
Date:   Wed Mar 17 08:19:53 2010 +0100

SOC_FAMILY: Change from SOC_CLASS

SOC_CLASS is not the correct name.
Use SOC_FAMILY instead

Signed-off-by: Ulf Samuelsson <ulf.samuelsson at atmel.com>

---

 conf/machine/include/at91-2.6.30.inc |    2 +-
 conf/machine/include/at91-2.6.32.inc |    6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/conf/machine/include/at91-2.6.30.inc b/conf/machine/include/at91-2.6.30.inc
index 12a226c..e245b15 100644
--- a/conf/machine/include/at91-2.6.30.inc
+++ b/conf/machine/include/at91-2.6.30.inc
@@ -2,7 +2,7 @@
 
 TARGET_ARCH = "arm"
 #PACKAGE_EXTRA_ARCHS = "armv4t armv5te"
-SOC_CLASS = "at91"
+SOC_FAMILY = "at91"
 
 PREFERRED_PROVIDER_virtual/kernel = "linux"
 PREFERRED_VERSION_linux = "2.6.30"
diff --git a/conf/machine/include/at91-2.6.32.inc b/conf/machine/include/at91-2.6.32.inc
index 3dfa3a4..f315af3 100644
--- a/conf/machine/include/at91-2.6.32.inc
+++ b/conf/machine/include/at91-2.6.32.inc
@@ -2,7 +2,7 @@
 
 TARGET_ARCH = "arm"
 #PACKAGE_EXTRA_ARCHS = "armv4t armv5te"
-CPU_FAMILY = "at91"
+SOC_FAMILY = "at91"
 
 PREFERRED_PROVIDER_virtual/kernel = "linux"
 PREFERRED_VERSION_linux = "2.6.32"
@@ -10,8 +10,8 @@ PREFERRED_VERSION_linux = "2.6.32"
 PREFERRED_PROVIDER_at91bootstrap = "at91bootstrap_2.13"
 PREFERRED_VERSION_at91bootstrap = "2.13"
 
-PREFERRED_PROVIDER_u-boot = "u-boot_2009.08"
-PREFERRED_VERSION_u-boot = "2009.08"
+PREFERRED_PROVIDER_u-boot = "u-boot_2009.11"
+PREFERRED_VERSION_u-boot = "2009.11"
 
 KERNEL_IMAGETYPE = "uImage"