mirror of
https://github.com/AsahiLinux/u-boot
synced 2024-11-28 23:51:33 +00:00
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. Signed-off-by: Lokesh Vutla <lokeshvutla@ti.com> Reviewed-by: Tom Rini <trini@konsulko.com>
This commit is contained in:
parent
5d21406516
commit
ceee15ce5d
5 changed files with 5 additions and 9 deletions
|
@ -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" \
|
||||
|
|
|
@ -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>
|
||||
|
||||
|
|
|
@ -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" \
|
||||
|
|
|
@ -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" \
|
||||
|
|
|
@ -247,6 +247,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" \
|
||||
|
@ -291,8 +292,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 \
|
||||
|
|
Loading…
Reference in a new issue