mirror/u-boot-2016
1
0
Fork 0
mirror of https://git.codelinaro.org/clo/qsdk/oss/boot/u-boot-2016.git synced 2026-03-06 09:21:26 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Revert "armv7: qca: common: smem: skip printing the partition info if it exceeds flash size"

Browse source 
This reverts commit c7c20989ab.

Change-Id: Idc9e56ee2f8eaa65cb2939f05b2cba73f13e65ff
Signed-off-by: Sridharan S N <quic_sridsn@quicinc.com>
This commit is contained in:
Sridharan S N 2023-09-14 12:25:51 +05:30
parent 61997a01de
commit 314971f0b9
2 changed files with 0 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
arch/arm/cpu/armv7/qca/common/smem.c
View file

@ -553,14 +553,6 @@ uint32_t get_nand_block_size(uint8_t dev_id)
return mtd->erasesize;
}
uint64_t get_nand_flash_size(uint8_t dev_id)
{
struct mtd_info *mtd;
mtd = &nand_info[dev_id];
return mtd->size;
}
#endif
/*
* get flash block size based on partition name.
@ -1175,10 +1167,6 @@ int do_smeminfo(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
qca_smem_flash_info_t *sfi = &qca_smem_flash_info;
int i;
uint32_t bsize;
#ifdef CONFIG_CMD_NAND
uint64_t fsize;
fsize = get_nand_flash_size(is_spi_nand_available());
#endif
#ifdef IPQ_UBI_VOL_WRITE_SUPPORT
ubi_set_rootfs_part();
#endif
@ -1230,11 +1218,6 @@ int do_smeminfo(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
psize = ((loff_t)p->size) * bsize;
}
#ifdef CONFIG_CMD_NAND
/* skip printing the partition that exceeds flash size */
if (((loff_t)p->start) * bsize + psize > fsize)
continue;
#endif
printf("%3d: " smem_ptn_name_fmt " 0x%08x %#16llx %#16llx\n",
i, p->name, p->attr, ((loff_t)p->start) * bsize, psize);
#ifdef IPQ_UBI_VOL_WRITE_SUPPORT

1
arch/arm/include/asm/arch-qca-common/smem.h
View file

@ -68,7 +68,6 @@ int smem_getpart_from_offset(uint32_t offset, uint32_t *start, uint32_t *size);
int getpart_offset_size(char *part_name, uint32_t *offset, uint32_t *size);
unsigned int smem_get_board_machtype(void);
uint32_t get_nand_block_size(uint8_t dev_id);
uint64_t get_nand_flash_size(uint8_t dev_id);
unsigned int get_which_flash_param(char *part_name);
int smem_get_build_version(char *version_name, int buf_size, int index);
int ipq_smem_get_boot_version(char *version_name, int buf_size);