On 28 December 2017 at 05:06, Marek Vasut marex@denx.de wrote:

Rather than verifying configuration signature of the configuration node containing the kernel image types, verify all configuration nodes, even those that do not contain kernel images. This is useful when the nodes contain ie. standalone OSes or U-Boot.

Signed-off-by: Marek Vasut marex@denx.de Cc: Pantelis Antoniou pantelis.antoniou@konsulko.com Cc: Simon Glass sjg@chromium.org

---

common/image-fit.c | 26 ++++++++++++++------------ 1 file changed, 14 insertions(+), 12 deletions(-)

diff --git a/common/image-fit.c b/common/image-fit.c index 8871e2dcd3..f559032691 100644 --- a/common/image-fit.c +++ b/common/image-fit.c @@ -1766,22 +1766,24 @@ int fit_image_load(bootm_headers_t *images, ulong addr, } fit_base_uname_config = fdt_get_name(fit, cfg_noffset, NULL); printf(" Using '%s' configuration\n", fit_base_uname_config);

•           if (image_type == IH_TYPE_KERNEL) {
  

•                   /* Remember (and possibly verify) this config */
  

•           /* Remember this config */
  

•           if (image_type == IH_TYPE_KERNEL)
                    images->fit_uname_cfg = fit_base_uname_config;
  

•                   if (IMAGE_ENABLE_VERIFY && images->verify) {
  

•                           puts("   Verifying Hash Integrity ... ");
  

•                           if (fit_config_verify(fit, cfg_noffset)) {
  

•                                   puts("Bad Data Hash\n");
  

•                                   bootstage_error(bootstage_id +
  

•                                           BOOTSTAGE_SUB_HASH);
  

•                                   return -EACCES;
  

•                           }
  

•                           puts("OK\n");
  

•           /* Verify this config */
  

•           if (IMAGE_ENABLE_VERIFY && images->verify) {
  

•                   puts("   Verifying Hash Integrity ... ");
  

•                   if (fit_config_verify(fit, cfg_noffset)) {
  

•                           puts("Bad Data Hash\n");
  

•                           bootstage_error(bootstage_id +
  

•                                   BOOTSTAGE_SUB_HASH);
  

•                           return -EACCES;
                    }
  

•                   bootstage_mark(BOOTSTAGE_ID_FIT_CONFIG);
  

•                   puts("OK\n");
  

What is this for? Doesn't the above function print the hash type or an error?

            }

•           bootstage_mark(BOOTSTAGE_ID_FIT_CONFIG);
  

•           noffset = fit_conf_get_prop_node(fit, cfg_noffset,
                                             prop_name);
            fit_uname = fit_get_name(fit, noffset, NULL);
  

-- 2.15.0

Regards, Simon

Hi Marek,

Add support for loading U-Boot and optionally FDT from a fitImage in SPL by using the full fitImage support from U-Boot. While we do have limited SPL loading support in SPL with a small footprint, it is missing a lot of important features, like checking signatures. This support has all the fitImage features, while the footprint is obviously larger.

Signed-off-by: Marek Vasut marex@denx.de Cc: Pantelis Antoniou pantelis.antoniou@konsulko.com Cc: Simon Glass sjg@chromium.org

---

Kconfig | 11 +++++++++++ common/spl/spl.c | 43 +++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 54 insertions(+)

diff --git a/Kconfig b/Kconfig index cd32096f21..4d0c1a01c1 100644 --- a/Kconfig +++ b/Kconfig @@ -293,6 +293,17 @@ config SPL_LOAD_FIT particular it can handle selecting from multiple device tree and passing the correct one to U-Boot.

+config SPL_LOAD_FIT_FULL

• bool "Enable SPL loading U-Boot as a FIT"
• select SPL_FIT
• help

•  Normally with the SPL framework a legacy image is
  

generated as part

•  of the build. This contains U-Boot along with information
  

as to

•  where it should be loaded. This option instead enables
  

generation

•  of a FIT (Flat Image Tree) which provides more
  

flexibility. In

•  particular it can handle selecting from multiple device
  

tree

•  and passing the correct one to U-Boot.
  

config SPL_FIT_IMAGE_POST_PROCESS bool "Enable post-processing of FIT artifacts after loading by the SPL" depends on SPL_LOAD_FIT diff --git a/common/spl/spl.c b/common/spl/spl.c index 76c1963611..d429ea2c82 100644 --- a/common/spl/spl.c +++ b/common/spl/spl.c @@ -139,9 +139,52 @@ void spl_set_header_raw_uboot(struct spl_image_info *spl_image) spl_image->name = "U-Boot"; }

+#ifdef CONFIG_SPL_LOAD_FIT_FULL +/* Parse and load full fitImage in SPL */ +static int spl_load_fit_image(struct spl_image_info *spl_image,

• 	      const struct image_header *header)
  

^^^ - this blank line can be removed.

+{

• bootm_headers_t images;
• const char *fit_uname_config = NULL;
• const char *fit_uname_fdt = FIT_FDT_PROP;
• ulong fw_data = 0, dt_data = 0;
• ulong fw_len = 0, dt_len = 0;
• int ret;
• ret = fit_image_load(&images, (ulong)header,

• 	     NULL, &fit_uname_config,
  

• 	     IH_ARCH_DEFAULT, IH_TYPE_STANDALONE, -1,
  

• 	     FIT_LOAD_REQUIRED, &fw_data, &fw_len);
  

• if (ret < 0)

• return ret;
  

• spl_image->size = fw_len;
• spl_image->entry_point = fw_data;
• spl_image->load_addr = fw_data;
• spl_image->os = IH_OS_U_BOOT;
• spl_image->name = "U-Boot";
• debug("spl: payload image: %.*s load addr: 0x%lx size: %d\n",

• (int)sizeof(spl_image->name), spl_image->name,
  

• spl_image->load_addr, spl_image->size);
  

• ret = fit_image_load(&images, (ulong)header,

• 	     &fit_uname_fdt, &fit_uname_config,
  

• 	     IH_ARCH_DEFAULT, IH_TYPE_FLATDT, -1,
  

• 	     FIT_LOAD_OPTIONAL, &dt_data, &dt_len);
  

• return 0;

+} +#endif

int spl_parse_image_header(struct spl_image_info *spl_image, const struct image_header *header) { +#ifdef CONFIG_SPL_LOAD_FIT_FULL

• int ret = spl_load_fit_image(spl_image, header);
• if (!ret)

• return ret;
  

+#endif if (image_get_magic(header) == IH_MAGIC) { #ifdef CONFIG_SPL_LEGACY_IMAGE_SUPPORT u32 header_size = sizeof(struct image_header);

Despite this minor thing:

Reviewed-by: Lukasz Majewski lukma@denx.de

Best regards,

Lukasz Majewski

--

DENX Software Engineering GmbH, Managing Director: Wolfgang Denk HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany Phone: (+49)-8142-66989-10 Fax: (+49)-8142-66989-80 Email: wd@denx.de

Hi Marek,

On 28 December 2017 at 05:06, Marek Vasut marex@denx.de wrote:

Add support for loading fitImage with device tree overlay image, which is applied to the U-Boot's own device tree. Once the DT is applied, the fitImage loading process is restarted.

This patch allows a usecase where the DTO patches ie. load address in the U-Boot's DT or patches in a new public key for authenticating the subsequently loaded fitImages.

Signed-off-by: Marek Vasut marex@denx.de Cc: Pantelis Antoniou pantelis.antoniou@konsulko.com Cc: Simon Glass sjg@chromium.org

---

common/spl/spl.c | 38 +++++++++++++++++++++++++++++++++++++- 1 file changed, 37 insertions(+), 1 deletion(-)

This needs a test.

diff --git a/common/spl/spl.c b/common/spl/spl.c index d429ea2c82..2444abbb08 100644 --- a/common/spl/spl.c +++ b/common/spl/spl.c @@ -140,6 +140,38 @@ void spl_set_header_raw_uboot(struct spl_image_info *spl_image) }

#ifdef CONFIG_SPL_LOAD_FIT_FULL +#ifdef CONFIG_OF_LIBFDT_OVERLAY

Can we avoid this by doing

if (IS_ENABLED(...))

below?

+static int spl_fit_overlay_uboot_fdt_full(const struct image_header *header) +{

•   bootm_headers_t images;
  

•   const char *fit_uname_config = NULL;
  

•   const char *fit_uname_dtbo = "u-boot-dtbo";
  

•   ulong dto_data = 0;
  

•   ulong dto_len = 0;
  

•   int ret;
  

•   ret = fit_image_load(&images, (ulong)header,
  

•                        &fit_uname_dtbo, &fit_uname_config,
  

•                        IH_ARCH_DEFAULT, IH_TYPE_FLATDT, -1,
  

•                        FIT_LOAD_OPTIONAL, &dto_data, &dto_len);
  

•   if (ret < 0)
  

•           return 0;
  

•   ret = fdt_overlay_apply_verbose((struct fdt_header *)gd->fdt_blob,
  

•                                   (void *)dto_data);
  

•   if (ret)
  

•           hang();
  

•   /* Restart the loading process to cater for the DT changes */
  

•   return -EAGAIN;
  

+} +#else +static int spl_fit_overlay_uboot_fdt_full(const struct image_header *header) +{

•   return 0;
  

+} +#endif

/* Parse and load full fitImage in SPL */ static int spl_load_fit_image(struct spl_image_info *spl_image, const struct image_header *header) @@ -152,6 +184,10 @@ static int spl_load_fit_image(struct spl_image_info *spl_image, ulong fw_len = 0, dt_len = 0; int ret;

•   ret = spl_fit_overlay_uboot_fdt_full(header);
  

•   if (ret)
  

•           return ret;
  

•   ret = fit_image_load(&images, (ulong)header,
                         NULL, &fit_uname_config,
                         IH_ARCH_DEFAULT, IH_TYPE_STANDALONE, -1,
  

@@ -182,7 +218,7 @@ int spl_parse_image_header(struct spl_image_info *spl_image, { #ifdef CONFIG_SPL_LOAD_FIT_FULL int ret = spl_load_fit_image(spl_image, header);

•   if (!ret)
  

•   if (!ret || ret == -EAGAIN)
            return ret;
  

#endif if (image_get_magic(header) == IH_MAGIC) { -- 2.15.0

Regards, Simon

Hi Marek,

If the loader->load_image returns -EAGAIN, it is an indication the loading process should restart the loading, possible due to DTO being applied on the U-Boot's DT. Restart the loading until the loader stops returning -EAGAIN.

Signed-off-by: Marek Vasut marex@denx.de Cc: Pantelis Antoniou pantelis.antoniou@konsulko.com Cc: Simon Glass sjg@chromium.org

---

common/spl/spl.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/common/spl/spl.c b/common/spl/spl.c index 2444abbb08..27f44c27b0 100644 --- a/common/spl/spl.c +++ b/common/spl/spl.c @@ -413,11 +413,16 @@ static int spl_load_image(struct spl_image_info *spl_image, struct spl_image_loader *loader) { struct spl_boot_device bootdev;

• int ret;

  bootdev.boot_device = loader->boot_device; bootdev.boot_device_name = NULL;

• return loader->load_image(spl_image, &bootdev);

• do {

• ret = loader->load_image(spl_image, &bootdev);
  

• } while (ret == -EAGAIN);

Maybe it would be good to have some counter or timeout (although, I doubt if any timer is set properly so early) to give the user some information if we fail?

• return ret;

}

/**

Best regards,

Lukasz Majewski

--

DENX Software Engineering GmbH, Managing Director: Wolfgang Denk HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany Phone: (+49)-8142-66989-10 Fax: (+49)-8142-66989-80 Email: wd@denx.de

Hi Marek,

Add support for fetching the image position in RAM from control DT rather than hard-coding it. While doing so, return the return value of spl_parse_header_image() to make it possible to test application of DTOs on U-Boot's control DT.

Signed-off-by: Marek Vasut marex@denx.de Cc: Pantelis Antoniou pantelis.antoniou@konsulko.com Cc: Simon Glass sjg@chromium.org

---

common/spl/spl_spi.c | 13 +++++++++++++ 1 file changed, 13 insertions(+)

diff --git a/common/spl/spl_spi.c b/common/spl/spl_spi.c index 42880d56b9..c2613a494b 100644 --- a/common/spl/spl_spi.c +++ b/common/spl/spl_spi.c @@ -75,6 +75,7 @@ static int spl_spi_load_image(struct spl_image_info *spl_image, unsigned payload_offs = CONFIG_SYS_SPI_U_BOOT_OFFS; struct spi_flash *flash; struct image_header *header;

• unsigned image_offs, image_size;

  /*

  • Load U-Boot image from SPI flash into RAM

@@ -96,6 +97,18 @@ static int spl_spi_load_image(struct spl_image_info *spl_image, payload_offs = fdtdec_get_config_int(gd->fdt_blob, "u-boot,spl-payload-offset", payload_offs);

• image_offs = fdtdec_get_config_int(gd->fdt_blob,

"u-boot,spl-image-offset", 0);

• image_size = fdtdec_get_config_int(gd->fdt_blob,

• 			   "u-boot,spl-image-size",
  

0);

• if (image_size) {

• err = spi_flash_read(flash, image_offs,
  

• 		     image_size,
  

• 		     (void *)CONFIG_SYS_TEXT_BASE);
  

• if (err)
  

• 	return err;
  

• return spl_parse_image_header(spl_image, header);
  

• }

#endif

#ifdef CONFIG_SPL_OS_BOOT

Reviewed-by: Lukasz Majewski lukma@denx.de

Best regards,

Lukasz Majewski

--

DENX Software Engineering GmbH, Managing Director: Wolfgang Denk HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany Phone: (+49)-8142-66989-10 Fax: (+49)-8142-66989-80 Email: wd@denx.de