rockchip: rk3399: Make u-boot.itb as BUILD_TARGET

PATCH Superseded Jagan Teki 4 participants 16 messages May 7, 2019 – Jun 18, 2019 5 messages not in the archive

Subsystems (4)

Arm (32-bit) Arm sub-architectures Kbuild Arm Rockchip

lore

Share & tools

lore

Jagan Teki

author

2019-05-07 18:52 UTC #0 lore raw

v3 cover rockchip: rk3399: Make u-boot.itb as BUILD_TARGET

RK3399 TPL changes are merged recently which I was thinking of waiting for next MW. so this series skip binman changes from previous version[1] and have only BUILD_TARGET changes.

BINMAN changes would need another rework, where we need to consider the TPL image as well and that would send separately.

CHanges for v3:
- skip binman changes
- rebase on u-boot-rockchip/master

[1] https://patchwork.ozlabs.org/cover/1092198/

Jagan Teki (6):
Makefile: clean image.map
Makefile: clean bl31_*.bin
travis.yml: Add pyelftools install entry
rockchip: rk3399: Get bl31.elf via BL31
board: puma: Get bl31.bin via BL31 and rk3399m0.bin via PMUM0
Kconfig: Add u-boot.itb BUILD_TARGET for Rockchip

 .travis.yml                                   |  1 +
 Kconfig                                       |  2 +-
 Makefile                                      |  3 +-
 arch/arm/mach-rockchip/make_fit_atf.py        | 11 ++-
 .../puma_rk3399/fit_spl_atf.its               | 58 ------------
 .../puma_rk3399/fit_spl_atf.sh                | 94 +++++++++++++++++++
 configs/puma-rk3399_defconfig                 |  2 +-
 doc/README.rockchip                           | 14 ++-
 8 files changed, 115 insertions(+), 70 deletions(-)
 delete mode 100644 board/theobroma-systems/puma_rk3399/fit_spl_atf.its
 create mode 100755 board/theobroma-systems/puma_rk3399/fit_spl_atf.sh

Signature · 1 line

2.18.0.321.gffc6fa0e3

A message that is not in the archive (sent off-list or not yet received): 20190507185215.15441-1-jagan-dyjBcgdgk7Pe9wHmmfpqLFaTQe2KTcn/@public.gmane.org

Jagan Teki

author

2019-05-07 18:52 UTC #2 lore raw

PATCH v3 1/6 Makefile: clean image.map

binman tools for creating single image build will create image.map at the end, which has information about binman image node details.

current u-boot, is unable to clean this image.map so add a command entry in clean target in Makefile.

Signed-off-by Jagan Teki <jagan-dyjBcgdgk7Pe9wHmmfpqLFaTQe2KTcn/@public.gmane.org>

---
 Makefile | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

Makefile +2 -1

index d6a6ef19ab..de11446ed3 100644
@@ -1813,7 +1813,8 @@ clean: $(clean-dirs)
 		-o -name modules.builtin -o -name '.tmp_*.o.*' \
 		-o -name 'dsdt.aml' -o -name 'dsdt.asl.tmp' -o -name 'dsdt.c' \
 		-o -name '*.efi' -o -name '*.gcno' -o -name '*.so' \) \
-		-type f -print | xargs rm -f
+		-type f -print | xargs rm -f \
+		image.map
 
 # mrproper - Delete all generated files, including .config
 #

Signature · 1 line

2.18.0.321.gffc6fa0e3

A message that is not in the archive (sent off-list or not yet received): 20190507185215.15441-2-jagan-dyjBcgdgk7Pe9wHmmfpqLFaTQe2KTcn/@public.gmane.org

Kever Yang

Reviewed-by

2019-05-08 07:04 UTC #4 lore raw

Re: [PATCH v3 1/6] Makefile: clean image.map

Quoted 7 lines · Jagan Teki

binman tools for creating single image build will create image.map at the end, which has information about binman image node details.
current u-boot, is unable to clean this image.map so add a command entry in clean target in Makefile.
Signed-off-by Jagan Teki <jagan-dyjBcgdgk7Pe9wHmmfpqLFaTQe2KTcn/@public.gmane.org>

Reviewed-by Kever Yang <[email protected]>

Thanks,
- Kever

Quoted 18 lines

---
 Makefile | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

Makefile +2 -1

index d6a6ef19ab..de11446ed3 100644
@@ -1813,7 +1813,8 @@ clean: $(clean-dirs)
 		-o -name modules.builtin -o -name '.tmp_*.o.*' \
 		-o -name 'dsdt.aml' -o -name 'dsdt.asl.tmp' -o -name 'dsdt.c' \
 		-o -name '*.efi' -o -name '*.gcno' -o -name '*.so' \) \
-		-type f -print | xargs rm -f
+		-type f -print | xargs rm -f \
+		image.map
 
 # mrproper - Delete all generated files, including .config
 #

Jagan Teki

author

2019-05-07 18:52 UTC #5 lore raw

PATCH v3 2/6 Makefile: clean bl31_*.bin

In reply to a message not in the archive

Rockchip platform has its python script that would generate various bl31_*bin for creating u-boot.itb file by taking bl31.elf as input.

These bl31_*.bin files are generated in u-boot root directory and have no rule to clean it up. so add support for it by adding in command entry of clean target in Makefile.

Signed-off-by Jagan Teki <jagan-dyjBcgdgk7Pe9wHmmfpqLFaTQe2KTcn/@public.gmane.org>

---
 Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Makefile +1 -1

index de11446ed3..64c7976f7e 100644
@@ -1814,7 +1814,7 @@ clean: $(clean-dirs)
 		-o -name 'dsdt.aml' -o -name 'dsdt.asl.tmp' -o -name 'dsdt.c' \
 		-o -name '*.efi' -o -name '*.gcno' -o -name '*.so' \) \
 		-type f -print | xargs rm -f \
-		image.map
+		bl31_*.bin image.map
 
 # mrproper - Delete all generated files, including .config
 #

Signature · 1 line

2.18.0.321.gffc6fa0e3

A message that is not in the archive (sent off-list or not yet received): 20190507185215.15441-3-jagan-dyjBcgdgk7Pe9wHmmfpqLFaTQe2KTcn/@public.gmane.org

Kever Yang

Reviewed-by

2019-05-08 07:04 UTC #7 lore raw

Re: [PATCH v3 2/6] Makefile: clean bl31_*.bin

Quoted 8 lines · Jagan Teki

Rockchip platform has its python script that would generate various bl31_*bin for creating u-boot.itb file by taking bl31.elf as input.
These bl31_*.bin files are generated in u-boot root directory and have no rule to clean it up. so add support for it by adding in command entry of clean target in Makefile.
Signed-off-by Jagan Teki <jagan-dyjBcgdgk7Pe9wHmmfpqLFaTQe2KTcn/@public.gmane.org>

Reviewed-by Kever Yang <[email protected]>

Thanks,
- Kever

Quoted 17 lines

---
 Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Makefile +1 -1

index de11446ed3..64c7976f7e 100644
@@ -1814,7 +1814,7 @@ clean: $(clean-dirs)
 		-o -name 'dsdt.aml' -o -name 'dsdt.asl.tmp' -o -name 'dsdt.c' \
 		-o -name '*.efi' -o -name '*.gcno' -o -name '*.so' \) \
 		-type f -print | xargs rm -f \
-		image.map
+		bl31_*.bin image.map
 
 # mrproper - Delete all generated files, including .config
 #

Jagan Teki

author

2019-05-07 18:52 UTC #8 lore raw

PATCH v3 3/6 travis.yml: Add pyelftools install entry

In reply to a message not in the archive

Currently rockchip platform is using explicit 'make u-boot.itb' for building u-boot.itb but if we enable CONFIG_BUILD_TARGET as 'u-boot.itb' then the resulting u-boot.itb directly will create by make.

But, that indeed make travis build fail since it require python-pyelftools host package.

So add pyelftools install entry as 'pip install pyelftools', this would create pyelftools on travis host which are required to build rk3399 itb.

Signed-off-by Jagan Teki <jagan-dyjBcgdgk7Pe9wHmmfpqLFaTQe2KTcn/@public.gmane.org>

---
 .travis.yml | 1 +
 1 file changed, 1 insertion(+)

.travis.yml +1 -0

index 8bd49ef1a5..94b795ef21 100644
@@ -50,6 +50,7 @@ install:
  - . /tmp/venv/bin/activate
  - pip install pytest==2.8.7
  - pip install python-subunit
+ - pip install pyelftools
  - grub-mkimage -o ~/grub_x86.efi -O i386-efi normal  echo lsefimmap lsefi lsefisystab efinet tftp minicmd
  - grub-mkimage -o ~/grub_x64.efi -O x86_64-efi normal  echo lsefimmap lsefi lsefisystab efinet tftp minicmd
  - mkdir ~/grub2-arm

Signature · 1 line

2.18.0.321.gffc6fa0e3

A message that is not in the archive (sent off-list or not yet received): 20190507185215.15441-4-jagan-dyjBcgdgk7Pe9wHmmfpqLFaTQe2KTcn/@public.gmane.org

Kever Yang

Reviewed-by

2019-05-08 07:04 UTC #10 lore raw

Re: [PATCH v3 3/6] travis.yml: Add pyelftools install entry

Quoted 11 lines · Jagan Teki

Currently rockchip platform is using explicit 'make u-boot.itb' for building u-boot.itb but if we enable CONFIG_BUILD_TARGET as 'u-boot.itb' then the resulting u-boot.itb directly will create by make.
But, that indeed make travis build fail since it require python-pyelftools host package.
So add pyelftools install entry as 'pip install pyelftools', this would create pyelftools on travis host which are required to build rk3399 itb.
Signed-off-by Jagan Teki <jagan-dyjBcgdgk7Pe9wHmmfpqLFaTQe2KTcn/@public.gmane.org>

Reviewed-by Kever Yang <[email protected]>

Thanks,
- Kever

Quoted 16 lines

---
 .travis.yml | 1 +
 1 file changed, 1 insertion(+)

.travis.yml +1 -0

index 8bd49ef1a5..94b795ef21 100644
@@ -50,6 +50,7 @@ install:
  - . /tmp/venv/bin/activate
  - pip install pytest==2.8.7
  - pip install python-subunit
+ - pip install pyelftools
  - grub-mkimage -o ~/grub_x86.efi -O i386-efi normal  echo lsefimmap lsefi lsefisystab efinet tftp minicmd
  - grub-mkimage -o ~/grub_x64.efi -O x86_64-efi normal  echo lsefimmap lsefi lsefisystab efinet tftp minicmd
  - mkdir ~/grub2-arm

Jagan Teki

author

2019-05-07 18:52 UTC #11 lore raw

PATCH v3 4/6 rockchip: rk3399: Get bl31.elf via BL31

In reply to a message not in the archive

Right now rockchip platform need to copy bl31.elf into u-boot source directory to make use of building u-boot.itb.

So, add environment variable BL31 like Allwinner SoC so-that the bl31.elf would available via BL31.

If the builds are not exporting BL31 env, the make_fit_atf.py explicitly create dummy bl31.elf in u-boot root directory to satisfy travis builds and it will show the warning on console as

WARNING: BL31 file bl31.elf NOT found, resulting binary is non-functional
WARNING: Please read Building section in doc/README.rockchip

Note, that the dummy bl31 files were created during not exporting BL31 case would be removed via clean target in Makefile.

Signed-off-by Jagan Teki <jagan-dyjBcgdgk7Pe9wHmmfpqLFaTQe2KTcn/@public.gmane.org>

---
 Makefile                               |  2 +-
 arch/arm/mach-rockchip/make_fit_atf.py | 11 ++++++++++-
 doc/README.rockchip                    |  4 ++--
 3 files changed, 13 insertions(+), 4 deletions(-)

Makefile +1 -1

index 64c7976f7e..c5078b95b7 100644
@@ -1814,7 +1814,7 @@ clean: $(clean-dirs)
 		-o -name 'dsdt.aml' -o -name 'dsdt.asl.tmp' -o -name 'dsdt.c' \
 		-o -name '*.efi' -o -name '*.gcno' -o -name '*.so' \) \
 		-type f -print | xargs rm -f \
-		bl31_*.bin image.map
+		bl31.c bl31.elf bl31_*.bin image.map
 
 # mrproper - Delete all generated files, including .config
 #

arch/arm/mach-rockchip/make_fit_atf.py +10 -1

index d1faff1957..327875d87b 100755
@@ -10,6 +10,7 @@ usage: $0 <dt_name> [<dt_name> [<dt_name] ...]
 import os
 import sys
 import getopt
+import logging
 
 # pip install pyelftools
 from elftools.elf.elffile import ELFFile

@@ -194,8 +195,16 @@ def get_bl31_segments_info(bl31_file_name):
 
 def main():
     uboot_elf="./u-boot"
-    bl31_elf="./bl31.elf"
     FIT_ITS=sys.stdout
+    if "BL31" in os.environ:
+        bl31_elf=os.getenv("BL31");
+    else:
+        os.system("echo 'int main(){}' > bl31.c")
+        os.system("${CROSS_COMPILE}gcc -c bl31.c -o bl31.elf")
+        bl31_elf="./bl31.elf"
+        logging.basicConfig(format='%(levelname)s:%(message)s', level=logging.DEBUG)
+        logging.warning(' BL31 file bl31.elf NOT found, resulting binary is non-functional')
+        logging.warning(' Please read Building section in doc/README.rockchip')
 
     opts, args = getopt.getopt(sys.argv[1:], "o:u:b:h")
     for opt, val in opts:

doc/README.rockchip +2 -2

index ca4d6473b0..98a3824e2c 100644
@@ -149,8 +149,8 @@ For example:
 	=> make realclean
 	=> make CROSS_COMPILE=aarch64-linux-gnu- PLAT=rk3399
 
-	(copy bl31.elf into U-Boot root dir)
-	=> cp build/rk3399/release/bl31/bl31.elf /path/to/u-boot
+	(export bl31.elf)
+	=> export BL31=/path/to/arm-trusted-firmware/build/rk3399/release/bl31/bl31.elf
 
    - Compile PMU M0 firmware

Signature · 1 line

2.18.0.321.gffc6fa0e3

A message that is not in the archive (sent off-list or not yet received): 20190507185215.15441-5-jagan-dyjBcgdgk7Pe9wHmmfpqLFaTQe2KTcn/@public.gmane.org

Kever Yang

Reviewed-by

2019-05-08 07:06 UTC #13 lore raw

Re: [PATCH v3 4/6] rockchip: rk3399: Get bl31.elf via BL31

Quoted 10 lines · Jagan Teki

Right now rockchip platform need to copy bl31.elf into u-boot source directory to make use of building u-boot.itb.
So, add environment variable BL31 like Allwinner SoC so-that the bl31.elf would available via BL31.
If the builds are not exporting BL31 env, the make_fit_atf.py explicitly create dummy bl31.elf in u-boot root directory to satisfy travis builds and it will show the warning on console as

Quoted 7 lines

WARNING: BL31 file bl31.elf NOT found, resulting binary is non-functional
WARNING: Please read Building section in doc/README.rockchip
Note, that the dummy bl31 files were created during not exporting BL31 case would be removed via clean target in Makefile.
Signed-off-by Jagan Teki <jagan-dyjBcgdgk7Pe9wHmmfpqLFaTQe2KTcn/@public.gmane.org>

Reviewed-by Kever Yang <[email protected]>

Thanks,
- Kever

Quoted 64 lines

---
 Makefile                               |  2 +-
 arch/arm/mach-rockchip/make_fit_atf.py | 11 ++++++++++-
 doc/README.rockchip                    |  4 ++--
 3 files changed, 13 insertions(+), 4 deletions(-)

Makefile +1 -1

index 64c7976f7e..c5078b95b7 100644
@@ -1814,7 +1814,7 @@ clean: $(clean-dirs)
 		-o -name 'dsdt.aml' -o -name 'dsdt.asl.tmp' -o -name 'dsdt.c' \
 		-o -name '*.efi' -o -name '*.gcno' -o -name '*.so' \) \
 		-type f -print | xargs rm -f \
-		bl31_*.bin image.map
+		bl31.c bl31.elf bl31_*.bin image.map
 
 # mrproper - Delete all generated files, including .config
 #

arch/arm/mach-rockchip/make_fit_atf.py +10 -1

index d1faff1957..327875d87b 100755
@@ -10,6 +10,7 @@ usage: $0 <dt_name> [<dt_name> [<dt_name] ...]
 import os
 import sys
 import getopt
+import logging
 
 # pip install pyelftools
 from elftools.elf.elffile import ELFFile

@@ -194,8 +195,16 @@ def get_bl31_segments_info(bl31_file_name):
 
 def main():
     uboot_elf="./u-boot"
-    bl31_elf="./bl31.elf"
     FIT_ITS=sys.stdout
+    if "BL31" in os.environ:
+        bl31_elf=os.getenv("BL31");
+    else:
+        os.system("echo 'int main(){}' > bl31.c")
+        os.system("${CROSS_COMPILE}gcc -c bl31.c -o bl31.elf")
+        bl31_elf="./bl31.elf"
+        logging.basicConfig(format='%(levelname)s:%(message)s', level=logging.DEBUG)
+        logging.warning(' BL31 file bl31.elf NOT found, resulting binary is non-functional')
+        logging.warning(' Please read Building section in doc/README.rockchip')
 
     opts, args = getopt.getopt(sys.argv[1:], "o:u:b:h")
     for opt, val in opts:

doc/README.rockchip +2 -2

index ca4d6473b0..98a3824e2c 100644
@@ -149,8 +149,8 @@ For example:
 	=> make realclean
 	=> make CROSS_COMPILE=aarch64-linux-gnu- PLAT=rk3399
 
-	(copy bl31.elf into U-Boot root dir)
-	=> cp build/rk3399/release/bl31/bl31.elf /path/to/u-boot
+	(export bl31.elf)
+	=> export BL31=/path/to/arm-trusted-firmware/build/rk3399/release/bl31/bl31.elf
 
    - Compile PMU M0 firmware

Jagan Teki

author

2019-05-07 18:52 UTC #14 lore raw

PATCH v3 5/6 board: puma: Get bl31.bin via BL31 and rk3399m0.bin via PMUM0

In reply to a message not in the archive

Right now puma rk3399 board need to copy bl31-rk3399.bin and rk3399m0.bin into u-boot source directory to make use of building u-boot.itb.

So, add environment variable
- BL31 for bl31.bin (instead of bl31-rk3399.bin to compatible with other platform BL31 env)
- PMUM0 for rk3399m0.bin

If the builds are not exporting BL31, PMUM0 env, the fit_spl_atf.sh will notify with warning about which document to refer for more information like this:

WARNING: BL31 file bl31.bin NOT found, resulting binary is non-functional Please read Building section in doc/README.rockchip
WARNING: PMUM0 file rk3399m0.bin NOT found, resulting binary is non-functional Please read Building section in doc/README.rockchip

Signed-off-by Jagan Teki <jagan-dyjBcgdgk7Pe9wHmmfpqLFaTQe2KTcn/@public.gmane.org>

---
 .../puma_rk3399/fit_spl_atf.its               | 58 ------------
 .../puma_rk3399/fit_spl_atf.sh                | 94 +++++++++++++++++++
 configs/puma-rk3399_defconfig                 |  2 +-
 doc/README.rockchip                           |  8 +-
 4 files changed, 99 insertions(+), 63 deletions(-)
 delete mode 100644 board/theobroma-systems/puma_rk3399/fit_spl_atf.its
 create mode 100755 board/theobroma-systems/puma_rk3399/fit_spl_atf.sh

board/theobroma-systems/puma_rk3399/fit_spl_atf.its deleted +0 ~~-58~~

deleted file mode 100644
index 530f059f3d..0000000000
@@ -1,58 +0,0 @@
-/* SPDX-License-Identifier: GPL-2.0+ OR X11 */
-/*
- * Copyright (C) 2017 Theobroma Systems Design und Consulting GmbH
- *
- * Minimal dts for a SPL FIT image payload.
- */
-
-/dts-v1/;
-
-/ {
-	description = "FIT image with U-Boot proper, ATF bl31, M0 Firmware, DTB";
-	#address-cells = <1>;
-
-	images {
-		uboot {
-			description = "U-Boot (64-bit)";
-			data = /incbin/("../../../u-boot-nodtb.bin");
-			type = "standalone";
-			os = "U-Boot";
-			arch = "arm64";
-			compression = "none";
-			load = <0x00200000>;
-		};
-		atf {
-			description = "ARM Trusted Firmware";
-			data = /incbin/("../../../bl31-rk3399.bin");
-			type = "firmware";
-			arch = "arm64";
-			os = "arm-trusted-firmware";
-			compression = "none";
-			load = <0x1000>;
-			entry = <0x1000>;
-		};
-		pmu {
-		        description = "Cortex-M0 firmware";
-			data = /incbin/("../../../rk3399m0.bin");
-			type = "pmu-firmware";
-			compression = "none";
-			load = <0x180000>;
-                };
-		fdt {
-			description = "RK3399-Q7 (Puma) flat device-tree";
-			data = /incbin/("../../../u-boot.dtb");
-			type = "flat_dt";
-			compression = "none";
-		};
-	};
-
-	configurations {
-		default = "conf";
-		conf {
-			description = "Theobroma Systems RK3399-Q7 (Puma) SoM";
-			firmware = "atf";
-			loadables = "uboot", "pmu";
-			fdt = "fdt";
-		};
-	};
-};

board/theobroma-systems/puma_rk3399/fit_spl_atf.sh new file +94 -0

94 lines not on this page · raw message

configs/puma-rk3399_defconfig +1 -1

index 03f0bfdb59..ebc78fb216 100644
@@ -15,7 +15,7 @@ CONFIG_DEBUG_UART_CLOCK=24000000
 CONFIG_SPL_SPI_FLASH_SUPPORT=y
 CONFIG_SPL_SPI_SUPPORT=y
 CONFIG_DEBUG_UART=y
-CONFIG_SPL_FIT_SOURCE="board/theobroma-systems/puma_rk3399/fit_spl_atf.its"
+CONFIG_SPL_FIT_GENERATOR="board/theobroma-systems/puma_rk3399/fit_spl_atf.sh"
 CONFIG_DEFAULT_FDT_FILE="rockchip/rk3399-puma-haikou.dtb"
 CONFIG_MISC_INIT_R=y
 # CONFIG_DISPLAY_CPUINFO is not set

doc/README.rockchip +4 -4

index 98a3824e2c..88a4593392 100644
@@ -137,8 +137,8 @@ For example:
 	=> cd arm-trusted-firmware
 	=> make CROSS_COMPILE=aarch64-linux-gnu- PLAT=rk3399 bl31
 
-	(copy bl31.bin into U-Boot root dir)
-	=> cp build/rk3399/release/bl31/bl31.bin /path/to/u-boot/bl31-rk3399.bin
+	(export bl31.bin)
+	=> export BL31=/path/to/arm-trusted-firmware/build/rk3399/release/bl31/bl31.bin
 
      For rest of rk3399 boards.

@@ -162,8 +162,8 @@ For example:
      (export cross compiler path for Cortex-M0 PMU)
      => make CROSS_COMPILE=arm-cortex_m0-eabi-
 
-     (copy rk3399m0.bin into U-Boot root dir)
-     => cp rk3399m0.bin /path/to/u-boot
+     (export rk3399m0.bin)
+     => export PMUM0=/path/to/rk3399-cortex-m0/rk3399m0.bin
 
    - Compile U-Boot

Signature · 1 line

2.18.0.321.gffc6fa0e3

Jagan Teki

author

2019-05-07 18:52 UTC #15 lore raw

PATCH v3 6/6 Kconfig: Add u-boot.itb BUILD_TARGET for Rockchip

In reply to a message not in the archive

Add u-boot.itb BUILD_TARGET for Rockchip platform when SPL_LOAD_FIT is being used.

This can get rid of building itb explicitly with 'make u-boot.itb' so, from now all required images will build just by make.

Signed-off-by Jagan Teki <jagan-dyjBcgdgk7Pe9wHmmfpqLFaTQe2KTcn/@public.gmane.org>

---
 Kconfig             | 2 +-
 doc/README.rockchip | 2 --
 2 files changed, 1 insertion(+), 3 deletions(-)

Kconfig +1 -1

index 91c1082ace..6bcff29659 100644
@@ -240,7 +240,7 @@ config BUILD_TARGET
 	default "u-boot-with-spl.sfp" if TARGET_SOCFPGA_GEN5
 	default "u-boot-spl.kwb" if ARCH_MVEBU && SPL
 	default "u-boot-elf.srec" if RCAR_GEN3
-	default "u-boot.itb" if SPL_LOAD_FIT && ARCH_SUNXI
+	default "u-boot.itb" if SPL_LOAD_FIT && (ROCKCHIP_RK3399 || ARCH_SUNXI)
 	default "u-boot.kwb" if KIRKWOOD
 	default "u-boot-with-spl.bin" if ARCH_AT91 && SPL_NAND_SUPPORT
 	help

doc/README.rockchip +0 -2

index 88a4593392..c4e5f83da7 100644
@@ -103,7 +103,6 @@ For example:
      => cd /path/to/u-boot
      => make nanopi-neo4-rk3399_defconfig
      => make
-     => make u-boot.itb
 
    - Get the rkbin

@@ -170,7 +169,6 @@ For example:
      => cd /path/to/u-boot
      => make orangepi-rk3399_defconfig
      => make
-     => make u-boot.itb
 
      (Get spl/u-boot-spl-dtb.bin, u-boot.itb images and some boards would get
       spl/u-boot-spl.bin since it doesn't enable CONFIG_SPL_OF_CONTROL)

Signature · 1 line

2.18.0.321.gffc6fa0e3

Kever Yang

Reviewed-by on v3 6/6

2019-05-08 07:11 UTC #16 lore raw

Re: [PATCH v3 6/6] Kconfig: Add u-boot.itb BUILD_TARGET for Rockchip

Quoted 7 lines · Jagan Teki

Add u-boot.itb BUILD_TARGET for Rockchip platform when SPL_LOAD_FIT is being used.
This can get rid of building itb explicitly with 'make u-boot.itb' so, from now all required images will build just by make.
Signed-off-by Jagan Teki <[email protected]>

Reviewed-by Kever Yang <[email protected]>

Thanks,
- Kever

Quoted 31 lines

---
 Kconfig             | 2 +-
 doc/README.rockchip | 2 --
 2 files changed, 1 insertion(+), 3 deletions(-)

Kconfig +1 -1

index 91c1082ace..6bcff29659 100644
@@ -240,7 +240,7 @@ config BUILD_TARGET
 	default "u-boot-with-spl.sfp" if TARGET_SOCFPGA_GEN5
 	default "u-boot-spl.kwb" if ARCH_MVEBU && SPL
 	default "u-boot-elf.srec" if RCAR_GEN3
-	default "u-boot.itb" if SPL_LOAD_FIT && ARCH_SUNXI
+	default "u-boot.itb" if SPL_LOAD_FIT && (ROCKCHIP_RK3399 || ARCH_SUNXI)
 	default "u-boot.kwb" if KIRKWOOD
 	default "u-boot-with-spl.bin" if ARCH_AT91 && SPL_NAND_SUPPORT
 	help

doc/README.rockchip +0 -1

index 88a4593392..c4e5f83da7 100644
@@ -103,7 +103,6 @@ For example:
      => cd /path/to/u-boot
      => make nanopi-neo4-rk3399_defconfig
      => make
-     => make u-boot.itb
 
    - Get the rkbin

doc/README.rockchip For example: · line 174

Quoted 7 lines

doc/README.rockchip +0 -1

@@ -170,7 +169,6 @@ For example:
      => cd /path/to/u-boot
      => make orangepi-rk3399_defconfig
      => make
-     => make u-boot.itb
 
      (Get spl/u-boot-spl-dtb.bin, u-boot.itb images and some boards would get
       spl/u-boot-spl.bin since it doesn't enable CONFIG_SPL_OF_CONTROL)

_______________________________________________
U-Boot mailing list
[email protected]
https://lists.denx.de/listinfo/u-boot

Jagan Teki

2019-06-13 06:53 UTC #17 lore raw

In reply to Jagan Teki

Hi Kever,

Quoted 14 lines · Jagan Teki

RK3399 TPL changes are merged recently which I was thinking of waiting for next MW. so this series skip binman changes from previous version[1] and have only BUILD_TARGET changes.
BINMAN changes would need another rework, where we need to consider the TPL image as well and that would send separately.
CHanges for v3:
- skip binman changes
- rebase on u-boot-rockchip/master
[1] https://patchwork.ozlabs.org/cover/1092198/

Quoted 7 lines

Jagan Teki (6):
Makefile: clean image.map
Makefile: clean bl31_*.bin
travis.yml: Add pyelftools install entry
rockchip: rk3399: Get bl31.elf via BL31
board: puma: Get bl31.bin via BL31 and rk3399m0.bin via PMUM0
Kconfig: Add u-boot.itb BUILD_TARGET for Rockchip

I think you hold for this with puma changes? any further comments please let me know.
_______________________________________________
U-Boot mailing list
[email protected]
https://lists.denx.de/listinfo/u-boot

Kever Yang

2019-06-18 07:09 UTC #18 lore raw

Hi Jagan,

Quoted 23 lines · Jagan Teki

Hi Kever,
Quoted 13 lines · Jagan Teki
RK3399 TPL changes are merged recently which I was thinking of waiting for next MW. so this series skip binman changes from previous version[1] and have only BUILD_TARGET changes.
BINMAN changes would need another rework, where we need to consider the TPL image as well and that would send separately.
CHanges for v3:
- skip binman changes
- rebase on u-boot-rockchip/master
[1] https://patchwork.ozlabs.org/cover/1092198/
Quoted 7 lines
Jagan Teki (6):
Makefile: clean image.map
Makefile: clean bl31_*.bin
travis.yml: Add pyelftools install entry
rockchip: rk3399: Get bl31.elf via BL31
board: puma: Get bl31.bin via BL31 and rk3399m0.bin via PMUM0
Kconfig: Add u-boot.itb BUILD_TARGET for Rockchip

Quoted 3 lines

I think you hold for this with puma changes? any further comments please let me know.

Yes, one reason is not get response from puma board.
And I think this does not break the board support but maybe break the build process if not all the environment has export as expected?

Thanks,
- Kever

_______________________________________________
U-Boot mailing list
[email protected]
https://lists.denx.de/listinfo/u-boot

Jagan Teki

2019-06-18 07:16 UTC #19 lore raw

Quoted 28 lines · Kever Yang

Hi Jagan,
Quoted 23 lines · Jagan Teki
Hi Kever,
Quoted 20 lines · Jagan Teki
RK3399 TPL changes are merged recently which I was thinking of waiting for next MW. so this series skip binman changes from previous version[1] and have only BUILD_TARGET changes.
BINMAN changes would need another rework, where we need to consider the TPL image as well and that would send separately.
CHanges for v3:
- skip binman changes
- rebase on u-boot-rockchip/master
[1] https://patchwork.ozlabs.org/cover/1092198/
Jagan Teki (6):
Makefile: clean image.map
Makefile: clean bl31_*.bin
travis.yml: Add pyelftools install entry
rockchip: rk3399: Get bl31.elf via BL31
board: puma: Get bl31.bin via BL31 and rk3399m0.bin via PMUM0
Kconfig: Add u-boot.itb BUILD_TARGET for Rockchip

Quoted 7 lines

Quoted 3 lines
I think you hold for this with puma changes? any further comments please let me know.
Yes, one reason is not get response from puma board.
And I think this does not break the board support but maybe break the build process if not all the environment has export as expected?

It can't break the build, for not exporting cases the script will create dummy bl31 elf and the bl31 variable assign it and finally trigger warning. fyi, the else statement on this patch [1] does what I mentioned.

[1] https://patchwork.ozlabs.org/patch/1096505/
_______________________________________________
U-Boot mailing list
[email protected]
https://lists.denx.de/listinfo/u-boot

Kever Yang

2019-06-18 09:11 UTC #20 lore raw

Re: [PATCH v3 0/6] rockchip: rk3399: Make u-boot.itb as BUILD_TARGET【请注意，邮件由linux-rockchip-bounces+kever.yang=rock-chips.com@lists.infradead.org代发】

Quoted 28 lines · Jagan Teki

Quoted 27 lines · Kever Yang
Hi Jagan,
Quoted 23 lines · Jagan Teki
Hi Kever,
Quoted 20 lines · Jagan Teki
RK3399 TPL changes are merged recently which I was thinking of waiting for next MW. so this series skip binman changes from previous version[1] and have only BUILD_TARGET changes.
BINMAN changes would need another rework, where we need to consider the TPL image as well and that would send separately.
CHanges for v3:
- skip binman changes
- rebase on u-boot-rockchip/master
[1] https://patchwork.ozlabs.org/cover/1092198/
Jagan Teki (6):
Makefile: clean image.map
Makefile: clean bl31_*.bin
travis.yml: Add pyelftools install entry
rockchip: rk3399: Get bl31.elf via BL31
board: puma: Get bl31.bin via BL31 and rk3399m0.bin via PMUM0
Kconfig: Add u-boot.itb BUILD_TARGET for Rockchip

Quoted 8 lines

Quoted 6 lines
Quoted 3 lines
I think you hold for this with puma changes? any further comments please let me know.
Yes, one reason is not get response from puma board.
And I think this does not break the board support but maybe break the build process if not all the environment has export as expected?
It can't break the build, for not exporting cases the script will create dummy bl31 elf

Could you create dummy bl31.elf after check if there is one already there, which is what we used to do instead of use BL31 env, and then this won't break anything and we can migrate to use BL31 smoothly.

Thanks,
- Kever

Quoted 11 lines

and the bl31 variable assign it and finally
trigger warning. fyi, the else statement on this patch [1] does what I mentioned.
[1] https://patchwork.ozlabs.org/patch/1096505/
_______________________________________________
Linux-rockchip mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-rockchip

_______________________________________________
U-Boot mailing list
[email protected]
https://lists.denx.de/listinfo/u-boot