Eric Lee / smarc-uboot

Download as
Browse Code ยป

Commit 06503f16c34b722ed07cda98aa6e268941c4dd46

Authored by Scott Wood
Committed by Tom Rini
1 parent 6d5ce1bd00
Exists in master and in 53 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, 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

mtd: fix warnings due to 64-bit partition support 

commit 39ac34473f3c96e77cbe03a49141771ed1639486 ("cmd_mtdparts: use 64
bits for flash size, partition size & offset") introduced warnings
in a couple places due to printf formats or pointer casting.

This patch fixes the warnings pointed out here:
http://lists.denx.de/pipermail/u-boot/2013-October/164981.html

Signed-off-by: Scott Wood <scottwood@freescale.com>
Cc: York Sun <yorksun@freescale.com>
Cc: Stefan Roese <sr@denx.de>
Cc: Paul Burton <paul.burton@imgtec.com>
Cc: Tom Rini <trini@ti.com>

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

common/fdt_support.c
Diff comments   View file @ 06503f1
... ... @@ -766,11 +766,11 @@
766 766  
767 767 part = list_entry(pentry, struct part_info, link);
768 768  
769   - debug("%2d: %-20s0x%08x\t0x%08x\t%d\n",
  769 + debug("%2d: %-20s0x%08llx\t0x%08llx\t%d\n",
770 770 part_num, part->name, part->size,
771 771 part->offset, part->mask_flags);
772 772  
773   - sprintf(buf, "partition@%x", part->offset);
  773 + sprintf(buf, "partition@%llx", part->offset);
774 774 add_sub:
775 775 ret = fdt_add_subnode(blob, parent_offset, buf);
776 776 if (ret == -FDT_ERR_NOSPACE) {
... ... @@ -43,9 +43,10 @@
43 43 * device address space offset, so we need to shift it by a device start address. */
44 44 #if !defined(CONFIG_SYS_NO_FLASH)
45 45 extern flash_info_t flash_info[];
46   -#define PART_OFFSET(x) (x->offset + flash_info[x->dev->id->num].start[0])
  46 +#define PART_OFFSET(x) ((ulong)x->offset + \
  47 + flash_info[x->dev->id->num].start[0])
47 48 #else
48   -#define PART_OFFSET(x) (x->offset)
  49 +#define PART_OFFSET(x) ((ulong)x->offset)
49 50 #endif
50 51  
51 52 static int cramfs_read_super (struct part_info *info)