diff options
Diffstat (limited to 'packages/linux/linux.inc')
| -rw-r--r-- | packages/linux/linux.inc | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/packages/linux/linux.inc b/packages/linux/linux.inc index 23f314353e..e213a2d3f6 100644 --- a/packages/linux/linux.inc +++ b/packages/linux/linux.inc @@ -70,7 +70,8 @@ do_configure_prepend() { -e '/CONFIG_CPU_BIG_ENDIAN/d' \ -e '/CONFIG_LOGO=/d' \ -e '/CONFIG_LOGO_LINUX_CLUT224=/d' \ - < '${WORKDIR}/defconfig' >>'${S}/.config' + -e '/CONFIG_LOCALVERSION/d' \ + < '${WORKDIR}/defconfig' >>'${S}/.config' # # root-over-nfs-over-usb-eth support. Limited, but should cover some cases. @@ -105,18 +106,24 @@ do_configure_append_avr32() { UBOOT_ENTRYPOINT ?= "20008000" +UBOOT_LOADADRESS ?= "${UBOOT_ENTRYPOINT}" do_compile_append() { if test "x${KERNEL_IMAGETYPE}" = "xuImage" ; then + if test "x${ARCH}" = "xpowerpc" ; then + UBOOT_ARCH=ppc + else + UBOOT_ARCH=$ARCH + fi if test -e arch/${ARCH}/boot/compressed/vmlinux ; then ${OBJCOPY} -O binary -R .note -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 + uboot-mkimage -A ${UBOOT_ARCH} -O linux -T kernel -C none -a ${UBOOT_LOADADRESS} -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 + uboot-mkimage -A ${UBOOT_ARCH} -O linux -T kernel -C gzip -a ${UBOOT_LOADADRESS} -e ${UBOOT_ENTRYPOINT} -n "${DISTRO_NAME}/${PV}/${MACHINE}" -d linux.bin.gz arch/${ARCH}/boot/uImage rm -f linux.bin.gz fi fi |