summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorTom Rini <trini@konsulko.com>2019-03-29 17:53:28 +0300
committerTom Rini <trini@konsulko.com>2019-03-29 17:53:28 +0300
commitc3aef9339ce0592b06c8d44cf2eaf9e6f3713e4f (patch)
treeee04147c6f17f12c95b1cd7a9a53a93c2c8513e2 /include
parentb357ae5ed697da038d0ee6807f308f9177fcb3a7 (diff)
parentf00c26284ec0aa3e9b01ebe4996aa8fc01526d03 (diff)
downloadu-boot-c3aef9339ce0592b06c8d44cf2eaf9e6f3713e4f.tar.xz
Merge branch '2019-03-29-master-imports'
- Bugfixes: - mmc: correct the HS400 initialization process - configs: ti: Move FIT image load address to avoid overwrite - lib: time: update module enable MACRO - Add mbrugger as RPi board maintainer, correct agraf's email address.
Diffstat (limited to 'include')
-rw-r--r--include/configs/ti_armv7_common.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/include/configs/ti_armv7_common.h b/include/configs/ti_armv7_common.h
index 1e2a62dd6f..828fb1b2a5 100644
--- a/include/configs/ti_armv7_common.h
+++ b/include/configs/ti_armv7_common.h
@@ -52,7 +52,7 @@
#define DEFAULT_FIT_TI_ARGS \
"boot_fit=0\0" \
- "fit_loadaddr=0x87000000\0" \
+ "fit_loadaddr=0x90000000\0" \
"fit_bootfile=fitImage\0" \
"update_to_fit=setenv loadaddr ${fit_loadaddr}; setenv bootfile ${fit_bootfile}\0" \
"loadfit=run args_mmc; bootm ${loadaddr}#${fdtfile};\0" \