fix(ci): update patches for bl31_main()
bl31_main() was changed heavily and these patches no longer apply. Redo
them, keeping their function identical.
Signed-off-by: Boyan Karatotev <boyan.karatotev@arm.com>
Change-Id: I452b390916959b4b37745a489892843e21559c3d
diff --git a/patch/ubsan/ubsan_test.patch b/patch/ubsan/ubsan_test.patch
index c452e6b..364216a 100644
--- a/patch/ubsan/ubsan_test.patch
+++ b/patch/ubsan/ubsan_test.patch
@@ -1,9 +1,9 @@
-diff --git a/bl31/bl31_main.c b/bl31/bl31_main.c
-index 8c5ba6f2e..21ed3b686 100644
---- a/bl31/bl31_main.c
-+++ b/bl31/bl31_main.c
-@@ -112,6 +112,19 @@ void bl31_setup(u_register_t arg0, u_register_t arg1, u_register_t arg2,
- report_ctx_memory_usage();
+diff --git i/bl31/bl31_main.c w/bl31/bl31_main.c
+index bf870a392..65eb3b8f2 100644
+--- i/bl31/bl31_main.c
++++ w/bl31/bl31_main.c
+@@ -94,6 +94,19 @@ static void __init bl31_lib_init(void)
+ cm_init();
}
+/*
@@ -22,7 +22,7 @@
/*******************************************************************************
* BL31 is responsible for setting up the runtime services for the primary cpu
* before passing control to the bootloader or an Operating System. This
-@@ -224,6 +237,10 @@ void bl31_main(void)
+@@ -235,6 +248,10 @@ void __no_pauth bl31_main(u_register_t arg0, u_register_t arg1, u_register_t arg
console_flush();
console_switch_state(CONSOLE_FLAG_RUNTIME);
@@ -32,4 +32,4 @@
+ ubsan_test_add_overflow();
}
- /*******************************************************************************
+ void __no_pauth bl31_warmboot(void)