From 9d2bde45dda6ce3dfe2df986dfeafaf80eeecd2e Mon Sep 17 00:00:00 2001 From: Andrei Gherzan Date: Mon, 2 Jul 2012 22:08:35 +0300 Subject: linux-raspberrypi: Update kernel to latest upstream Signed-off-by: Andrei Gherzan --- recipes-kernel/linux/linux-raspberrypi_3.1.9.bb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/recipes-kernel/linux/linux-raspberrypi_3.1.9.bb b/recipes-kernel/linux/linux-raspberrypi_3.1.9.bb index ab5c6a0..14b25f2 100755 --- a/recipes-kernel/linux/linux-raspberrypi_3.1.9.bb +++ b/recipes-kernel/linux/linux-raspberrypi_3.1.9.bb @@ -4,11 +4,11 @@ require linux.inc DESCRIPTION = "Linux kernel for the RaspberryPi board" -PR = "r1" +PR = "r2" # Bump MACHINE_KERNEL_PR in the machine config if you update the kernel. # This is on the rpi-patches branch -SRCREV = "0ec4154d64ebba48ca2446cde60a90546311defc" +SRCREV = "14ad68cf4afc7acf14076f895b539d81cd9f32ab" SRC_URI = "git://github.com/raspberrypi/linux.git;protocol=git;branch=rpi-patches \ " -- cgit v1.2.3-54-g00ecf From 1f4fad072fa8e181dbda35c077338565cc4b56e3 Mon Sep 17 00:00:00 2001 From: Andrei Gherzan Date: Mon, 2 Jul 2012 22:11:45 +0300 Subject: firmware.inc: Update to latest upstream Signed-off-by: Andrei Gherzan --- recipes-bcm/common/firmware.inc | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/recipes-bcm/common/firmware.inc b/recipes-bcm/common/firmware.inc index 89192a2..addee25 100644 --- a/recipes-bcm/common/firmware.inc +++ b/recipes-bcm/common/firmware.inc @@ -1,7 +1,7 @@ -# 21/06/2012 firmware; this can be overridden from distro config -RPIFW_SRCREV ?= "fc0232ac463f0618914bab9314e8e2ae27466d8c" -RPIFW_DATE ?= "20120621" +# 01/07/2012 firmware; this can be overridden from distro config +RPIFW_SRCREV ?= "0671d60180c8d10978b442de5ec9d083596a5f3f" +RPIFW_DATE ?= "20120701" SRCREV = "${RPIFW_SRCREV}" -- cgit v1.2.3-54-g00ecf From 6f744980b5cbad1f94cc44ae6d3c4f106e58f931 Mon Sep 17 00:00:00 2001 From: Andrei Gherzan Date: Tue, 3 Jul 2012 15:08:04 +0300 Subject: raspberrypi.conf: Remove bcm2835-kernel-image as we can boot from Image directly Signed-off-by: Andrei Gherzan --- conf/machine/raspberrypi.conf | 1 - 1 file changed, 1 deletion(-) diff --git a/conf/machine/raspberrypi.conf b/conf/machine/raspberrypi.conf index a64104b..b45ee66 100755 --- a/conf/machine/raspberrypi.conf +++ b/conf/machine/raspberrypi.conf @@ -33,7 +33,6 @@ MACHINE_FEATURES = "kernel26 apm usbgadget usbhost keyboard vfat ext2 screen tou MACHINE_EXTRA_RRECOMMENDS += " \ kernel-modules \ - bcm2835-kernel-image \ " # Set GPU firmware image to be used -- cgit v1.2.3-54-g00ecf From 275c6b1a2b8d757fe24257636be140face6f6723 Mon Sep 17 00:00:00 2001 From: Andrei Gherzan Date: Tue, 3 Jul 2012 15:08:48 +0300 Subject: bcm2835-kernel-image: Remove recipe as bootloader can boot from Image directly There is no need for a mangled kernel image anymore. Precompiled RPI Bootloader can boot an uncompressed kernel image. Signed-off-by: Andrei Gherzan --- recipes-bcm/kernel-image/bcm2835-kernel-image.bb | 19 ------------------- 1 file changed, 19 deletions(-) delete mode 100644 recipes-bcm/kernel-image/bcm2835-kernel-image.bb diff --git a/recipes-bcm/kernel-image/bcm2835-kernel-image.bb b/recipes-bcm/kernel-image/bcm2835-kernel-image.bb deleted file mode 100644 index 085cd01..0000000 --- a/recipes-bcm/kernel-image/bcm2835-kernel-image.bb +++ /dev/null @@ -1,19 +0,0 @@ -DESCRIPTION = "Helper recipe to make the munged kernel.img image for the RaspberryPi." -LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58" - -COMPATIBLE_MACHINE = "raspberrypi" -PR = "${MACHINE_KERNEL_PR}.2" - -DEPENDS = "bcm2835-bootfiles bcm2835-mkimage-native virtual/kernel" - -S = "${WORKDIR}" - -addtask deploy before do_package after do_install - -do_deploy() { - install -d ${DEPLOY_DIR_IMAGE}/bcm2835-bootfiles - bcm2835-mkimage.py ${DEPLOY_DIR_IMAGE}/zImage-${MACHINE}.bin ${DEPLOY_DIR_IMAGE}/bcm2835-bootfiles/kernel.img ${STAGING_BINDIR_NATIVE}/ -} - -PACKAGE_ARCH = "${MACHINE_ARCH}" -- cgit v1.2.3-54-g00ecf From 44444b0511861f152e3c8bb5466871b51938766f Mon Sep 17 00:00:00 2001 From: Andrei Gherzan Date: Tue, 3 Jul 2012 15:10:41 +0300 Subject: bcm2835-mkimage: Remove recipe as bootloader can boot from Image directly Signed-off-by: Andrei Gherzan --- recipes-bcm/kernel-image/bcm2835-mkimage.bb | 33 ------------- recipes-bcm/kernel-image/bcm2835-mkimage/LICENCE | 3 -- .../bcm2835-mkimage/bcm2835-args-uncompressed.txt | 12 ----- .../bcm2835-mkimage/bcm2835-boot-uncompressed.txt | 17 ------- .../bcm2835-mkimage/bcm2835-kernel-first32k.bin | Bin 32768 -> 0 bytes .../bcm2835-mkimage/bcm2835-mkimage.py | 51 --------------------- 6 files changed, 116 deletions(-) delete mode 100644 recipes-bcm/kernel-image/bcm2835-mkimage.bb delete mode 100644 recipes-bcm/kernel-image/bcm2835-mkimage/LICENCE delete mode 100644 recipes-bcm/kernel-image/bcm2835-mkimage/bcm2835-args-uncompressed.txt delete mode 100644 recipes-bcm/kernel-image/bcm2835-mkimage/bcm2835-boot-uncompressed.txt delete mode 100644 recipes-bcm/kernel-image/bcm2835-mkimage/bcm2835-kernel-first32k.bin delete mode 100644 recipes-bcm/kernel-image/bcm2835-mkimage/bcm2835-mkimage.py diff --git a/recipes-bcm/kernel-image/bcm2835-mkimage.bb b/recipes-bcm/kernel-image/bcm2835-mkimage.bb deleted file mode 100644 index 83d5d26..0000000 --- a/recipes-bcm/kernel-image/bcm2835-mkimage.bb +++ /dev/null @@ -1,33 +0,0 @@ -DESCRIPTION = "Tools to append 32KB binary header to kernel image." -LICENSE = "proprietary-binary" - -COMPATIBLE_MACHINE = "raspberrypi" -PR = "${MACHINE_KERNEL_PR}.3" - -SECTION = "bootloader" - -LIC_FILES_CHKSUM = "file://LICENCE;md5=3d7292881293368c0a9f3bc521c2b87e" - -SRC_URI = " \ - file://LICENCE \ - file://bcm2835-args-uncompressed.txt \ - file://bcm2835-boot-uncompressed.txt \ - file://bcm2835-mkimage.py \ - file://bcm2835-kernel-first32k.bin \ -" - -S = "${WORKDIR}" - -BBCLASSEXTEND = "native nativesdk" - -do_install () { - install -d ${D}${bindir} - install -m 0755 bcm2835-mkimage.py ${D}${bindir} - install -m 0644 bcm2835-args-uncompressed.txt ${D}${bindir} - install -m 0644 bcm2835-boot-uncompressed.txt ${D}${bindir} - install -m 0644 bcm2835-kernel-first32k.bin ${D}${bindir} -} - -FILES_${PN} = " \ - ${bindir}/bcm2835-* \ -" diff --git a/recipes-bcm/kernel-image/bcm2835-mkimage/LICENCE b/recipes-bcm/kernel-image/bcm2835-mkimage/LICENCE deleted file mode 100644 index c6849d9..0000000 --- a/recipes-bcm/kernel-image/bcm2835-mkimage/LICENCE +++ /dev/null @@ -1,3 +0,0 @@ -I believe this is a proprietary binary (the first32k.bin file) provided by Broadcom. - -It is distributed with the express permission of the RaspberryPi foundation. diff --git a/recipes-bcm/kernel-image/bcm2835-mkimage/bcm2835-args-uncompressed.txt b/recipes-bcm/kernel-image/bcm2835-mkimage/bcm2835-args-uncompressed.txt deleted file mode 100644 index 09398b4..0000000 --- a/recipes-bcm/kernel-image/bcm2835-mkimage/bcm2835-args-uncompressed.txt +++ /dev/null @@ -1,12 +0,0 @@ -; kernel args (place at 0x00000100) -0x00000005 -0x54410001 -0x00000001 -0x00001000 -0x00000000 -0x00000004 -0x54410002 -0x08000000 -0x00000000 -0x00000000 -0x00000000 diff --git a/recipes-bcm/kernel-image/bcm2835-mkimage/bcm2835-boot-uncompressed.txt b/recipes-bcm/kernel-image/bcm2835-mkimage/bcm2835-boot-uncompressed.txt deleted file mode 100644 index 1cf5888..0000000 --- a/recipes-bcm/kernel-image/bcm2835-mkimage/bcm2835-boot-uncompressed.txt +++ /dev/null @@ -1,17 +0,0 @@ -; bootloader (place at 0x00000000) -0xea000006 -0xe1a00000 -0xe1a00000 -0xe1a00000 -0xe1a00000 -0xe1a00000 -0xe1a00000 -0xe1a00000 - -0xe3a00000 -0xe3a01042 -0xe3811c0c -0xe59f2000 -0xe59ff000 -0x00000100 -0x00008000 diff --git a/recipes-bcm/kernel-image/bcm2835-mkimage/bcm2835-kernel-first32k.bin b/recipes-bcm/kernel-image/bcm2835-mkimage/bcm2835-kernel-first32k.bin deleted file mode 100644 index ebf74be..0000000 Binary files a/recipes-bcm/kernel-image/bcm2835-mkimage/bcm2835-kernel-first32k.bin and /dev/null differ diff --git a/recipes-bcm/kernel-image/bcm2835-mkimage/bcm2835-mkimage.py b/recipes-bcm/kernel-image/bcm2835-mkimage/bcm2835-mkimage.py deleted file mode 100644 index 6ce9231..0000000 --- a/recipes-bcm/kernel-image/bcm2835-mkimage/bcm2835-mkimage.py +++ /dev/null @@ -1,51 +0,0 @@ -#!/usr/bin/python - -import os -import re -import sys - -try: - raw_kernel = sys.argv[1] -except: - raw_kernel = "./zImage" - -try: - output_img = sys.argv[2] -except: - output_img = "./kernel.img" - -try: - supfile_loc = sys.argv[3] -except: - supfile_loc = "./" - -re_line = re.compile(r"0x(?P[0-9a-f]{8})") - -mem = [0 for i in range(32768)] - -def load_to_mem(name, addr): - f = open(name) - - for l in f.readlines(): - m = re_line.match(l) - - if m: - value = int(m.group("value"), 16) - - for i in range(4): - mem[addr] = int(value >> i * 8 & 0xff) - addr += 1 - - f.close() - -load_to_mem(""+supfile_loc+"bcm2835-boot-uncompressed.txt", 0x00000000) -load_to_mem(""+supfile_loc+"bcm2835-args-uncompressed.txt", 0x00000100) - -f = open(""+supfile_loc+"bcm2835-kernel-first32k.bin", "wb") - -for m in mem: - f.write(chr(m)) - -f.close() - -os.system("cat "+supfile_loc+"bcm2835-kernel-first32k.bin "+raw_kernel+" > "+output_img+"") -- cgit v1.2.3-54-g00ecf From b9b0c009c873758eacb9683575c863cf55cc638a Mon Sep 17 00:00:00 2001 From: Andrei Gherzan Date: Tue, 3 Jul 2012 19:35:10 +0300 Subject: linux-raspberrypi: Add CMDLINE for raspberrypi Because CONFIG_EXT4_USE_FOR_EXT23 is built in, use rootfstype=ext4 to mount ext2/3/4. Signed-off-by: Andrei Gherzan --- recipes-kernel/linux/linux-raspberrypi_3.1.9.bb | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/recipes-kernel/linux/linux-raspberrypi_3.1.9.bb b/recipes-kernel/linux/linux-raspberrypi_3.1.9.bb index 14b25f2..d9929dd 100755 --- a/recipes-kernel/linux/linux-raspberrypi_3.1.9.bb +++ b/recipes-kernel/linux/linux-raspberrypi_3.1.9.bb @@ -4,7 +4,7 @@ require linux.inc DESCRIPTION = "Linux kernel for the RaspberryPi board" -PR = "r2" +PR = "r3" # Bump MACHINE_KERNEL_PR in the machine config if you update the kernel. # This is on the rpi-patches branch @@ -22,6 +22,9 @@ S = "${WORKDIR}/git" KERNEL_DEFCONFIG = "bcmrpi_defconfig" +# CMDLINE fro raspberypi +CMDLINE_raspberrypi = "dwc_otg.lpm_enable=0 console=ttyAMA0,115200 kgdboc=ttyAMA0,115200 root=/dev/mmcblk0p2 rootfstype=ext4 rootwait" + PARALLEL_MAKEINST = "" do_configure_prepend() { -- cgit v1.2.3-54-g00ecf From 41afde0961f3adadb742c39655cc4ea60cd7ee46 Mon Sep 17 00:00:00 2001 From: Andrei Gherzan Date: Thu, 5 Jul 2012 23:41:56 +0300 Subject: raspberrypi.conf: Use Image as as kernel fstype It's a bug in the latest bootloader where rpi doesn't boot with zImage. Use uncompressed kernel type. Signed-off-by: Andrei Gherzan --- conf/machine/raspberrypi.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conf/machine/raspberrypi.conf b/conf/machine/raspberrypi.conf index b45ee66..932563f 100755 --- a/conf/machine/raspberrypi.conf +++ b/conf/machine/raspberrypi.conf @@ -27,7 +27,7 @@ XSERVER = " \ xf86-video-fbdev \ " -KERNEL_IMAGETYPE = "zImage" +KERNEL_IMAGETYPE = "Image" MACHINE_FEATURES = "kernel26 apm usbgadget usbhost keyboard vfat ext2 screen touchscreen alsa bluetooth wifi sdio" -- cgit v1.2.3-54-g00ecf From 94d69f85331b2bf6aa5f8fffd9dab4c05b6827e9 Mon Sep 17 00:00:00 2001 From: Andrei Gherzan Date: Thu, 5 Jul 2012 23:49:10 +0300 Subject: sdcard_image-rpi: Copy the kernel specified with KERNEL_FSTYPE Signed-off-by: Andrei Gherzan --- classes/sdcard_image-rpi.bbclass | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/classes/sdcard_image-rpi.bbclass b/classes/sdcard_image-rpi.bbclass index af18aab..6d08020 100644 --- a/classes/sdcard_image-rpi.bbclass +++ b/classes/sdcard_image-rpi.bbclass @@ -77,7 +77,7 @@ IMAGE_CMD_rpi-sdimg () { # of the rootfs mcopy -i ${WORKDIR}/boot.img -s ${DEPLOY_DIR_IMAGE}/bcm2835-bootfiles/bootcode.bin :: mcopy -i ${WORKDIR}/boot.img -s ${DEPLOY_DIR_IMAGE}/bcm2835-bootfiles/loader.bin :: - mcopy -i ${WORKDIR}/boot.img -s ${DEPLOY_DIR_IMAGE}/bcm2835-bootfiles/kernel.img :: + mcopy -i ${WORKDIR}/boot.img -s ${DEPLOY_DIR_IMAGE}/${KERNEL_IMAGETYPE} ::kernel.img if [ -n ${FATPAYLOAD} ] ; then echo "Copying payload into VFAT" -- cgit v1.2.3-54-g00ecf