From b4b84def3c4ea921e3abbfc90a092a0b9782fca9 Mon Sep 17 00:00:00 2001 From: Florent Kermarrec Date: Mon, 18 May 2020 23:33:34 +0200 Subject: [PATCH] software/bios: mode spisdcard code to liblitesdcard. --- litex/soc/software/bios/boot.c | 2 +- litex/soc/software/libbase/Makefile | 2 +- litex/soc/software/liblitesdcard/Makefile | 2 +- litex/soc/software/{libbase => liblitesdcard}/spisdcard.c | 2 +- litex/soc/software/{include/base => liblitesdcard}/spisdcard.h | 0 5 files changed, 4 insertions(+), 4 deletions(-) rename litex/soc/software/{libbase => liblitesdcard}/spisdcard.c (99%) rename litex/soc/software/{include/base => liblitesdcard}/spisdcard.h (100%) diff --git a/litex/soc/software/bios/boot.c b/litex/soc/software/bios/boot.c index 36993a6f..a85bca2d 100644 --- a/litex/soc/software/bios/boot.c +++ b/litex/soc/software/bios/boot.c @@ -497,7 +497,7 @@ void romboot(void) // SPI HARDWARE BITBANG #ifdef CSR_SPISDCARD_BASE -#include +#include "spisdcard.h" void spisdcardboot(void) { diff --git a/litex/soc/software/libbase/Makefile b/litex/soc/software/libbase/Makefile index 55380d8e..b29bffb4 100755 --- a/litex/soc/software/libbase/Makefile +++ b/litex/soc/software/libbase/Makefile @@ -2,7 +2,7 @@ include ../include/generated/variables.mak include $(SOC_DIRECTORY)/software/common.mak OBJECTS=exception.o libc.o errno.o crc16.o crc32.o console.o \ - system.o id.o uart.o time.o qsort.o strtod.o spiflash.o spisdcard.o strcasecmp.o + system.o id.o uart.o time.o qsort.o strtod.o spiflash.o strcasecmp.o all: crt0-ctr.o crt0-xip.o libbase.a libbase-nofloat.a diff --git a/litex/soc/software/liblitesdcard/Makefile b/litex/soc/software/liblitesdcard/Makefile index 7b0c749a..48b39261 100644 --- a/litex/soc/software/liblitesdcard/Makefile +++ b/litex/soc/software/liblitesdcard/Makefile @@ -1,7 +1,7 @@ include ../include/generated/variables.mak include $(SOC_DIRECTORY)/software/common.mak -OBJECTS=sdcard.o +OBJECTS=sdcard.o spisdcard.o all: liblitesdcard.a diff --git a/litex/soc/software/libbase/spisdcard.c b/litex/soc/software/liblitesdcard/spisdcard.c similarity index 99% rename from litex/soc/software/libbase/spisdcard.c rename to litex/soc/software/liblitesdcard/spisdcard.c index ae3ec730..b335da40 100644 --- a/litex/soc/software/libbase/spisdcard.c +++ b/litex/soc/software/liblitesdcard/spisdcard.c @@ -26,7 +26,7 @@ #ifdef CSR_SPISDCARD_BASE // Import prototypes for the functions -#include +#include "spisdcard.h" // SPI // cs line - high to indicate DESELECT diff --git a/litex/soc/software/include/base/spisdcard.h b/litex/soc/software/liblitesdcard/spisdcard.h similarity index 100% rename from litex/soc/software/include/base/spisdcard.h rename to litex/soc/software/liblitesdcard/spisdcard.h -- 2.30.2