summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMegan Wachs <megan@sifive.com>2017-01-31 19:02:18 -0800
committerMegan Wachs <megan@sifive.com>2017-01-31 19:02:18 -0800
commit43942973cd9b61dc94bb52be53a99f8ca711eb7e (patch)
tree8f090fc06be12bf87d73570199fbda01e2af3304
parentcebc4033491f5be7b717ad2ac66715771d374138 (diff)
Move plic_driver code to a common location.
-rw-r--r--bsp/drivers/plic/plic_driver.c (renamed from software/demo_gpio/plic_driver.c)2
-rw-r--r--bsp/drivers/plic/plic_driver.h (renamed from software/demo_gpio/plic_driver.h)0
-rw-r--r--bsp/env/common.mk1
-rw-r--r--software/demo_gpio/Makefile6
-rw-r--r--software/demo_gpio/demo_gpio.c2
5 files changed, 7 insertions, 4 deletions
diff --git a/software/demo_gpio/plic_driver.c b/bsp/drivers/plic/plic_driver.c
index 01b7e6e..b27d7a5 100644
--- a/software/demo_gpio/plic_driver.c
+++ b/bsp/drivers/plic/plic_driver.c
@@ -1,7 +1,7 @@
// See LICENSE for license details.
#include "sifive/devices/plic.h"
-#include "plic_driver.h"
+#include "plic/plic_driver.h"
#include "platform.h"
#include "encoding.h"
#include <string.h>
diff --git a/software/demo_gpio/plic_driver.h b/bsp/drivers/plic/plic_driver.h
index 66410be..66410be 100644
--- a/software/demo_gpio/plic_driver.h
+++ b/bsp/drivers/plic/plic_driver.h
diff --git a/bsp/env/common.mk b/bsp/env/common.mk
index 420c196..c828306 100644
--- a/bsp/env/common.mk
+++ b/bsp/env/common.mk
@@ -19,6 +19,7 @@ C_SRCS += $(PLATFORM_DIR)/init.c
LINKER_SCRIPT := $(PLATFORM_DIR)/link.lds
INCLUDES += -I$(BSP_BASE)/include
+INCLUDES += -I$(BSP_BASE)/drivers/
INCLUDES += -I$(ENV_DIR)
INCLUDES += -I$(PLATFORM_DIR)
diff --git a/software/demo_gpio/Makefile b/software/demo_gpio/Makefile
index 04a11b7..b181c5f 100644
--- a/software/demo_gpio/Makefile
+++ b/software/demo_gpio/Makefile
@@ -1,7 +1,9 @@
TARGET = demo_gpio
-C_SRCS += demo_gpio.c
-C_SRCS += plic_driver.c
CFLAGS += -O2 -fno-builtin-printf -DUSE_PLIC -DUSE_M_TIME
BSP_BASE = ../../bsp
+
+C_SRCS += demo_gpio.c
+C_SRCS += $(BSP_BASE)/drivers/plic/plic_driver.c
+
include $(BSP_BASE)/env/common.mk
diff --git a/software/demo_gpio/demo_gpio.c b/software/demo_gpio/demo_gpio.c
index 00bc8cd..bfa388e 100644
--- a/software/demo_gpio/demo_gpio.c
+++ b/software/demo_gpio/demo_gpio.c
@@ -4,7 +4,7 @@
#include <stdlib.h>
#include "platform.h"
#include <string.h>
-#include "plic_driver.h"
+#include "plic/plic_driver.h"
#include "encoding.h"
#include <unistd.h>
#include "stdatomic.h"