From de6f9e7e836027e6122bc3076be84c3a0f55d056 Mon Sep 17 00:00:00 2001 From: Florent Kermarrec Date: Wed, 25 May 2022 09:03:45 +0200 Subject: [PATCH] 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. --- litex/soc/integration/soc.py | 3 ++- litex/soc/software/bios/main.c | 6 +++--- litex/soc/software/liblitedram/bist.c | 2 +- litex/soc/software/liblitedram/sdram.c | 2 +- 4 files changed, 7 insertions(+), 6 deletions(-) diff --git a/litex/soc/integration/soc.py b/litex/soc/integration/soc.py index 49134ee68..0c7d4b329 100644 --- a/litex/soc/integration/soc.py +++ b/litex/soc/integration/soc.py @@ -1216,7 +1216,8 @@ class LiteXSoC(SoC): self.check_if_exists(name) if with_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)) # Add UART ------------------------------------------------------------------------------------- diff --git a/litex/soc/software/bios/main.c b/litex/soc/software/bios/main.c index 05b6b06a9..7288a7855 100644 --- a/litex/soc/software/bios/main.c +++ b/litex/soc/software/bios/main.c @@ -97,7 +97,7 @@ __attribute__((__used__)) int main(int i, char **c) i2c_send_init_cmds(); #endif -#ifndef CONFIG_SIM_DISABLE_BIOS_PROMPT +#ifndef CONFIG_BIOS_NO_PROMPT printf("\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 2007-2015 M-Labs\n"); printf("\n"); -#ifdef CONFIG_WITH_BUILD_TIME +#ifndef CONFIG_BIOS_NO_BUILD_TIME printf(" BIOS built on "__DATE__" "__TIME__"\n"); #endif crcbios(); @@ -149,7 +149,7 @@ __attribute__((__used__)) int main(int i, char **c) #endif #endif printf("\n"); -#endif // CONFIG_SIM_DISABLE_BIOS_PROMPT +#endif sdr_ok = 1; diff --git a/litex/soc/software/liblitedram/bist.c b/litex/soc/software/liblitedram/bist.c index f2079224d..044563792 100644 --- a/litex/soc/software/liblitedram/bist.c +++ b/litex/soc/software/liblitedram/bist.c @@ -23,7 +23,7 @@ uint32_t rd_errors; __attribute__((unused)) static void cdelay(int i) { -#ifndef CONFIG_DISABLE_DELAYS +#ifndef CONFIG_BIOS_NO_DELAYS while(i > 0) { __asm__ volatile(CONFIG_CPU_NOP); i--; diff --git a/litex/soc/software/liblitedram/sdram.c b/litex/soc/software/liblitedram/sdram.c index 12aea95c4..53acec829 100644 --- a/litex/soc/software/liblitedram/sdram.c +++ b/litex/soc/software/liblitedram/sdram.c @@ -43,7 +43,7 @@ __attribute__((unused)) void cdelay(int i) { -#ifndef CONFIG_DISABLE_DELAYS +#ifndef CONFIG_BIOS_NO_DELAYS while(i > 0) { __asm__ volatile(CONFIG_CPU_NOP); i--;