Merge changes from mainline OE to try and keep us in sync.

git-svn-id: https://svn.o-hand.com/repos/poky@127 311d38ba-8fff-0310-9ca6-ca027cbcb966
This commit is contained in:
Richard Purdie
2005-10-10 10:41:35 +00:00
parent 562d4d3587
commit cbf3ef9130
41 changed files with 169 additions and 177 deletions

View File

@@ -45,7 +45,14 @@ module_autoload_pxaficp_ir = "pxaficp_ir"
do_configure() {
install -m 0644 ${WORKDIR}/defconfig-${MACHINE} ${S}/.config || die "No default configuration for ${MACHINE} available."
case ${MACHINE} in
akita | spitz | borzoi )
install -m 0644 ${WORKDIR}/defconfig-cxx00 ${S}/.config || die "No default configuration for cxx00 available."
;;
*)
install -m 0644 ${WORKDIR}/defconfig-${MACHINE} ${S}/.config || die "No default configuration for ${MACHINE} available."
;;
esac
if [ "${MACHINE}" == "collie" ]; then
mempos=`echo "obase=16; $mem * 1024 * 1024" | bc`
@@ -86,7 +93,7 @@ do_compile_append() {
size=`ls arch/${ARCH}/boot/${KERNEL_IMAGETYPE} -s | cut -d ' ' -f 1`
if [ $size -ge 1271 ]; then
rm arch/${ARCH}/boot/${KERNEL_IMAGETYPE}
die "This kernel is too big for the c7x0 and will destroy your machine if you flash it!!!"
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
;;
*)

View File

@@ -32,7 +32,7 @@ SRC_URI = "ftp://ftp.kernel.org/pub/linux/kernel/v2.6/linux-2.6.13.tar.gz \
${RPSRC}/sharpsl_pm-r8.patch;patch=1 \
${RPSRC}/corgi_pm-r3.patch;patch=1 \
${RPSRC}/spitz_base_extras-r2.patch;patch=1 \
${RPSRC}/spitz_pm-r3.patch;patch=1 \
${RPSRC}/spitz_pm-r4.patch;patch=1 \
${RPSRC}/spitz_kbd_fix1-r0.patch;patch=1 \
${RPSRC}/spitzcf-r3.patch;patch=1 \
${RPSRC}/pxa_timerfix-r0.patch;patch=1 \
@@ -73,10 +73,10 @@ SRC_URI = "ftp://ftp.kernel.org/pub/linux/kernel/v2.6/linux-2.6.13.tar.gz \
file://dtl1_cs-add-socket-revE.patch;patch=1 \
file://connectplus-remove-ide-HACK.patch;patch=1 \
file://defconfig-c7x0 \
file://defconfig-ipaq-pxa-2.6 \
file://defconfig-ipaq-pxa270 \
file://defconfig-collie \
file://defconfig-poodle \
file://defconfig-spitz \
file://defconfig-cxx00 \
file://defconfig-tosa "
# These patches would really help collie/poodle but we