123456789101112131415161718192021222324252627282930313233343536373839404142434445464748495051525354555657585960616263646566676869707172737475767778798081828384858687888990919293949596979899100101102103104105106 |
- From e88d5d10314d2bbaa99c1ecf8bc9640555c1e674 Mon Sep 17 00:00:00 2001
- From: Andy Hu <andy.hu@starfivetech.com>
- Date: Fri, 18 Nov 2022 12:52:51 +0800
- Subject: [PATCH] codaj12: fix building issue and support the vendor code
- building
- ---
- codaj12/Makefile | 2 +-
- codaj12/build_for_riscv.sh | 15 +++++++++------
- codaj12/codaj12_buildroot.mak | 31 ++++++++++++++++++++++++++++++-
- 3 files changed, 40 insertions(+), 8 deletions(-)
- diff --git a/codaj12/Makefile b/codaj12/Makefile
- index 8e41864..1be8a83 100644
- --- a/codaj12/Makefile
- +++ b/codaj12/Makefile
- @@ -38,7 +38,7 @@ ifeq ("$(BUILD_CONFIGURATION)", "NonOS")
- USE_ALLOCATOR = yes
- endif
- ifeq ("$(BUILD_CONFIGURATION)", "EmbeddedLinux")
- - CROSS_CC_PREFIX = riscv64-buildroot-linux-gnu-
- + CROSS_CC_PREFIX =
- PLATFORM = riscvlinux
- USE_FFMPEG ?= yes
- endif
- diff --git a/codaj12/build_for_riscv.sh b/codaj12/build_for_riscv.sh
- index 75c1c31..dee8ad4 100755
- --- a/codaj12/build_for_riscv.sh
- +++ b/codaj12/build_for_riscv.sh
- @@ -25,10 +25,13 @@ cp -rdvp ${jpu_path}/yuv $obj_jpu
- cp -rdvp ${jpu_path}/stream $obj_jpu
-
- #make linux driver
- -cd $jpu_driver
- -source build_env_setup_riscv.sh
- -make clean
- -make
- +# cd $jpu_driver
- +# source build_env_setup_riscv.sh
- +# make clean
- +# make
- +export ARCH=riscv
- +export SUBARCH=riscv
- +export CROSS_COMPILE=
-
- #make multi_instance
- cd $jpu_path
- @@ -42,7 +45,7 @@ make USE_FFMPEG=no
- cp ${jpu_path}/jpg_enc_test ${jpu_path}/jpg_dec_test $obj_jpu
-
- #cp driver
- -cp ${jpu_driver}/jpu.ko $obj_jpu_driver
- -cp -rdvp jpu_driver ../../work/buildroot_initramfs_sysroot/root/
- +# cp ${jpu_driver}/jpu.ko $obj_jpu_driver
- +# cp -rdvp jpu_driver ../../work/buildroot_initramfs_sysroot/root/
-
-
- diff --git a/codaj12/codaj12_buildroot.mak b/codaj12/codaj12_buildroot.mak
- index bffe02d..6833f09 100644
- --- a/codaj12/codaj12_buildroot.mak
- +++ b/codaj12/codaj12_buildroot.mak
- @@ -53,7 +53,8 @@ ifeq ("$(BUILD_CONFIGURATION)", "EmbeddedLinux")
- endif
-
- ifeq ("$(BUILD_CONFIGURATION)", "EmbeddedRiscvLinux")
- - CROSS_CC_PREFIX = riscv64-buildroot-linux-gnu-
- +# CROSS_CC_PREFIX = riscv64-buildroot-linux-gnu-
- + CROSS_CC_PREFIX =
- PLATFORM = riscvlinux
- endif
- CC = $(CROSS_CC_PREFIX)gcc
- @@ -146,3 +147,31 @@ obj/%.o: %.c $(MAKEFILE)
- lint:
- "$(LINT_HOME)/flint" -i"$(LINT_HOME)" $(DEFINES) $(INCLUDES) $(VPATH2) linux_std.lnt $(HAPS_RULE) $(NONOS_RULE) $(SOURCES_COMMON)
-
- +TARGET_DIR=../target
- +STAGING_DIR=$(TARGET_DIR)
- +INSTALL=install
- +
- +install:
- + @echo install ...
- + $(INSTALL) -D -m 0777 jdi/linux/driver/load.sh $(TARGET_DIR)/root/codaj12/load.sh
- + $(INSTALL) -D -m 0777 jdi/linux/driver/unload.sh $(TARGET_DIR)/root/codaj12/unload.sh
- + $(INSTALL) -D -m 0644 libcodadec.so $(TARGET_DIR)/usr/lib/libcodadec.so
- + @echo "install STAGING_DIR ..."
- + $(INSTALL) -D -m 0644 jpuapi/jpuapi.h $(STAGING_DIR)/usr/include/codaj12/jpuapi/jpuapi.h
- + $(INSTALL) -D -m 0644 jpuapi/jpuapifunc.h $(STAGING_DIR)/usr/include/codaj12/jpuapi/jpuapifunc.h
- + $(INSTALL) -D -m 0644 jpuapi/regdefine.h $(STAGING_DIR)/usr/include/codaj12/jpuapi/regdefine.h
- + $(INSTALL) -D -m 0644 jpuapi/jpuconfig.h $(STAGING_DIR)/usr/include/codaj12/jpuapi/jpuconfig.h
- + $(INSTALL) -D -m 0644 jpuapi/jputypes.h $(STAGING_DIR)/usr/include/codaj12/jpuapi/jputypes.h
- + $(INSTALL) -D -m 0644 jpuapi/jputable.h $(STAGING_DIR)/usr/include/codaj12/jpuapi/jputable.h
- + $(INSTALL) -D -m 0644 sample/helper/cnm_fpga.h $(STAGING_DIR)/usr/include/codaj12/sample/helper/cnm_fpga.h
- + $(INSTALL) -D -m 0644 sample/helper/platform.h $(STAGING_DIR)/usr/include/codaj12/sample/helper/platform.h
- + $(INSTALL) -D -m 0644 sample/helper/yuv_feeder.h $(STAGING_DIR)/usr/include/codaj12/sample/helper/yuv_feeder.h
- + $(INSTALL) -D -m 0644 sample/helper/datastructure.h $(STAGING_DIR)/usr/include/codaj12/sample/helper/datastructure.h
- + $(INSTALL) -D -m 0644 sample/helper/jpulog.h $(STAGING_DIR)/usr/include/codaj12/sample/helper/jpulog.h
- + $(INSTALL) -D -m 0644 sample/main_helper.h $(STAGING_DIR)/usr/include/codaj12/sample/main_helper.h
- + $(INSTALL) -D -m 0644 jdi/linux/driver/jpu.h $(STAGING_DIR)/usr/include/codaj12/jdi/linux/driver/jpu.h
- + $(INSTALL) -D -m 0644 jdi/linux/driver/jmm.h $(STAGING_DIR)/usr/include/codaj12/jdi/linux/driver/jmm.h
- + $(INSTALL) -D -m 0644 jdi/jdi.h $(STAGING_DIR)/usr/include/codaj12/jdi/jdi.h
- + $(INSTALL) -D -m 0644 jdi/mm.h $(STAGING_DIR)/usr/include/codaj12/jdi/mm.h
- + $(INSTALL) -D -m 0644 config.h $(STAGING_DIR)/usr/include/codaj12/config.h
- +
- --
- 2.36.0
|