diff options
| author | Tom Rini <trini@konsulko.com> | 2016-07-19 16:38:57 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2016-07-19 16:38:57 -0400 |
| commit | 66669fcf809c1e3ff644b12e04e625d3737ffd8e (patch) | |
| tree | 362111f12b9dcf33eb31e165d882957df45fc896 /cmd | |
| parent | f60d0603edca472c4458b30956f38c6c1a836d66 (diff) | |
| parent | 0e68a3694d1f33c69be7d1cec5a4261aa1d3d01d (diff) | |
Merge git://git.denx.de/u-boot-fsl-qoriq
Signed-off-by: Tom Rini <trini@konsulko.com>
Conflicts:
arch/arm/cpu/armv8/Makefile
arch/arm/lib/bootm-fdt.c
Diffstat (limited to 'cmd')
| -rw-r--r-- | cmd/bdinfo.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/cmd/bdinfo.c b/cmd/bdinfo.c index 1c4bed96b5..f2435ab7e5 100644 --- a/cmd/bdinfo.c +++ b/cmd/bdinfo.c @@ -385,9 +385,9 @@ static int do_bdinfo(cmd_tbl_t *cmdtp, int flag, int argc, } #ifdef CONFIG_SYS_MEM_RESERVE_SECURE - if (gd->secure_ram & MEM_RESERVE_SECURE_SECURED) { + if (gd->arch.secure_ram & MEM_RESERVE_SECURE_SECURED) { print_num("Secure ram", - gd->secure_ram & MEM_RESERVE_SECURE_ADDR_MASK); + gd->arch.secure_ram & MEM_RESERVE_SECURE_ADDR_MASK); } #endif #if defined(CONFIG_CMD_NET) && !defined(CONFIG_DM_ETH) |