Clean up and release build without logging

Author: MabezDev

Cargo.lock

@@ -5,7 +5,6 @@ edition = "2018"
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-esp32c3 = "0.2.0"
 panic-never  = "0.1.0"
 ufmt = { version = "0.1.0", optional = true }
 

Cargo.toml

@@ -11,7 +11,7 @@ fi
 
 BASE_ADDR=0x40390000
 
-cargo build --release --features log
+cargo build --release
 ELF=target/riscv32imc-unknown-none-elf/release/esp-flashloader
 
 rust-objdump --disassemble $ELF > target/disassembly.s

build.sh

@@ -1,6 +1,6 @@
 ---
 name: "esp32c3"
-manufacturer: ~
+manufacturer: Espressif Systems
 variants:
   - name: "esp32c3"
     part: ~
@@ -25,21 +25,21 @@ variants:
           cores: 
             - main
     flash_algorithms:
-      - esp-flashloader
+      - esp32c3-flashloader
 flash_algorithms:
   - esp-flashloader:
-    name: esp-flashloader
+    name: esp32c3-flashloader
     cores: 
       - main
-    description: ""
+    description: "A flash loader for the esp32c3."
     default: true
-    instructions: QREGxiLEJsJKwAFENwU5QJME5S8VSTMFlAADRQUAlwDH/+eAoAQFBOMXJP+XAMf/54AAb4FFlwDH/+eA4BICSZJEIkSyQEEBFwPH/2cAgw8BEQbOIswmykrITsYqiZcAx//ngCAOYeUBRDcFOUCTBLUwoUkzBZQAA0UFAJcAx//ngMD+BQTjFzT/N9XMzJMF1cwzNbkCDYEpSDMFBQMzBalAE2UFA6MFoQBjdgkBEwaxAIVFkaCBRhMHIQCTBzAGyoQmhDO1tAKTVDUAM7W0Ag2BMwUFAzOFpEAzBtcAE2UFAyMEpgD9FuPth/yFRZWNEwYhADaWJQaTBBYAE4T1/xN19Q+XAMf/54BA9hHEA8UEAIUEfRTttylFlwDH/+eA4PQTVckAlwDH/+eAIACySUJJ0kRiRPJABWGCgAFFgoB5cQbWItQm0krQTs5SzFbKWsgyiS6KqoqXAMf/54CA/mMTBRiTdTkAY58FFgFENwU5QJMENTChSTMFlAADRQUAlwDH/+eAgO4FBOMXNP831czMkwXVzDM1ugINgSlIMwUFAzMFqkCTCfEAE2UFA6MHoQAFR86GY2UKBYFGEwdhAJMHMAbShCaEM7W0ApNUNQAztbQCDYEzBQUDM4WkQDMG1wATZQUDIwSmAP0W4+2H/IVFM4fVQJMFYQC2lZOGlQAThBYAkwT3/xN19Q+XAMf/54DA5ZHEA0UEAAUE/RTttwFENwU5QJMENTElSzMFlAADRQUAlwDH/+eAQOMFBOMXZP831czMkwXVzDO1ugINgSlIMwUFAzOFqkATZQUDowehAAVHY+UKBYFGEwdhAJMHMAbWhCaEM7W0ApNUNQAztbQCDYEzBQUDM4WkQDMG1wATZQUDIwSmAP0W4+2H/IVFM4fVQJMFYQC2lZOJlQAThBkAkwT3/xN19Q+XAMf/54Dg2pHEA0UEAAUE/RTttylFlwDH/+eAgNlWhcqFUoaXAMf/54Dg5EJL0kpiSvJJAlmSVCJUslBFYYKAAUWCgElOSVQKUFJPR1JBTSBFUkFTRSBAICBieXRlcyBAIA==
+    instructions: QREGxpcAx//ngIBxgUWXAMf/54BgFbJAQQEXA8f/ZwBjEkERBsYixCqElwDH/+eAYBEJxSJEskBBAYKAE1XEACJEskBBARcDx/9nACMOAUWCgEERBsYixCbCSsCyhC6JKoSXAMf/54DgDQHlk/U0AJnFAkmSRCJEskBBAYKAIoWmhUqGAkmSRCJEskBBARcDx/9nAOMJAUWCgAAA
     pc_init: 1
-    pc_uninit: 763
-    pc_program_page: 321
-    pc_erase_sector: 81
-    pc_erase_all: 317
-    data_section_offset: 796
+    pc_uninit: 151
+    pc_program_page: 83
+    pc_erase_sector: 35
+    pc_erase_all: 79
+    data_section_offset: 156
     load_address: 0x40390000
     flash_properties:
       address_range:

output/esp32c3.yaml

@@ -7,14 +7,7 @@
 //
 // [ARM CMSIS-Pack documentation]: https://arm-software.github.io/CMSIS_5/Pack/html/algorithmFunc.html
 
-// use panic_never as _;
-
-#[panic_handler]
-fn panic(_info: &core::panic::PanicInfo) -> ! {
-    loop {}
-}
-
-use esp32c3::RTC_CNTL;
+use panic_never as _;
 
 
 const FLASH_SECTOR_SIZE: u32 = 4096;
@@ -108,12 +101,8 @@ extern "C" {
 pub unsafe extern "C" fn Init(_adr: u32, _clk: u32, _fnc: u32) -> i32 {
     dprintln!("INIT");
 
-    // // todo setup higher speed clocks
-    // let peripherals = esp32c3::Peripherals::steal();
-    // let rtc_ctl = peripherals.RTC_CNTL;
-   
-    // // set apb to xtal mhz
-    // rtc_ctl.rtc_store5.write(|w| w.bits(150));
+    // TODO setup higher speed clocks
+    // TODO setup qio mode for supported flash chips
 
     let spiconfig: u32 = ets_efuse_get_spiconfig();
     // let spiconfig = 1; // hspi
@@ -128,9 +117,6 @@ pub unsafe extern "C" fn Init(_adr: u32, _clk: u32, _fnc: u32) -> i32 {
     0
 }
 
-fn clk_val_to_reg_val(input: u32) -> u32 {
-    return (input & 0xFFFF) | ((input & 0xFFFF) << 16);
-}
 /// Erase the sector at the given address in flash
 ///
 /// Returns 0 on success, 1 on failure.