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

soc/bios: Cleanup bios manual config flags. 

- CONFIG_WITH_BUILD_TIME    -> CONFIG_BIOS_NO_BUILD_TIME.
- CONFIG_SIM_DISABLE_PROMPT -> CONFIG_BIOS_NO_PROMPT.
- CONFIG_DISABLE_DELAYS     -> CONFIG_BIOS_NO_DELAYS.
This commit is contained in:
Florent Kermarrec 2022-05-25 09:03:45 +02:00
parent b033d91738
commit de6f9e7e83
4 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
litex/soc/integration/soc.py
View File

@ -1216,7 +1216,8 @@ class LiteXSoC(SoC):
self.check_if_exists(name) self.check_if_exists(name)
if with_build_time: if with_build_time:
identifier += " " + build_time() identifier += " " + build_time()
self.add_config("WITH_BUILD_TIME") else:
self.add_config("BIOS_NO_BUILD_TIME")
setattr(self.submodules, name, Identifier(identifier)) setattr(self.submodules, name, Identifier(identifier))
# Add UART ------------------------------------------------------------------------------------- # Add UART -------------------------------------------------------------------------------------

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

@ -97,7 +97,7 @@ __attribute__((__used__)) int main(int i, char **c)
i2c_send_init_cmds(); i2c_send_init_cmds();
#endif #endif
#ifndef CONFIG_SIM_DISABLE_BIOS_PROMPT #ifndef CONFIG_BIOS_NO_PROMPT
printf("\n"); printf("\n");
printf("\e[1m __ _ __ _ __\e[0m\n"); printf("\e[1m __ _ __ _ __\e[0m\n");
printf("\e[1m / / (_) /____ | |/_/\e[0m\n"); printf("\e[1m / / (_) /____ | |/_/\e[0m\n");
@ -108,7 +108,7 @@ __attribute__((__used__)) int main(int i, char **c)
printf(" (c) Copyright 2012-2022 Enjoy-Digital\n"); printf(" (c) Copyright 2012-2022 Enjoy-Digital\n");
printf(" (c) Copyright 2007-2015 M-Labs\n"); printf(" (c) Copyright 2007-2015 M-Labs\n");
printf("\n"); printf("\n");
#ifdef CONFIG_WITH_BUILD_TIME #ifndef CONFIG_BIOS_NO_BUILD_TIME
printf(" BIOS built on "__DATE__" "__TIME__"\n"); printf(" BIOS built on "__DATE__" "__TIME__"\n");
#endif #endif
crcbios(); crcbios();
@ -149,7 +149,7 @@ __attribute__((__used__)) int main(int i, char **c)
#endif #endif
#endif #endif
printf("\n"); printf("\n");
#endif // CONFIG_SIM_DISABLE_BIOS_PROMPT #endif
sdr_ok = 1; sdr_ok = 1;

2
litex/soc/software/liblitedram/bist.c
View File

@ -23,7 +23,7 @@ uint32_t rd_errors;
__attribute__((unused)) static void cdelay(int i) __attribute__((unused)) static void cdelay(int i)
{ {
#ifndef CONFIG_DISABLE_DELAYS #ifndef CONFIG_BIOS_NO_DELAYS
while(i > 0) { while(i > 0) {
__asm__ volatile(CONFIG_CPU_NOP); __asm__ volatile(CONFIG_CPU_NOP);
i--; i--;

2
litex/soc/software/liblitedram/sdram.c
View File

@ -43,7 +43,7 @@
__attribute__((unused)) void cdelay(int i) __attribute__((unused)) void cdelay(int i)
{ {
#ifndef CONFIG_DISABLE_DELAYS #ifndef CONFIG_BIOS_NO_DELAYS
while(i > 0) { while(i > 0) {
__asm__ volatile(CONFIG_CPU_NOP); __asm__ volatile(CONFIG_CPU_NOP);
i--; i--;