add cvitek-middleware

This commit is contained in:
Justin Hammond 2024-03-10 21:47:29 +08:00
parent 722cc54c2d
commit f668f54d5b
12 changed files with 378 additions and 9 deletions

View file

@ -0,0 +1,188 @@
From c6d8a5f7729307bc35d5562b86201736f92c1880 Mon Sep 17 00:00:00 2001
From: Justin Hammond <justin@dynam.ac>
Date: Sun, 10 Mar 2024 15:49:10 +0800
Subject: [PATCH] fix buildroot compiles
---
v2/Makefile.param | 7 +++----
v2/modules/bin/Makefile | 34 +++++++++++++++++-----------------
v2/modules/osdc/Makefile | 6 ++++--
v2/modules/sys/Makefile | 3 ++-
v2/modules/vdec/Makefile | 2 --
v2/modules/venc/Makefile | 2 --
v2/pkgconfig/cvi_common.pc | 2 +-
v2/sample/sample.mk | 6 +++---
8 files changed, 30 insertions(+), 32 deletions(-)
diff --git a/v2/Makefile.param b/v2/Makefile.param
index e03d73d..0e4df16 100644
--- a/v2/Makefile.param
+++ b/v2/Makefile.param
@@ -40,9 +40,8 @@ else ifeq ($(SDK_VER), glibc_riscv64)
OPT_LEVEL := -Os
OPT_LEVEL += -mcpu=c906fdv -march=rv64imafdcv0p7xthead -mcmodel=medany -mabi=lp64d
else ifeq ($(SDK_VER), musl_riscv64)
- export CROSS_COMPILE = $(CROSS_COMPILE_MUSL_RISCV64)
- SYSROOT := $(ROOT_DIR)/../../host-tools/gcc/riscv64-linux-musl-x86_64/sysroot
- KERNEL_INC := $(KERNEL_DIR)/riscv/usr/include
+ SYSROOT := $(SYSROOT_DIR)
+ KERNEL_INC := $(KERNEL_DIR)
OPT_LEVEL := -Os
OPT_LEVEL += -mcpu=c906fdv -march=rv64imafdcv0p7xthead -mcmodel=medany -mabi=lp64d
endif
@@ -95,7 +94,7 @@ OBJCOPY = $(CROSS_COMPILE)objcopy
#
# export TARGET_PACKAGES_INCLUDE and TARGET_PACKAGES_LIBDIR from build/Makefile
#
-WARNING_LEVEL=-Wall -Wextra -Werror
+WARNING_LEVEL=-Wall -Wextra
#Generate object files by CC
CFLAGS = $(OPT_LEVEL) -std=gnu11 -g $(WARNING_LEVEL) -fPIC -ffunction-sections -fdata-sections -Wl,--gc-sections $(CVI_TARGET_PACKAGES_INCLUDE)
diff --git a/v2/modules/bin/Makefile b/v2/modules/bin/Makefile
index 0b4428f..20b6a4f 100644
--- a/v2/modules/bin/Makefile
+++ b/v2/modules/bin/Makefile
@@ -9,8 +9,8 @@ SRCS := $(wildcard $(SDIR)/*.c)
# 3rdparty lib
OSS_MODULE_INSTALL_PATH = $(OUTPUT_DIR)/mw_$(SDK_VER)/cvitek_mw_sdk
-OSS_MODULE_INCLUDE_PATH = $(OSS_MODULE_INSTALL_PATH)/include
-OSS_MODULE_LIB_PATH = $(OSS_MODULE_INSTALL_PATH)/lib
+OSS_MODULE_INCLUDE_PATH = $(STAGING_DIR)/usr/include
+OSS_MODULE_LIB_PATH = $(STAGING_DIR)/usr/lib
ISP_BIN_DIR = $(MW_PATH)/modules/isp/$(shell echo $(CHIP_ARCH) | tr A-Z a-z)/isp_bin/inc
@@ -45,25 +45,25 @@ OSS_MODULE_LIB_CVI_MINIZ_CHECK_PATH = $(OSS_MODULE_LIB_PATH)/libcvi_miniz*
prepare_3rdparty_module:
# cvi_json-c
-ifeq "$(wildcard $(OSS_MODULE_LIB_CVI_JSONC_CHECK_PATH))" ""
-ifeq "$(wildcard $(OSS_TARBALL_CVI_JSONC_PATH))" ""
- $(error libcvi_json-c source tarball not exist, please run build_3rd_party first!!)
-endif
- @mkdir -p $(OSS_MODULE_INSTALL_PATH)
- @$(OSS_BUILD_SRCIPT) -n cvi-json-c -e -t "$(OSS_TARBALL_PATH)" -i "$(OSS_MODULE_INSTALL_PATH)"
-endif
+#ifeq "$(wildcard $(OSS_MODULE_LIB_CVI_JSONC_CHECK_PATH))" ""
+#ifeq "$(wildcard $(OSS_TARBALL_CVI_JSONC_PATH))" ""
+# $(error libcvi_json-c source tarball not exist, please run build_3rd_party first!!)
+#endif
+# @mkdir -p $(OSS_MODULE_INSTALL_PATH)
+# @$(OSS_BUILD_SRCIPT) -n cvi-json-c -e -t "$(OSS_TARBALL_PATH)" -i "$(OSS_MODULE_INSTALL_PATH)"
+#endif
# cvi_miniz
-ifeq "$(wildcard $(OSS_MODULE_LIB_CVI_MINIZ_CHECK_PATH))" ""
-ifeq "$(wildcard $(OSS_TARBALL_CVI_MINIZ_PATH))" ""
- $(error libcvi_miniz source tarball not exist, please run build_3rd_party first!!)
-endif
- @mkdir -p $(OSS_MODULE_INSTALL_PATH)
- @$(OSS_BUILD_SRCIPT) -n cvi-miniz -e -t "$(OSS_TARBALL_PATH)" -i "$(OSS_MODULE_INSTALL_PATH)"
-endif
+#ifeq "$(wildcard $(OSS_MODULE_LIB_CVI_MINIZ_CHECK_PATH))" ""
+#ifeq "$(wildcard $(OSS_TARBALL_CVI_MINIZ_PATH))" ""
+# $(error libcvi_miniz source tarball not exist, please run build_3rd_party first!!)
+#endif
+# @mkdir -p $(OSS_MODULE_INSTALL_PATH)
+# @$(OSS_BUILD_SRCIPT) -n cvi-miniz -e -t "$(OSS_TARBALL_PATH)" -i "$(OSS_MODULE_INSTALL_PATH)"
+#endif
$(SDIR)/%.o: $(SDIR)/%.c
- @$(CC) $(DEPFLAGS) $(CFLAGS) $(EXTRA_CFLAGS) -o $@ -c $<
+ $(CC) $(DEPFLAGS) $(CFLAGS) $(EXTRA_CFLAGS) -o $@ -c $<
@echo [$(notdir $(CC))] $(notdir $@)
$(SDIR)/%.o: $(SDIR)/%.S
diff --git a/v2/modules/osdc/Makefile b/v2/modules/osdc/Makefile
index 4c9bf35..971f773 100644
--- a/v2/modules/osdc/Makefile
+++ b/v2/modules/osdc/Makefile
@@ -18,14 +18,16 @@ TARGET_SO = $(MW_LIB)/libosdc.so
INCS = -I$(MW_INC) -I$(KERNEL_INC) -I$(OSDC_INC)
EXTRA_CFLAGS = $(INCS) -fpack-struct=8
-EXTRA_CFLAGS += -DMMF_VERSION=\"$(shell git describe --always)\"
+#EXTRA_CFLAGS += -DMMF_VERSION=\"$(shell git describe --always)\"
+EXTRA_CFLAGS += -DMMF_VERSION=\"$(CVITEK_MIDDLEWARE_VERSION)\"
EXTRA_CFLAGS += -DSDK_VER=\"$(SDK_VER)\"
ifeq ($(SDK_VER), 32bit)
EXTRA_CFLAGS += -D_FILE_OFFSET_BITS=64
endif
EXTRA_CXXFLAGS = $(INCS) -fpack-struct=8
-EXTRA_CXXFLAGS += -DMMF_VERSION=\"$(shell git describe --always)\"
+#EXTRA_CXXFLAGS += -DMMF_VERSION=\"$(shell git describe --always)\"
+EXTRA_CFLAGS += -DMMF_VERSION=\"$(CVITEK_MIDDLEWARE_VERSION)\"
EXTRA_CXXFLAGS += -DSDK_VER=\"$(SDK_VER)\"
ifeq ($(SDK_VER), 32bit)
EXTRA_CXXFLAGS += -D_FILE_OFFSET_BITS=64
diff --git a/v2/modules/sys/Makefile b/v2/modules/sys/Makefile
index 4f5b749..9846f69 100644
--- a/v2/modules/sys/Makefile
+++ b/v2/modules/sys/Makefile
@@ -29,7 +29,8 @@ TARGET_SO = $(MW_LIB)/libsys.so
INCS = -I$(MW_INC) -I$(KERNEL_INC) -I$(SYS_INC) -I$(VPU_INC)
EXTRA_CFLAGS = $(INCS) -fpack-struct=8
-EXTRA_CFLAGS += -DMMF_VERSION=\"$(shell git describe --always)\"
+#EXTRA_CFLAGS += -DMMF_VERSION=\"$(shell git describe --always)\"
+EXTRA_CFLAGS += -DMMF_VERSION=\"$(CVITEK_MIDDLEWARE_VERSION)\"
EXTRA_CFLAGS += -DSDK_VER=\"$(SDK_VER)\"
ifeq ($(SDK_VER), 32bit)
EXTRA_CFLAGS += -D_FILE_OFFSET_BITS=64
diff --git a/v2/modules/vdec/Makefile b/v2/modules/vdec/Makefile
index 354a96d..3d8e14d 100644
--- a/v2/modules/vdec/Makefile
+++ b/v2/modules/vdec/Makefile
@@ -38,7 +38,5 @@ clean:
prepare:
@echo "SDK_VER = ${SDK_VER}"
- @head=`git rev-parse --verify --short HEAD`
- @date=`git show -s --format=%cd --date=short ${head}`
-include $(DEPS)
diff --git a/v2/modules/venc/Makefile b/v2/modules/venc/Makefile
index a8d8c40..f68dcd4 100644
--- a/v2/modules/venc/Makefile
+++ b/v2/modules/venc/Makefile
@@ -53,7 +53,5 @@ clean:
prepare:
@echo "SDK_VER = ${SDK_VER}"
- @head=`git rev-parse --verify --short HEAD`
- @date=`git show -s --format=%cd --date=short ${head}`
-include $(DEPS)
diff --git a/v2/pkgconfig/cvi_common.pc b/v2/pkgconfig/cvi_common.pc
index 554d45d..453e480 100644
--- a/v2/pkgconfig/cvi_common.pc
+++ b/v2/pkgconfig/cvi_common.pc
@@ -6,4 +6,4 @@ Name: CVITEK System lib
Description: SYS / VPU / ISP / VENC / BIN libs
Version: 2.0
Cflags: -I${includedir} -I${includedir}/isp/cv181x
-Libs: -L${libdir} -lsys -lvpu -lvenc -lcvi_bin -lcvi_bin_isp -lisp -lisp_algo -lae -laf -lawb -lsns_full -latomic
+Libs: -L${libdir} -lsys -lvpu -lvenc -lcvi_bin -lcvi_bin_isp -lisp -lisp_algo -lae -laf -lawb -lsns_full -latomic -ltinyalsa
diff --git a/v2/sample/sample.mk b/v2/sample/sample.mk
index 33ea2df..1ac3db2 100644
--- a/v2/sample/sample.mk
+++ b/v2/sample/sample.mk
@@ -13,9 +13,9 @@ ifeq ($(DEBUG), 1)
CFLAGS += -g -O0
endif
-ifeq ($(SAMPLE_STATIC), 1)
-ELFFLAGS += -static
-endif
+#ifeq ($(SAMPLE_STATIC), 1)
+#ELFFLAGS += -static
+#endif
#########################################################################
COMM_SRC := $(wildcard $(COMMON_DIR)/*.c)
--
2.44.0

View file

@ -79,8 +79,6 @@ BR2_PACKAGE_GST1_PLUGINS_BASE_PLUGIN_VORBIS=y
BR2_PACKAGE_GST1_PLUGINS_GOOD=y
BR2_PACKAGE_GST1_PLUGINS_GOOD_JPEG=y
BR2_PACKAGE_GST1_PLUGINS_GOOD_PNG=y
BR2_PACKAGE_GST1_PLUGINS_BAD=y
BR2_PACKAGE_GST1_PLUGINS_UGLY=y
BR2_PACKAGE_GZIP=y
BR2_PACKAGE_LRZIP=y
BR2_PACKAGE_LZIP=y
@ -162,6 +160,8 @@ BR2_PACKAGE_LUA_LINENOISE=y
BR2_PACKAGE_PYTHON3=y
BR2_PACKAGE_PYTHON3_PY_PYC=y
BR2_PACKAGE_PYTHON3_CURSES=y
BR2_PACKAGE_TINYALSA=y
BR2_PACKAGE_TINYALSA_TOOLS=y
BR2_PACKAGE_MARIADB=y
BR2_PACKAGE_SQLITE_STAT4=y
BR2_PACKAGE_SQLITE_ENABLE_FTS3=y

View file

@ -1,3 +1,6 @@
source "$BR2_EXTERNAL_LICHEERVNANO_BR_PATH/package/aic-firmware/Config.in"
source "$BR2_EXTERNAL_LICHEERVNANO_BR_PATH/package/cloudutils/Config.in"
source "$BR2_EXTERNAL_LICHEERVNANO_BR_PATH/package/cvitek-modules/Config.in"
source "$BR2_EXTERNAL_LICHEERVNANO_BR_PATH/package/cvitek-middleware/Config.in"
source "$BR2_EXTERNAL_LICHEERVNANO_BR_PATH/package/miniz/Config.in"
source "$BR2_EXTERNAL_LICHEERVNANO_BR_PATH/package/cvitek-oss/Config.in"

View file

@ -0,0 +1,9 @@
config BR2_PACKAGE_CVITEK_MIDDLEWARE
bool "CVITEK Middleware package"
select BR2_PACKAGE_MINIZ
select BR2_PACKAGE_JSON_C
select BR2_PACKAGE_TINYALSA
select BR2_PACKAGE_CVITEK_OSS
help
CVITEK Middleware and sample applications.

View file

@ -0,0 +1,90 @@
CVITEK_MIDDLEWARE_VERSION = b70217f
CVITEK_MIDDLEWARE_SITE = $(call github,sophgo,middleware,$(CVITEK_MIDDLEWARE_VERSION))
CVITEK_MIDDLEWARE_LICENSE = GPL-3.0
CVITEK_MIDDLEWARE_DEPENDENCIES = cvitek-modules miniz json-c tinyalsa cvitek-oss cvitekconfig
CVITEK_MIDDLEWARE_INSTALL_STAGING = YES
UCCHIPARCH = $(shell echo '$(BR2_PACKAGE_CVITEKCONFIG_CHIP_ARCH)' | tr '[:lower:]' '[:upper:]')
CVITEK_MIDDLEWARE_MAKE_OPTS = \
CROSS_COMPILE=$(BR2_TOOLCHAIN_EXTERNAL_PREFIX)- \
PROJECT_FULLNAME=$(BR2_PACKAGE_CVITEKCONFIG_CHIP_ARCH)_$(BR2_PACKAGE_CVITEKCONFIG_BOARD_NAME) \
SDK_VER=$(BR2_PACKAGE_CVITEKCONFIG_LIBC)_$(BR2_ARCH) \
CHIP_ARCH=$(UCCHIPARCH) \
BUILD_PATH=$(@D) \
KERNEL_DIR=$(LINUX_DIR)/usr/include/ \
SYSROOT_DIR=$(STAGING_DIR) \
MW_VER=v2
CVITEK_MIDDLEWARE_DISABLED_SENSORS = SENSOR_GCORE_GC02M1 \
SENSOR_GCORE_GC2093_SLAVE \
SENSOR_GCORE_GC4653_SLAVE \
SENSOR_OV_OS02D10 \
SENSOR_OV_OS02D10_SLAVE \
SENSOR_OV_OS02K10_SLAVE \
SENSOR_OV_OS04C10_SLAVE \
SENSOR_OV_OS08A20_SLAVE \
SENSOR_PICO_384 \
SENSOR_PICO_640 \
SENSOR_SMS_SC850SL \
SENSOR_VIVO_MM308M2 \
SENSOR_VIVO_MCS369Q \
SENSOR_VIVO_MCS369 \
SENSOR_TECHPOINT_TP2850 \
SENSOR_SONY_IMX385 \
SENSOR_SONY_IMX334 \
SENSOR_SONY_IMX347 \
SENSOR_SONY_IMX307_SUBLVDS \
SENSOR_SONY_IMX290_2L \
SENSOR_SOI_H65 \
SENSOR_SOI_F35_SLAVE \
SENSOR_SMS_SC8238 \
SENSOR_SMS_SC4210 \
SENSOR_SMS_SC3335_SLAVE
CVITEK_MIDDLEWARE_RM_FILES = v2/lib/libjson-c.* \
v2/modules/audio/lib/musl_riscv64/libtinyalsa.* \
v2/modules/isp/lib/musl_riscv64/libjson-c.*
CVITEK_MIDDLEWARE_BIN_FILES = v2/sample/audio/sample_audio \
v2/sample/fisheye/sample_fisheye \
v2/sample/ir_auto/ir_auto \
v2/sample/ive/sample_* \
v2/sample/mipi_tx/sample_dsi \
v2/sample/osdc/sample_osdc \
v2/sample/overlay/sample_overlay \
v2/sample/region/sample_region \
v2/sample/sample_panel/sample_panel \
v2/sample/scene_auto/sample_scene_auto \
v2/sample/sensor_test/sensor_test \
v2/sample/vdec/sample_vdec \
v2/sample/vdecvo/sample_vdecvo \
v2/sample/venc/sample_vcodec \
v2/sample/venc/sample_venc \
v2/sample/vio/sample_vio
define CVITEK_MIDDLEWARE_BUILD_CMDS
cat $(@D)/v2/component/isp/sensor.mk | grep CONFIG | awk '{sub(/.*[(]/,""); sub(/[)].*/,""); print $$0"=y"}' | sort | uniq > $(@D)/.config
sed -i 's/SENSOR_GCORE_GC02M1=y/SENSOR_GCORE_GC02M1=n/' $(@D)/.config
$(foreach SENSOR,$(CVITEK_MIDDLEWARE_DISABLED_SENSORS),sed -i 's/$(SENSOR)=y/$(SENSOR)=n/' $(@D)/.config;)
$(foreach FILE,$(CVITEK_MIDDLEWARE_RM_FILES),rm -f $(@D)/$(FILE);)
ln -f -s $(@D)/v2/Makefile.param $(@D)/Makefile.param
#V=1 $(TARGET_MAKE_ENV) $(CVITEK_MIDDLEWARE_MAKE_OPTS) make -C $(@D)/v2 clean
V=1 $(TARGET_MAKE_ENV) $(CVITEK_MIDDLEWARE_MAKE_OPTS) make -C $(@D)/v2 all
endef
define CVITEK_MIDDLEWARE_INSTALL_STAGING_CMDS
@$(INSTALL) -m 0644 $(@D)/v2/include/*.h $(STAGING_DIR)/usr/include/
@$(INSTALL) -m 0644 $(@D)/v2/include/isp/$(BR2_PACKAGE_CVITEKCONFIG_CHIP_ARCH)/*.h $(STAGING_DIR)/usr/include/
@$(INSTALL) -m 0755 $(@D)/v2/lib/lib* $(STAGING_DIR)/usr/lib/
@$(INSTALL) -m 0755 $(@D)/v2/lib/3rd/lib* $(STAGING_DIR)/usr/lib/
endef
define CVITEK_MIDDLEWARE_INSTALL_TARGET_CMDS
@$(INSTALL) -m 0755 $(@D)/v2/lib/lib* $(TARGET_DIR)/usr/lib/
@$(INSTALL) -m 0755 $(@D)/v2/lib/3rd/lib* $(TARGET_DIR)/usr/lib
$(foreach BINFILE,$(CVITEK_MIDDLEWARE_BIN_FILES), $(INSTALL) -m 0755 $(@D)/$(BINFILE) $(TARGET_DIR)/usr/bin/;)
endef
$(eval $(generic-package))

View file

@ -1,14 +1,15 @@
################################################################################
#
# blwnet_xram
# cvitek-modules
#
################################################################################
CVITEK_MODULES_VERSION = 5637fbf
CVITEK_MODULES_SITE = $(call github,sophgo,osdrv,$(CVITEK_MODULES_VERSION))
CVITEK_MODULES_LICENSE = GPL-2.0(kernel driver), Apache 2.0(userspace)
CVITEK_MODULES_INSTALL_STAGING = YES
CVITEK_MODULES_MODULE_MAKE_OPTS = CHIP_CODE=mars V=1
CVITEK_MODULES_MODULE_MAKE_OPTS = CHIP_CODE=$(BR2_PACKAGE_CVITEKCONFIG_CHIPCODE)
CVITEK_MODULES_MODULE_SUBDIRS = interdrv/v2/sys
CVITEK_MODULES_MODULE_SUBDIRS += interdrv/v2/base
@ -47,6 +48,11 @@ CVITEK_MODULES_MODULE_SUBDIRS += extdrv/wiegand-gpio
#CVITEK_MODULES_MODULE_SUBDIRS += extdrv/wireless/realtek/rtl8821cs
CVITEK_MODULES_MODULE_SUBDIRS += extdrv/wireless/aic8800/
define CVITEK_MODULES_INSTALL_STAGING_CMDS
$(INSTALL) -D -m 0644 $(@D)/interdrv/v2/include/common/uapi/linux/* $(LINUX_DIR)/usr/include/linux/
$(INSTALL) -D -m 0644 $(@D)/interdrv/v2/include/chip/$(BR2_PACKAGE_CVITEKCONFIG_CHIPCODE)/uapi/linux/* $(LINUX_DIR)/usr/include/linux
$(info Staging Directory = $(STAGING_DIR))
endef
$(eval $(kernel-module))

View file

@ -0,0 +1,5 @@
config BR2_PACKAGE_CVITEK_OSS
bool "CVITEK OSS package"
help
CVITEK OSS Applications

View file

@ -0,0 +1,37 @@
CVITEK_OSS_VERSION = 59b6a54
CVITEK_OSS_SITE = $(call github,sophgo,oss,$(CVITEK_OSS_VERSION))
CVITEK_OSS_LICENSE = GPL-3.0
CVITEK_OSS_DEPENDENCIES = host-tar cvitekconfig
CVITEK_OSS_INSTALL_STAGING = YES
define CVITEK_OSS_BUILD_CMDS
@echo "Extracting CVITEK OSS tarballs - cvi_json-c cvi_miniz"
@rm -rf $(@D)/output
@mkdir -p $(@D)/output
@$(TAR) --no-same-owner -xzf $(@D)/oss_release_tarball/$(BR2_PACKAGE_CVITEKCONFIG_LIBC)_$(BR2_ARCH)/cvi-json-c.tar.gz -C $(@D)/output
@$(TAR) --no-same-owner -xzf $(@D)/oss_release_tarball/$(BR2_PACKAGE_CVITEKCONFIG_LIBC)_$(BR2_ARCH)/cvi-miniz.tar.gz -C $(@D)/output
endef
define CVITEK_OSS_INSTALL_STAGING_CMDS
@$(INSTALL) -d -m 0755 $(STAGING_DIR)/usr/include/cvi_json-c
@$(INSTALL) -m 0644 $(@D)/output/include/cvi_json-c/*.h $(STAGING_DIR)/usr/include/cvi_json-c
@$(INSTALL) -d -m 0755 $(STAGING_DIR)/usr/lib/cmake/cvi_json-c
@$(INSTALL) -m 0644 $(@D)/output/lib/cmake/cvi_json-c/* $(STAGING_DIR)/usr/lib/cmake/cvi_json-c
@$(INSTALL) -d -m 0755 $(STAGING_DIR)/usr/lib/pkgconfig
@$(INSTALL) -m 0644 $(@D)/output/lib/pkgconfig/* $(STAGING_DIR)/usr/lib/pkgconfig
@$(INSTALL) -m 0644 $(@D)/output/share/pkgconfig/* $(STAGING_DIR)/usr/lib/pkgconfig
@$(INSTALL) -d -m 0755 $(STAGING_DIR)/usr/include/cvi_miniz
@$(INSTALL) -m 0644 $(@D)/output/include/cvi_miniz/*.h $(STAGING_DIR)/usr/include/cvi_miniz
@$(INSTALL) -m 0755 $(@D)/output/lib/lib* $(STAGING_DIR)/usr/lib
endef
define CVITEK_OSS_INSTALL_TARGET_CMDS
@$(INSTALL) -m 0755 $(@D)/output/lib/lib* $(TARGET_DIR)/usr/lib
endef
$(eval $(generic-package))

View file

@ -158,6 +158,10 @@ if BR2_PACKAGE_CVITEKCONFIG_BOARD_LICHEERVNANO
string
default "sg2002"
config BR2_PACKAGE_CVITEKCONFIG_CHIPCODE
string
default "mars"
config BR2_PACKAGE_CVITEKCONFIG_CHIP_ARCH
string
default "sg200x"
@ -174,6 +178,13 @@ if BR2_PACKAGE_CVITEKCONFIG_BOARD_LICHEERVNANO
string
default "sd"
config BR2_PACKAGE_CVITEKCONFIG_CHIPCODE
string
default mars
config BR2_PACKAGE_CVITEKCONFIG_LIBC
string
default "musl"
endif

View file

@ -107,6 +107,7 @@ endif
UBOOT_POST_PATCH_HOOKS += UBOOT_APPLY_CVITEK_CONFIG_HOOK
UBOOT_DEPENDENCIES += cvitekconfig
LINUX_POST_PATCH_HOOKS += LINUX_APPLY_CVITEK_CONFIG_HOOK
LINUX_POST_INSTALL_TARGET_HOOKS += LINUX_ADDITIONAL_INSTALL_STAGING_HOOK
LINUX_DEPENDENCIES += cvitekconfig
CVITEKFSBL_POST_PATCH_HOOKS += CVITEKFSBL_APPLY_CVITEK_CONFIG_HOOK
CVITEKFSBL_DEPENDENCIES += cvitekconfig
@ -114,21 +115,27 @@ CVITEKFSBL_DEPENDENCIES += cvitekconfig
define UBOOT_APPLY_CVITEK_CONFIG_HOOK
@echo "Applying CVITEK Generated Config"
$(INSTALL) -D -m 0644 $(TARGET_DIR)/include/cvi_board_memmap.h $(@D)/include/cvi_board_memmap.h
@cp $(BR2_GLOBAL_PATCH_DIR)../generated/cvipart.h $(@D)/include/cvipart.h
@cp $(BR2_GLOBAL_PATCH_DIR)../generated/uboot/cvi_board_init.c $(@D)/board/cvitek/
$(INSTALL) -D -m 0644 $(BR2_GLOBAL_PATCH_DIR)../generated/cvipart.h $(@D)/include/cvipart.h
$(INSTALL) -D -m 0644 $(BR2_GLOBAL_PATCH_DIR)../generated/uboot/cvi_board_init.c $(@D)/board/cvitek/
endef
define LINUX_APPLY_CVITEK_CONFIG_HOOK
@echo "Applying SG2002 Generated Config"
$(INSTALL) -D -m 0644 $(TARGET_DIR)/include/cvi_board_memmap.h $(@D)/include/cvi_board_memmap.h
#@cp $(BR2_GLOBAL_PATCH_DIR)../generated/cvi_board_memmap.h $(@D)/include/cvi_board_memmap.h
@cp $(BR2_GLOBAL_PATCH_DIR)../generated/cvipart.h $(@D)/include/cvipart.h
$(INSTALL) -D -m 0644 $(BR2_GLOBAL_PATCH_DIR)../generated/cvipart.h $(@D)/include/cvipart.h
endef
define LINUX_ADDITIONAL_INSTALL_STAGING_HOOK
@echo "Installing Kernel Headers"
V=1 $(LINUX_MAKE_ENV) $(BR2_MAKE) $(LINUX_MAKE_FLAGS) -C $(LINUX_DIR) V=1 headers_install
$(INSTALL) -D -m 0644 $(@D)/drivers/staging/android/uapi/ion*.h $(LINUX_DIR)/usr/include/linux/
#Makefile: ${Q}cp ${KERNEL_PATH}/include/uapi/linux/dma-buf.h ${1}/linux/
endef
define CVITEKFSBL_APPLY_CVITEK_CONFIG_HOOK
@echo "Applying SG2002 Generated Config"
$(INSTALL) -D -m 0644 $(TARGET_DIR)/include/cvi_board_memmap.h $(@D)/include/cvi_board_memmap.h
#@cp $(BR2_GLOBAL_PATCH_DIR)../generated/cvi_board_memmap.h $(@D)/include/cvi_board_memmap.h
endef

5
package/miniz/Config.in Normal file
View file

@ -0,0 +1,5 @@
config BR2_PACKAGE_MINIZ
bool "Miniz package"
help
miniz: Single C source file zlib-replacement library, originally from code.google.com/p/miniz

8
package/miniz/miniz.mk Normal file
View file

@ -0,0 +1,8 @@
MINIZ_VERSION = 3.0.2
MINIZ_SITE = $(call github,richgel999,miniz,$(MINIZ_VERSION))
MINIZ_LICENSE = MIT
MINIZ_CONF_OPTIONS = -DBUILD_SHARED_LIBS=ON
MINIZ_INSTALL_STAGING = YES
$(eval $(cmake-package))