Eric Lee / smarc-uboot

Download as
Browse Code ยป

Commit 33554fcec99b7c8b57e004fdf18588ce21d85e68

Authored by Jagan Teki
Committed by Philipp Tomsich
1 parent 849f672bdb
Exists in smarc_8mq_lf_v2020.04 and in 20 other branches 8qm-imx_v2020.04_5.4.70_2.3.0, emb_lf-6.6.52-2.2.0, emb_lf_v2022.04, emb_lf_v2023.04, emb_lf_v2024.04, pitx_8mp_lf_v2020.04, smarc-8m-android-10.0.0_2.6.0, smarc-8m-android-11.0.0_2.0.0, smarc-8mp-android-11.0.0_2.0.0, smarc-imx6_v2018.03_4.14.98_2.0.0_ga, smarc-imx7_v2018.03_4.14.98_2.0.0_ga, smarc-imx_v2018.03_4.14.78_1.0.0_ga, smarc_8m-imx_v2018.03_4.14.98_2.0.0_ga, smarc_8m-imx_v2019.04_4.19.35_1.1.0, smarc_8m_00d0-imx_v2018.03_4.14.98_2.0.0_ga, smarc_8mm-imx_v2018.03_4.14.98_2.0.0_ga, smarc_8mm-imx_v2019.04_4.19.35_1.1.0, smarc_8mm-imx_v2020.04_5.4.24_2.1.0, smarc_8mp_lf_v2020.04, smarc_8mq-imx_v2020.04_5.4.24_2.1.0

rockchip: rk3288: Fix wrong TPL_TEXT_BASE 

TPL offset 0xff704004 is unaligned address which is adding nearest
8-bytes for next instruction, So  0xff704004 is adding 0x20 for
proper alignment which is causing the next instruction data
0xefffffff is moved.

Hexdump with overlaped bytes:
-----------------------------
0000000 0000 0000 0000 0000 0000 0000 0000 0000
0000010 0000 0000 0000 0000 0000 0000 ffff eaff

So, Fix the TEXT_BASE for proper aligned address 0xff704000

Signed-off-by: Jagan Teki <jagan@amarulasolutions.com>
Acked-by: Philipp Tomsich <philipp.tomsich@theobroma-systems.com>

Showing 2 changed files with 3 additions and 1 deletions Side-by-side Diff

arch/arm/mach-rockchip/Kconfig
Diff comments   View file @ 33554fc
... ... @@ -77,6 +77,9 @@
77 77 config TPL_LDSCRIPT
78 78 default "arch/arm/mach-rockchip/rk3288/u-boot-tpl.lds"
79 79  
  80 +config TPL_TEXT_BASE
  81 + default 0xff704000
  82 +
80 83 endif
81 84  
82 85 config ROCKCHIP_RK3328
configs/vyasa-rk3288_defconfig
Diff comments   View file @ 33554fc
... ... @@ -5,7 +5,6 @@
5 5 CONFIG_SYS_TEXT_BASE=0x00100000
6 6 CONFIG_SYS_MALLOC_F_LEN=0x2000
7 7 CONFIG_ROCKCHIP_RK3288=y
8   -CONFIG_TPL_TEXT_BASE=0xff704004
9 8 CONFIG_TARGET_VYASA_RK3288=y
10 9 CONFIG_SPL_STACK_R_ADDR=0x80000
11 10 CONFIG_DEFAULT_DEVICE_TREE="rk3288-vyasa"