diff --git a/br-ext-chip-sigmastar/configs/ssc378qe_fpv_defconfig b/br-ext-chip-sigmastar/configs/ssc378qe_fpv_defconfig index d9be9ba6..f71cba0e 100644 --- a/br-ext-chip-sigmastar/configs/ssc378qe_fpv_defconfig +++ b/br-ext-chip-sigmastar/configs/ssc378qe_fpv_defconfig @@ -53,6 +53,7 @@ BR2_PACKAGE_LIBCURL_OPENIPC_CURL=y # BR2_PACKAGE_LIBCURL_OPENIPC_COOKIES_SUPPORT is not set # BR2_PACKAGE_LIBCURL_OPENIPC_EXTRA_PROTOCOLS_FEATURES is not set BR2_PACKAGE_LIBEVENT_OPENIPC=y +BR2_PACKAGE_LINUX_PATCHER_SIGMASTAR_DTB="infinity6c-ssc027d-s01a-demo" BR2_PACKAGE_LIBOGG_OPENIPC=y BR2_PACKAGE_MAJESTIC_FONTS=y BR2_PACKAGE_MAJESTIC_WEBUI=y diff --git a/general/package/linux-patcher/Config.in b/general/package/linux-patcher/Config.in index d1ccefa8..2180b20f 100644 --- a/general/package/linux-patcher/Config.in +++ b/general/package/linux-patcher/Config.in @@ -8,3 +8,8 @@ config BR2_PACKAGE_LINUX_PATCHER_ATHEROS bool "linux patcher atheros" help Atheros wireless driver + +config BR2_PACKAGE_LINUX_PATCHER_SIGMASTAR_DTB + string "linux patcher sigmastar dtb" + help + Sigmastar custom device tree diff --git a/general/package/linux-patcher/linux-patcher.mk b/general/package/linux-patcher/linux-patcher.mk index 0f4a1d77..9edf05ee 100644 --- a/general/package/linux-patcher/linux-patcher.mk +++ b/general/package/linux-patcher/linux-patcher.mk @@ -19,8 +19,15 @@ define LINUX_PATCHER_CONFIG_ATHEROS endef endif +ifneq ($(BR2_PACKAGE_LINUX_PATCHER_SIGMASTAR_DTB),"") +define LINUX_PATCHER_CONFIG_SIGMASTAR_DTB + $(call KCONFIG_SET_OPT,CONFIG_SS_DTB_NAME,$(BR2_PACKAGE_LINUX_PATCHER_SIGMASTAR_DTB)) +endef +endif + define LINUX_PATCHER_LINUX_CONFIG_FIXUPS $(LINUX_PATCHER_CONFIG_ATHEROS) + $(LINUX_PATCHER_CONFIG_SIGMASTAR_DTB) endef $(eval $(generic-package)) diff --git a/general/scripts/rootfs_script.sh b/general/scripts/rootfs_script.sh index 6ea0d81a..d3e61cd3 100755 --- a/general/scripts/rootfs_script.sh +++ b/general/scripts/rootfs_script.sh @@ -7,16 +7,11 @@ date +GITHUB_VERSION="\"${GIT_BRANCH-local}+${GIT_HASH-build}, %Y-%m-%d"\" >> ${ echo BUILD_OPTION=${OPENIPC_VARIANT} >> ${FILE} date +TIME_STAMP=%s >> ${FILE} -CONF="USES_GLIBC=y|OSDRV_T30=y|OSDRV_V85X=y|LIBV4L=y|MAVLINK_ROUTER=y|RUBYFPV=y|WIFIBROADCAST=y|AUDIO_PROCESSING_OPENIPC=y" +CONF="USES_GLIBC=y|OSDRV_T30=y|OSDRV_V85X=y|LIBV4L=y|MAVLINK_ROUTER=y|RUBYFPV=y|WIFIBROADCAST=y|WIFIBROADCAST_NG=y|AUDIO_PROCESSING_OPENIPC=y" if ! grep -qP ${CONF} ${BR2_CONFIG}; then rm -f ${TARGET_DIR}/usr/lib/libstdc++* fi -if grep -q "USES_MUSL" ${BR2_CONFIG}; then - ln -sf libc.so ${TARGET_DIR}/lib/ld-uClibc.so.0 - ln -sf ../../lib/libc.so ${TARGET_DIR}/usr/bin/ldd -fi - LIST="${BR2_EXTERNAL_GENERAL_PATH}/scripts/excludes/${OPENIPC_SOC_MODEL}_${OPENIPC_VARIANT}.list" if [ -f ${LIST} ]; then xargs -a ${LIST} -I % rm -f ${TARGET_DIR}%