diff --git a/bao1x-boot/boot0/src/platform/bao1x/bao1x.rs b/bao1x-boot/boot0/src/platform/bao1x/bao1x.rs index df45b95a9..fb4609713 100644 --- a/bao1x-boot/boot0/src/platform/bao1x/bao1x.rs +++ b/bao1x-boot/boot0/src/platform/bao1x/bao1x.rs @@ -318,7 +318,7 @@ pub unsafe fn init_clock_asic(freq_hz: u32) -> u32 { // commit dividers daric_cgu.add(utra::sysctrl::SFR_CGUSET.offset()).write_volatile(0x32); - if freq_hz >= 600_000_000 { + if freq_hz > 700_000_000 { crate::println!("setting vdd85 to 0.893v"); let mut ao_sysctrl = CSR::new(utralib::HW_AO_SYSCTRL_BASE as *mut u32); ao_sysctrl.wo(utra::ao_sysctrl::SFR_PMUTRM0CSR, 0x08421FF1); @@ -326,9 +326,9 @@ pub unsafe fn init_clock_asic(freq_hz: u32) -> u32 { cgu.wo(sysctrl::SFR_IPCARIPFLOW, 0x57); crate::platform::delay_at_sysfreq(20, 48_000_000); } else { - crate::println!("setting vdd85 to 0.80v"); + crate::println!("setting vdd85 to 0.81v"); let mut ao_sysctrl = CSR::new(utralib::HW_AO_SYSCTRL_BASE as *mut u32); - ao_sysctrl.wo(utra::ao_sysctrl::SFR_PMUTRM0CSR, 0x08421080); + ao_sysctrl.wo(utra::ao_sysctrl::SFR_PMUTRM0CSR, 0x08421290); ao_sysctrl.wo(utra::ao_sysctrl::SFR_PMUTRM1CSR, 0x2); cgu.wo(sysctrl::SFR_IPCARIPFLOW, 0x57); crate::platform::delay_at_sysfreq(20, 48_000_000); diff --git a/bao1x-boot/boot0/src/version.rs b/bao1x-boot/boot0/src/version.rs new file mode 100644 index 000000000..cb070b3ca --- /dev/null +++ b/bao1x-boot/boot0/src/version.rs @@ -0,0 +1 @@ +pub const SEMVER: &'static str = "v0.9.16-1847-g0efcd0af9"; diff --git a/bao1x-boot/boot1/src/platform/bao1x/bao1x.rs b/bao1x-boot/boot1/src/platform/bao1x/bao1x.rs index f2907275d..a1103ad66 100644 --- a/bao1x-boot/boot1/src/platform/bao1x/bao1x.rs +++ b/bao1x-boot/boot1/src/platform/bao1x/bao1x.rs @@ -440,7 +440,7 @@ pub unsafe fn init_clock_asic(freq_hz: u32) -> u32 { // commit dividers daric_cgu.add(utra::sysctrl::SFR_CGUSET.offset()).write_volatile(0x32); - if freq_hz >= 600_000_000 { + if freq_hz > 700_000_000 { crate::println!("setting vdd85 to 0.893v"); let mut ao_sysctrl = CSR::new(utralib::HW_AO_SYSCTRL_BASE as *mut u32); ao_sysctrl.wo(utra::ao_sysctrl::SFR_PMUTRM0CSR, 0x08421FF1); @@ -448,9 +448,9 @@ pub unsafe fn init_clock_asic(freq_hz: u32) -> u32 { cgu.wo(sysctrl::SFR_IPCARIPFLOW, 0x57); crate::platform::delay_at_sysfreq(20, 48_000_000); } else { - crate::println!("setting vdd85 to 0.80v"); + crate::println!("setting vdd85 to 0.81v"); let mut ao_sysctrl = CSR::new(utralib::HW_AO_SYSCTRL_BASE as *mut u32); - ao_sysctrl.wo(utra::ao_sysctrl::SFR_PMUTRM0CSR, 0x08421080); + ao_sysctrl.wo(utra::ao_sysctrl::SFR_PMUTRM0CSR, 0x08421290); ao_sysctrl.wo(utra::ao_sysctrl::SFR_PMUTRM1CSR, 0x2); cgu.wo(sysctrl::SFR_IPCARIPFLOW, 0x57); crate::platform::delay_at_sysfreq(20, 48_000_000); diff --git a/bao1x-boot/boot1/src/version.rs b/bao1x-boot/boot1/src/version.rs new file mode 100644 index 000000000..cb070b3ca --- /dev/null +++ b/bao1x-boot/boot1/src/version.rs @@ -0,0 +1 @@ +pub const SEMVER: &'static str = "v0.9.16-1847-g0efcd0af9";