On Tue, 2018-01-23 at 13:16 -0600, Pierre-Louis Bossart wrote:
This one does not apply for me?
Using index info to reconstruct a base tree... error: patch failed: src/arch/xtensa/crt1-boards.S:120 error: src/arch/xtensa/crt1-boards.S: patch does not apply
On 01/23/2018 10:40 AM, Liam Girdwood wrote:
From: Rander Wang rander.wang@linux.intel.com
Add a support for a secondary boot loader than cant be used to bootstrap multiple firmware modules.
Signed-off-by: Rander Wang rander.wang@linux.intel.com
src/arch/xtensa/boot_entry.S | 98 ++++++++++++++++++++ src/arch/xtensa/boot_loader.c | 206 +++++++++++++++++++++++++++++++++++++++++ src/arch/xtensa/crt1-boards.S | 16 ++++ src/arch/xtensa/main-entry.S | 57 ++++++++++++ src/arch/xtensa/reset-vector.S | 16 +++- 5 files changed, 391 insertions(+), 2 deletions(-) create mode 100644 src/arch/xtensa/boot_entry.S create mode 100644 src/arch/xtensa/boot_loader.c create mode 100644 src/arch/xtensa/main-entry.S
[...]
diff --git a/src/arch/xtensa/crt1-boards.S b/src/arch/xtensa/crt1- boards.S index 5d9b842..ff24bfd 100644 --- a/src/arch/xtensa/crt1-boards.S +++ b/src/arch/xtensa/crt1-boards.S @@ -120,6 +120,22 @@ _start: #include "reset-unneeded.S" #endif
Maybe because the code is different initially, something looks missing...
#if XTOS_RESET_UNNEEDED && !XCHAL_HAVE_HALT #include "reset-unneeded.S" #endif
I suspect I've sent the pre-merge version after running cleanpatch....but I've pushed the post merge version.
Liam