Mirrors/u-boot
2
0
Fork 0
mirror of https://github.com/AsahiLinux/u-boot synced 2024-11-28 23:51:33 +00:00
Code Issues Projects Releases Packages Wiki Activity

ti_armv7_keystone2: Update addr_mon variable

Browse source 
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:
Lokesh Vutla 2016-09-16 10:17:53 +05:30 committed by Tom Rini
parent 5d21406516
commit ceee15ce5d
5 changed files with 5 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
include/configs/k2e_evm.h
View file

@ -18,7 +18,6 @@
#define CONFIG_EXTRA_ENV_KS2_BOARD_SETTINGS \ #define CONFIG_EXTRA_ENV_KS2_BOARD_SETTINGS \
DEFAULT_FW_INITRAMFS_BOOT_ENV \ DEFAULT_FW_INITRAMFS_BOOT_ENV \
"boot=ubi\0" \ "boot=ubi\0" \
"addr_mon=0x0c140000\0" \
"args_ubi=setenv bootargs ${bootargs} rootfstype=ubifs " \ "args_ubi=setenv bootargs ${bootargs} rootfstype=ubifs " \
"root=ubi0:rootfs rootflags=sync rw ubi.mtd=ubifs,2048\0" \ "root=ubi0:rootfs rootflags=sync rw ubi.mtd=ubifs,2048\0" \
"name_fdt=keystone-k2e-evm.dtb\0" \ "name_fdt=keystone-k2e-evm.dtb\0" \

6
include/configs/k2g_evm.h
View file

@ -24,7 +24,6 @@
"bootpart=0:2\0" \ "bootpart=0:2\0" \
"bootdir=/boot\0" \ "bootdir=/boot\0" \
"rd_spec=-\0" \ "rd_spec=-\0" \
"addr_mon=0x0c040000\0" \
"args_ubi=setenv bootargs ${bootargs} rootfstype=ubifs " \ "args_ubi=setenv bootargs ${bootargs} rootfstype=ubifs " \
"root=ubi0:rootfs rootflags=sync rw ubi.mtd=ubifs,2048\0" \ "root=ubi0:rootfs rootflags=sync rw ubi.mtd=ubifs,2048\0" \
"name_fdt=keystone-k2g-evm.dtb\0" \ "name_fdt=keystone-k2g-evm.dtb\0" \
@ -44,9 +43,8 @@
#define CONFIG_BOOTCOMMAND \ #define CONFIG_BOOTCOMMAND \
"run envboot; " \ "run envboot; " \
"run set_name_pmmc init_${boot} init_fw_rd_${boot} " \ "run set_name_pmmc init_${boot} init_fw_rd_${boot} " \
"get_pmmc_${boot} run_pmmc " \ "get_pmmc_${boot} run_pmmc get_mon_${boot} run_mon " \
"get_fdt_${boot} get_mon_${boot} get_kern_${boot} " \ "get_fdt_${boot} get_kern_${boot} run_kern"
"run_mon run_kern"
#include <configs/ti_armv7_keystone2.h> #include <configs/ti_armv7_keystone2.h>

1
include/configs/k2hk_evm.h
View file

@ -18,7 +18,6 @@
#define CONFIG_EXTRA_ENV_KS2_BOARD_SETTINGS \ #define CONFIG_EXTRA_ENV_KS2_BOARD_SETTINGS \
DEFAULT_FW_INITRAMFS_BOOT_ENV \ DEFAULT_FW_INITRAMFS_BOOT_ENV \
"boot=ubi\0" \ "boot=ubi\0" \
"addr_mon=0x0c5f0000\0" \
"args_ubi=setenv bootargs ${bootargs} rootfstype=ubifs " \ "args_ubi=setenv bootargs ${bootargs} rootfstype=ubifs " \
"root=ubi0:rootfs rootflags=sync rw ubi.mtd=ubifs,2048\0" \ "root=ubi0:rootfs rootflags=sync rw ubi.mtd=ubifs,2048\0" \
"name_fdt=keystone-k2hk-evm.dtb\0" \ "name_fdt=keystone-k2hk-evm.dtb\0" \

1
include/configs/k2l_evm.h
View file

@ -18,7 +18,6 @@
#define CONFIG_EXTRA_ENV_KS2_BOARD_SETTINGS \ #define CONFIG_EXTRA_ENV_KS2_BOARD_SETTINGS \
DEFAULT_FW_INITRAMFS_BOOT_ENV \ DEFAULT_FW_INITRAMFS_BOOT_ENV \
"boot=ubi\0" \ "boot=ubi\0" \
"addr_mon=0x0c140000\0" \
"args_ubi=setenv bootargs ${bootargs} rootfstype=ubifs " \ "args_ubi=setenv bootargs ${bootargs} rootfstype=ubifs " \
"root=ubi0:rootfs rootflags=sync rw ubi.mtd=ubifs,4096\0" \ "root=ubi0:rootfs rootflags=sync rw ubi.mtd=ubifs,4096\0" \
"name_fdt=keystone-k2l-evm.dtb\0" \ "name_fdt=keystone-k2l-evm.dtb\0" \

5
include/configs/ti_armv7_keystone2.h
View file

@ -247,6 +247,7 @@
"addr_ubi=0x82000000\0" \ "addr_ubi=0x82000000\0" \
"addr_secdb_key=0xc000000\0" \ "addr_secdb_key=0xc000000\0" \
"name_kern=zImage\0" \ "name_kern=zImage\0" \
"addr_mon=0x87000000\0" \
"run_mon=mon_install ${addr_mon}\0" \ "run_mon=mon_install ${addr_mon}\0" \
"run_kern=bootz ${loadaddr} ${rd_spec} ${fdtaddr}\0" \ "run_kern=bootz ${loadaddr} ${rd_spec} ${fdtaddr}\0" \
"init_net=run args_all args_net\0" \ "init_net=run args_all args_net\0" \
@ -291,8 +292,8 @@
#ifndef CONFIG_BOOTCOMMAND #ifndef CONFIG_BOOTCOMMAND
#define CONFIG_BOOTCOMMAND \ #define CONFIG_BOOTCOMMAND \
"run init_${boot} init_fw_rd_${boot} get_fdt_${boot} " \ "run init_${boot} get_mon_${boot} run_mon init_fw_rd_${boot} " \
"get_mon_${boot} get_kern_${boot} run_mon run_kern" "get_fdt_${boot} get_kern_${boot} run_kern"
#endif #endif
#define CONFIG_BOOTARGS \ #define CONFIG_BOOTARGS \