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

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

[seth bollinger]

[-- 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

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

[Paul Barker]

On 25 April 2013 02:00, seth bollinger <seth.boll@gmail.com> wrote:
> 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>

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: paul@paulbarker.me.uk
http://www.paulbarker.me.uk

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

[Paul Barker]

On 25 April 2013 13:57, Seth Bollinger <seth.boll@gmail.com> wrote:
> On Thu, Apr 25, 2013 at 7:51 AM, Paul Barker <paul@paulbarker.me.uk> wrote:
>>
>> 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.
>
>
> 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: paul@paulbarker.me.uk
http://www.paulbarker.me.uk

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

[Andrei Gherzan]

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

On Thu, Apr 25, 2013 at 3:03 PM, Paul Barker <paul@paulbarker.me.uk> wrote:

> On 25 April 2013 13:57, Seth Bollinger <seth.boll@gmail.com> wrote:
> > On Thu, Apr 25, 2013 at 7:51 AM, Paul Barker <paul@paulbarker.me.uk>
> wrote:
> >>
> >> 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.
> >
> >
> > 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.
>
>
Aaaaaa... I just can't make it work. My advice is to use git send-email
too.

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

[-- Attachment #2: Type: text/html, Size: 2852 bytes --]

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

[Paul Barker]

On 1 May 2013 20:19, Andrei Gherzan <andrei@gherzan.ro> wrote:
>
> Aaaaaa... I just can't make it work. My advice is to use git send-email too.
>

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: paul@paulbarker.me.uk
http://www.paulbarker.me.uk

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

[Andrei Gherzan]

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

Managed to apply it. Thanks.


On Thu, May 2, 2013 at 1:37 PM, Paul Barker <paul@paulbarker.me.uk> wrote:

> On 1 May 2013 20:19, Andrei Gherzan <andrei@gherzan.ro> wrote:
> >
> > Aaaaaa... I just can't make it work. My advice is to use git send-email
> too.
> >
>
> 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: paul@paulbarker.me.uk
> http://www.paulbarker.me.uk
>



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

[-- Attachment #2: Type: text/html, Size: 1647 bytes --]

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

[Andrei Gherzan]

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

Merged to master.

Thanks a lot.


On Thu, May 2, 2013 at 2:05 PM, Andrei Gherzan <andrei@gherzan.ro> wrote:

> Managed to apply it. Thanks.
>
>
> On Thu, May 2, 2013 at 1:37 PM, Paul Barker <paul@paulbarker.me.uk> wrote:
>
>> On 1 May 2013 20:19, Andrei Gherzan <andrei@gherzan.ro> wrote:
>> >
>> > Aaaaaa... I just can't make it work. My advice is to use git send-email
>> too.
>> >
>>
>> 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: paul@paulbarker.me.uk
>> http://www.paulbarker.me.uk
>>
>
>
>
> --
> *Andrei Gherzan*
> m: +40.744.478.414 |  f: +40.31.816.28.12
>



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

[-- Attachment #2: Type: text/html, Size: 2770 bytes --]