Skip to contentSkip to conversation

sdcard_image-rpi.bbclass: Copy startup files required for 16MB GPU operation.

PATCH Applied seth bollinger 3 participants 7 messages Apr 25, 2013 – May 3, 2013 1 message not in the archive

lore
Share & tools
lore
#0 lore raw

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.

---
 classes/sdcard_image-rpi.bbclass |    6 +-----
 1 files changed, 1 insertions(+), 5 deletions(-)
classes/sdcard_image-rpi.bbclass +0 -0
index 7fe7c35..2ae5fd4 100644
@@ -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
Signature · 1 line
1.7.2.5

From 2ac1c7b285fa0f48ae88461e72fd9b95d8ee2576 Mon Sep 17 00:00:00 2001
From: Seth Bollinger <[email protected]>
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.

---
 classes/sdcard_image-rpi.bbclass |    6 +-----
 1 files changed, 1 insertions(+), 5 deletions(-)
classes/sdcard_image-rpi.bbclass +1 -5
index 7fe7c35..2ae5fd4 100644
@@ -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
Signature · 1 line
1.7.2.5
#1 lore raw
Quoted 5 lines · seth bollinger

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.

Trying to apply this email I get:

Applying: sdcard_image-rpi.bbclass: Copy startup files required
for 16MB GPU operation.
fatal: corrupt patch at line 14
Patch failed at 0001 sdcard_image-rpi.bbclass: Copy startup files
required for 16MB GPU operation.

Trying to apply the attached patch I get:

Patch format detection failed.

Are you using 'git send-email'?

However, I can apply this after fixing the attached patch file by hand, giving it a test now.

--
Paul Barker

Email: [email protected]
http://www.paulbarker.me.uk

#3 lore raw
In reply to a message not in the archive
Quoted 20 lines · Seth Bollinger
Quoted 9 lines · Paul Barker

Trying to apply this email I get:

Applying: sdcard_image-rpi.bbclass: Copy startup files required
for 16MB GPU operation.
fatal: corrupt patch at line 14
Patch failed at 0001 sdcard_image-rpi.bbclass: Copy startup files
required for 16MB GPU operation.

Quoted 8 lines

Trying to apply the attached patch I get:

Patch format detection failed.

Are you using 'git send-email'?

However, I can apply this after fixing the attached patch file by hand, giving it a test now.

Quoted 6 lines

I run git format-patch and then copy the text into the email and attach the patch. I apologize for the trouble. Richard complained of whitespace problems in my last patches so I'm trying to alleviate this problem. :) I'll see if I can't get gmail set up on my vm so I can use git send-email.

Seth

Somehow a leading '>' crept into the attached patch.

Almost all mail clients ruin patches, maybe take a look at
https://coderwall.com/p/dp-gka for using 'git send-email' with gmail.

If you don't want to clog the list with attempts which might not work, send a few test patches to me and i'll let you know if they work.

--
Paul Barker

Email: [email protected]
http://www.paulbarker.me.uk

#4 lore raw
Quoted 31 lines · Paul Barker
Quoted 1 line · Seth Bollinger

On Thu, Apr 25, 2013 at 7:51 AM, Paul Barker <[email protected]>

Quoted 13 lines · wrote:
Quoted 13 lines

Trying to apply this email I get:

Applying: sdcard_image-rpi.bbclass: Copy startup files required
for 16MB GPU operation.
fatal: corrupt patch at line 14
Patch failed at 0001 sdcard_image-rpi.bbclass: Copy startup files
required for 16MB GPU operation.

Trying to apply the attached patch I get:

Patch format detection failed.

Quoted 7 lines
Quoted 4 lines

Are you using 'git send-email'?

However, I can apply this after fixing the attached patch file by hand, giving it a test now.

I run git format-patch and then copy the text into the email and attach

the

Quoted 3 lines

patch. I apologize for the trouble. Richard complained of whitespace problems in my last patches so I'm trying to alleviate this problem. :) I'll see if I can't get gmail set up on my vm so I can use git

send-email.

Quoted 2 lines

Seth

Quoted 9 lines

Somehow a leading '>' crept into the attached patch.

Almost all mail clients ruin patches, maybe take a look at
https://coderwall.com/p/dp-gka for using 'git send-email' with gmail.

If you don't want to clog the list with attempts which might not work, send a few test patches to me and i'll let you know if they work.

Aaaaaa... I just can't make it work. My advice is to use git send-email too.

Signature · 2 lines
*Andrei Gherzan*
m: +40.744.478.414 |  f: +40.31.816.28.12
#6 lore raw

Managed to apply it. Thanks.

Quoted 16 lines · Paul Barker
Quoted 2 lines · Andrei Gherzan

Aaaaaa... I just can't make it work. My advice is to use git send-email

too.

Quoted 1 line

You can cherry-pick it from my repository at the moment
(https://bitbucket.org/betafive/meta-raspberrypi), but yes, git send-email is the way forward.

--
Paul Barker

Email: [email protected]
http://www.paulbarker.me.uk

Signature · 2 lines
*Andrei Gherzan*
m: +40.744.478.414 |  f: +40.31.816.28.12
#7 lore raw

Merged to master.

Thanks a lot.

Quoted 28 lines · Andrei Gherzan

Managed to apply it. Thanks.

Quoted 10 lines · Paul Barker
Quoted 2 lines · Andrei Gherzan

Aaaaaa... I just can't make it work. My advice is to use git send-email

too.

Quoted 1 line

You can cherry-pick it from my repository at the moment
(https://bitbucket.org/betafive/meta-raspberrypi), but yes, git send-email is the way forward.

Quoted 6 lines

--
Paul Barker

Email: [email protected]
http://www.paulbarker.me.uk

--
*Andrei Gherzan*
m: +40.744.478.414 | f: +40.31.816.28.12

Signature · 2 lines
*Andrei Gherzan*
m: +40.744.478.414 |  f: +40.31.816.28.12