diff mbox

[U-Boot,v2,1/1] meson: gxbb: change ramdisk_addr_r

Message ID 1492193086-23563-1-git-send-email-xypron.glpk@gmx.de
State Accepted
Delegated to: Tom Rini
Headers show

Commit Message

Heinrich Schuchardt April 14, 2017, 6:04 p.m. UTC
0x10000000 is the start of a 2 MiB area used by the
ARM Trusted Firmware (BL31).

See
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable.git/tree/arch/arm64/boot/dts/amlogic/meson-gx.dtsi?id=refs/tags/v4.10.10

So we should not load the ramdisk here.

The legacy Ubuntu image for the Odroid C2 comes with the
following line in boot.ini:
setenv initrd_loadaddr "0x13000000"

See
http://odroid.in/ubuntu_16.04lts/ubuntu64-16.04-minimal-odroid-c2-20160815.img.xz
http://deb.odroid.in/c2/pool/main/u/u-boot/u-boot_20170226-752a100-8_arm64.deb

So let's use the same address.

With the patch booting Linux with booti succeeds on an Odroid C2,
without the patch Linux hangs.

Cc: Andreas Färber <afaerber@suse.de>
Signed-off-by: Heinrich Schuchardt <xypron.glpk@gmx.de>
---
v2:
  Title and commit message changed to reflect that this patch
  applies to all Meson GXBB systems.
v1:
  Initial patch
  [PATCH 1/1] odroid-c2: change ramdisk_addr_r
  https://lists.denx.de/pipermail/u-boot/2017-April/287373.html
---
 include/configs/meson-gxbb-common.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Comments

Simon Glass April 16, 2017, 7:33 p.m. UTC | #1
On 14 April 2017 at 12:04, Heinrich Schuchardt <xypron.glpk@gmx.de> wrote:
> 0x10000000 is the start of a 2 MiB area used by the
> ARM Trusted Firmware (BL31).
>
> See
> https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable.git/tree/arch/arm64/boot/dts/amlogic/meson-gx.dtsi?id=refs/tags/v4.10.10
>
> So we should not load the ramdisk here.
>
> The legacy Ubuntu image for the Odroid C2 comes with the
> following line in boot.ini:
> setenv initrd_loadaddr "0x13000000"
>
> See
> http://odroid.in/ubuntu_16.04lts/ubuntu64-16.04-minimal-odroid-c2-20160815.img.xz
> http://deb.odroid.in/c2/pool/main/u/u-boot/u-boot_20170226-752a100-8_arm64.deb
>
> So let's use the same address.
>
> With the patch booting Linux with booti succeeds on an Odroid C2,
> without the patch Linux hangs.
>
> Cc: Andreas Färber <afaerber@suse.de>
> Signed-off-by: Heinrich Schuchardt <xypron.glpk@gmx.de>
> ---
> v2:
>   Title and commit message changed to reflect that this patch
>   applies to all Meson GXBB systems.
> v1:
>   Initial patch
>   [PATCH 1/1] odroid-c2: change ramdisk_addr_r
>   https://lists.denx.de/pipermail/u-boot/2017-April/287373.html
> ---
>  include/configs/meson-gxbb-common.h | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)

Reviewed-by: Simon Glass <sjg@chromium.org>
Vagrant Cascadian April 17, 2017, 8:41 p.m. UTC | #2
On 2017-04-14, xypron.glpk@gmx.de wrote:
> 0x10000000 is the start of a 2 MiB area used by the
> ARM Trusted Firmware (BL31).
>
> See
> https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable.git/tree/arch/arm64/boot/dts/amlogic/meson-gx.dtsi?id=refs/tags/v4.10.10
>
> So we should not load the ramdisk here.
>
> The legacy Ubuntu image for the Odroid C2 comes with the
> following line in boot.ini:
> setenv initrd_loadaddr "0x13000000"
>
> See
> http://odroid.in/ubuntu_16.04lts/ubuntu64-16.04-minimal-odroid-c2-20160815.img.xz
> http://deb.odroid.in/c2/pool/main/u/u-boot/u-boot_20170226-752a100-8_arm64.deb
>
> So let's use the same address.
>
> With the patch booting Linux with booti succeeds on an Odroid C2,
> without the patch Linux hangs.
>
> Cc: Andreas Färber <afaerber@suse.de>
> Signed-off-by: Heinrich Schuchardt <xypron.glpk@gmx.de>
> Reviewed-by: Simon Glass <sjg@chromium.org>

Tested booting kernel+devicetree+ramdisk on an odroid-c2.

Tested-by: Vagrant Cascadian <vagrant@debian.org>

live well,
  vagrant

> ---
> v2:
>   Title and commit message changed to reflect that this patch
>   applies to all Meson GXBB systems.
> v1:
>   Initial patch
>   [PATCH 1/1] odroid-c2: change ramdisk_addr_r
>   https://lists.denx.de/pipermail/u-boot/2017-April/287373.html
> ---
>  include/configs/meson-gxbb-common.h | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/include/configs/meson-gxbb-common.h b/include/configs/meson-gxbb-common.h
> index 3fbfcef..66b37a6 100644
> --- a/include/configs/meson-gxbb-common.h
> +++ b/include/configs/meson-gxbb-common.h
> @@ -50,7 +50,7 @@
>  	"scriptaddr=0x1f000000\0" \
>  	"kernel_addr_r=0x01080000\0" \
>  	"pxefile_addr_r=0x01080000\0" \
> -	"ramdisk_addr_r=0x10000000\0" \
> +	"ramdisk_addr_r=0x13000000\0" \
>  	MESON_FDTFILE_SETTING \
>  	BOOTENV
>
Heinrich Schuchardt May 1, 2017, 4:20 p.m. UTC | #3
On 04/17/2017 10:41 PM, Vagrant Cascadian wrote:
> On 2017-04-14, xypron.glpk@gmx.de wrote:
>> 0x10000000 is the start of a 2 MiB area used by the
>> ARM Trusted Firmware (BL31).
>>
>> See
>> https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable.git/tree/arch/arm64/boot/dts/amlogic/meson-gx.dtsi?id=refs/tags/v4.10.10
>>
>> So we should not load the ramdisk here.
>>
>> The legacy Ubuntu image for the Odroid C2 comes with the
>> following line in boot.ini:
>> setenv initrd_loadaddr "0x13000000"
>>
>> See
>> http://odroid.in/ubuntu_16.04lts/ubuntu64-16.04-minimal-odroid-c2-20160815.img.xz
>> http://deb.odroid.in/c2/pool/main/u/u-boot/u-boot_20170226-752a100-8_arm64.deb
>>
>> So let's use the same address.
>>
>> With the patch booting Linux with booti succeeds on an Odroid C2,
>> without the patch Linux hangs.
>>
>> Cc: Andreas Färber <afaerber@suse.de>
>> Signed-off-by: Heinrich Schuchardt <xypron.glpk@gmx.de>
>> Reviewed-by: Simon Glass <sjg@chromium.org>
> 
> Tested booting kernel+devicetree+ramdisk on an odroid-c2.
> 
> Tested-by: Vagrant Cascadian <vagrant@debian.org>
> 
> live well,
>   vagrant
> 
>> ---
>> v2:
>>   Title and commit message changed to reflect that this patch
>>   applies to all Meson GXBB systems.
>> v1:
>>   Initial patch
>>   [PATCH 1/1] odroid-c2: change ramdisk_addr_r
>>   https://lists.denx.de/pipermail/u-boot/2017-April/287373.html
>> ---
>>  include/configs/meson-gxbb-common.h | 2 +-
>>  1 file changed, 1 insertion(+), 1 deletion(-)
>>
>> diff --git a/include/configs/meson-gxbb-common.h b/include/configs/meson-gxbb-common.h
>> index 3fbfcef..66b37a6 100644
>> --- a/include/configs/meson-gxbb-common.h
>> +++ b/include/configs/meson-gxbb-common.h
>> @@ -50,7 +50,7 @@
>>  	"scriptaddr=0x1f000000\0" \
>>  	"kernel_addr_r=0x01080000\0" \
>>  	"pxefile_addr_r=0x01080000\0" \
>> -	"ramdisk_addr_r=0x10000000\0" \
>> +	"ramdisk_addr_r=0x13000000\0" \
>>  	MESON_FDTFILE_SETTING \
>>  	BOOTENV
>>  
Hello Tom,

could you, please, merge this patch. It is needed to boot the Odroid C2.

Best regards

Heinrich Schuchardt
Tom Rini May 1, 2017, 4:38 p.m. UTC | #4
On Fri, Apr 14, 2017 at 08:04:46PM +0200, xypron.glpk@gmx.de wrote:

> 0x10000000 is the start of a 2 MiB area used by the
> ARM Trusted Firmware (BL31).
> 
> See
> https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable.git/tree/arch/arm64/boot/dts/amlogic/meson-gx.dtsi?id=refs/tags/v4.10.10
> 
> So we should not load the ramdisk here.
> 
> The legacy Ubuntu image for the Odroid C2 comes with the
> following line in boot.ini:
> setenv initrd_loadaddr "0x13000000"
> 
> See
> http://odroid.in/ubuntu_16.04lts/ubuntu64-16.04-minimal-odroid-c2-20160815.img.xz
> http://deb.odroid.in/c2/pool/main/u/u-boot/u-boot_20170226-752a100-8_arm64.deb
> 
> So let's use the same address.
> 
> With the patch booting Linux with booti succeeds on an Odroid C2,
> without the patch Linux hangs.
> 
> Cc: Andreas Färber <afaerber@suse.de>
> Signed-off-by: Heinrich Schuchardt <xypron.glpk@gmx.de>
> Reviewed-by: Simon Glass <sjg@chromium.org>
> Tested-by: Vagrant Cascadian <vagrant@debian.org>

Applied to u-boot/master, thanks!
diff mbox

Patch

diff --git a/include/configs/meson-gxbb-common.h b/include/configs/meson-gxbb-common.h
index 3fbfcef..66b37a6 100644
--- a/include/configs/meson-gxbb-common.h
+++ b/include/configs/meson-gxbb-common.h
@@ -50,7 +50,7 @@ 
 	"scriptaddr=0x1f000000\0" \
 	"kernel_addr_r=0x01080000\0" \
 	"pxefile_addr_r=0x01080000\0" \
-	"ramdisk_addr_r=0x10000000\0" \
+	"ramdisk_addr_r=0x13000000\0" \
 	MESON_FDTFILE_SETTING \
 	BOOTENV