[oe-commits] org.oe.dev linux-gta01: make it compatible w/ gta02, adjust DEPENDS

[mickeyl commit]

linux-gta01: make it compatible w/ gta02, adjust DEPENDS

Author: mickeyl
Branch: org.openembedded.dev
Revision: d95b16d3d10f16e8365d19879b558c8b6d997ded
ViewMTN: http://monotone.openembedded.org/revision.psp?id=d95b16d3d10f16e8365d19879b558c8b6d997ded
Files:
1
packages/linux/linux-gta01/defconfig-2.6.22.5-fic-gta01
packages/linux/linux-gta01.inc
Diffs:

#
# mt diff -r76b3eaaf78af7bef8ae185d70ad72a4c8f9a3af7 -rd95b16d3d10f16e8365d19879b558c8b6d997ded
#
# 
# 
# patch "packages/linux/linux-gta01/defconfig-2.6.22.5-fic-gta01"
#  from [d0e30d670e0eb15b4371c0cbe0172aaa7184af72]
#    to [e0d5e01862edf513ce61dd257d3e4a6790a4bfab]
# 
# patch "packages/linux/linux-gta01.inc"
#  from [5cda3191314c5f66abcba84fb066049563b8ff99]
#    to [c481e7e941b515e8ad0dff078aef372dddc37590]
# 
============================================================
--- packages/linux/linux-gta01/defconfig-2.6.22.5-fic-gta01	d0e30d670e0eb15b4371c0cbe0172aaa7184af72
+++ packages/linux/linux-gta01/defconfig-2.6.22.5-fic-gta01	e0d5e01862edf513ce61dd257d3e4a6790a4bfab
@@ -270,7 +270,7 @@ CONFIG_ZBOOT_ROM_BSS=0x0
 #
 CONFIG_ZBOOT_ROM_TEXT=0x0
 CONFIG_ZBOOT_ROM_BSS=0x0
-CONFIG_CMDLINE="console=ttySAC0,115200n8  ip=192.168.1.2:192.168.1.10:192.168.1.10:255.255.255.0:ezx:usb0:off   debug"
+CONFIG_CMDLINE="ip=192.168.1.2:192.168.1.10:192.168.1.10:255.255.255.0:ezx:usb0:off"
 # CONFIG_XIP_KERNEL is not set
 CONFIG_KEXEC=y
 
@@ -1170,7 +1170,7 @@ CONFIG_FB_S3C2410=y
 #
 # CONFIG_FB_S1D13XXX is not set
 CONFIG_FB_S3C2410=y
-CONFIG_FB_S3C2410_DEBUG=y
+# CONFIG_FB_S3C2410_DEBUG is not set
 CONFIG_GLAMO=y
 CONFIG_FB_GLAMO=y
 CONFIG_GLAMO_SPI_GPIO=y
@@ -1195,10 +1195,10 @@ CONFIG_FONT_6x11=y
 # CONFIG_FONT_SUN8x16 is not set
 # CONFIG_FONT_SUN12x22 is not set
 # CONFIG_FONT_10x18 is not set
-CONFIG_LOGO=y
+# CONFIG_LOGO is not set
 # CONFIG_LOGO_LINUX_MONO is not set
 # CONFIG_LOGO_LINUX_VGA16 is not set
-CONFIG_LOGO_LINUX_CLUT224=y
+# CONFIG_LOGO_LINUX_CLUT224 is not set
 
 #
 # Sound
============================================================
--- packages/linux/linux-gta01.inc	5cda3191314c5f66abcba84fb066049563b8ff99
+++ packages/linux/linux-gta01.inc	c481e7e941b515e8ad0dff078aef372dddc37590
@@ -1,9 +1,9 @@ AUTHOR = "Harald Welte <laforge at openmoko
 DESCRIPTION = "2.6 Linux Development Kernel for FIC Neo1973 (GTA01)"
 SECTION = "kernel"
 AUTHOR = "Harald Welte <laforge at openmoko.org>"
-HOMEPAGE = "N/A"
+HOMEPAGE = "http://www.openmoko.org"
 LICENSE = "GPL"
-DEPENDS += "quilt-native uboot-openmoko"
+DEPENDS += "uboot-mkimage-openmoko-native"
 
 inherit kernel
 
@@ -24,7 +24,7 @@ COMPATIBLE_HOST = "arm.*-linux"
 ALLOW_EMPTY = "1"
 
 COMPATIBLE_HOST = "arm.*-linux"
-COMPATIBLE_MACHINE = 'fic-gta01'
+COMPATIBLE_MACHINE = 'fic-gta01|fic-gta02'
 
 CMDLINE_CON = "console=ttySAC0,115200n8"
 #CMDLINE_ROOT = "root=/dev/mmcblk0p1 rootfstype=ext3 rootdelay=5"