Sojus07/hackrf
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #967 from miek/fix_m0_copy

Browse Source 
Copy M0 image directly from ROM, instead of shadow region.
This commit is contained in:
Michael Ossmann
2021-10-13 10:25:08 -06:00
committed by GitHub
parent ac0983fadf 7f21c93c33
commit b293750691
2 changed files with 16 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
firmware/common/LPC43xx_M4_M0_image_from_text.ld
View File

@ -22,7 +22,7 @@
SECTIONS SECTIONS
{ {
.text : { .m0_text : {
PROVIDE(__m0_start__ = .); PROVIDE(__m0_start__ = .);
KEEP(*(.m0_bin*)); KEEP(*(.m0_bin*));
. = ALIGN(4); . = ALIGN(4);

23
firmware/hackrf_usb/hackrf_usb.c
View File

@ -21,6 +21,7 @@
*/ */
#include <stddef.h> #include <stddef.h>
#include <string.h>
#include <libopencm3/lpc43xx/ipc.h> #include <libopencm3/lpc43xx/ipc.h>
#include <libopencm3/lpc43xx/m4/nvic.h> #include <libopencm3/lpc43xx/m4/nvic.h>
@ -56,6 +57,7 @@
extern uint32_t __m0_start__; extern uint32_t __m0_start__;
extern uint32_t __m0_end__; extern uint32_t __m0_end__;
extern uint32_t __ram_m0_start__; extern uint32_t __ram_m0_start__;
extern uint32_t _etext_ram, _text_ram, _etext_rom;
static usb_request_handler_fn vendor_request_handler[] = { static usb_request_handler_fn vendor_request_handler[] = {
NULL, NULL,
@ -188,16 +190,21 @@ static bool cpld_jtag_sram_load(jtag_t* const jtag) {
static void m0_rom_to_ram() { static void m0_rom_to_ram() {
uint32_t *dest = &__ram_m0_start__; uint32_t *dest = &__ram_m0_start__;
uint32_t *src = &__m0_start__;
while (src < &__m0_end__) { // Calculate the base address of ROM
*dest = *src; uint32_t base = (uint32_t)(&_etext_rom - (&_etext_ram - &_text_ram));
dest++;
src++; // M0 image location, relative to the start of ROM
} uint32_t src = (uint32_t)&__m0_start__;
uint32_t len = (uint32_t)&__m0_end__ - (uint32_t)src;
memcpy(dest, (uint32_t*)(base + src), len);
} }
int main(void) { int main(void) {
bool operacake_allow_gpio; // Copy M0 image from ROM before SPIFI is disabled
m0_rom_to_ram();
pin_setup(); pin_setup();
enable_1v8_power(); enable_1v8_power();
#if (defined HACKRF_ONE || defined RAD1O) #if (defined HACKRF_ONE || defined RAD1O)
@ -209,7 +216,6 @@ int main(void) {
cpu_clock_init(); cpu_clock_init();
/* Wake the M0 */ /* Wake the M0 */
m0_rom_to_ram();
ipc_start_m0((uint32_t)&__ram_m0_start__); ipc_start_m0((uint32_t)&__ram_m0_start__);
if( !cpld_jtag_sram_load(&jtag_cpld) ) { if( !cpld_jtag_sram_load(&jtag_cpld) ) {
@ -245,6 +251,7 @@ int main(void) {
rf_path_init(&rf_path); rf_path_init(&rf_path);
bool operacake_allow_gpio;
if( hackrf_ui()->operacake_gpio_compatible() ) { if( hackrf_ui()->operacake_gpio_compatible() ) {
operacake_allow_gpio = true; operacake_allow_gpio = true;
} else { } else {