[meta-raspberrypi][PATCH 2/2] sdcard_image-rpi.bbclass: Copy startup files required for 16MB GPU operation.

[seth bollinger <seth.boll@gmail.com>]

[-- Attachment #1: Type: text/plain, Size: 1567 bytes --]

start_cd.elf and fixup_cd.dat are required when running the system with
a 16MB GPU memory configuration.  This change copies all files contained
in bcm2835-bootfiles instead of cherry picking.

Signed-off-by: Seth Bollinger <seth.boll@gmail.com>
---
  classes/sdcard_image-rpi.bbclass |    6 +-----
  1 files changed, 1 insertions(+), 5 deletions(-)

diff --git a/classes/sdcard_image-rpi.bbclass 
b/classes/sdcard_image-rpi.bbclass
index 7fe7c35..2ae5fd4 100644
--- a/classes/sdcard_image-rpi.bbclass
+++ b/classes/sdcard_image-rpi.bbclass
@@ -77,11 +77,7 @@ IMAGE_CMD_rpi-sdimg () {
      # Create a vfat image with boot files
      BOOT_BLOCKS=$(LC_ALL=C parted -s ${SDIMG} unit b print | awk '/ 1 
/ { print substr($4, 1, length($4 -1)) / 512 /2 }')
      mkfs.vfat -n "${BOOTDD_VOLUME_ID}" -S 512 -C ${WORKDIR}/boot.img 
$BOOT_BLOCKS
-    mcopy -i ${WORKDIR}/boot.img -s 
${DEPLOY_DIR_IMAGE}/bcm2835-bootfiles/start.elf ::
-    mcopy -i ${WORKDIR}/boot.img -s 
${DEPLOY_DIR_IMAGE}/bcm2835-bootfiles/fixup.dat ::
-    mcopy -i ${WORKDIR}/boot.img -s 
${DEPLOY_DIR_IMAGE}/bcm2835-bootfiles/config.txt ::
-    mcopy -i ${WORKDIR}/boot.img -s 
${DEPLOY_DIR_IMAGE}/bcm2835-bootfiles/cmdline.txt ::
-    mcopy -i ${WORKDIR}/boot.img -s 
${DEPLOY_DIR_IMAGE}/bcm2835-bootfiles/bootcode.bin ::
+    mcopy -i ${WORKDIR}/boot.img -s 
${DEPLOY_DIR_IMAGE}/bcm2835-bootfiles/* ::/
      mcopy -i ${WORKDIR}/boot.img -s 
${DEPLOY_DIR_IMAGE}/${KERNEL_IMAGETYPE}-${MACHINE}.bin ::kernel.img

      if [ -n ${FATPAYLOAD} ] ; then
-- 
1.7.2.5

[-- Attachment #2: 0002-sdcard_image-rpi.bbclass-Copy-startup-files-required.patch --]
[-- Type: text/plain, Size: 1768 bytes --]

From 2ac1c7b285fa0f48ae88461e72fd9b95d8ee2576 Mon Sep 17 00:00:00 2001
From: Seth Bollinger <seth.boll@gmail.com>
Date: Mon, 22 Apr 2013 07:25:58 -0500
Subject: [PATCH 2/2] sdcard_image-rpi.bbclass:  Copy startup files required for 16MB GPU operation.

start_cd.elf and fixup_cd.dat are required when running the system with
a 16MB GPU memory configuration.  This change copies all files contained
in bcm2835-bootfiles instead of cherry picking.

Signed-off-by: Seth Bollinger <seth.boll@gmail.com>
---
 classes/sdcard_image-rpi.bbclass |    6 +-----
 1 files changed, 1 insertions(+), 5 deletions(-)

diff --git a/classes/sdcard_image-rpi.bbclass b/classes/sdcard_image-rpi.bbclass
index 7fe7c35..2ae5fd4 100644
--- a/classes/sdcard_image-rpi.bbclass
+++ b/classes/sdcard_image-rpi.bbclass
@@ -77,11 +77,7 @@ IMAGE_CMD_rpi-sdimg () {
 	# Create a vfat image with boot files
 	BOOT_BLOCKS=$(LC_ALL=C parted -s ${SDIMG} unit b print | awk '/ 1 / { print substr($4, 1, length($4 -1)) / 512 /2 }')
 	mkfs.vfat -n "${BOOTDD_VOLUME_ID}" -S 512 -C ${WORKDIR}/boot.img $BOOT_BLOCKS
-	mcopy -i ${WORKDIR}/boot.img -s ${DEPLOY_DIR_IMAGE}/bcm2835-bootfiles/start.elf ::
-	mcopy -i ${WORKDIR}/boot.img -s ${DEPLOY_DIR_IMAGE}/bcm2835-bootfiles/fixup.dat ::
-	mcopy -i ${WORKDIR}/boot.img -s ${DEPLOY_DIR_IMAGE}/bcm2835-bootfiles/config.txt ::
-	mcopy -i ${WORKDIR}/boot.img -s ${DEPLOY_DIR_IMAGE}/bcm2835-bootfiles/cmdline.txt ::
-	mcopy -i ${WORKDIR}/boot.img -s ${DEPLOY_DIR_IMAGE}/bcm2835-bootfiles/bootcode.bin ::
+	mcopy -i ${WORKDIR}/boot.img -s ${DEPLOY_DIR_IMAGE}/bcm2835-bootfiles/* ::/
 	mcopy -i ${WORKDIR}/boot.img -s ${DEPLOY_DIR_IMAGE}/${KERNEL_IMAGETYPE}-${MACHINE}.bin ::kernel.img
 
 	if [ -n ${FATPAYLOAD} ] ; then
-- 
1.7.2.5