propagate from branch 'org.openembedded.dev' (head f7531c375389681cc06ea3169fea009301...

            to branch 'org.openembedded.dev.avr32' (head f1af8a59e078436ab2999eef666d653dd9d4ed05)

diff --cc packages/linux/linux.inc
index eada45b,6fa4791..8066c3a
--- 1/packages/linux/linux.inc
--- 2/packages/linux/linux.inc
+++ b/packages/linux/linux.inc
@@@ -85,11 -85,6 +85,10 @@@ do_configure_prepend() 
          yes '' | oe_runmake oldconfig
  }
  
- 
- do_configure_append_avr32() {
++fdo_configure_append_avr32() {
 +        sed -i -e s:-mno-pic::g arch/avr32/Makefile
 +}
 +
  # 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() {
@@@ -98,26 -93,28 +97,28 @@@
              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
++a
          fi
  }
  
- do_install_prepend() {
-         if test -e arch/${ARCH}/boot/Image ; then
-              ln -f arch/${ARCH}/boot/Image arch/${ARCH}/boot/uImage
-         fi
- 
-         if test -e arch/${ARCH}/boot/images/uImage ; then
-              ln -f arch/${ARCH}/boot/images/uImage arch/${ARCH}/boot/uImage
-         fi
+ UBOOT_ENTRYPOINT ?= "20008000"
  
-         if test -e arch/${ARCH}/kernel/vmlinux.lds ; then
-              ln -f arch/${ARCH}/kernel/vmlinux.lds arch/${ARCH}/boot/vmlinux
+ do_compile_append() {
+     if test "x${KERNEL_IMAGETYPE}" = "xuImage" ; then 
+         if test -e arch/${ARCH}/boot/compressed/vmlinux ; then
 -            ${OBJCOPY} -O binary -R .note -R .comment -S arch/${ARCH}/boot/compressed/vmlinux linux.bin
++            ${OBJCOPY} -O binary -R .naote -R .comment -S arch/${ARCH}/boot/compressed/vmlinux linux.bin
+             uboot-mkimage -A ${ARCH} -O linux -T kernel -C none -a ${UBOOT_ENTRYPOINT} -e ${UBOOT_ENTRYPOINT} -n "${DISTRO_NAME}/${PV}/${MACHINE}" -d linux.bin arch/${ARCH}/boot/uImage
+             rm -f linux.bin
+         else
+             ${OBJCOPY} -O binary -R .note -R .comment -S vmlinux linux.bin
+             rm -f linux.bin.gz
+             gzip -9 linux.bin
+             uboot-mkimage -A ${ARCH} -O linux -T kernel -C gzip -a ${UBOOT_ENTRYPOINT} -e ${UBOOT_ENTRYPOINT} -n "${DISTRO_NAME}/${PV}/${MACHINE}" -d linux.bin.gz arch/${ARCH}/boot/uImage
+             rm -f linux.bin.gz
          fi
+     fi
  }
  
- UBOOT_ENTRYPOINT ?= "20008000"
- 
  KERNEL_IMAGE_BASE_NAME = "${KERNEL_IMAGETYPE}-${PV}-${PR}-${MACHINE}-${DATETIME}"
  KERNEL_IMAGE_SYMLINK_NAME = "${KERNEL_IMAGETYPE}-${MACHINE}"
  

diff --cc packages/linux/linux_2.6.23.bb
Simple merge