diff options
| author | Ying-Chun Liu (PaulLiu) <paulliu@debian.org> | 2021-07-21 03:48:36 +0800 |
|---|---|---|
| committer | Ying-Chun Liu (PaulLiu) <paulliu@debian.org> | 2021-07-21 03:48:36 +0800 |
| commit | 5890438194226818dda467ffe095b537c40c2dcf (patch) | |
| tree | e83df349e32faf707b9ae118af6f9216bf7a0a1a | |
| parent | 54671bb41189c0fbb97fc432cf4bf56289a1c155 (diff) | |
Update for upstreaming.
Signed-off-by: Ying-Chun Liu (PaulLiu) <paulliu@debian.org>
| -rwxr-xr-x | build_atf.sh | 8 | ||||
| -rwxr-xr-x | build_flashbin.sh | 2 | ||||
| -rwxr-xr-x | build_uboot.sh | 3 |
3 files changed, 7 insertions, 6 deletions
diff --git a/build_atf.sh b/build_atf.sh index 65e62fa..b5f4685 100755 --- a/build_atf.sh +++ b/build_atf.sh @@ -7,13 +7,13 @@ if [ -d build ]; then fi manual_config() { - sed -i.bak001 '/#include <platform_def.h>/a #define IMX8MP_FIP_MMAP' plat/imx/imx8m/imx8mp/imx8mp_io_storage.c + sed -i.bak001 '/#include <platform_def.h>/a #define IMX8M_FIP_MMAP' plat/imx/imx8m/imx8m_io_storage.c } restore_manual_config() { - if [ -e plat/imx/imx8m/imx8mp/imx8mp_io_storage.c.bak001 ]; then - mv -f plat/imx/imx8m/imx8mp/imx8mp_io_storage.c.bak001 \ - plat/imx/imx8m/imx8mp/imx8mp_io_storage.c + if [ -e plat/imx/imx8m/imx8m_io_storage.c.bak001 ]; then + mv -f plat/imx/imx8m/imx8m_io_storage.c.bak001 \ + plat/imx/imx8m/imx8m_io_storage.c fi } diff --git a/build_flashbin.sh b/build_flashbin.sh index 694446e..f4ba5f6 100755 --- a/build_flashbin.sh +++ b/build_flashbin.sh @@ -19,7 +19,7 @@ cp -v ../trusted-firmware-a/build/imx8mp/release/fip.bin "$B" export ARCH=arm64 export CROSS_COMPILE=aarch64-linux-gnu- -export ATF_LOAD_ADDR=0x970000 +export ATF_LOAD_ADDR=0x960000 make O="$B" diff --git a/build_uboot.sh b/build_uboot.sh index 9dfce0a..b84a31b 100755 --- a/build_uboot.sh +++ b/build_uboot.sh @@ -16,7 +16,8 @@ export CROSS_COMPILE=aarch64-linux-gnu- make O="$B" imx8mp_rsb3720a1_6G_defconfig cat <<EOF > "${B}"/extraconfig CONFIG_USB_XHCI_IMX8M=y +# CONFIG_DM_DEVICE_REMOVE is not set EOF ./scripts/kconfig/merge_config.sh -O ${B} ${B}/.config ${B}/extraconfig -export ATF_LOAD_ADDR=0x970000 +export ATF_LOAD_ADDR=0x960000 make O="$B" |