Conflicts: bl2/bl2_main.c Change-Id: I2f2ee2db6ee70536deaefc562a04037bf16c22a4 |
||
---|---|---|
.. | ||
aarch64 | ||
bl2.ld.S | ||
bl2.mk | ||
bl2_main.c | ||
bl2_private.h |
Conflicts: bl2/bl2_main.c Change-Id: I2f2ee2db6ee70536deaefc562a04037bf16c22a4 |
||
---|---|---|
.. | ||
aarch64 | ||
bl2.ld.S | ||
bl2.mk | ||
bl2_main.c | ||
bl2_private.h |