[oe-commits] org.oe.dev merge of '389aed28979c814d3706b4a96498170e50800a5b'

[mickeyl commit]

merge of '389aed28979c814d3706b4a96498170e50800a5b'
     and 'f5aa47e401818b4b23bbbe7d7d767f86adbe7858'

Author: mickeyl at openembedded.org
Branch: org.openembedded.dev
Revision: 81c1b8b6af44ea89185b7a286dcbe855dbfea94b
ViewMTN: http://monotone.openembedded.org/revision/info/81c1b8b6af44ea89185b7a286dcbe855dbfea94b
Files:
1
packages/gsm/files/fic-gta02
packages/gsm/files/fic-gta02/gsmd
packages/gsm/files/default
packages/gsm/gsmd.inc
packages/gsm/libgsmd-devel_svn.bb
packages/gsm/libgsmd_svn.bb
packages/uboot/files/glamo-ram-init.patch
packages/uboot/uboot-openmoko_svn.bb
Diffs:

#
# mt diff -r389aed28979c814d3706b4a96498170e50800a5b -r81c1b8b6af44ea89185b7a286dcbe855dbfea94b
#
# 
# 
# delete "packages/gsm/files/fic-gta02"
# 
# delete "packages/gsm/files/fic-gta02/gsmd"
# 
# patch "packages/gsm/files/default"
#  from [efb2ffd0f9bdb2ad3bad8260d6445d035231000f]
#    to [fff8f5a5e6aa3b4c82a98e13da7f097b7ee15b91]
# 
# patch "packages/gsm/gsmd.inc"
#  from [efa697c34e73643320c6c7219e0c11c6e1a6d160]
#    to [47a99ec93ca96658be70db56cfe0b8ef57b36875]
# 
# patch "packages/gsm/libgsmd-devel_svn.bb"
#  from [3900c43393a71f47919234038b7dcab8455d0bf9]
#    to [007fad012550434955b7a39afaa1fe27811670da]
# 
# patch "packages/gsm/libgsmd_svn.bb"
#  from [85aa333ab8c520078feda84c84f2f1864a9b94e4]
#    to [4f4377a67a7fbe7a92d148f5481bec0ded65e8b6]
# 
============================================================
--- packages/gsm/files/default	efb2ffd0f9bdb2ad3bad8260d6445d035231000f
+++ packages/gsm/files/default	fff8f5a5e6aa3b4c82a98e13da7f097b7ee15b91
@@ -1,20 +1,14 @@ case `cpuinfo_id` in
 # gsmd	This shell script configures for the gsmd init script.
 
 . /etc/init.d/functions
 
 case `cpuinfo_id` in
-	"GTA01")
+	"GTA01"|"GTA02")
 		GSMD_OPTS="-s 115200 -F"
 		GSM_POW="/sys/bus/platform/devices/gta01-pm-gsm.0/power_on"
 		GSM_RES="/sys/bus/platform/devices/gta01-pm-gsm.0/reset"
 		GSM_DEV="/dev/ttySAC0"
 		;;
-    "GTA02")
-        GSMD_OPTS="-s 115200 -F"
-        GSM_POW="/sys/bus/platform/devices/gta01-pm-gsm.0/power_on"
-        GSM_RES="/sys/bus/platform/devices/gta01-pm-gsm.0/reset"
-        GSM_DEV="/dev/ttySAC1"
-        ;;
 	"HTC Apache"|"HTC Blueangel"|"HTC Universal")
 		GSMD_OPTS="-s 115200 -F"
 		GSM_DEV="/dev/ttyS0"
============================================================
--- packages/gsm/gsmd.inc	efa697c34e73643320c6c7219e0c11c6e1a6d160
+++ packages/gsm/gsmd.inc	47a99ec93ca96658be70db56cfe0b8ef57b36875
@@ -5,6 +5,7 @@ PV = "0.1+svnr${SRCREV}"
 PROVIDES += "gsmd"
 RPROVIDES_${PN} = "libgsmd0 libgsmd gsmd gsmd-devel"
 PV = "0.1+svnr${SRCREV}"
+PR = "r39"
 
 SRC_URI = "svn://svn.openmoko.org/trunk/src/target;module=gsm;proto=http \
            file://gsmd \
============================================================
--- packages/gsm/libgsmd-devel_svn.bb	3900c43393a71f47919234038b7dcab8455d0bf9
+++ packages/gsm/libgsmd-devel_svn.bb	007fad012550434955b7a39afaa1fe27811670da
@@ -1,10 +1,8 @@ require gsmd.inc
 BASEPN = "gsmd-devel"
 CONFLICTNAME = "gsmd"
 
 require gsmd.inc
 
-PR = "r40"
-
 PROVIDES += "libgsmd"
 RPROVIDES_${PN}-tools = "lib${CONFLICTNAME}-tools"
 
============================================================
--- packages/gsm/libgsmd_svn.bb	85aa333ab8c520078feda84c84f2f1864a9b94e4
+++ packages/gsm/libgsmd_svn.bb	4f4377a67a7fbe7a92d148f5481bec0ded65e8b6
@@ -1,7 +1,5 @@ require gsmd.inc
 BASEPN = "gsmd"
 CONFLICTNAME = "gsmd-devel"
 
 require gsmd.inc
 
-PR = "r40"
-


#
# mt diff -rf5aa47e401818b4b23bbbe7d7d767f86adbe7858 -r81c1b8b6af44ea89185b7a286dcbe855dbfea94b
#
# 
# 
# delete "packages/uboot/files/glamo-ram-init.patch"
# 
# patch "packages/uboot/uboot-openmoko_svn.bb"
#  from [c0a89cd0bab0ba4349b2bf440f42a1f17e7fa912]
#    to [f7e8df9fab2b480e384525d33ccc0b0221c3f575]
# 
============================================================
--- packages/uboot/uboot-openmoko_svn.bb	c0a89cd0bab0ba4349b2bf440f42a1f17e7fa912
+++ packages/uboot/uboot-openmoko_svn.bb	f7e8df9fab2b480e384525d33ccc0b0221c3f575
@@ -6,7 +6,7 @@ PV = "1.3.0${LOCALVERSION}"
 PROVIDES = "virtual/bootloader"
 LOCALVERSION = "+git${SRCDATE}+svnr${SRCREV}"
 PV = "1.3.0${LOCALVERSION}"
-PR = "r0"
+PR = "r1"
 
 SRCREV_FORMAT = "patches"
 
@@ -20,7 +20,6 @@ SRC_URI = "\
   file://uboot-eabi-fix-HACK.patch \
   file://uboot-20070311-tools_makefile_ln_sf.patch;patch=1 \
   file://makefile-no-dirafter.patch;patch=1 \
-  file://glamo-ram-init.patch;patch=1 \
 "
 S = "${WORKDIR}/git"