Hardware
/
litex
mirror of https://github.com/enjoy-digital/litex.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

bios/boot: add progress bar to copy_image_from_flash_to_ram, use uint32_t in flash/sdcard functions.

This commit is contained in:
Florent Kermarrec 2020-06-10 08:12:12 +02:00
parent 99f40fecaa
commit d294e0f1de
1 changed files with 26 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
litex/soc/software/bios/boot.c
View File

@ -33,6 +33,9 @@
#include <liblitesdcard/sdcard.h> #include <liblitesdcard/sdcard.h>
#include <liblitesdcard/fat/ff.h> #include <liblitesdcard/fat/ff.h>
#define max(x, y) (((x) > (y)) ? (x) : (y))
#define min(x, y) (((x) < (y)) ? (x) : (y))
extern void boot_helper(unsigned long r1, unsigned long r2, unsigned long r3, unsigned long addr); extern void boot_helper(unsigned long r1, unsigned long r2, unsigned long r3, unsigned long addr);
static void __attribute__((noreturn)) boot(unsigned long r1, unsigned long r2, unsigned long r3, unsigned long addr) static void __attribute__((noreturn)) boot(unsigned long r1, unsigned long r2, unsigned long r3, unsigned long addr)
@ -407,7 +410,7 @@ void netboot(void)
#ifdef FLASH_BOOT_ADDRESS #ifdef FLASH_BOOT_ADDRESS
/* On systems with exernal SDRAM we copy out of the SPI flash into the SDRAM /* On systems with external SDRAM we copy out of the SPI flash into the SDRAM
before running, as it is faster. If we have no SDRAM then we have to before running, as it is faster. If we have no SDRAM then we have to
execute directly out of the SPI flash. */ execute directly out of the SPI flash. */
#ifdef MAIN_RAM_BASE #ifdef MAIN_RAM_BASE
@ -419,9 +422,9 @@ void netboot(void)
static unsigned int check_image_in_flash(unsigned int base_address) static unsigned int check_image_in_flash(unsigned int base_address)
{ {
unsigned int length; uint32_t length;
unsigned int crc; uint32_t crc;
unsigned int got_crc; uint32_t got_crc;
length = MMPTR(base_address); length = MMPTR(base_address);
if((length < 32) || (length > 16*1024*1024)) { if((length < 32) || (length > 16*1024*1024)) {
@ -442,13 +445,23 @@ static unsigned int check_image_in_flash(unsigned int base_address)
#if defined(MAIN_RAM_BASE) && defined(FLASH_BOOT_ADDRESS) #if defined(MAIN_RAM_BASE) && defined(FLASH_BOOT_ADDRESS)
static int copy_image_from_flash_to_ram(unsigned int flash_address, unsigned int ram_address) static int copy_image_from_flash_to_ram(unsigned int flash_address, unsigned int ram_address)
{ {
unsigned int length; uint32_t length;
uint32_t offset;
length = check_image_in_flash(flash_address); length = check_image_in_flash(flash_address);
if(length > 0) { if(length > 0) {
printf("Copying %d bytes from 0x%08x to 0x%08x...\n", length, flash_address, ram_address); printf("Copying %d bytes from 0x%08x to 0x%08x...\n", length, flash_address, ram_address);
// skip length and crc offset = 0;
memcpy((void *)ram_address, (unsigned int *)(flash_address + 2 * sizeof(unsigned int)), length); while (length > 0) {
uint32_t chunk_length;
chunk_length = min(length, 0x8000); /* 32KB chunks */
memcpy((void *) ram_address + offset, (void*) flash_address + offset + 8, chunk_length);
offset += chunk_length;
length -= chunk_length;
show_progress(offset);
}
show_progress(offset);
printf("\n");
return 1; return 1;
} }
@ -471,8 +484,8 @@ static int copy_image_from_flash_to_ram(unsigned int flash_address, unsigned int
void flashboot(void) void flashboot(void)
{ {
unsigned int length; uint32_t length;
unsigned int result; uint32_t result;
#if defined(MAIN_RAM_BASE) && defined(CONFIG_CPU_TYPE_VEXRISCV) && defined(CONFIG_CPU_VARIANT_LINUX) #if defined(MAIN_RAM_BASE) && defined(CONFIG_CPU_TYPE_VEXRISCV) && defined(CONFIG_CPU_VARIANT_LINUX)
@ -541,14 +554,14 @@ static int copy_image_from_sdcard_to_ram(const char * filename, unsigned int ram
{ {
FRESULT fr; FRESULT fr;
FIL file; FIL file;
UINT br; uint32_t br;
UINT offset; uint32_t offset;
fr = f_open(&file, filename, FA_READ); fr = f_open(&file, filename, FA_READ);
if (fr == FR_OK){ if (fr == FR_OK){
printf("Copying %d bytes from %s to 0x%08x...\n", f_size(&file), filename, ram_address); printf("Copying %d bytes from %s to 0x%08x...\n", f_size(&file), filename, ram_address);
offset = 0;
init_progression_bar(f_size(&file)); init_progression_bar(f_size(&file));
offset = 0;
for (;;) { for (;;) {
fr = f_read(&file, (void *) ram_address + offset, 512, &br); fr = f_read(&file, (void *) ram_address + offset, 512, &br);
if (br == 0) break; if (br == 0) break;
@ -569,7 +582,7 @@ static int copy_image_from_sdcard_to_ram(const char * filename, unsigned int ram
void sdcardboot(void) void sdcardboot(void)
{ {
FATFS FatFs; FATFS FatFs;
unsigned int result; uint32_t result;
printf("Booting from SDCard...\n"); printf("Booting from SDCard...\n");