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

bios/main: Add CONFIG_NO_BOOT support to allow disabling Boot sequence and minor cleanups.

This commit is contained in:
Florent Kermarrec 2022-06-06 18:28:39 +02:00
parent c299a82968
commit d537e30c5a
1 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
litex/soc/software/bios/main.c
View File

@ -161,11 +161,11 @@ __attribute__((__used__)) int main(int i, char **c)
eth_init(); eth_init();
#endif #endif
/* Initialize and test DRAM */ /* Initialize and test DRAM */
#ifdef CSR_SDRAM_BASE #ifdef CSR_SDRAM_BASE
sdr_ok = sdram_init(); sdr_ok = sdram_init();
#else #else
/* Test Main RAM when present and not pre-initialized */ /* Test Main RAM when present and not pre-initialized */
#ifdef MAIN_RAM_BASE #ifdef MAIN_RAM_BASE
#ifndef CONFIG_MAIN_RAM_INIT #ifndef CONFIG_MAIN_RAM_INIT
sdr_ok = memtest((unsigned int *) MAIN_RAM_BASE, min(MAIN_RAM_SIZE, MEMTEST_DATA_SIZE)); sdr_ok = memtest((unsigned int *) MAIN_RAM_BASE, min(MAIN_RAM_SIZE, MEMTEST_DATA_SIZE));
@ -176,27 +176,35 @@ __attribute__((__used__)) int main(int i, char **c)
if (sdr_ok != 1) if (sdr_ok != 1)
printf("Memory initialization failed\n"); printf("Memory initialization failed\n");
#endif #endif
/* Initialize and test SPIFLASH */
#ifdef CSR_SPIFLASH_CORE_BASE #ifdef CSR_SPIFLASH_CORE_BASE
spiflash_init(); spiflash_init();
#endif #endif
printf("\n"); printf("\n");
#ifdef CSR_VIDEO_FRAMEBUFFER_BASE
/* Initialize Video Framebuffer FIXME: Move */ /* Initialize Video Framebuffer FIXME: Move */
#ifdef CSR_VIDEO_FRAMEBUFFER_BASE
video_framebuffer_vtg_enable_write(0); video_framebuffer_vtg_enable_write(0);
video_framebuffer_dma_enable_write(0); video_framebuffer_dma_enable_write(0);
video_framebuffer_vtg_enable_write(1); video_framebuffer_vtg_enable_write(1);
video_framebuffer_dma_enable_write(1); video_framebuffer_dma_enable_write(1);
#endif #endif
/* Execute initialization functions */
init_dispatcher(); init_dispatcher();
/* Execute Boot sequence */
#ifndef CONFIG_BIOS_NO_BOOT
if(sdr_ok) { if(sdr_ok) {
printf("--============== \e[1mBoot\e[0m ==================--\n"); printf("--============== \e[1mBoot\e[0m ==================--\n");
boot_sequence(); boot_sequence();
printf("\n"); printf("\n");
} }
#endif
/* Console */
printf("--============= \e[1mConsole\e[0m ================--\n"); printf("--============= \e[1mConsole\e[0m ================--\n");
#if !defined(TERM_MINI) && !defined(TERM_NO_HIST) #if !defined(TERM_MINI) && !defined(TERM_NO_HIST)
hist_init(); hist_init();