diff options
| -rw-r--r-- | conf/machine/mpc8313e-rdb.conf | 2 | ||||
| -rw-r--r-- | conf/machine/mpc8323e-rdb.conf | 2 | ||||
| -rw-r--r-- | packages/linux/linux.inc | 9 |
3 files changed, 11 insertions, 2 deletions
diff --git a/conf/machine/mpc8313e-rdb.conf b/conf/machine/mpc8313e-rdb.conf index 3bc18e3f9e..27706cbd4a 100644 --- a/conf/machine/mpc8313e-rdb.conf +++ b/conf/machine/mpc8313e-rdb.conf @@ -10,6 +10,8 @@ PREFERRED_VERSION_u-boot = "git" MACHINE_FEATURES = "kernel26 usbhost ext2" +KERNEL_IMAGETYPE = "uImage" + PREFERRED_VERSION_u-boot = "1.3.1" UBOOT_MACHINE = "MPC8313ERDB_33_config" diff --git a/conf/machine/mpc8323e-rdb.conf b/conf/machine/mpc8323e-rdb.conf index ee2c6144a9..38f3b1930c 100644 --- a/conf/machine/mpc8323e-rdb.conf +++ b/conf/machine/mpc8323e-rdb.conf @@ -10,6 +10,8 @@ PREFERRED_PROVIDER_virtual/kernel = "linux" MACHINE_FEATURES = "kernel26 usbhost pci ext2 uboot" +KERNEL_IMAGETYPE = "uImage" + PREFERRED_VERSION_u-boot = "1.1.6" UBOOT_MACHINE = "MPC8323ERDB_config" diff --git a/packages/linux/linux.inc b/packages/linux/linux.inc index 23f314353e..b98b722d97 100644 --- a/packages/linux/linux.inc +++ b/packages/linux/linux.inc @@ -108,15 +108,20 @@ UBOOT_ENTRYPOINT ?= "20008000" 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_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 + uboot-mkimage -A ${UBOOT_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 |