[oe-commits] org.oe.dev merge of '0a2c0b977acc12b551929c86418ebe390325056e'

[hrw commit]

merge of '0a2c0b977acc12b551929c86418ebe390325056e'
     and 'f72a0f688eea0a4559430f2d777a82a1324bd4d2'

Author: hrw at openembedded.org
Branch: org.openembedded.dev
Revision: 2d22192ab414f61b08f93950e568d5c2c28cc9b1
ViewMTN: http://monotone.openembedded.org/revision/info/2d22192ab414f61b08f93950e568d5c2c28cc9b1
Files:
1
conf/machine/include/zaurus-2.6.inc
packages/linux/linux-rp.inc
packages/linux/linux.inc
packages/spandsp/spandsp_0.0.3+0.0.4pre3.bb
packages/spandsp/spandsp_0.0.3+0.0.4pre16.bb
Diffs:

#
# mt diff -r0a2c0b977acc12b551929c86418ebe390325056e -r2d22192ab414f61b08f93950e568d5c2c28cc9b1
#
# 
# 
# patch "conf/machine/include/zaurus-2.6.inc"
#  from [0baab00ebcdca461a1c5f13d5bcba53c6099622a]
#    to [369ab4994dfbf2ae3f9cedb438e595502fa29ebc]
# 
# patch "packages/linux/linux-rp.inc"
#  from [909451ef86b7f046c9e21dd9cc93f456381c98fd]
#    to [f6ead960d9a72e9da49bbcc20e05e0c2c0642a00]
# 
# patch "packages/linux/linux.inc"
#  from [c2377d7cc726218e3c29b1d34e48ddc5e3e5c482]
#    to [2aaab624113f0e8a11e72235f6a6d3324e669100]
# 
============================================================
--- conf/machine/include/zaurus-2.6.inc	0baab00ebcdca461a1c5f13d5bcba53c6099622a
+++ conf/machine/include/zaurus-2.6.inc	369ab4994dfbf2ae3f9cedb438e595502fa29ebc
@@ -37,6 +37,9 @@ GUI_MACHINE_CLASS_poodle = "smallscreen"
 GUI_MACHINE_CLASS_collie = "smallscreen"
 GUI_MACHINE_CLASS_poodle = "smallscreen"
 
+KERNEL_IMAGE_MAXSIZE = "1294336"
+KERNEL_IMAGE_MAXSIZE_collie = "1048576"
+
 MACHINE_POSTPROCESS_COMMAND = "zaurus_make_installkit"
 
 zaurus_make_installkit () {
============================================================
--- packages/linux/linux-rp.inc	909451ef86b7f046c9e21dd9cc93f456381c98fd
+++ packages/linux/linux-rp.inc	f6ead960d9a72e9da49bbcc20e05e0c2c0642a00
@@ -136,30 +136,6 @@ do_configure() {
 	yes '' | oe_runmake oldconfig
 }
 
-# Check the kernel is below the 1264*1024 byte limit for the PXA Zaurii
-do_compile_append() {
-	case ${MACHINE} in
-		c7x0 | akita | poodle | spitz | tosa )
-			size=`ls -l arch/${ARCH}/boot/${KERNEL_IMAGETYPE} | awk '{ print $5}'`
-			if [ $size -ge 1294336 ]; then	
-				rm arch/${ARCH}/boot/${KERNEL_IMAGETYPE}
-				echo "Size is $size"
-				die "This kernel is too big for your PXA Zaurus and will destroy data if you flash it. Please reduce the size of the kernel by making more of it modular."
-			fi
-			;;
-		collie )
-			size=`ls -l arch/${ARCH}/boot/${KERNEL_IMAGETYPE} | awk '{ print $5}'`
-			if [ $size -ge 1048576 ]; then	
-				rm arch/${ARCH}/boot/${KERNEL_IMAGETYPE}
-				echo "Size is $size"
-				die "This kernel is too big for your Collie and will not be flashed. Please reduce the size of the kernel by making more of it modular."
-			fi
-			;;
-        	*)
-			;;
-	esac
-}
-
 do_deploy() {
 	install -d ${DEPLOY_DIR_IMAGE}
 	install -m 0644 arch/${ARCH}/boot/${KERNEL_IMAGETYPE} ${DEPLOY_DIR_IMAGE}/${KERNEL_DEPLOY_NAME}
============================================================
--- packages/linux/linux.inc	c2377d7cc726218e3c29b1d34e48ddc5e3e5c482
+++ packages/linux/linux.inc	2aaab624113f0e8a11e72235f6a6d3324e669100
@@ -99,18 +99,6 @@ do_configure_prepend() {
         yes '' | oe_runmake oldconfig
 }
 
-# Support checking the kernel size since some kernels need to reside in partitions
-# with a fixed length or there is a limit in transferring the kernel to memory
-do_sizecheck() {
-        if [ ! -z "${KERNEL_IMAGE_MAXSIZE}" ]; then
-            size=`ls -l arch/${ARCH}/boot/${KERNEL_IMAGETYPE} | awk '{ print $5}'`
-            if [ $size -ge ${KERNEL_IMAGE_MAXSIZE} ]; then
-                    rm arch/${ARCH}/boot/${KERNEL_IMAGETYPE}
-                    die  "This kernel (size=$size) is too big for your device. Please reduce the size of the kernel by making more of it modular."
-            fi
-        fi
-}
-
 UBOOT_ENTRYPOINT ?= "20008000"
 
 do_compile_append() {


#
# mt diff -rf72a0f688eea0a4559430f2d777a82a1324bd4d2 -r2d22192ab414f61b08f93950e568d5c2c28cc9b1
#
# 
# 
# rename "packages/spandsp/spandsp_0.0.3+0.0.4pre3.bb"
#     to "packages/spandsp/spandsp_0.0.3+0.0.4pre16.bb"
# 
# patch "packages/spandsp/spandsp_0.0.3+0.0.4pre16.bb"
#  from [fbe9bad3c15e9f49b220b38345531002889f8b7f]
#    to [cbf596364dc7d8cbafb87b41aa8550243180eef5]
# 
============================================================
--- packages/spandsp/spandsp_0.0.3+0.0.4pre3.bb	fbe9bad3c15e9f49b220b38345531002889f8b7f
+++ packages/spandsp/spandsp_0.0.3+0.0.4pre16.bb	cbf596364dc7d8cbafb87b41aa8550243180eef5
@@ -6,7 +6,7 @@ PR = "r0"
 
 PR = "r0"
 
-SRC_URI = "http://www.soft-switch.org/downloads/spandsp/spandsp-0.0.4pre3.tgz"
+SRC_URI = "http://www.soft-switch.org/downloads/spandsp/spandsp-0.0.4pre16.tgz"
 
 S = "${WORKDIR}/spandsp-0.0.4"