From: Marcin Juszkiewicz <hrw@openembedded.org>
Date: Sun, 9 Sep 2007 21:36:58 +0000 (+0000)
Subject: merge of '6cbf0719a581ec7faecefbc05b3c17d8b1b72d52'
X-Git-Tag: Release-2010-05/1~8696^2~5
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=68c1896202e12376543b4bfafe48fc053f8d38b9;p=openembedded.git

Merge ... '6cbf0719a581ec7faecefbc05b3c17d8b1b72d52'
     and '7d51500e1f981f891b494ca3d396c965faecc9e0'
---

68c1896202e12376543b4bfafe48fc053f8d38b9
diff --cc packages/linux/linux.inc
index 97adebf678,14b0987970..a25dc44083
--- a/packages/linux/linux.inc
+++ b/packages/linux/linux.inc
@@@ -2,21 -2,22 +2,23 @@@ DESCRIPTION = "Linux Kernel
  SECTION = "kernel"
  LICENSE = "GPL"
  
 +inherit kernel
 +
  # These devices need mkimage to generate a kernel image 
 -DEPENDS_kb9202 = "u-boot-mkimage-openmoko-native"
 -DEPENDS_at32stk1000 = "u-boot-mkimage-openmoko-native" 
 -DEPENDS_atngw100 = "u-boot-mkimage-openmoko-native"
 -DEPENDS_at91sam9263ek = "u-boot-mkimage-openmoko-native"
 -DEPENDS_at91sam9261ek = "u-boot-mkimage-openmoko-native"
 -DEPENDS_at91sam9260ek = "u-boot-mkimage-openmoko-native"
 -DEPENDS_sarge-at91 = "u-boot-mkimage-openmoko-native"
 -DEPENDS_gumstix-connex = "u-boot-mkimage-openmoko-native"
 -DEPENDS_gumstix-verdex = "u-boot-mkimage-openmoko-native"
 -DEPENDS_fic-gta01 = "u-boot-mkimage-openmoko-native"
 -DEPENDS_fic-gta02 = "u-boot-mkimage-openmoko-native"
 +DEPENDS_append_kb9202         = " u-boot-mkimage-openmoko-native "
 +DEPENDS_append_at32stk1000    = " u-boot-mkimage-openmoko-native "
 +DEPENDS_append_atngw100       = " u-boot-mkimage-openmoko-native "
 +DEPENDS_append_at91sam9263ek  = " u-boot-mkimage-openmoko-native "
 +DEPENDS_append_at91sam9261ek  = " u-boot-mkimage-openmoko-native "
 +DEPENDS_append_at91sam9260ek  = " u-boot-mkimage-openmoko-native "
 +DEPENDS_append_sarge-at91     = " u-boot-mkimage-openmoko-native "
 +DEPENDS_append_gumstix-connex = " u-boot-mkimage-openmoko-native "
 +DEPENDS_append_gumstix-verdex = " u-boot-mkimage-openmoko-native "
++DEPENDS_append_fic-gta01      = " u-boot-mkimage-openmoko-native "
++DEPENDS_append_fic-gta02      = " u-boot-mkimage-openmoko-native "
  
 -inherit kernel
  
- # Specify the commandline for you device here:
+ # Specify the commandline for you device
  
  #boot from mmc
  CMDLINE_at91sam9263ek = "mem=64M console=ttyS0,115200 root=/dev/mmcblk0p1 rootfstype=ext2 rootdelay=5"