RISCV: get RISCV to build again

This makes lzmadecode 64-bit clean (I hope).
It also cleans up a few other nits.

Change-Id: I24492e9f357e8d3a6de6abc351267f900eb4a19a
Signed-off-by: Ronald G. Minnich <rminnich@gmail.com>
Reviewed-on: http://review.coreboot.org/7623
Reviewed-by: Edward O'Callaghan <eocallaghan@alterapraxis.com>
Reviewed-by: Patrick Georgi <pgeorgi@google.com>
Tested-by: build bot (Jenkins)

2 files changed, 1 insertions, 11 deletions

diff --git a/src/arch/riscv/Makefile.inc b/src/arch/riscv/Makefile.inc
index 394220c292..1020fc7d06 100644
--- a/src/arch/riscv/Makefile.inc
+++ b/src/arch/riscv/Makefile.inc
@@ -41,7 +41,7 @@ bootblock-y += \
 
 $(objcbfs)/bootblock.debug: $(src)/arch/riscv/bootblock.ld $(obj)/ldoptions $$(bootblock-objs)
 	@printf "    LINK       $(subst $(obj)/,,$(@))\n"
-	$(LD_bootblock) -m elf64-littleriscv --gc-sections -static -o $@ -L$(obj) $< -T $(src)/arch/riscv/bootblock.ld
+	$(LD_bootblock) -m elf64lriscv --gc-sections -static -o $@ -L$(obj) $< -T $(src)/arch/riscv/bootblock.ld
 
 endif
 
@@ -58,7 +58,6 @@ romstage-y += \
 	$(top)/src/lib/memcpy.c \
 	$(top)/src/lib/memmove.c \
 	$(top)/src/lib/memset.c
-romstage-y += cbmem.c
 
 romstage-$(CONFIG_COLLECT_TIMESTAMPS) += timestamp.c
 
@@ -86,7 +85,6 @@ ramstage-y += rom_media.c
 ramstage-y += stages.c
 ramstage-y += misc.c
 ramstage-y += boot.c
-ramstage-y += cbmem.c
 ramstage-y += tables.c
 ramstage-y += \
 	$(top)/src/lib/memchr.c \
diff --git a/src/arch/riscv/rom_media.c b/src/arch/riscv/rom_media.c
index 712b7c49d4..8e858cb9bc 100644
--- a/src/arch/riscv/rom_media.c
+++ b/src/arch/riscv/rom_media.c
@@ -90,11 +90,3 @@ static int init_rom_media_cbfs(struct cbfs_media *media) {
 int init_default_cbfs_media(struct cbfs_media *media) {
 	return init_rom_media_cbfs(media);
 }
-// bug in coreboot. Fix me.
-// even if you have no use for lzma cbfs demands it.
-// and the ulzma code is terrible -- full of bad 32/64 bad things.
-unsigned long ulzma(unsigned char *src, unsigned char *dst);
-unsigned long ulzma(unsigned char *src, unsigned char *dst)
-{
-	return 0;
-}