diff options
| -rwxr-xr-x | configure | 20 | ||||
| -rw-r--r-- | configure.ac | 4 | ||||
| -rw-r--r-- | customext/customext.ac (renamed from dummy_rocc/dummy_rocc.ac) | 0 | ||||
| -rw-r--r-- | customext/customext.mk.in | 11 | ||||
| -rw-r--r-- | customext/dummy_rocc.cc (renamed from dummy_rocc/dummy_rocc.cc) | 0 | ||||
| -rw-r--r-- | customext/dummy_rocc_test.c (renamed from dummy_rocc/dummy_rocc_test.c) | 0 | ||||
| -rw-r--r-- | dummy_rocc/dummy_rocc.mk.in | 7 | ||||
| -rw-r--r-- | riscv-customext.pc.in (renamed from riscv-dummy_rocc.pc.in) | 4 |
8 files changed, 25 insertions, 21 deletions
@@ -4974,7 +4974,7 @@ fi # Add subproject to our running list - subprojects="$subprojects dummy_rocc" + subprojects="$subprojects customext" # Process the subproject appropriately. If enabled add it to the # $enabled_subprojects running shell variable, set a @@ -4982,14 +4982,14 @@ fi # 'subproject.ac'. - { $as_echo "$as_me:${as_lineno-$LINENO}: configuring default subproject : dummy_rocc" >&5 -$as_echo "$as_me: configuring default subproject : dummy_rocc" >&6;} - ac_config_files="$ac_config_files dummy_rocc.mk:dummy_rocc/dummy_rocc.mk.in" + { $as_echo "$as_me:${as_lineno-$LINENO}: configuring default subproject : customext" >&5 +$as_echo "$as_me: configuring default subproject : customext" >&6;} + ac_config_files="$ac_config_files customext.mk:customext/customext.mk.in" - enable_dummy_rocc_sproj="yes" - subprojects_enabled="$subprojects_enabled dummy_rocc" + enable_customext_sproj="yes" + subprojects_enabled="$subprojects_enabled customext" -$as_echo "#define DUMMY_ROCC_ENABLED /**/" >>confdefs.h +$as_echo "#define CUSTOMEXT_ENABLED /**/" >>confdefs.h @@ -5165,7 +5165,7 @@ ac_config_files="$ac_config_files riscv-fesvr.pc" ac_config_files="$ac_config_files riscv-softfloat.pc" -ac_config_files="$ac_config_files riscv-dummy_rocc.pc" +ac_config_files="$ac_config_files riscv-customext.pc" ac_config_files="$ac_config_files riscv-fdt.pc" @@ -5864,7 +5864,7 @@ do case $ac_config_target in "fesvr.mk") CONFIG_FILES="$CONFIG_FILES fesvr.mk:fesvr/fesvr.mk.in" ;; "riscv.mk") CONFIG_FILES="$CONFIG_FILES riscv.mk:riscv/riscv.mk.in" ;; - "dummy_rocc.mk") CONFIG_FILES="$CONFIG_FILES dummy_rocc.mk:dummy_rocc/dummy_rocc.mk.in" ;; + "customext.mk") CONFIG_FILES="$CONFIG_FILES customext.mk:customext/customext.mk.in" ;; "fdt.mk") CONFIG_FILES="$CONFIG_FILES fdt.mk:fdt/fdt.mk.in" ;; "softfloat.mk") CONFIG_FILES="$CONFIG_FILES softfloat.mk:softfloat/softfloat.mk.in" ;; "spike_main.mk") CONFIG_FILES="$CONFIG_FILES spike_main.mk:spike_main/spike_main.mk.in" ;; @@ -5874,7 +5874,7 @@ do "riscv-riscv.pc") CONFIG_FILES="$CONFIG_FILES riscv-riscv.pc" ;; "riscv-fesvr.pc") CONFIG_FILES="$CONFIG_FILES riscv-fesvr.pc" ;; "riscv-softfloat.pc") CONFIG_FILES="$CONFIG_FILES riscv-softfloat.pc" ;; - "riscv-dummy_rocc.pc") CONFIG_FILES="$CONFIG_FILES riscv-dummy_rocc.pc" ;; + "riscv-customext.pc") CONFIG_FILES="$CONFIG_FILES riscv-customext.pc" ;; "riscv-fdt.pc") CONFIG_FILES="$CONFIG_FILES riscv-fdt.pc" ;; "riscv-spike_main.pc") CONFIG_FILES="$CONFIG_FILES riscv-spike_main.pc" ;; diff --git a/configure.ac b/configure.ac index e2ac44a..c63490b 100644 --- a/configure.ac +++ b/configure.ac @@ -96,7 +96,7 @@ AX_APPEND_LINK_FLAGS([-Wl,--export-dynamic]) # The '*' suffix indicates an optional subproject. The '**' suffix # indicates an optional subproject which is also the name of a group. -MCPPBS_SUBPROJECTS([ fesvr, riscv, dummy_rocc, fdt, softfloat, spike_main ]) +MCPPBS_SUBPROJECTS([ fesvr, riscv, customext, fdt, softfloat, spike_main ]) #------------------------------------------------------------------------- # MCPPBS subproject groups @@ -119,7 +119,7 @@ AC_CONFIG_FILES([riscv-spike.pc]) AC_CONFIG_FILES([riscv-riscv.pc]) AC_CONFIG_FILES([riscv-fesvr.pc]) AC_CONFIG_FILES([riscv-softfloat.pc]) -AC_CONFIG_FILES([riscv-dummy_rocc.pc]) +AC_CONFIG_FILES([riscv-customext.pc]) AC_CONFIG_FILES([riscv-fdt.pc]) AC_CONFIG_FILES([riscv-spike_main.pc]) AC_OUTPUT diff --git a/dummy_rocc/dummy_rocc.ac b/customext/customext.ac index e69de29..e69de29 100644 --- a/dummy_rocc/dummy_rocc.ac +++ b/customext/customext.ac diff --git a/customext/customext.mk.in b/customext/customext.mk.in new file mode 100644 index 0000000..1bf336c --- /dev/null +++ b/customext/customext.mk.in @@ -0,0 +1,11 @@ +customext_subproject_deps = \ + spike_main \ + riscv \ + softfloat \ + +customext_srcs = \ + dummy_rocc.cc \ + +customext_CFLAGS = -fPIC + +customext_install_shared_lib = yes diff --git a/dummy_rocc/dummy_rocc.cc b/customext/dummy_rocc.cc index 85ab7aa..85ab7aa 100644 --- a/dummy_rocc/dummy_rocc.cc +++ b/customext/dummy_rocc.cc diff --git a/dummy_rocc/dummy_rocc_test.c b/customext/dummy_rocc_test.c index 94de8c0..94de8c0 100644 --- a/dummy_rocc/dummy_rocc_test.c +++ b/customext/dummy_rocc_test.c diff --git a/dummy_rocc/dummy_rocc.mk.in b/dummy_rocc/dummy_rocc.mk.in deleted file mode 100644 index 0143ffd..0000000 --- a/dummy_rocc/dummy_rocc.mk.in +++ /dev/null @@ -1,7 +0,0 @@ -dummy_rocc_subproject_deps = \ - spike_main \ - riscv \ - softfloat \ - -dummy_rocc_srcs = \ - dummy_rocc.cc \ diff --git a/riscv-dummy_rocc.pc.in b/riscv-customext.pc.in index 31635f6..c796862 100644 --- a/riscv-dummy_rocc.pc.in +++ b/riscv-customext.pc.in @@ -3,9 +3,9 @@ exec_prefix=@prefix@ libdir=${prefix}/@libdir@ includedir=${prefix}/@includedir@ -Name: riscv-dummy_rocc +Name: riscv-customext Description: Example RISC-V ROCC accelerator Version: git -Libs: -Wl,-rpath,${libdir} -L${libdir} -ldummy_rocc +Libs: -Wl,-rpath,${libdir} -L${libdir} -lcustomext Cflags: -I${includedir} URL: http://riscv.org/download.html#tab_spike |