diff options
| author | Lokesh Vutla <lokeshvutla@ti.com> | 2016-09-16 10:17:53 +0530 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2016-10-01 20:05:12 -0400 |
| commit | ceee15ce5d4813672f6ede5080d7682022f069c0 (patch) | |
| tree | 33b315a6f2fbc62dcfbb9c62f24f0a2985189c1d /include | |
| parent | 5d214065167ed4052b552a7224b9fbf807b8c107 (diff) | |
| download | u-boot-imx-ceee15ce5d4813672f6ede5080d7682022f069c0.zip u-boot-imx-ceee15ce5d4813672f6ede5080d7682022f069c0.tar.gz u-boot-imx-ceee15ce5d4813672f6ede5080d7682022f069c0.tar.bz2 | |
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>
Diffstat (limited to 'include')
| -rw-r--r-- | include/configs/k2e_evm.h | 1 | ||||
| -rw-r--r-- | include/configs/k2g_evm.h | 6 | ||||
| -rw-r--r-- | include/configs/k2hk_evm.h | 1 | ||||
| -rw-r--r-- | include/configs/k2l_evm.h | 1 | ||||
| -rw-r--r-- | include/configs/ti_armv7_keystone2.h | 5 |
5 files changed, 5 insertions, 9 deletions
diff --git a/include/configs/k2e_evm.h b/include/configs/k2e_evm.h index 7eaab87..8d6471a 100644 --- a/include/configs/k2e_evm.h +++ b/include/configs/k2e_evm.h @@ -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" \ diff --git a/include/configs/k2g_evm.h b/include/configs/k2g_evm.h index d73543f..a145445 100644 --- a/include/configs/k2g_evm.h +++ b/include/configs/k2g_evm.h @@ -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> diff --git a/include/configs/k2hk_evm.h b/include/configs/k2hk_evm.h index 0256f0e..913d454 100644 --- a/include/configs/k2hk_evm.h +++ b/include/configs/k2hk_evm.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" \ diff --git a/include/configs/k2l_evm.h b/include/configs/k2l_evm.h index 2322ab2..395e61c 100644 --- a/include/configs/k2l_evm.h +++ b/include/configs/k2l_evm.h @@ -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" \ diff --git a/include/configs/ti_armv7_keystone2.h b/include/configs/ti_armv7_keystone2.h index 9c0614e..c42dedb 100644 --- a/include/configs/ti_armv7_keystone2.h +++ b/include/configs/ti_armv7_keystone2.h @@ -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 \ |