move ad9361 to targets/xc_ppf1901, move lib/a3k* to targets/vocoder

Signed-off-by: surenyi <surenyi82@163.com>
5 years ago · e799c45133
18 changed files with 18 additions and 2 deletions
--- a/lib/lib.mk
+++ b/lib/lib.mk
@ -7,7 +7,6 @@ lib_srcs += \
 	  $(lib_dir)/cmd.c \
 	  $(lib_dir)/commands.c \
 	  $(lib_dir)/gpio.c \
-	  $(lib_dir)/a3k.c \
 	  $(lib_dir)/serial.c \
 	  $(lib_dir)/vrom.c \
 	  $(lib_dir)/utils.c \
--- a/targets/vocoder/Makefile
+++ b/targets/vocoder/Makefile
@ -0,0 +1,8 @@
+all:
+	$(MAKE) target=xc_ppf1901 -C ../../
+
+clean:
+	$(MAKE) target=xc_ppf1901 -C ../../ clean
+
+distclean:
+	$(MAKE) target=xc_ppf1901 -C ../../ distclean
--- a/targets/vocoder/a3k.c
+++ b/targets/vocoder/a3k.c
--- a/targets/vocoder/a3k.h
+++ b/targets/vocoder/a3k.h
--- a/targets/vocoder/a3kpacket.h
+++ b/targets/vocoder/a3kpacket.h
--- a/targets/vocoder/target.mk
+++ b/targets/vocoder/target.mk
@ -13,6 +13,7 @@ cmsis_srcs += $(stdph_dir)/src/stm32f4xx_fmc.c

 vocoder_srcs := \
 	  $(target_dir)/retarget.c \
+	  $(target_dir)/a3k.c \
 	  $(target_dir)/main.c

 iap_srcs := \
--- a/targets/xc_ppf1901/Makefile
+++ b/targets/xc_ppf1901/Makefile
@ -0,0 +1,8 @@
+all:
+	$(MAKE) target=xc_ppf1901 -C ../../
+
+clean:
+	$(MAKE) target=xc_ppf1901 -C ../../ clean
+
+distclean:
+	$(MAKE) target=xc_ppf1901 -C ../../ distclean
--- a/targets/xc_ppf1901/ad9361/ad9361.c
+++ b/targets/xc_ppf1901/ad9361/ad9361.c
--- a/targets/xc_ppf1901/ad9361/ad9361.h
+++ b/targets/xc_ppf1901/ad9361/ad9361.h
--- a/targets/xc_ppf1901/ad9361/ad9361_api.c
+++ b/targets/xc_ppf1901/ad9361/ad9361_api.c
--- a/targets/xc_ppf1901/ad9361/ad9361_api.h
+++ b/targets/xc_ppf1901/ad9361/ad9361_api.h
--- a/targets/xc_ppf1901/ad9361/ad9361_conv.c
+++ b/targets/xc_ppf1901/ad9361/ad9361_conv.c
--- a/targets/xc_ppf1901/ad9361/common.h
+++ b/targets/xc_ppf1901/ad9361/common.h
--- a/targets/xc_ppf1901/ad9361/platform.c
+++ b/targets/xc_ppf1901/ad9361/platform.c
--- a/targets/xc_ppf1901/ad9361/platform.h
+++ b/targets/xc_ppf1901/ad9361/platform.h
--- a/targets/xc_ppf1901/ad9361/util.c
+++ b/targets/xc_ppf1901/ad9361/util.c
--- a/targets/xc_ppf1901/ad9361/util.h
+++ b/targets/xc_ppf1901/ad9361/util.h
--- a/targets/xc_ppf1901/target.mk
+++ b/targets/xc_ppf1901/target.mk
@ -24,7 +24,7 @@ vocoder_srcs := \
 	  $(target_dir)/can.c \
 	  $(target_dir)/main.c

-ad9361_dir := $(top_dir)/ad9361
+ad9361_dir := $(target_dir)/ad9361

 ad9361_srcs := \
 	$(ad9361_dir)/util.c \