Skip to content

Commit

Permalink
Merge pull request #346 from sifive/v20.05.01-branch
Browse files Browse the repository at this point in the history
Merging Kiwi features L2PM and L2PF
  • Loading branch information
bsousi5 authored Sep 29, 2020
2 parents e4104e0 + 7150fb3 commit a42a921
Show file tree
Hide file tree
Showing 16 changed files with 835 additions and 330 deletions.
5 changes: 3 additions & 2 deletions Makefile.am
Original file line number Diff line number Diff line change
Expand Up @@ -46,13 +46,13 @@ nobase_include_HEADERS += \
metal/drivers/sifive_fe310-g000_lfrosc.h \
metal/drivers/sifive_fe310-g000_pll.h \
metal/drivers/sifive_fe310-g000_prci.h \
metal/drivers/sifive_fu540-c000_l2.h \
metal/drivers/sifive_global-external-interrupts0.h \
metal/drivers/sifive_gpio-buttons.h \
metal/drivers/sifive_gpio-leds.h \
metal/drivers/sifive_gpio-switches.h \
metal/drivers/sifive_gpio0.h \
metal/drivers/sifive_i2c0.h \
metal/drivers/sifive_l2pf0.h \
metal/drivers/sifive_local-external-interrupts0.h \
metal/drivers/sifive_pwm0.h \
metal/drivers/sifive_rtc0.h \
Expand Down Expand Up @@ -84,6 +84,7 @@ nobase_include_HEADERS += \
metal/pwm.h\
metal/rtc.h \
metal/shutdown.h \
metal/scrub.h \
metal/spi.h \
metal/switch.h \
metal/timer.h \
Expand Down Expand Up @@ -113,13 +114,13 @@ libmetal_a_SOURCES = \
src/drivers/sifive_fe310-g000_lfrosc.c \
src/drivers/sifive_fe310-g000_pll.c \
src/drivers/sifive_fe310-g000_prci.c \
src/drivers/sifive_fu540-c000_l2.c \
src/drivers/sifive_global-external-interrupts0.c \
src/drivers/sifive_gpio-buttons.c \
src/drivers/sifive_gpio-leds.c \
src/drivers/sifive_gpio-switches.c \
src/drivers/sifive_gpio0.c \
src/drivers/sifive_i2c0.c \
src/drivers/sifive_l2pf0.c \
src/drivers/sifive_local-external-interrupts0.c \
src/drivers/sifive_pwm0.c \
src/drivers/sifive_rtc0.c \
Expand Down
31 changes: 15 additions & 16 deletions Makefile.in

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

50 changes: 25 additions & 25 deletions aclocal.m4

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading

0 comments on commit a42a921

Please sign in to comment.