From: Denis 'GNUtoo' Carikli <GNUtoo@no-log.org>
Date: Sun, 12 Sep 2010 14:12:36 +0000 (+0200)
Subject: nokia900: do not require omap3.inc as we would have to override nearly everything
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=40d26d15ad151542759da38d1b03c25d1743e1ea;p=openembedded.git

nokia900: do not require omap3.inc as we would have to override nearly everything

when we required omap3.inc we pulled that:
    EXTRA_IMAGEDEPENDS += "u-boot x-load"
  which we can't and won't use for the moment.
We also had to override nearly all variables.
---

diff --git a/conf/machine/nokia900.conf b/conf/machine/nokia900.conf
index b0abee2a46..942d650d0b 100644
--- a/conf/machine/nokia900.conf
+++ b/conf/machine/nokia900.conf
@@ -1,7 +1,11 @@
 #@TYPE: Machine
 #@NAME: Nokia 900 internet tablet
 #@DESCRIPTION: Machine configuration for the Nokia 900
+
 TARGET_ARCH = "arm"
+SOC_FAMILY = "omap3"
+require conf/machine/include/tune-cortexa8.inc
+
 
 PREFERRED_PROVIDER_virtual/xserver = "xserver-xorg"
 XSERVER = "xserver-xorg \
@@ -13,9 +17,6 @@ GUI_MACHINE_CLASS = "bigscreen"
 MACHINE_DISPLAY_WIDTH_PIXELS = "800"
 MACHINE_DISPLAY_HEIGHT_PIXELS = "480"
 
-require conf/machine/include/omap3.inc
-
-# omap3.inc redefine it to uImage
 KERNEL_IMAGETYPE = "zImage"
 
 ROOT_FLASH_SIZE = "100"