diff mbox series

[U-Boot,RFC,5/6] arm: exynos: odroid: fix the confict scripaddr extra env setting

Message ID 20190401115232.453-6-linux.amoon@gmail.com
State RFC
Delegated to: Lukasz Majewski
Headers show
Series Odroid U3 usb initialization | expand

Commit Message

Anand Moon April 1, 2019, 11:52 a.m. UTC
fix the confict of scriptaddr address with ramdisk_addr_r
also add missing pxefile_addr_r u-boot extras env setting.

Signed-off-by: Anand Moon <linux.amoon@gmail.com>
---
 include/configs/odroid.h | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

Comments

Krzysztof Kozlowski April 1, 2019, 1 p.m. UTC | #1
On Mon, 1 Apr 2019 at 13:53, Anand Moon <linux.amoon@gmail.com> wrote:
>
> fix the confict of scriptaddr address with ramdisk_addr_r

Start with capital letter, so s/fix/Fix. End with a full-stop.

> also add missing pxefile_addr_r u-boot extras env setting.

s/also/Also/

... but there is no conflict in the first place. These addresses are
not used in the same time.

Best regards,
Krzysztof

>
> Signed-off-by: Anand Moon <linux.amoon@gmail.com>
> ---
>  include/configs/odroid.h | 3 ++-
>  1 file changed, 2 insertions(+), 1 deletion(-)
>
> diff --git a/include/configs/odroid.h b/include/configs/odroid.h
> index d8d30c0f62..64819cf81c 100644
> --- a/include/configs/odroid.h
> +++ b/include/configs/odroid.h
> @@ -169,9 +169,10 @@
>         "consoleoff=set console console=ram; save; reset\0" \
>         "initrdname=uInitrd\0" \
>         "ramdisk_addr_r=0x42000000\0" \
> -       "scriptaddr=0x42000000\0" \
>         "fdt_addr_r=0x40800000\0" \
>         "kernel_addr_r=0x41000000\0" \
> +       "scriptaddr=0x50000000\0" \
> +       "pxefile_addr_r=0x51000000\0" \
>         BOOTENV
>
>  /* GPT */
> --
> 2.21.0
>
Anand Moon April 1, 2019, 3:43 p.m. UTC | #2
Hi Krzysztof,

On Mon, 1 Apr 2019 at 18:30, Krzysztof Kozlowski <krzk@kernel.org> wrote:
>
> On Mon, 1 Apr 2019 at 13:53, Anand Moon <linux.amoon@gmail.com> wrote:
> >
> > fix the confict of scriptaddr address with ramdisk_addr_r
>
> Start with capital letter, so s/fix/Fix. End with a full-stop.
>
> > also add missing pxefile_addr_r u-boot extras env setting.
>
> s/also/Also/
>
> ... but there is no conflict in the first place. These addresses are
> not used in the same time.
>
> Best regards,
> Krzysztof
>

Thanks for your review comments. I will try to improve on this.
While investigating my earlier failure to load kernel some time ago.
I discover this inputs after study Arch linux u-boot changes.

Below is loot log on ArchLinux and the boot.scr script is loaded
50000000 address
which do not conflict with rest of the settings.

U-Boot 2019.04-rc4-00089-ga5515f5f60 (Apr 01 2019 - 11:11:59 +0000)

CPU:   Exynos4412 @ 1 GHz
Model: Odroid based on Exynos4412
Type:  u3
DRAM:  2 GiB
LDO20@VDDQ_EMMC_1.8V: set 1800000 uV; enabling
LDO22@VDDQ_EMMC_2.8V: set 2800000 uV; enabling
LDO21@TFLASH_2.8V: set 2800000 uV; enabling
MMC:   SAMSUNG SDHCI: 1, EXYNOS DWMMC: 0
Loading Environment from MMC... Card did not respond to voltage select!
*** Warning - No block device, using default environment

Net:   No ethernet found.
Hit any key to stop autoboot:  0
switch to partitions #0, OK
mmc1 is current device
Scanning mmc 1:1...
Found U-Boot script /boot/boot.scr
932 bytes read in 6 ms (151.4 KiB/s)
## Executing script at 50000000
6625664 bytes read in 243 ms (26 MiB/s)
72657 bytes read in 20 ms (3.5 MiB/s)
6593459 bytes read in 241 ms (26.1 MiB/s)
Kernel image @ 0x41000000 [ 0x000000 - 0x651980 ]
## Flattened Device Tree blob at 40800000
   Booting using the fdt blob at 0x40800000
   Loading Ramdisk to 4f9b6000, end 4ffffbb3 ... OK
   Loading Device Tree to 4f9a1000, end 4f9b5bd0 ... OK

Starting kernel ...

[    0.000000] Booting Linux on physical CPU 0xa00
[    0.000000] Linux version 5.0.5-1-ARCH (builduser@leming) (gcc
version 8.2.1 20181127 (GCC)) #1 SMP PREEMPT Sat Mar 30 00:25:25 UTC
2019
[    0.000000] CPU: ARMv7 Processor [413fc090] revision 0 (ARMv7), cr=10c5387d
[    0.000000] CPU: PIPT / VIPT nonaliasing data cache, VIPT aliasing
instruction cache
[    0.000000] OF: fdt: Machine model: Hardkernel ODROID-U3 board
based on Exynos4412

Best Regards
-Anand
diff mbox series

Patch

diff --git a/include/configs/odroid.h b/include/configs/odroid.h
index d8d30c0f62..64819cf81c 100644
--- a/include/configs/odroid.h
+++ b/include/configs/odroid.h
@@ -169,9 +169,10 @@ 
 	"consoleoff=set console console=ram; save; reset\0" \
 	"initrdname=uInitrd\0" \
 	"ramdisk_addr_r=0x42000000\0" \
-	"scriptaddr=0x42000000\0" \
 	"fdt_addr_r=0x40800000\0" \
 	"kernel_addr_r=0x41000000\0" \
+	"scriptaddr=0x50000000\0" \
+	"pxefile_addr_r=0x51000000\0" \
 	BOOTENV
 
 /* GPT */