diff options
| author | Jonathan Neuschäfer <j.neuschaefer@gmx.net> | 2017-11-20 00:57:32 +0100 |
|---|---|---|
| committer | Martin Roth <martinroth@google.com> | 2017-12-02 05:25:00 +0000 |
| commit | c0c31b6d1a91d8e69bce847a21884944dc679587 (patch) | |
| tree | df097599c145e4e0b41028d7a6b203a67702daaf /src/arch/riscv | |
| parent | 3ca8b598ed4ea16fd55d0d8108749c1da537a036 (diff) | |
riscv: Remove config string support
The code dealing with the old config string isn't needed anymore,
because the config string has been deprecated in favor of
OpenFirmware-derived devicetrees.
Change-Id: I71398fb4861dbaf7eefc6e6f222bb7159798fafa
Signed-off-by: Jonathan Neuschäfer <j.neuschaefer@gmx.net>
Reviewed-on: https://review.coreboot.org/22594
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Ronald G. Minnich <rminnich@gmail.com>
Diffstat (limited to 'src/arch/riscv')
| -rw-r--r-- | src/arch/riscv/Kconfig | 5 | ||||
| -rw-r--r-- | src/arch/riscv/Makefile.inc | 9 | ||||
| -rw-r--r-- | src/arch/riscv/boot.c | 3 | ||||
| -rw-r--r-- | src/arch/riscv/trap_handler.c | 1 |
4 files changed, 4 insertions, 14 deletions
diff --git a/src/arch/riscv/Kconfig b/src/arch/riscv/Kconfig index f05a98b106..a30cb7091b 100644 --- a/src/arch/riscv/Kconfig +++ b/src/arch/riscv/Kconfig @@ -19,8 +19,3 @@ config ARCH_ROMSTAGE_RISCV config ARCH_RAMSTAGE_RISCV bool default n - -config RISCV_CONFIGSTRING - hex "Location of pointer to RISCV config string" - default 0x100c - depends on ARCH_RISCV diff --git a/src/arch/riscv/Makefile.inc b/src/arch/riscv/Makefile.inc index 057088acd4..d2b6cce11d 100644 --- a/src/arch/riscv/Makefile.inc +++ b/src/arch/riscv/Makefile.inc @@ -43,8 +43,7 @@ bootblock-y += \ $(top)/src/lib/memcmp.c \ $(top)/src/lib/memcpy.c \ $(top)/src/lib/memmove.c \ - $(top)/src/lib/memset.c \ - $(top)/src/commonlib/configstring.c + $(top)/src/lib/memset.c $(objcbfs)/bootblock.debug: $$(bootblock-objs) @printf " LINK $(subst $(obj)/,,$(@))\n" @@ -70,8 +69,7 @@ romstage-y += \ $(top)/src/lib/memcmp.c \ $(top)/src/lib/memcpy.c \ $(top)/src/lib/memmove.c \ - $(top)/src/lib/memset.c \ - $(top)/src/commonlib/configstring.c + $(top)/src/lib/memset.c romstage-$(CONFIG_COLLECT_TIMESTAMPS) += timestamp.c @@ -103,8 +101,7 @@ ramstage-y += \ $(top)/src/lib/memcmp.c \ $(top)/src/lib/memcpy.c \ $(top)/src/lib/memmove.c \ - $(top)/src/lib/memset.c \ - $(top)/src/commonlib/configstring.c + $(top)/src/lib/memset.c $(eval $(call create_class_compiler,rmodules,riscv)) diff --git a/src/arch/riscv/boot.c b/src/arch/riscv/boot.c index 9483c48177..ac095bbee1 100644 --- a/src/arch/riscv/boot.c +++ b/src/arch/riscv/boot.c @@ -18,13 +18,12 @@ #include <arch/encoding.h> #include <rules.h> #include <console/console.h> -#include <commonlib/configstring.h> void arch_prog_run(struct prog *prog) { void (*doit)(void *) = prog_entry(prog); void riscvpayload(const char *configstring, void *payload); - const char *config = configstring(); + const char *config = NULL; if (ENV_RAMSTAGE && prog_type(prog) == PROG_PAYLOAD) { printk(BIOS_SPEW, "Config string: '%s'\n", config); diff --git a/src/arch/riscv/trap_handler.c b/src/arch/riscv/trap_handler.c index b64505cc87..8fd037507a 100644 --- a/src/arch/riscv/trap_handler.c +++ b/src/arch/riscv/trap_handler.c @@ -18,7 +18,6 @@ #include <console/console.h> #include <string.h> #include <vm.h> -#include <commonlib/configstring.h> static uint64_t *time; static uint64_t *timecmp; |