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

software: merge libextra into libbase

This commit is contained in:
Sebastien Bourdeauducq 2012-05-24 19:01:47 +02:00
parent 2823034a7b
commit 2500e71cb7
9 changed files with 7 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
software/bios/Makefile
View File

@ -18,12 +18,11 @@ bios.elf: linker.ld $(OBJECTS) libs
bios-rescue.elf: linker-rescue.ld $(OBJECTS) libs bios-rescue.elf: linker-rescue.ld $(OBJECTS) libs
%.elf: %.elf:
$(LD) $(LDFLAGS) -T $< -N -o $@ $(OBJECTS) -L$(M2DIR)/software/libbase -L$(M2DIR)/software/libextra -lbase -lextra $(LD) $(LDFLAGS) -T $< -N -o $@ $(OBJECTS) -L$(M2DIR)/software/libbase -lbase
chmod -x $@ chmod -x $@
libs: libs:
make -C $(M2DIR)/software/libbase make -C $(M2DIR)/software/libbase
make -C $(M2DIR)/software/libextra
flash: bios.bin flash: bios.bin
m1nor bios.bin m1nor bios.bin

2
software/bios/boot.c
View File

@ -20,7 +20,7 @@
#include <uart.h> #include <uart.h>
#include <system.h> #include <system.h>
#include <board.h> #include <board.h>
#include <extra/crc.h> #include <crc.h>
#include <sfl.h> #include <sfl.h>
#include <string.h> #include <string.h>
#include <irq.h> #include <irq.h>

2
software/bios/main.c
View File

@ -23,7 +23,7 @@
#include <board.h> #include <board.h>
#include <irq.h> #include <irq.h>
#include <version.h> #include <version.h>
#include <extra/crc.h> #include <crc.h>
#include <timer.h> #include <timer.h>
#include <hw/flash.h> #include <hw/flash.h>

2
software/bios/microudp.c
View File

@ -17,7 +17,7 @@
#include <stdio.h> #include <stdio.h>
#include <system.h> #include <system.h>
#include <extra/crc.h> #include <crc.h>
#include <hw/minimac.h> #include <hw/minimac.h>
#include "microudp.h" #include "microudp.h"

0
software/include/extra/crc.h → software/include/base/crc.h
View File

2
software/libbase/Makefile
View File

@ -1,7 +1,7 @@
M2DIR=../.. M2DIR=../..
include $(M2DIR)/software/include.mak include $(M2DIR)/software/include.mak
OBJECTS=divsi3.o libc.o console.o timer.o system.o board.o uart.o softfloat.o softfloat-glue.o vsnprintf.o atof.o OBJECTS=divsi3.o libc.o crc16.o crc32.o console.o timer.o system.o board.o uart.o softfloat.o softfloat-glue.o vsnprintf.o atof.o
all: libbase.a all: libbase.a

2
software/libextra/crc16.c → software/libbase/crc16.c
View File

@ -1,4 +1,4 @@
#include <extra/crc.h> #include <crc.h>
static const unsigned int crc16_table[256] = { static const unsigned int crc16_table[256] = {
0x0000, 0x1021, 0x2042, 0x3063, 0x4084, 0x50A5, 0x60C6, 0x70E7, 0x0000, 0x1021, 0x2042, 0x3063, 0x4084, 0x50A5, 0x60C6, 0x70E7,

2
software/libextra/crc32.c → software/libbase/crc32.c
View File

@ -3,7 +3,7 @@
* For conditions of distribution and use, see copyright notice in zlib.h * For conditions of distribution and use, see copyright notice in zlib.h
*/ */
#include <extra/crc.h> #include <crc.h>
static const unsigned int crc_table[256] = { static const unsigned int crc_table[256] = {
0x00000000L, 0x77073096L, 0xee0e612cL, 0x990951baL, 0x076dc419L, 0x00000000L, 0x77073096L, 0xee0e612cL, 0x990951baL, 0x076dc419L,

18
software/libextra/Makefile
View File

@ -1,18 +0,0 @@
M2DIR=../..
include $(M2DIR)/software/include.mak
OBJECTS=crc16.o crc32.o
all: libextra.a
# pull in dependency info for *existing* .o files
-include $(OBJECTS:.o=.d)
libextra.a: $(OBJECTS)
$(AR) clr libextra.a $(OBJECTS)
$(RANLIB) libextra.a
.PHONY: clean
clean:
rm -f $(OBJECTS) $(OBJECTS:.o=.d) libextra.a .*~ *~