[U-Boot] arm64: a37xx: add distro boot compability

[U-Boot] arm64: a37xx: add distro boot compability

[Andre Heider]

Hi,

this small set improves the usability to ease booting distro shipped
kernels. Tested on espressobin with debian's flash-kernel. I could
successfully boot from usb.

Thanks,
Andre

ps: please keep me cc:'ed, not subscribed

[U-Boot] [PATCH 1/4] arm64: a37xx: use disto defaults

[Andre Heider]

Signed-off-by: Andre Heider <a.heider@gmail.com>
---
 include/configs/mvebu_armada-37xx.h | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/include/configs/mvebu_armada-37xx.h b/include/configs/mvebu_armada-37xx.h
index 1b2e0d71b4..3e1ff02ed7 100644
--- a/include/configs/mvebu_armada-37xx.h
+++ b/include/configs/mvebu_armada-37xx.h
@@ -44,9 +44,6 @@
 /*
  * Other required minimal configurations
  */
-#define CONFIG_SYS_LONGHELP
-#define CONFIG_AUTO_COMPLETE
-#define CONFIG_CMDLINE_EDITING
 #define CONFIG_ARCH_CPU_INIT		/* call arch_cpu_init() */
 #define CONFIG_SYS_LOAD_ADDR	0x00800000	/* default load adr- 8M */
 #define CONFIG_SYS_MEMTEST_START 0x00800000	/* 8M */
@@ -109,4 +106,6 @@
 
 #define CONFIG_SUPPORT_VFAT
 
+#include <config_distro_defaults.h>
+
 #endif /* _CONFIG_MVEBU_ARMADA_37XX_H */
-- 
2.15.1

[U-Boot] [PATCH 2/4] arm64: a37xx: add distro compatible env vars

[Andre Heider]

the values of dt_addr_r/kernel_addr_r/ramdisk_addr_r are taken from
the downstream 'u-boot-2017.03-armada-17.10' release.

the chosen values of scriptaddr and pxefile_addr_r are below fdt_addr_r,
in 1MB steps.

Signed-off-by: Andre Heider <a.heider@gmail.com>
---
 include/configs/mvebu_armada-37xx.h | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/include/configs/mvebu_armada-37xx.h b/include/configs/mvebu_armada-37xx.h
index 3e1ff02ed7..383e6dfaf4 100644
--- a/include/configs/mvebu_armada-37xx.h
+++ b/include/configs/mvebu_armada-37xx.h
@@ -108,4 +108,11 @@
 
 #include <config_distro_defaults.h>
 
+#define CONFIG_EXTRA_ENV_SETTINGS	\
+	"scriptaddr=0x4d00000\0"	\
+	"pxefile_addr_r=0x4e00000\0"	\
+	"fdt_addr_r=0x4f00000\0"	\
+	"kernel_addr_r=0x5000000\0"	\
+	"ramdisk_addr_r=0x8000000"
+
 #endif /* _CONFIG_MVEBU_ARMADA_37XX_H */
-- 
2.15.1

[U-Boot] [PATCH 3/4] arm64: a37xx: defconfigs: enable CONFIG_DISTRO_DEFAULTS

[Andre Heider]

Signed-off-by: Andre Heider <a.heider@gmail.com>
---
 configs/mvebu_db-88f3720_defconfig          | 1 +
 configs/mvebu_espressobin-88f3720_defconfig | 1 +
 2 files changed, 2 insertions(+)

diff --git a/configs/mvebu_db-88f3720_defconfig b/configs/mvebu_db-88f3720_defconfig
index 0fd4514c37..321151e41d 100644
--- a/configs/mvebu_db-88f3720_defconfig
+++ b/configs/mvebu_db-88f3720_defconfig
@@ -3,6 +3,7 @@ CONFIG_ARCH_MVEBU=y
 CONFIG_SYS_MALLOC_F_LEN=0x2000
 CONFIG_TARGET_MVEBU_ARMADA_37XX=y
 CONFIG_DEFAULT_DEVICE_TREE="armada-3720-db"
+CONFIG_DISTRO_DEFAULTS=y
 CONFIG_DEBUG_UART=y
 CONFIG_AHCI=y
 # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
diff --git a/configs/mvebu_espressobin-88f3720_defconfig b/configs/mvebu_espressobin-88f3720_defconfig
index 95db6c610e..5d9fb75b17 100644
--- a/configs/mvebu_espressobin-88f3720_defconfig
+++ b/configs/mvebu_espressobin-88f3720_defconfig
@@ -3,6 +3,7 @@ CONFIG_ARCH_MVEBU=y
 CONFIG_SYS_MALLOC_F_LEN=0x2000
 CONFIG_TARGET_MVEBU_ARMADA_37XX=y
 CONFIG_DEFAULT_DEVICE_TREE="armada-3720-espressobin"
+CONFIG_DISTRO_DEFAULTS=y
 CONFIG_DEBUG_UART=y
 CONFIG_AHCI=y
 # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
-- 
2.15.1

[U-Boot] [PATCH 4/4] arm64: a37xx: use distro bootcmd

[Andre Heider]

Signed-off-by: Andre Heider <a.heider@gmail.com>
---
 include/configs/mvebu_armada-37xx.h | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/include/configs/mvebu_armada-37xx.h b/include/configs/mvebu_armada-37xx.h
index 383e6dfaf4..f5b4f72118 100644
--- a/include/configs/mvebu_armada-37xx.h
+++ b/include/configs/mvebu_armada-37xx.h
@@ -108,11 +108,22 @@
 
 #include <config_distro_defaults.h>
 
+#define BOOT_TARGET_DEVICES(func) \
+	func(MMC, mmc, 1) \
+	func(MMC, mmc, 0) \
+	func(USB, usb, 0) \
+	func(SCSI, scsi, 0) \
+	func(PXE, pxe, na) \
+	func(DHCP, dhcp, na)
+
+#include <config_distro_bootcmd.h>
+
 #define CONFIG_EXTRA_ENV_SETTINGS	\
 	"scriptaddr=0x4d00000\0"	\
 	"pxefile_addr_r=0x4e00000\0"	\
 	"fdt_addr_r=0x4f00000\0"	\
 	"kernel_addr_r=0x5000000\0"	\
-	"ramdisk_addr_r=0x8000000"
+	"ramdisk_addr_r=0x8000000\0"	\
+	BOOTENV
 
 #endif /* _CONFIG_MVEBU_ARMADA_37XX_H */
-- 
2.15.1

[U-Boot] arm64: a37xx: add distro boot compability

[Andre Heider]

On 02/12/17 10:46, Andre Heider wrote:
> this small set improves the usability to ease booting distro shipped
> kernels. Tested on espressobin with debian's flash-kernel. I could
> successfully boot from usb.

Anyone? Bueller?

[U-Boot] arm64: a37xx: add distro boot compability

[Stefan Roese]

Hi Andre,

On 14.12.2017 11:17, Andre Heider wrote:
> On 02/12/17 10:46, Andre Heider wrote:
>> this small set improves the usability to ease booting distro shipped
>> kernels. Tested on espressobin with debian's flash-kernel. I could
>> successfully boot from usb.
> 
> Anyone? Bueller?

I'm waiting for Kosta to comment on this (already triggered). So
please allow us a bit more time.

Thanks,
Stefan

[U-Boot] arm64: a37xx: add distro boot compability

[Andre Heider]

Hi,

On 14/12/17 11:23, Stefan Roese wrote:
> Hi Andre,
> 
> On 14.12.2017 11:17, Andre Heider wrote:
>> On 02/12/17 10:46, Andre Heider wrote:
>>> this small set improves the usability to ease booting distro shipped
>>> kernels. Tested on espressobin with debian's flash-kernel. I could
>>> successfully boot from usb.
>>
>> Anyone? Bueller?
> 
> I'm waiting for Kosta to comment on this (already triggered). So
> please allow us a bit more time.

Alright, thanks! I just wanted to make sure this isn't falling through 
the cracks.

Regards,
Andre

[U-Boot] arm64: a37xx: add distro boot compability

[Stefan Roese]

On 14.12.2017 11:26, Andre Heider wrote:
> On 14/12/17 11:23, Stefan Roese wrote:
>> Hi Andre,
>>
>> On 14.12.2017 11:17, Andre Heider wrote:
>>> On 02/12/17 10:46, Andre Heider wrote:
>>>> this small set improves the usability to ease booting distro shipped
>>>> kernels. Tested on espressobin with debian's flash-kernel. I could
>>>> successfully boot from usb.
>>>
>>> Anyone? Bueller?
>>
>> I'm waiting for Kosta to comment on this (already triggered). So
>> please allow us a bit more time.
> 
> Alright, thanks! I just wanted to make sure this isn't falling through 
> the cracks.

No problem. Checking for the status is always possible. My current
plan is to push this patch (and other pending Marvell patches) after
this upcoming release, as Tom wanted to be a bit more strict with
only accepting bug fixes after rc1.

Thanks,
Stefan

[U-Boot] [EXT] [PATCH 1/4] arm64: a37xx: use disto defaults

[Kostya Porotchkin]

> -----Original Message-----
> From: Andre Heider [mailto:a.heider at gmail.com]
> Sent: Saturday, December 02, 2017 11:47
> To: u-boot at lists.denx.de
> Cc: Stefan Roese; Kostya Porotchkin
> Subject: [EXT] [PATCH 1/4] arm64: a37xx: use disto defaults
> 
> External Email
> 
> ----------------------------------------------------------------------
> Signed-off-by: Andre Heider <a.heider@gmail.com>
> ---
>  include/configs/mvebu_armada-37xx.h | 5 ++---
>  1 file changed, 2 insertions(+), 3 deletions(-)
> 
> diff --git a/include/configs/mvebu_armada-37xx.h
> b/include/configs/mvebu_armada-37xx.h
> index 1b2e0d71b4..3e1ff02ed7 100644
> --- a/include/configs/mvebu_armada-37xx.h
> +++ b/include/configs/mvebu_armada-37xx.h
> @@ -44,9 +44,6 @@
>  /*
>   * Other required minimal configurations
>   */
> -#define CONFIG_SYS_LONGHELP
> -#define CONFIG_AUTO_COMPLETE
> -#define CONFIG_CMDLINE_EDITING
>  #define CONFIG_ARCH_CPU_INIT		/* call arch_cpu_init() */
>  #define CONFIG_SYS_LOAD_ADDR	0x00800000	/* default load adr- 8M */
>  #define CONFIG_SYS_MEMTEST_START 0x00800000	/* 8M */
> @@ -109,4 +106,6 @@
> 
>  #define CONFIG_SUPPORT_VFAT
> 
> +#include <config_distro_defaults.h>
> +
>  #endif /* _CONFIG_MVEBU_ARMADA_37XX_H */
> --
> 2.15.1
Reviewed-by: Konstantin Porotchkin <kostap@marvell.com>

[U-Boot] [EXT] [PATCH 3/4] arm64: a37xx: defconfigs: enable CONFIG_DISTRO_DEFAULTS

[Kostya Porotchkin]

> -----Original Message-----
> From: Andre Heider [mailto:a.heider at gmail.com]
> Sent: Saturday, December 02, 2017 11:47
> To: u-boot at lists.denx.de
> Cc: Stefan Roese; Kostya Porotchkin
> Subject: [EXT] [PATCH 3/4] arm64: a37xx: defconfigs: enable
> CONFIG_DISTRO_DEFAULTS
> 
> External Email
> 
> ----------------------------------------------------------------------
> Signed-off-by: Andre Heider <a.heider@gmail.com>
> ---
>  configs/mvebu_db-88f3720_defconfig          | 1 +
>  configs/mvebu_espressobin-88f3720_defconfig | 1 +
>  2 files changed, 2 insertions(+)
> 
> diff --git a/configs/mvebu_db-88f3720_defconfig b/configs/mvebu_db-
> 88f3720_defconfig
> index 0fd4514c37..321151e41d 100644
> --- a/configs/mvebu_db-88f3720_defconfig
> +++ b/configs/mvebu_db-88f3720_defconfig
> @@ -3,6 +3,7 @@ CONFIG_ARCH_MVEBU=y
>  CONFIG_SYS_MALLOC_F_LEN=0x2000
>  CONFIG_TARGET_MVEBU_ARMADA_37XX=y
>  CONFIG_DEFAULT_DEVICE_TREE="armada-3720-db"
> +CONFIG_DISTRO_DEFAULTS=y
>  CONFIG_DEBUG_UART=y
>  CONFIG_AHCI=y
>  # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set diff --git
> a/configs/mvebu_espressobin-88f3720_defconfig
> b/configs/mvebu_espressobin-88f3720_defconfig
> index 95db6c610e..5d9fb75b17 100644
> --- a/configs/mvebu_espressobin-88f3720_defconfig
> +++ b/configs/mvebu_espressobin-88f3720_defconfig
> @@ -3,6 +3,7 @@ CONFIG_ARCH_MVEBU=y
>  CONFIG_SYS_MALLOC_F_LEN=0x2000
>  CONFIG_TARGET_MVEBU_ARMADA_37XX=y
>  CONFIG_DEFAULT_DEVICE_TREE="armada-3720-espressobin"
> +CONFIG_DISTRO_DEFAULTS=y
>  CONFIG_DEBUG_UART=y
>  CONFIG_AHCI=y
>  # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
> --
> 2.15.1
 
Reviewed-by: Konstantin Porotchkin <kostap@marvell.com>

[U-Boot] [EXT] [PATCH 2/4] arm64: a37xx: add distro compatible env vars

[Kostya Porotchkin]

> -----Original Message-----
> From: Andre Heider [mailto:a.heider at gmail.com]
> Sent: Saturday, December 02, 2017 11:47
> To: u-boot at lists.denx.de
> Cc: Stefan Roese; Kostya Porotchkin
> Subject: [EXT] [PATCH 2/4] arm64: a37xx: add distro compatible env vars
> 
> External Email
> 
> ----------------------------------------------------------------------
> the values of dt_addr_r/kernel_addr_r/ramdisk_addr_r are taken from the
> downstream 'u-boot-2017.03-armada-17.10' release.
> 
> the chosen values of scriptaddr and pxefile_addr_r are below fdt_addr_r,
> in 1MB steps.
> 
> Signed-off-by: Andre Heider <a.heider@gmail.com>
> ---
>  include/configs/mvebu_armada-37xx.h | 7 +++++++
>  1 file changed, 7 insertions(+)
> 
> diff --git a/include/configs/mvebu_armada-37xx.h
> b/include/configs/mvebu_armada-37xx.h
> index 3e1ff02ed7..383e6dfaf4 100644
> --- a/include/configs/mvebu_armada-37xx.h
> +++ b/include/configs/mvebu_armada-37xx.h
> @@ -108,4 +108,11 @@
> 
>  #include <config_distro_defaults.h>
> 
> +#define CONFIG_EXTRA_ENV_SETTINGS	\
> +	"scriptaddr=0x4d00000\0"	\
> +	"pxefile_addr_r=0x4e00000\0"	\
> +	"fdt_addr_r=0x4f00000\0"	\
> +	"kernel_addr_r=0x5000000\0"	\
> +	"ramdisk_addr_r=0x8000000"
> +
>  #endif /* _CONFIG_MVEBU_ARMADA_37XX_H */
> --
> 2.15.1
Reviewed-by: Konstantin Porotchkin <kostap@marvell.com>

[U-Boot] [EXT] [PATCH 4/4] arm64: a37xx: use distro bootcmd

[Kostya Porotchkin]

> -----Original Message-----
> From: Andre Heider [mailto:a.heider at gmail.com]
> Sent: Saturday, December 02, 2017 11:47
> To: u-boot at lists.denx.de
> Cc: Stefan Roese; Kostya Porotchkin
> Subject: [EXT] [PATCH 4/4] arm64: a37xx: use distro bootcmd
> 
> External Email
> 
> ----------------------------------------------------------------------
> Signed-off-by: Andre Heider <a.heider@gmail.com>
> ---
>  include/configs/mvebu_armada-37xx.h | 13 ++++++++++++-
>  1 file changed, 12 insertions(+), 1 deletion(-)
> 
> diff --git a/include/configs/mvebu_armada-37xx.h
> b/include/configs/mvebu_armada-37xx.h
> index 383e6dfaf4..f5b4f72118 100644
> --- a/include/configs/mvebu_armada-37xx.h
> +++ b/include/configs/mvebu_armada-37xx.h
> @@ -108,11 +108,22 @@
> 
>  #include <config_distro_defaults.h>
> 
> +#define BOOT_TARGET_DEVICES(func) \
> +	func(MMC, mmc, 1) \
> +	func(MMC, mmc, 0) \
> +	func(USB, usb, 0) \
> +	func(SCSI, scsi, 0) \
> +	func(PXE, pxe, na) \
> +	func(DHCP, dhcp, na)
> +
> +#include <config_distro_bootcmd.h>
> +
>  #define CONFIG_EXTRA_ENV_SETTINGS	\
>  	"scriptaddr=0x4d00000\0"	\
>  	"pxefile_addr_r=0x4e00000\0"	\
>  	"fdt_addr_r=0x4f00000\0"	\
>  	"kernel_addr_r=0x5000000\0"	\
> -	"ramdisk_addr_r=0x8000000"
> +	"ramdisk_addr_r=0x8000000\0"	\
> +	BOOTENV
> 
>  #endif /* _CONFIG_MVEBU_ARMADA_37XX_H */
> --
> 2.15.1
Reviewed-by: Konstantin Porotchkin <kostap@marvell.com>

[U-Boot] arm64: a37xx: add distro boot compability

[Andre Heider]

On 14/12/17 11:30, Stefan Roese wrote:
> On 14.12.2017 11:26, Andre Heider wrote:
>> On 14/12/17 11:23, Stefan Roese wrote:
>>> Hi Andre,
>>>
>>> On 14.12.2017 11:17, Andre Heider wrote:
>>>> On 02/12/17 10:46, Andre Heider wrote:
>>>>> this small set improves the usability to ease booting distro shipped
>>>>> kernels. Tested on espressobin with debian's flash-kernel. I could
>>>>> successfully boot from usb.
>>>>
>>>> Anyone? Bueller?
>>>
>>> I'm waiting for Kosta to comment on this (already triggered). So
>>> please allow us a bit more time.
>>
>> Alright, thanks! I just wanted to make sure this isn't falling through 
>> the cracks.
> 
> No problem. Checking for the status is always possible. My current
> plan is to push this patch (and other pending Marvell patches) after
> this upcoming release, as Tom wanted to be a bit more strict with
> only accepting bug fixes after rc1.

Thanks for the reviews, Konstantin!

For the record, I wasn't aiming at this release, next is just fine.

While having the attention of both of you:
Downstream has diverged quite a bit compared to upstream, is there any 
ongoing work to upstream the missing bits?

Konstantin, since the discrepancy got pretty big I guess most users are 
currently using a downstream release. Is there any chance to get this 
set in there? I already got these patches against that tree if it helps.

Thanks,
Andre

[U-Boot] [EXT] Re: arm64: a37xx: add distro boot compability

[Kostya Porotchkin]

Hi, Andre,

> -----Original Message-----
> From: Andre Heider [mailto:a.heider at gmail.com]
> Sent: Thursday, December 14, 2017 14:03
> To: Stefan Roese; Kostya Porotchkin
> Cc: u-boot at lists.denx.de
> Subject: [EXT] Re: arm64: a37xx: add distro boot compability
> 
> External Email
> 
> ----------------------------------------------------------------------
> On 14/12/17 11:30, Stefan Roese wrote:
> > On 14.12.2017 11:26, Andre Heider wrote:
> >> On 14/12/17 11:23, Stefan Roese wrote:
> >>> Hi Andre,
> >>>
> >>> On 14.12.2017 11:17, Andre Heider wrote:
> >>>> On 02/12/17 10:46, Andre Heider wrote:
> >>>>> this small set improves the usability to ease booting distro
> >>>>> shipped kernels. Tested on espressobin with debian's flash-kernel.
> >>>>> I could successfully boot from usb.
> >>>>
> >>>> Anyone? Bueller?
> >>>
> >>> I'm waiting for Kosta to comment on this (already triggered). So
> >>> please allow us a bit more time.
> >>
> >> Alright, thanks! I just wanted to make sure this isn't falling
> >> through the cracks.
> >
> > No problem. Checking for the status is always possible. My current
> > plan is to push this patch (and other pending Marvell patches) after
> > this upcoming release, as Tom wanted to be a bit more strict with only
> > accepting bug fixes after rc1.
> 
> Thanks for the reviews, Konstantin!
[Konstantin Porotchkin] You are welcome!
> 
> For the record, I wasn't aiming at this release, next is just fine.
> 
> While having the attention of both of you:
> Downstream has diverged quite a bit compared to upstream, is there any
> ongoing work to upstream the missing bits?
[Konstantin Porotchkin] I need to understand the terminology first :-)
The upstream is the DENX release and the downstream is Marvell's 2017.03?

> 
> Konstantin, since the discrepancy got pretty big I guess most users are
> currently using a downstream release. Is there any chance to get this
> set in there? I already got these patches against that tree if it helps.
[Konstantin Porotchkin] If my assumption above is right, you are asking when we are planning to sync with the current mainline, right?
Unfortunately this is out of my control. We are planning to do so as soon as we have time for it, but we got pretty busy supporting new SoC devices at this moment.

Regards
Kosta
> 
> Thanks,
> Andre

[U-Boot] [EXT] Re: arm64: a37xx: add distro boot compability

[Andre Heider]

Hi Kostya,

On 14/12/17 13:21, Kostya Porotchkin wrote:
>> While having the attention of both of you:
>> Downstream has diverged quite a bit compared to upstream, is there any
>> ongoing work to upstream the missing bits?
> [Konstantin Porotchkin] I need to understand the terminology first :-)
> The upstream is the DENX release and the downstream is Marvell's 2017.03?

Exactly ;)

>> Konstantin, since the discrepancy got pretty big I guess most users are
>> currently using a downstream release. Is there any chance to get this
>> set in there? I already got these patches against that tree if it helps.
> [Konstantin Porotchkin] If my assumption above is right, you are asking when we are planning to sync with the current mainline, right?
> Unfortunately this is out of my control. We are planning to do so as soon as we have time for it, but we got pretty busy supporting new SoC devices at this moment.

Alright, and I can see that syncing would be a rather big task.

But instead I was offering the same patches against the Marvell tree, 
without the need for any syncing.

They're now in a pull request I just created on Marvell's public github:
https://github.com/MarvellEmbeddedProcessors/u-boot-marvell/pull/8

Thanks,
Andre

[U-Boot] [EXT] Re: arm64: a37xx: add distro boot compability

[Kostya Porotchkin]

Hi, Andre,

> -----Original Message-----
> From: Andre Heider [mailto:a.heider at gmail.com]
> Sent: Thursday, December 14, 2017 14:50
> To: Kostya Porotchkin; Stefan Roese
> Cc: u-boot at lists.denx.de; Nadav Haklai; Igal Liberman
> Subject: Re: [EXT] Re: arm64: a37xx: add distro boot compability
> 
> Hi Kostya,
> 
> On 14/12/17 13:21, Kostya Porotchkin wrote:
> >> While having the attention of both of you:
> >> Downstream has diverged quite a bit compared to upstream, is there
> >> any ongoing work to upstream the missing bits?
> > [Konstantin Porotchkin] I need to understand the terminology first :-)
> > The upstream is the DENX release and the downstream is Marvell's
> 2017.03?
> 
> Exactly ;)
> 
> >> Konstantin, since the discrepancy got pretty big I guess most users
> >> are currently using a downstream release. Is there any chance to get
> >> this set in there? I already got these patches against that tree if
> it helps.
> > [Konstantin Porotchkin] If my assumption above is right, you are
> asking when we are planning to sync with the current mainline, right?
> > Unfortunately this is out of my control. We are planning to do so as
> soon as we have time for it, but we got pretty busy supporting new SoC
> devices at this moment.
> 
> Alright, and I can see that syncing would be a rather big task.
> 
> But instead I was offering the same patches against the Marvell tree,
> without the need for any syncing.
> 
> They're now in a pull request I just created on Marvell's public github:
> https://github.com/MarvellEmbeddedProcessors/u-boot-marvell/pull/8
[Konstantin Porotchkin] Thank you, I hope that I or Igal (in CC list) will have some time shortly for merging your changes into our GIT.

Regards
Kosta
> 
> Thanks,
> Andre

[U-Boot] [EXT] Re: arm64: a37xx: add distro boot compability

[Andre Heider]

On 20/12/17 17:08, Kostya Porotchkin wrote:
[...]
>> But instead I was offering the same patches against the Marvell tree,
>> without the need for any syncing.
>>
>> They're now in a pull request I just created on Marvell's public github:
>> https://github.com/MarvellEmbeddedProcessors/u-boot-marvell/pull/8
> [Konstantin Porotchkin] Thank you, I hope that I or Igal (in CC list) will have some time shortly for merging your changes into our GIT.

Neat, thanks for merging! :)

Regards,
Andre

[U-Boot] [EXT] Re: arm64: a37xx: add distro boot compability

[Kostya Porotchkin]

> -----Original Message-----
> From: Andre Heider [mailto:a.heider at gmail.com]
> Sent: Thursday, December 21, 2017 13:35
> To: Kostya Porotchkin; Stefan Roese
> Cc: u-boot at lists.denx.de; Nadav Haklai; Igal Liberman
> Subject: Re: [EXT] Re: arm64: a37xx: add distro boot compability
> 
> On 20/12/17 17:08, Kostya Porotchkin wrote:
> [...]
> >> But instead I was offering the same patches against the Marvell tree,
> >> without the need for any syncing.
> >>
> >> They're now in a pull request I just created on Marvell's public
> github:
> >> https://github.com/MarvellEmbeddedProcessors/u-boot-marvell/pull/8
> > [Konstantin Porotchkin] Thank you, I hope that I or Igal (in CC list)
> will have some time shortly for merging your changes into our GIT.
> 
> Neat, thanks for merging! :)
[Konstantin Porotchkin] I pushed them internally to the current development branch, so once they passed the CI test, internal review and get merged, they will be available inside of the next u-boot release.
> 
> Regards,
> Andre

[U-Boot] [PATCH 1/4] arm64: a37xx: use disto defaults

[Stefan Roese]

On 02.12.2017 10:46, Andre Heider wrote:
> Signed-off-by: Andre Heider <a.heider@gmail.com>
> ---
>   include/configs/mvebu_armada-37xx.h | 5 ++---
>   1 file changed, 2 insertions(+), 3 deletions(-)
> 
> diff --git a/include/configs/mvebu_armada-37xx.h b/include/configs/mvebu_armada-37xx.h
> index 1b2e0d71b4..3e1ff02ed7 100644
> --- a/include/configs/mvebu_armada-37xx.h
> +++ b/include/configs/mvebu_armada-37xx.h
> @@ -44,9 +44,6 @@
>   /*
>    * Other required minimal configurations
>    */
> -#define CONFIG_SYS_LONGHELP
> -#define CONFIG_AUTO_COMPLETE
> -#define CONFIG_CMDLINE_EDITING
>   #define CONFIG_ARCH_CPU_INIT		/* call arch_cpu_init() */
>   #define CONFIG_SYS_LOAD_ADDR	0x00800000	/* default load adr- 8M */
>   #define CONFIG_SYS_MEMTEST_START 0x00800000	/* 8M */
> @@ -109,4 +106,6 @@
>   
>   #define CONFIG_SUPPORT_VFAT
>   
> +#include <config_distro_defaults.h>
> +
>   #endif /* _CONFIG_MVEBU_ARMADA_37XX_H */
> 

Applied to u-boot-marvell/master

Thanks,
Stefan

[U-Boot] [PATCH 2/4] arm64: a37xx: add distro compatible env vars

[Stefan Roese]

On 02.12.2017 10:46, Andre Heider wrote:
> the values of dt_addr_r/kernel_addr_r/ramdisk_addr_r are taken from
> the downstream 'u-boot-2017.03-armada-17.10' release.
> 
> the chosen values of scriptaddr and pxefile_addr_r are below fdt_addr_r,
> in 1MB steps.
> 
> Signed-off-by: Andre Heider <a.heider@gmail.com>
> ---
>   include/configs/mvebu_armada-37xx.h | 7 +++++++
>   1 file changed, 7 insertions(+)
> 
> diff --git a/include/configs/mvebu_armada-37xx.h b/include/configs/mvebu_armada-37xx.h
> index 3e1ff02ed7..383e6dfaf4 100644
> --- a/include/configs/mvebu_armada-37xx.h
> +++ b/include/configs/mvebu_armada-37xx.h
> @@ -108,4 +108,11 @@
>   
>   #include <config_distro_defaults.h>
>   
> +#define CONFIG_EXTRA_ENV_SETTINGS	\
> +	"scriptaddr=0x4d00000\0"	\
> +	"pxefile_addr_r=0x4e00000\0"	\
> +	"fdt_addr_r=0x4f00000\0"	\
> +	"kernel_addr_r=0x5000000\0"	\
> +	"ramdisk_addr_r=0x8000000"
> +
>   #endif /* _CONFIG_MVEBU_ARMADA_37XX_H */
> 

Applied to u-boot-marvell/master

Thanks,
Stefan

[U-Boot] [PATCH 3/4] arm64: a37xx: defconfigs: enable CONFIG_DISTRO_DEFAULTS

[Stefan Roese]

On 02.12.2017 10:46, Andre Heider wrote:
> Signed-off-by: Andre Heider <a.heider@gmail.com>
> ---
>   configs/mvebu_db-88f3720_defconfig          | 1 +
>   configs/mvebu_espressobin-88f3720_defconfig | 1 +
>   2 files changed, 2 insertions(+)
> 
> diff --git a/configs/mvebu_db-88f3720_defconfig b/configs/mvebu_db-88f3720_defconfig
> index 0fd4514c37..321151e41d 100644
> --- a/configs/mvebu_db-88f3720_defconfig
> +++ b/configs/mvebu_db-88f3720_defconfig
> @@ -3,6 +3,7 @@ CONFIG_ARCH_MVEBU=y
>   CONFIG_SYS_MALLOC_F_LEN=0x2000
>   CONFIG_TARGET_MVEBU_ARMADA_37XX=y
>   CONFIG_DEFAULT_DEVICE_TREE="armada-3720-db"
> +CONFIG_DISTRO_DEFAULTS=y
>   CONFIG_DEBUG_UART=y
>   CONFIG_AHCI=y
>   # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
> diff --git a/configs/mvebu_espressobin-88f3720_defconfig b/configs/mvebu_espressobin-88f3720_defconfig
> index 95db6c610e..5d9fb75b17 100644
> --- a/configs/mvebu_espressobin-88f3720_defconfig
> +++ b/configs/mvebu_espressobin-88f3720_defconfig
> @@ -3,6 +3,7 @@ CONFIG_ARCH_MVEBU=y
>   CONFIG_SYS_MALLOC_F_LEN=0x2000
>   CONFIG_TARGET_MVEBU_ARMADA_37XX=y
>   CONFIG_DEFAULT_DEVICE_TREE="armada-3720-espressobin"
> +CONFIG_DISTRO_DEFAULTS=y
>   CONFIG_DEBUG_UART=y
>   CONFIG_AHCI=y
>   # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
> 

Applied to u-boot-marvell/master

Thanks,
Stefan

[U-Boot] [PATCH 4/4] arm64: a37xx: use distro bootcmd

[Stefan Roese]

On 02.12.2017 10:46, Andre Heider wrote:
> Signed-off-by: Andre Heider <a.heider@gmail.com>
> ---
>   include/configs/mvebu_armada-37xx.h | 13 ++++++++++++-
>   1 file changed, 12 insertions(+), 1 deletion(-)
> 
> diff --git a/include/configs/mvebu_armada-37xx.h b/include/configs/mvebu_armada-37xx.h
> index 383e6dfaf4..f5b4f72118 100644
> --- a/include/configs/mvebu_armada-37xx.h
> +++ b/include/configs/mvebu_armada-37xx.h
> @@ -108,11 +108,22 @@
>   
>   #include <config_distro_defaults.h>
>   
> +#define BOOT_TARGET_DEVICES(func) \
> +	func(MMC, mmc, 1) \
> +	func(MMC, mmc, 0) \
> +	func(USB, usb, 0) \
> +	func(SCSI, scsi, 0) \
> +	func(PXE, pxe, na) \
> +	func(DHCP, dhcp, na)
> +
> +#include <config_distro_bootcmd.h>
> +
>   #define CONFIG_EXTRA_ENV_SETTINGS	\
>   	"scriptaddr=0x4d00000\0"	\
>   	"pxefile_addr_r=0x4e00000\0"	\
>   	"fdt_addr_r=0x4f00000\0"	\
>   	"kernel_addr_r=0x5000000\0"	\
> -	"ramdisk_addr_r=0x8000000"
> +	"ramdisk_addr_r=0x8000000\0"	\
> +	BOOTENV
>   
>   #endif /* _CONFIG_MVEBU_ARMADA_37XX_H */
> 

Applied to u-boot-marvell/master

Thanks,
Stefan