Synchronize with upstream Tock to remove 04-rtt.patch

patches/tock/01-persistent-storage.patch

 diff --git a/boards/nordic/nrf52dk_base/src/lib.rs b/boards/nordic/nrf52dk_base/src/lib.rs
-index ddac9dbd..7e2a3298 100644
+index fe493727..105f7120 100644
 --- a/boards/nordic/nrf52dk_base/src/lib.rs
 +++ b/boards/nordic/nrf52dk_base/src/lib.rs
-@@ -105,6 +105,7 @@ pub struct Platform {
+@@ -104,6 +104,7 @@ pub struct Platform {
      // The nRF52dk does not have the flash chip on it, so we make this optional.
      nonvolatile_storage:
          Option<&'static capsules::nonvolatile_storage_driver::NonvolatileStorage<'static>>,
@@ -18,9 +18,9 @@ index ddac9dbd..7e2a3298 100644
              kernel::ipc::DRIVER_NUM => f(Some(&self.ipc)),
              _ => f(None),
          }
-@@ -408,6 +410,14 @@ pub unsafe fn setup_board<I: nrf52::interrupt_service::InterruptService>(
-         None
-     };
+@@ -405,6 +407,14 @@ pub unsafe fn setup_board<I: nrf52::interrupt_service::InterruptService>(
+     );
+     nrf52::acomp::ACOMP.set_client(analog_comparator);
  
 +    let nvmc = static_init!(
 +        nrf52::nvmc::SyscallDriver,
@@ -33,8 +33,8 @@ index ddac9dbd..7e2a3298 100644
      // Start all of the clocks. Low power operation will require a better
      // approach than this.
      nrf52::clock::CLOCK.low_stop();
-@@ -441,6 +451,7 @@ pub unsafe fn setup_board<I: nrf52::interrupt_service::InterruptService>(
-         alarm: alarm,
+@@ -439,6 +449,7 @@ pub unsafe fn setup_board<I: nrf52::interrupt_service::InterruptService>(
+         analog_comparator: analog_comparator,
          nonvolatile_storage: nonvolatile_storage,
          ipc: kernel::ipc::IPC::new(board_kernel, &memory_allocation_capability),
 +        nvmc: nvmc,
@@ -286,10 +286,10 @@ index 5abd2d84..5a726fdb 100644
 +    }
 +}
 diff --git a/kernel/src/callback.rs b/kernel/src/callback.rs
-index 95b25cc0..a7d8bc5c 100644
+index ece4a443..9a1afc84 100644
 --- a/kernel/src/callback.rs
 +++ b/kernel/src/callback.rs
-@@ -50,6 +50,31 @@ impl AppId {
+@@ -52,6 +52,31 @@ impl AppId {
              (start, end)
          })
      }

patches/tock/02-usb.patch

 diff --git a/boards/nordic/nrf52840_dongle/src/main.rs b/boards/nordic/nrf52840_dongle/src/main.rs
-index 5a9da538..75043d13 100644
+index 9a8dccfd..ad3e69b8 100644
 --- a/boards/nordic/nrf52840_dongle/src/main.rs
 +++ b/boards/nordic/nrf52840_dongle/src/main.rs
-@@ -140,6 +140,7 @@ pub unsafe fn reset_handler() {
+@@ -144,6 +144,7 @@ pub unsafe fn reset_handler() {
          FAULT_RESPONSE,
          nrf52840::uicr::Regulator0Output::V3_0,
          false,
@@ -11,10 +11,10 @@ index 5a9da538..75043d13 100644
      );
  }
 diff --git a/boards/nordic/nrf52840dk/src/main.rs b/boards/nordic/nrf52840dk/src/main.rs
-index 0b19ea3f..bd71dfbe 100644
+index 127c4f2f..a5847805 100644
 --- a/boards/nordic/nrf52840dk/src/main.rs
 +++ b/boards/nordic/nrf52840dk/src/main.rs
-@@ -252,6 +252,7 @@ pub unsafe fn reset_handler() {
+@@ -236,6 +236,7 @@ pub unsafe fn reset_handler() {
          FAULT_RESPONSE,
          nrf52840::uicr::Regulator0Output::DEFAULT,
          false,
@@ -23,10 +23,10 @@ index 0b19ea3f..bd71dfbe 100644
      );
  }
 diff --git a/boards/nordic/nrf52dk/src/main.rs b/boards/nordic/nrf52dk/src/main.rs
-index b49518ff..39f996c4 100644
+index d67ac695..b0bd8bf1 100644
 --- a/boards/nordic/nrf52dk/src/main.rs
 +++ b/boards/nordic/nrf52dk/src/main.rs
-@@ -209,6 +209,7 @@ pub unsafe fn reset_handler() {
+@@ -213,6 +213,7 @@ pub unsafe fn reset_handler() {
          FAULT_RESPONSE,
          nrf52832::uicr::Regulator0Output::DEFAULT,
          false,
@@ -35,10 +35,10 @@ index b49518ff..39f996c4 100644
      );
  }
 diff --git a/boards/nordic/nrf52dk_base/src/lib.rs b/boards/nordic/nrf52dk_base/src/lib.rs
-index 7e2a3298..d391e455 100644
+index 105f7120..535e5cd8 100644
 --- a/boards/nordic/nrf52dk_base/src/lib.rs
 +++ b/boards/nordic/nrf52dk_base/src/lib.rs
-@@ -102,6 +102,13 @@ pub struct Platform {
+@@ -101,6 +101,13 @@ pub struct Platform {
          'static,
          capsules::virtual_alarm::VirtualMuxAlarm<'static, nrf52::rtc::Rtc<'static>>,
      >,
@@ -70,7 +70,7 @@ index 7e2a3298..d391e455 100644
      chip: &'static nrf52::chip::NRF52<I>,
  ) {
      // Make non-volatile memory writable and activate the reset button
-@@ -418,6 +429,44 @@ pub unsafe fn setup_board<I: nrf52::interrupt_service::InterruptService>(
+@@ -415,6 +426,44 @@ pub unsafe fn setup_board<I: nrf52::interrupt_service::InterruptService>(
          )
      );
  
@@ -115,10 +115,10 @@ index 7e2a3298..d391e455 100644
      // Start all of the clocks. Low power operation will require a better
      // approach than this.
      nrf52::clock::CLOCK.low_stop();
-@@ -449,6 +498,7 @@ pub unsafe fn setup_board<I: nrf52::interrupt_service::InterruptService>(
-         rng: rng,
+@@ -447,6 +496,7 @@ pub unsafe fn setup_board<I: nrf52::interrupt_service::InterruptService>(
          temp: temp,
          alarm: alarm,
+         analog_comparator: analog_comparator,
 +        usb: usb_driver,
          nonvolatile_storage: nonvolatile_storage,
          ipc: kernel::ipc::IPC::new(board_kernel, &memory_allocation_capability),
@@ -967,15 +967,15 @@ index 8ddb5895..8c1992cc 100644
  
  fn status_epin(ep: usize) -> Field<u32, EndpointStatus::Register> {
 diff --git a/chips/nrf52840/src/lib.rs b/chips/nrf52840/src/lib.rs
-index 0c281276..7e9f7d1e 100644
+index 9d58a705..942d0288 100644
 --- a/chips/nrf52840/src/lib.rs
 +++ b/chips/nrf52840/src/lib.rs
 @@ -2,7 +2,7 @@
  
  pub use nrf52::{
-     adc, aes, ble_radio, clock, constants, crt1, ficr, i2c, ieee802154_radio, init, nvmc, pinmux,
--    ppi, pwm, rtc, spi, temperature, timer, trng, uart, uicr,
-+    ppi, pwm, rtc, spi, temperature, timer, trng, uart, uicr, usbd,
+     acomp, adc, aes, ble_radio, clock, constants, crt1, ficr, i2c, ieee802154_radio, init, nvmc,
+-    pinmux, ppi, pwm, rtc, spi, temperature, timer, trng, uart, uicr,
++    pinmux, ppi, pwm, rtc, spi, temperature, timer, trng, uart, uicr, usbd,
  };
  pub mod chip;
  pub mod gpio;

patches/tock/03-app-memory.patch → patches/tock/03-usb-debugging.patch

 diff --git a/boards/nordic/nrf52840dk/src/main.rs b/boards/nordic/nrf52840dk/src/main.rs
-index bd71dfbe..e8247905 100644
+index a5847805..f0b303bf 100644
 --- a/boards/nordic/nrf52840dk/src/main.rs
 +++ b/boards/nordic/nrf52840dk/src/main.rs
-@@ -113,7 +113,7 @@ const FAULT_RESPONSE: kernel::procs::FaultResponse = kernel::procs::FaultRespons
+@@ -102,7 +102,7 @@ pub mod io;
+ // Whether to use UART debugging or Segger RTT (USB) debugging.
+ // - Set to false to use UART.
+ // - Set to true to use Segger RTT over USB.
+-const USB_DEBUGGING: bool = false;
++const USB_DEBUGGING: bool = true;
+ 
+ // State for loading and holding applications.
+ // How should the kernel respond when a process faults.
+@@ -112,7 +112,7 @@ const FAULT_RESPONSE: kernel::procs::FaultResponse = kernel::procs::FaultRespons
  const NUM_PROCS: usize = 8;
  
  #[link_section = ".app_memory"]
--static mut APP_MEMORY: [u8; 245760] = [0; 245760];
+-static mut APP_MEMORY: [u8; 0x3C000] = [0; 0x3C000];
 +static mut APP_MEMORY: [u8; 0x3A000] = [0; 0x3A000];
  
  static mut PROCESSES: [Option<&'static dyn kernel::procs::ProcessType>; NUM_PROCS] =

tock @ 3a7d6b77

-Subproject commit 862452b77ae0fc160231a2250de385dc7c358ef7
+Subproject commit 3a7d6b775d972798bfd731cba8365b58fab27175