ti_armv7_keystone2: Update addr_mon variable
PATCH 2/2 ti_armv7_keystone2: Update addr_mon variable
As boot monitor contains a mkimage header, it can be loaded at any location. So, have a common addr_mon address across all keystone2 SoCs. And also making sure that boot monitor is installed early during default boot to avoid any overlapping with other images.
---
- This is based on top of https://patchwork.ozlabs.org/patch/670426/
include/configs/k2e_evm.h | 1 - include/configs/k2g_evm.h | 6 ++---- include/configs/k2hk_evm.h | 1 - include/configs/k2l_evm.h | 1 - include/configs/ti_armv7_keystone2.h | 5 +++-- 5 files changed, 5 insertions(+), 9 deletions(-)
include/configs/k2e_evm.h +0 -1
@@ -18,7 +18,6 @@#define CONFIG_EXTRA_ENV_KS2_BOARD_SETTINGS \ DEFAULT_FW_INITRAMFS_BOOT_ENV \ "boot=ubi\0" \ - "addr_mon=0x0c140000\0" \ "args_ubi=setenv bootargs ${bootargs} rootfstype=ubifs " \ "root=ubi0:rootfs rootflags=sync rw ubi.mtd=ubifs,2048\0" \ "name_fdt=keystone-k2e-evm.dtb\0" \
include/configs/k2g_evm.h +2 -4
@@ -24,7 +24,6 @@"bootpart=0:2\0" \"bootdir=/boot\0" \"rd_spec=-\0" \ -"addr_mon=0x0c040000\0" \"args_ubi=setenv bootargs ${bootargs} rootfstype=ubifs " \"root=ubi0:rootfs rootflags=sync rw ubi.mtd=ubifs,2048\0" \"name_fdt=keystone-k2g-evm.dtb\0" \
@@ -44,9 +43,8 @@#define CONFIG_BOOTCOMMAND \ "run envboot; " \ "run set_name_pmmc init_${boot} init_fw_rd_${boot} " \ - "get_pmmc_${boot} run_pmmc " \ - "get_fdt_${boot} get_mon_${boot} get_kern_${boot} " \ - "run_mon run_kern" + "get_pmmc_${boot} run_pmmc get_mon_${boot} run_mon " \ + "get_fdt_${boot} get_kern_${boot} run_kern"#include <configs/ti_armv7_keystone2.h>
include/configs/k2hk_evm.h +0 -1
@@ -18,7 +18,6 @@#define CONFIG_EXTRA_ENV_KS2_BOARD_SETTINGS \ DEFAULT_FW_INITRAMFS_BOOT_ENV \ "boot=ubi\0" \ - "addr_mon=0x0c5f0000\0" \ "args_ubi=setenv bootargs ${bootargs} rootfstype=ubifs " \ "root=ubi0:rootfs rootflags=sync rw ubi.mtd=ubifs,2048\0" \ "name_fdt=keystone-k2hk-evm.dtb\0" \
include/configs/k2l_evm.h +0 -1
@@ -18,7 +18,6 @@#define CONFIG_EXTRA_ENV_KS2_BOARD_SETTINGS \ DEFAULT_FW_INITRAMFS_BOOT_ENV \ "boot=ubi\0" \ - "addr_mon=0x0c140000\0" \ "args_ubi=setenv bootargs ${bootargs} rootfstype=ubifs " \ "root=ubi0:rootfs rootflags=sync rw ubi.mtd=ubifs,4096\0" \ "name_fdt=keystone-k2l-evm.dtb\0" \
include/configs/ti_armv7_keystone2.h +3 -2
@@ -250,6 +250,7 @@"addr_ubi=0x82000000\0" \"addr_secdb_key=0xc000000\0" \"name_kern=zImage\0" \ +"addr_mon=0x87000000\0" \"run_mon=mon_install ${addr_mon}\0" \"run_kern=bootz ${loadaddr} ${rd_spec} ${fdtaddr}\0" \"init_net=run args_all args_net\0" \
@@ -294,8 +295,8 @@#ifndef CONFIG_BOOTCOMMAND #define CONFIG_BOOTCOMMAND \ - "run init_${boot} init_fw_rd_${boot} get_fdt_${boot} " \ - "get_mon_${boot} get_kern_${boot} run_mon run_kern" + "run init_${boot} get_mon_${boot} run_mon init_fw_rd_${boot} " \ + "get_fdt_${boot} get_kern_${boot} run_kern"#endif #define CONFIG_BOOTARGS \
Signature · 1 line
2.9.3
PATCH 2/2 ti_armv7_keystone2: Update addr_mon variable
Quoted 6 lines · Lokesh Vutla
As boot monitor contains a mkimage header, it can be loaded at any location. So, have a common
addr_monaddress across all keystone2 SoCs. And also making sure that boot monitor is installed early during default boot to avoid any overlapping with other images.Signed-off-by Lokesh Vutla <[email protected]>
Signature · 8 lines
Tom -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 819 bytes Desc: Digital signature URL: <http://lists.denx.de/pipermail/u-boot/attachments/20160916/5a57f003/attachment.sig>
PATCH 2/2 ti_armv7_keystone2: Update addr_mon variable
In reply to Lokesh VutlaQuoted 7 lines · Lokesh Vutla
As boot monitor contains a mkimage header, it can be loaded at any location. So, have a common
addr_monaddress across all keystone2 SoCs. And also making sure that boot monitor is installed early during default boot to avoid any overlapping with other images.Signed-off-by Lokesh Vutla <[email protected]>Reviewed-by Tom Rini <[email protected]>
Applied to u-boot/master, thanks!
Signature · 8 lines
Tom -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 819 bytes Desc: Digital signature URL: <http://lists.denx.de/pipermail/u-boot/attachments/20161003/a3d8c88c/attachment.sig>