Browse Source

Merge branch 'CR_683_JPU_devel_Andy.Hu' into 'JH7100_VisionFive_devel'

codaj12: update the codaj12 makefile

See merge request jh7100/buildroot!3
jianlong.huang 2 years ago
parent
commit
a83af32eb9
2 changed files with 10 additions and 11 deletions
  1. 0 1
      package/starfive/codaj12/Config.in
  2. 10 10
      package/starfive/codaj12/codaj12.mk

+ 0 - 1
package/starfive/codaj12/Config.in

@@ -2,6 +2,5 @@ comment "codaj12 package"
 
 config BR2_PACKAGE_CODAJ12
 	bool "codaj12"
-	depends on BR2_KERNEL_HEADERS_CUSTOM_GIT
 	help
 	  codaj12 package

+ 10 - 10
package/starfive/codaj12/codaj12.mk

@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-
+# CODAJ12_VERSION:=1.0.0
 CODAJ12_SITE=$(TOPDIR)/../soft_3rdpart/codaj12
 CODAJ12_SITE_METHOD=local
 CODAJ12_INSTALL_STAGING = YES
@@ -13,7 +13,7 @@ export KERNELDIR=$(TOPDIR)/../work/linux
 
 define CODAJ12_BUILD_CMDS
 	$(TARGET_MAKE_ENV) $(MAKE) -C $(@D) -f $(@D)/codaj12_buildroot.mak
-	$(TARGET_MAKE_ENV) $(MAKE) -C $(@D) -f $(@D)/codaj12Driver_buildroot.mak
+#	$(TARGET_MAKE_ENV) $(MAKE) -C $(@D) -f $(@D)/codaj12Driver_buildroot.mak
 endef
 
 define CODAJ12_CLEAN_CMDS
@@ -24,7 +24,7 @@ define CODAJ12_INSTALL_TARGET_CMDS
 	$(INSTALL) -D -m 0777 $(@D)/jdi/linux/driver/load.sh $(TARGET_DIR)/root/codaj12/load.sh
 	$(INSTALL) -D -m 0777 $(@D)/jdi/linux/driver/unload.sh $(TARGET_DIR)/root/codaj12/unload.sh
 	$(INSTALL) -D -m 0644 $(@D)/libcodadec.so $(TARGET_DIR)/usr/lib/libcodadec.so
-	$(INSTALL) -D -m 0644 $(@D)/jdi/linux/driver/jpu.ko $(TARGET_DIR)/root/codaj12/jpu.ko
+#	$(INSTALL) -D -m 0644 $(@D)/jdi/linux/driver/jpu.ko $(TARGET_DIR)/root/codaj12/jpu.ko
 endef
 
 
@@ -51,16 +51,16 @@ define CODAJ12_INSTALL_STAGING_CMDS
 endef
 
 define CODAJ12_UNINSTALL_TARGET_CMDS
-	# rm -rf $(TARGET_DIR)/root/vdec.ko
-	# rm -rf $(TARGET_DIR)/root/vdec_load.sh
-	# rm -rf $(TARGET_DIR)/root/vdec_unload.sh
+	rm -rf $(TARGET_DIR)/root/codaj12/jpu.ko
+	rm -rf $(TARGET_DIR)/root/codaj12/load.sh
+	rm -rf $(TARGET_DIR)/root/codaj12/unload.sh
 endef
 
-codaj12_WORK_DIR := $(TARGET_DIR)/../build/codaj12-$(CODAJ12_VERSION)
+codaj12_WORK_DIR := $(TARGET_DIR)/../build/codaj12
 codaj12driver:
-ifneq ($(wildcard $(codaj12_WORK_DIR)/WaveDecDriver_buildroot.mak),)
-	$(TARGET_MAKE_ENV) $(MAKE) -C $(codaj12_WORK_DIR) -f $(codaj12_WORK_DIR)/WaveDecDriver_buildroot.mak
-	$(INSTALL) -D -m 0644 $(codaj12_WORK_DIR)/jdi/linux/driver/vdec.ko $(TARGET_DIR)/root/codaj12/vdec.ko
+ifneq ($(wildcard $(codaj12_WORK_DIR)/codaj12Driver_buildroot.mak),)
+	$(TARGET_MAKE_ENV) $(MAKE) -C $(codaj12_WORK_DIR) -f $(codaj12_WORK_DIR)/codaj12Driver_buildroot.mak
+	$(INSTALL) -D -m 0644 $(codaj12_WORK_DIR)/jdi/linux/driver/jpu.ko $(TARGET_DIR)/root/codaj12/jpu.ko
 endif
 
 $(eval $(generic-package))