rapgenic/meta-raspberrypi
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #25 from agherzan/devel_kernel

Browse Source 
Fix a couple of kernel issues / update kernel / update bootloader and related files / remove unneeded packages
This commit is contained in:
Andrei Gherzan
2012-07-09 13:05:15 -07:00
parent a71cbe5274 94d69f8533
commit fc02bba13d
11 changed files with 10 additions and 143 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
classes/sdcard_image-rpi.bbclass
View File

@ -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"

3
conf/machine/raspberrypi.conf
View File

@ -27,13 +27,12 @@ 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"
MACHINE_EXTRA_RRECOMMENDS += " \
kernel-modules \
bcm2835-kernel-image \
"
# Set GPU firmware image to be used

6
recipes-bcm/common/firmware.inc
View File

@ -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}"

19
recipes-bcm/kernel-image/bcm2835-kernel-image.bb
View File

@ -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}"

33
recipes-bcm/kernel-image/bcm2835-mkimage.bb
View File

@ -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-* \
"

3
recipes-bcm/kernel-image/bcm2835-mkimage/LICENCE
View File

@ -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.

12
recipes-bcm/kernel-image/bcm2835-mkimage/bcm2835-args-uncompressed.txt
View File

@ -1,12 +0,0 @@
; kernel args (place at 0x00000100)
0x00000005
0x54410001
0x00000001
0x00001000
0x00000000
0x00000004
0x54410002
0x08000000
0x00000000
0x00000000
0x00000000

17
recipes-bcm/kernel-image/bcm2835-mkimage/bcm2835-boot-uncompressed.txt
View File

@ -1,17 +0,0 @@
; bootloader (place at 0x00000000)
0xea000006
0xe1a00000
0xe1a00000
0xe1a00000
0xe1a00000
0xe1a00000
0xe1a00000
0xe1a00000
0xe3a00000
0xe3a01042
0xe3811c0c
0xe59f2000
0xe59ff000
0x00000100
0x00008000

BIN
recipes-bcm/kernel-image/bcm2835-mkimage/bcm2835-kernel-first32k.bin
View File

Binary file not shown.

51
recipes-bcm/kernel-image/bcm2835-mkimage/bcm2835-mkimage.py
View File

@ -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<value>[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+"")

7
recipes-kernel/linux/linux-raspberrypi_3.1.9.bb
View File

@ -4,11 +4,11 @@ require linux.inc
DESCRIPTION = "Linux kernel for the RaspberryPi board"
PR = "r1"
PR = "r3"
# 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 \
"
@ -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() {