diff --git a/bao1x-boot/boot1/src/asm.rs b/bao1x-boot/boot1/src/asm.rs index dfee6e8e5..846f98b46 100644 --- a/bao1x-boot/boot1/src/asm.rs +++ b/bao1x-boot/boot1/src/asm.rs @@ -54,13 +54,3 @@ pub extern "C" fn abort() -> ! { ); } } - -#[link_section = ".text.init"] -#[no_mangle] -pub unsafe extern "C" fn jump_to(target: usize) -> ! { - core::arch::asm!( - "jr {0}", - in(reg) target, - options(noreturn) - ); -} diff --git a/bao1x-boot/boot1/src/platform/bao1x/bao1x.rs b/bao1x-boot/boot1/src/platform/bao1x/bao1x.rs index 5dc084228..46cb3d426 100644 --- a/bao1x-boot/boot1/src/platform/bao1x/bao1x.rs +++ b/bao1x-boot/boot1/src/platform/bao1x/bao1x.rs @@ -119,6 +119,9 @@ pub fn early_init(mut board_type: bao1x_api::BoardTypeCoding) -> (bao1x_api::Boa // serves as a "debounce" of accidental butt-dials of the // power button. pmic.set_ldo(&mut i2c, Some(3.3), bao1x_hal::axp2101::WhichLdo::Bldo1).unwrap(); + + // set PWM mode on DCDC2. greatly reduces noise on the regulator line + pmic.set_pwm_mode(&mut i2c, bao1x_hal::axp2101::WhichDcDc::Dcdc2, true).unwrap(); // make sure the DCDC2 is set to 0.9V, which will allow us to enter high-speed run // mode. It defaults to 0.85V on boot. pmic.set_dcdc(&mut i2c, Some((0.9, true)), bao1x_hal::axp2101::WhichDcDc::Dcdc2) diff --git a/bao1x-boot/boot1/src/platform/bao1x/gfx.rs b/bao1x-boot/boot1/src/platform/bao1x/gfx.rs index 008272144..24fdcf386 100644 --- a/bao1x-boot/boot1/src/platform/bao1x/gfx.rs +++ b/bao1x-boot/boot1/src/platform/bao1x/gfx.rs @@ -1,5 +1,4 @@ #![allow(dead_code)] -use bao1x_hal::sh1107::Mono; use ux_api::minigfx::*; // The discipline for all the APIs in this module are that they act on a FrameBuffer which is