From c5cc423a2ce2c5a1659c171aefcbcec22b768c56 Mon Sep 17 00:00:00 2001 From: Nicolas Ferre Date: Thu, 6 Sep 2007 16:44:48 +0000 Subject: at91sam*: add 2 more at91sam machines, close #2942 --- packages/linux/linux.inc | 2 ++ 1 file changed, 2 insertions(+) (limited to 'packages/linux/linux.inc') diff --git a/packages/linux/linux.inc b/packages/linux/linux.inc index 4a09c92975..abd7c7a9d2 100644 --- a/packages/linux/linux.inc +++ b/packages/linux/linux.inc @@ -7,6 +7,8 @@ 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_at91sam9261ek = "u-boot-mkimage-openmoko-native" +DEPENDS_at91sam9260ek = "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" -- cgit v1.2.3 From 276505761d55c8b8b1af7bbeacc1c14b9b2b4791 Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Fri, 7 Sep 2007 07:07:49 +0000 Subject: linux.inc: add configure magic for replacing bootlogo --- packages/linux/linux.inc | 8 ++++++++ 1 file changed, 8 insertions(+) (limited to 'packages/linux/linux.inc') diff --git a/packages/linux/linux.inc b/packages/linux/linux.inc index abd7c7a9d2..8a3a36a66b 100644 --- a/packages/linux/linux.inc +++ b/packages/linux/linux.inc @@ -25,6 +25,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 @@ -38,6 +44,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 -- cgit v1.2.3 From b4cce23419175f56d1dd8a3f811a7f1aefcf25f8 Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Fri, 7 Sep 2007 11:32:10 +0000 Subject: linux.inc: use kernel decompressor (fast!) instead of uboot one (sloooooooow), closes #2925 --- packages/linux/linux.inc | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-) (limited to 'packages/linux/linux.inc') diff --git a/packages/linux/linux.inc b/packages/linux/linux.inc index 8a3a36a66b..05bfc2f472 100644 --- a/packages/linux/linux.inc +++ b/packages/linux/linux.inc @@ -71,16 +71,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 -- cgit v1.2.3 From 5fff1e40328e6ab7967b55fbcd717c29d68a1d3f Mon Sep 17 00:00:00 2001 From: Michael Lauer Date: Fri, 7 Sep 2007 14:47:28 +0000 Subject: linux.inc: prepare adding fic-gta01/fic-gta02 support --- packages/linux/linux.inc | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'packages/linux/linux.inc') diff --git a/packages/linux/linux.inc b/packages/linux/linux.inc index 05bfc2f472..14b0987970 100644 --- a/packages/linux/linux.inc +++ b/packages/linux/linux.inc @@ -12,10 +12,12 @@ DEPENDS_at91sam9260ek = "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_fic-gta01 = "u-boot-mkimage-openmoko-native" +DEPENDS_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" -- cgit v1.2.3 From f13935215c790b58ba20b0bd570802288bf3f0b2 Mon Sep 17 00:00:00 2001 From: Marcin Juszkiewicz Date: Sun, 9 Sep 2007 21:33:05 +0000 Subject: linux: changed way of adding uboot-mkimage dependency so #2926 should be fixed Something is wrong wen it comes to overrides and adding into variable - bug #2966 opened. --- packages/linux/linux.inc | 23 ++++++++++++----------- 1 file changed, 12 insertions(+), 11 deletions(-) (limited to 'packages/linux/linux.inc') diff --git a/packages/linux/linux.inc b/packages/linux/linux.inc index 05bfc2f472..97adebf678 100644 --- a/packages/linux/linux.inc +++ b/packages/linux/linux.inc @@ -2,18 +2,19 @@ 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_at91sam9261ek = "u-boot-mkimage-openmoko-native" -DEPENDS_at91sam9260ek = "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 " -inherit kernel # Specify the commandline for you device here: @@ -63,7 +64,7 @@ do_install_prepend() { UBOOT_ENTRYPOINT ?= "20008000" -KERNEL_IMAGE_BASE_NAME = ${KERNEL_IMAGETYPE}-${PV}-${PR}-${MACHINE}-${DATETIME} +KERNEL_IMAGE_BASE_NAME = ${KERNEL_IMAGETYPE}-${KERNEL_RELEASE}-${PR}-${MACHINE}-${DATETIME} do_deploy() { install -d ${DEPLOY_DIR_IMAGE} -- cgit v1.2.3