Eric Lee / smarc-uboot

Download as
Browse Code ยป

Commit 022b4975c8dd304fa9f949594784f78601ae07c2

Authored by Stefan Roese
Committed by Tom Rini
1 parent 33d346464a
Exists in master and in 54 other branches 8qm-imx_v2020.04_5.4.70_2.3.0, emb_lf_v2022.04, imx_v2015.04_4.1.15_1.0.0_ga, pitx_8mp_lf_v2020.04, smarc-8m-android-10.0.0_2.6.0, smarc-8m-android-11.0.0_2.0.0, smarc-8mp-android-11.0.0_2.0.0, smarc-emmc-imx_v2014.04_3.10.53_1.1.0_ga, smarc-emmc-imx_v2014.04_3.14.28_1.0.0_ga, smarc-imx-l5.0.0_1.0.0-ga, smarc-imx6_v2018.03_4.14.98_2.0.0_ga, smarc-imx7_v2017.03_4.9.11_1.0.0_ga, smarc-imx7_v2018.03_4.14.98_2.0.0_ga, smarc-imx_v2014.04_3.14.28_1.0.0_ga, smarc-imx_v2015.04_4.1.15_1.0.0_ga, smarc-imx_v2017.03_4.9.11_1.0.0_ga, smarc-imx_v2017.03_4.9.88_2.0.0_ga, smarc-imx_v2017.03_o8.1.0_1.3.0_8m, smarc-imx_v2018.03_4.14.78_1.0.0_ga, smarc-m6.0.1_2.1.0-ga, smarc-n7.1.2_2.0.0-ga, smarc-rel_imx_4.1.15_2.0.0_ga, smarc_8m-imx_v2018.03_4.14.98_2.0.0_ga, smarc_8m-imx_v2019.04_4.19.35_1.1.0, smarc_8m_00d0-imx_v2018.03_4.14.98_2.0.0_ga, smarc_8mm-imx_v2018.03_4.14.98_2.0.0_ga, smarc_8mm-imx_v2019.04_4.19.35_1.1.0, smarc_8mm-imx_v2020.04_5.4.24_2.1.0, smarc_8mp_lf_v2020.04, smarc_8mq-imx_v2020.04_5.4.24_2.1.0, smarc_8mq_lf_v2020.04, ti-u-boot-2015.07, u-boot-2013.01.y, v2013.10, v2013.10-smarct33, v2013.10-smartmen, v2014.01, v2014.04, v2014.04-smarct33, v2014.04-smarct33-emmc, v2014.04-smartmen, v2014.07, v2014.07-smarct33, v2014.07-smartmen, v2015.07-smarct33, v2015.07-smarct33-emmc, v2015.07-smarct4x, v2016.05-dlt, v2016.05-smarct3x, v2016.05-smarct3x-emmc, v2016.05-smarct4x, v2017.01-smarct3x, v2017.01-smarct3x-emmc, v2017.01-smarct4x

SPL: Add option to skip copying of the mkimage header 

On some system (e.g. powerpc), the load-address and entry-point is
located at address 0. So the current approach to load the image
(payload) including the header to the address "load-address - 64"
can't work here.

This patch adds an flag to skip this copying including header to
the SPL framework. By setting SPL_COPY_PAYLOAD_ONLY, only the
playload will be copied. This will be used by the SPL NOR flash
driver on powerpc.

Signed-off-by: Stefan Roese <sr@denx.de>
Signed-off-by: Tom Rini <trini@ti.com>

Showing 2 changed files with 20 additions and 4 deletions Side-by-side Diff

... ... @@ -76,10 +76,23 @@
76 76 u32 header_size = sizeof(struct image_header);
77 77  
78 78 if (image_get_magic(header) == IH_MAGIC) {
79   - spl_image.size = image_get_data_size(header) + header_size;
80   - spl_image.entry_point = image_get_load(header);
81   - /* Load including the header */
82   - spl_image.load_addr = spl_image.entry_point - header_size;
  79 + if (spl_image.flags & SPL_COPY_PAYLOAD_ONLY) {
  80 + /*
  81 + * On some system (e.g. powerpc), the load-address and
  82 + * entry-point is located at address 0. We can't load
  83 + * to 0-0x40. So skip header in this case.
  84 + */
  85 + spl_image.load_addr = image_get_load(header);
  86 + spl_image.entry_point = image_get_ep(header);
  87 + spl_image.size = image_get_data_size(header);
  88 + } else {
  89 + spl_image.entry_point = image_get_load(header);
  90 + /* Load including the header */
  91 + spl_image.load_addr = spl_image.entry_point -
  92 + header_size;
  93 + spl_image.size = image_get_data_size(header) +
  94 + header_size;
  95 + }
83 96 spl_image.os = image_get_os(header);
84 97 spl_image.name = image_get_name(header);
85 98 debug("spl: payload image: %s load addr: 0x%x size: %d\n",
... ... @@ -38,7 +38,10 @@
38 38 u32 load_addr;
39 39 u32 entry_point;
40 40 u32 size;
  41 + u32 flags;
41 42 };
  43 +
  44 +#define SPL_COPY_PAYLOAD_ONLY 1
42 45  
43 46 extern struct spl_image_info spl_image;
44 47 extern u32 *boot_params_ptr;