diff mbox series

[U-Boot,RFC,2/2] ARM: sunxi: Build u-boot-sunxi-with-spl.bin on ARM64 as well

Message ID 20180306213822.32723-3-tuomas@tuxera.com
State Accepted
Commit b0b0d22f1a11b656e1a72f0e178f968b14be7ff3
Delegated to: Jagannadha Sutradharudu Teki
Headers show
Series sunxi: Build u-boot-sunxi-with-spl.bin on ARM64 as well | expand

Commit Message

Tuomas Tynkkynen March 6, 2018, 9:38 p.m. UTC
In README.sunxi64 we tell the user how to optionally create
u-boot-sunxi-with-spl.bin by manually running cat. Instead, have the
build system create the file automatically just like it does for 32-bit
sunxi boards.

Signed-off-by: Tuomas Tynkkynen <tuomas@tuxera.com>
---
 Makefile                   | 5 +++++
 board/sunxi/README.sunxi64 | 3 +--
 2 files changed, 6 insertions(+), 2 deletions(-)

Comments

Andre Przywara March 7, 2018, 2:21 a.m. UTC | #1
Hi,

On 06/03/18 21:38, Tuomas Tynkkynen wrote:
> In README.sunxi64 we tell the user how to optionally create
> u-boot-sunxi-with-spl.bin by manually running cat. Instead, have the
> build system create the file automatically just like it does for 32-bit
> sunxi boards.
> 
> Signed-off-by: Tuomas Tynkkynen <tuomas@tuxera.com>

Reviewed-by: Andre Przywara <andre.przywara@arm.com>

Cheers,
Andre.

> ---
>  Makefile                   | 5 +++++
>  board/sunxi/README.sunxi64 | 3 +--
>  2 files changed, 6 insertions(+), 2 deletions(-)
> 
> diff --git a/Makefile b/Makefile
> index 24a79446d8..4b203a0155 100644
> --- a/Makefile
> +++ b/Makefile
> @@ -1191,8 +1191,13 @@ u-boot-x86-16bit.bin: u-boot FORCE
>  endif
>  
>  ifneq ($(CONFIG_ARCH_SUNXI),)
> +ifeq ($(CONFIG_ARM64),)
>  u-boot-sunxi-with-spl.bin: spl/sunxi-spl.bin u-boot.img u-boot.dtb FORCE
>  	$(call if_changed,binman)
> +else
> +u-boot-sunxi-with-spl.bin: spl/sunxi-spl.bin u-boot.itb FORCE
> +	$(call if_changed,cat)
> +endif
>  endif
>  
>  ifneq ($(CONFIG_TEGRA),)
> diff --git a/board/sunxi/README.sunxi64 b/board/sunxi/README.sunxi64
> index c492f749b8..5a363d27b8 100644
> --- a/board/sunxi/README.sunxi64
> +++ b/board/sunxi/README.sunxi64
> @@ -95,9 +95,8 @@ Transfer the SPL and the U-Boot FIT image directly to an uSD card:
>  (replace /dev/sdx with you SD card device file name, which could be
>  /dev/mmcblk[x] as well).
>  
> -Alternatively you can concatenate the SPL and the U-Boot FIT image into a
> +Alternatively you can use the SPL and the U-Boot FIT image combined into a
>  single file and transfer that instead:
> -$ cat spl/sunxi-spl.bin u-boot.itb > u-boot-sunxi-with-spl.bin
>  # dd if=u-boot-sunxi-with-spl.bin of=/dev/sdx bs=8k seek=1
>  
>  You can partition the microSD card, but leave the first MB unallocated (most
>
Jagan Teki March 13, 2018, 3:04 p.m. UTC | #2
On Wed, Mar 7, 2018 at 7:51 AM, André Przywara <andre.przywara@arm.com> wrote:
> Hi,
>
> On 06/03/18 21:38, Tuomas Tynkkynen wrote:
>> In README.sunxi64 we tell the user how to optionally create
>> u-boot-sunxi-with-spl.bin by manually running cat. Instead, have the
>> build system create the file automatically just like it does for 32-bit
>> sunxi boards.
>>
>> Signed-off-by: Tuomas Tynkkynen <tuomas@tuxera.com>
>
> Reviewed-by: Andre Przywara <andre.przywara@arm.com>

Reviewed-by: Jagan Teki <jagan@openedev.com>
diff mbox series

Patch

diff --git a/Makefile b/Makefile
index 24a79446d8..4b203a0155 100644
--- a/Makefile
+++ b/Makefile
@@ -1191,8 +1191,13 @@  u-boot-x86-16bit.bin: u-boot FORCE
 endif
 
 ifneq ($(CONFIG_ARCH_SUNXI),)
+ifeq ($(CONFIG_ARM64),)
 u-boot-sunxi-with-spl.bin: spl/sunxi-spl.bin u-boot.img u-boot.dtb FORCE
 	$(call if_changed,binman)
+else
+u-boot-sunxi-with-spl.bin: spl/sunxi-spl.bin u-boot.itb FORCE
+	$(call if_changed,cat)
+endif
 endif
 
 ifneq ($(CONFIG_TEGRA),)
diff --git a/board/sunxi/README.sunxi64 b/board/sunxi/README.sunxi64
index c492f749b8..5a363d27b8 100644
--- a/board/sunxi/README.sunxi64
+++ b/board/sunxi/README.sunxi64
@@ -95,9 +95,8 @@  Transfer the SPL and the U-Boot FIT image directly to an uSD card:
 (replace /dev/sdx with you SD card device file name, which could be
 /dev/mmcblk[x] as well).
 
-Alternatively you can concatenate the SPL and the U-Boot FIT image into a
+Alternatively you can use the SPL and the U-Boot FIT image combined into a
 single file and transfer that instead:
-$ cat spl/sunxi-spl.bin u-boot.itb > u-boot-sunxi-with-spl.bin
 # dd if=u-boot-sunxi-with-spl.bin of=/dev/sdx bs=8k seek=1
 
 You can partition the microSD card, but leave the first MB unallocated (most