diff options
Diffstat (limited to 'packages/linux/linux.inc')
| -rw-r--r-- | packages/linux/linux.inc | 50 |
1 files changed, 34 insertions, 16 deletions
diff --git a/packages/linux/linux.inc b/packages/linux/linux.inc index 4a09c92975..a25dc44083 100644 --- a/packages/linux/linux.inc +++ b/packages/linux/linux.inc @@ -2,18 +2,23 @@ DESCRIPTION = "Linux Kernel" SECTION = "kernel" LICENSE = "GPL" +inherit kernel + # These devices need mkimage to generate a kernel image -DEPENDS_kb9202 = "u-boot-mkimage-openmoko-native" -DEPENDS_at32stk1000 = "u-boot-mkimage-openmoko-native" -DEPENDS_atngw100 = "u-boot-mkimage-openmoko-native" -DEPENDS_at91sam9263ek = "u-boot-mkimage-openmoko-native" -DEPENDS_sarge-at91 = "u-boot-mkimage-openmoko-native" -DEPENDS_gumstix-connex = "u-boot-mkimage-openmoko-native" -DEPENDS_gumstix-verdex = "u-boot-mkimage-openmoko-native" +DEPENDS_append_kb9202 = " u-boot-mkimage-openmoko-native " +DEPENDS_append_at32stk1000 = " u-boot-mkimage-openmoko-native " +DEPENDS_append_atngw100 = " u-boot-mkimage-openmoko-native " +DEPENDS_append_at91sam9263ek = " u-boot-mkimage-openmoko-native " +DEPENDS_append_at91sam9261ek = " u-boot-mkimage-openmoko-native " +DEPENDS_append_at91sam9260ek = " u-boot-mkimage-openmoko-native " +DEPENDS_append_sarge-at91 = " u-boot-mkimage-openmoko-native " +DEPENDS_append_gumstix-connex = " u-boot-mkimage-openmoko-native " +DEPENDS_append_gumstix-verdex = " u-boot-mkimage-openmoko-native " +DEPENDS_append_fic-gta01 = " u-boot-mkimage-openmoko-native " +DEPENDS_append_fic-gta02 = " u-boot-mkimage-openmoko-native " -inherit kernel -# Specify the commandline for you device here: +# Specify the commandline for you device #boot from mmc CMDLINE_at91sam9263ek = "mem=64M console=ttyS0,115200 root=/dev/mmcblk0p1 rootfstype=ext2 rootdelay=5" @@ -23,6 +28,12 @@ CMDLINE_at91sam9263ek = "mem=64M console=ttyS0,115200 root=/dev/mmcblk0p1 rootfs do_configure_prepend() { echo "" > ${S}/.config + if [ -e ${WORKDIR}/logo_linux_clut224.ppm ]; then + install -m 0644 ${WORKDIR}/logo_linux_clut224.ppm drivers/video/logo/logo_linux_clut224.ppm + echo "CONFIG_LOGO=y" >> ${S}/.config + echo "CONFIG_LOGO_LINUX_CLUT224=y" >> ${S}/.config + fi + if [ "${TARGET_OS}" == "linux-gnueabi" -o "${TARGET_OS}" == "linux-uclibcgnueabi" ]; then echo "CONFIG_AEABI=y" >> ${S}/.config echo "CONFIG_OABI_COMPAT=y" >> ${S}/.config @@ -36,6 +47,8 @@ do_configure_prepend() { sed -e '/CONFIG_AEABI/d' \ -e '/CONFIG_OABI_COMPAT=/d' \ -e '/CONFIG_CMDLINE=/d' \ + -e '/CONFIG_LOGO=/d' \ + -e '/CONFIG_LOGO_LINUX_CLUT224=/d' \ < '${WORKDIR}/defconfig' >>'${S}/.config' yes '' | oe_runmake oldconfig @@ -61,16 +74,21 @@ do_deploy() { tar -cvzf ${DEPLOY_DIR_IMAGE}/modules-${KERNEL_RELEASE}-${PR}-${MACHINE}.tgz -C ${D} lib if test "x${KERNEL_IMAGETYPE}" = "xuImage" ; then - ${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 ${DEPLOY_DIR_IMAGE}/uImage-${PV}-${PR}-${MACHINE}-${DATETIME}.bin - rm -f linux.bin.gz - 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 ${DEPLOY_DIR_IMAGE}/uImage-${PV}-${PR}-${MACHINE}-${DATETIME}.bin + 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 ${DEPLOY_DIR_IMAGE}/uImage-${PV}-${PR}-${MACHINE}-${DATETIME}.bin + rm -f linux.bin.gz + fi + fi } do_deploy[dirs] = "${S}" -addtask prepatch before do_patch after do_unpack addtask deploy before do_package after do_install |