From 550098d560a7edb36da2dad1ed6cf06c7625ae37 Mon Sep 17 00:00:00 2001 From: Jean-Michel Picod <jmichel@google.com> Date: Wed, 11 Mar 2020 17:53:57 +0100 Subject: [PATCH] Remove duplicate patch --- .../tock/06-add-set_vector_table_offset.patch | 23 ------------------- 1 file changed, 23 deletions(-) delete mode 100644 patches/tock/06-add-set_vector_table_offset.patch diff --git a/patches/tock/06-add-set_vector_table_offset.patch b/patches/tock/06-add-set_vector_table_offset.patch deleted file mode 100644 index e3b3618..0000000 --- a/patches/tock/06-add-set_vector_table_offset.patch +++ /dev/null @@ -1,23 +0,0 @@ -diff --git a/arch/cortex-m/src/scb.rs b/arch/cortex-m/src/scb.rs -index 8107f16..a271db9 100644 ---- a/arch/cortex-m/src/scb.rs -+++ b/arch/cortex-m/src/scb.rs -@@ -9,7 +9,7 @@ use kernel::common::StaticRef; - struct ScbRegisters { - cpuid: VolatileCell<u32>, - icsr: VolatileCell<u32>, -- vtor: VolatileCell<u32>, -+ vtor: VolatileCell<*const ()>, - aircr: VolatileCell<u32>, - scr: VolatileCell<u32>, - ccr: VolatileCell<u32>, -@@ -54,3 +54,8 @@ pub unsafe fn reset() { - let reset = (0x5FA << 16) | (aircr & (0x7 << 8)) | (1 << 2); - SCB.aircr.set(reset); - } -+ -+/// relocate interrupt vector table -+pub unsafe fn set_vector_table_offset(offset: *const ()) { -+ SCB.vtor.set(offset); -+} - -- GitLab