aboutsummaryrefslogtreecommitdiff
path: root/board/sunxi
diff options
context:
space:
mode:
authorIcenowy Zheng <icenowy@aosc.io>2018-07-21 16:20:23 +0800
committerJagan Teki <jagan@amarulasolutions.com>2018-07-31 11:38:13 +0530
commit0a21fdd62be117ea781d37805ec569037f2fa6c3 (patch)
tree52508695c15c86df546858997ccaaaa2f55ce2c3 /board/sunxi
parent80197801f4786fef257119981c977ed6debdf539 (diff)
downloadu-boot-0a21fdd62be117ea781d37805ec569037f2fa6c3.zip
u-boot-0a21fdd62be117ea781d37805ec569037f2fa6c3.tar.gz
u-boot-0a21fdd62be117ea781d37805ec569037f2fa6c3.tar.bz2
sunxi: change ATF position for H6
H6 has different SRAM A2 address, so the ATF load address is also different. Add judgment code to sunxi 64-bit FIT generation script. It will judge the SoC by the device tree's name. Signed-off-by: Icenowy Zheng <icenowy@aosc.io> Reviewed-by: Andre Przywara <andre.przywara@arm.com> Acked-by: Maxime Ripard <maxime.ripard@bootlin.com> Reviewed-by: Jagan Teki <jagan@openedev.com> Tested-by: Jagan Teki <jagan@amarulasolutions.com>
Diffstat (limited to 'board/sunxi')
-rwxr-xr-xboard/sunxi/mksunxi_fit_atf.sh10
1 files changed, 8 insertions, 2 deletions
diff --git a/board/sunxi/mksunxi_fit_atf.sh b/board/sunxi/mksunxi_fit_atf.sh
index 36abe9e..88ad719 100755
--- a/board/sunxi/mksunxi_fit_atf.sh
+++ b/board/sunxi/mksunxi_fit_atf.sh
@@ -13,6 +13,12 @@ if [ ! -f $BL31 ]; then
BL31=/dev/null
fi
+if grep -q "^CONFIG_MACH_SUN50I_H6=y" .config; then
+ BL31_ADDR=0x104000
+else
+ BL31_ADDR=0x44000
+fi
+
cat << __HEADER_EOF
/dts-v1/;
@@ -35,8 +41,8 @@ cat << __HEADER_EOF
type = "firmware";
arch = "arm64";
compression = "none";
- load = <0x44000>;
- entry = <0x44000>;
+ load = <$BL31_ADDR>;
+ entry = <$BL31_ADDR>;
};
__HEADER_EOF