diff --git a/.github/workflows/t31_images.yml b/.github/workflows/t31_images.yml index df151e8d..0eb7ce96 100644 --- a/.github/workflows/t31_images.yml +++ b/.github/workflows/t31_images.yml @@ -124,7 +124,7 @@ jobs: with: repo_token: ${{ secrets.GITHUB_TOKEN }} file: ${{ env.ARCHIVE_SDK }} - asset_name: "mips-openipc-t31-linux-musl_sdk-buildroot.tar.gz" + asset_name: "mipsel-openipc-t31-linux-musl_sdk-buildroot.tar.gz" tag: ${{ env.TAG_NAME }} overwrite: true diff --git a/br-ext-chip-ingenic/Config.in b/br-ext-chip-ingenic/Config.in index 54b03cb7..c5ff5820 100644 --- a/br-ext-chip-ingenic/Config.in +++ b/br-ext-chip-ingenic/Config.in @@ -16,8 +16,8 @@ source "$BR2_EXTERNAL_INGENIC_PATH/package/libogg-openipc/Config.in" source "$BR2_EXTERNAL_INGENIC_PATH/package/libsrt-openipc/Config.in" source "$BR2_EXTERNAL_INGENIC_PATH/package/libwebsockets-openipc/Config.in" source "$BR2_EXTERNAL_INGENIC_PATH/package/linux-firmware-openipc/Config.in" -#source "$BR2_EXTERNAL_INGENIC_PATH/package/majestic-fonts/Config.in" -#source "$BR2_EXTERNAL_INGENIC_PATH/package/majestic/Config.in" +source "$BR2_EXTERNAL_INGENIC_PATH/package/majestic-fonts/Config.in" +source "$BR2_EXTERNAL_INGENIC_PATH/package/majestic-t31/Config.in" source "$BR2_EXTERNAL_INGENIC_PATH/package/mbedtls-openipc/Config.in" source "$BR2_EXTERNAL_INGENIC_PATH/package/microbe-web/Config.in" source "$BR2_EXTERNAL_INGENIC_PATH/package/motors/Config.in" diff --git a/br-ext-chip-ingenic/configs/unknown_unknown_t31_openipc_defconfig b/br-ext-chip-ingenic/configs/unknown_unknown_t31_openipc_defconfig index 869fcda4..655ef4a4 100644 --- a/br-ext-chip-ingenic/configs/unknown_unknown_t31_openipc_defconfig +++ b/br-ext-chip-ingenic/configs/unknown_unknown_t31_openipc_defconfig @@ -73,7 +73,7 @@ BR2_PACKAGE_LIBOGG_OPENIPC=y BR2_PACKAGE_LIBWEBSOCKETS_OPENIPC=y BR2_PACKAGE_LIBYAML=y BR2_PACKAGE_MAJESTIC_FONTS=y -# BR2_PACKAGE_MAJESTIC_T31 is not set +BR2_PACKAGE_MAJESTIC_T31=y BR2_PACKAGE_MBEDTLS_OPENIPC=y # BR2_PACKAGE_MBEDTLS_OPENIPC_PROGRAMS is not set # BR2_PACKAGE_MBEDTLS_OPENIPC_COMPRESSION is not set diff --git a/br-ext-chip-ingenic/external.mk b/br-ext-chip-ingenic/external.mk index 7d31edea..cc2ea9ee 100644 --- a/br-ext-chip-ingenic/external.mk +++ b/br-ext-chip-ingenic/external.mk @@ -16,8 +16,8 @@ include $(BR2_EXTERNAL_INGENIC_PATH)/package/libogg-openipc/libogg-openipc.mk include $(BR2_EXTERNAL_INGENIC_PATH)/package/libsrt-openipc/libsrt-openipc.mk include $(BR2_EXTERNAL_INGENIC_PATH)/package/libwebsockets-openipc/libwebsockets-openipc.mk include $(BR2_EXTERNAL_INGENIC_PATH)/package/linux-firmware-openipc/linux-firmware-openipc.mk -#include $(BR2_EXTERNAL_INGENIC_PATH)/package/majestic/majestic.mk -#include $(BR2_EXTERNAL_INGENIC_PATH)/package/majestic-fonts/majestic-fonts.mk +include $(BR2_EXTERNAL_INGENIC_PATH)/package/majestic-t31/majestic-t31.mk +include $(BR2_EXTERNAL_INGENIC_PATH)/package/majestic-fonts/majestic-fonts.mk include $(BR2_EXTERNAL_INGENIC_PATH)/package/mbedtls-openipc/mbedtls-openipc.mk include $(BR2_EXTERNAL_INGENIC_PATH)/package/microbe-web/microbe-web.mk include $(BR2_EXTERNAL_INGENIC_PATH)/package/motors/motors.mk diff --git a/br-ext-chip-ingenic/package/majestic-t31 b/br-ext-chip-ingenic/package/majestic-t31 new file mode 120000 index 00000000..8fc9cc36 --- /dev/null +++ b/br-ext-chip-ingenic/package/majestic-t31 @@ -0,0 +1 @@ +../../general/package/majestic-t31 \ No newline at end of file diff --git a/general/package/ingenic-osdrv-t31/files/script/S95ingenic b/general/package/ingenic-osdrv-t31/files/script/S95ingenic index f1d6a7af..45605112 100755 --- a/general/package/ingenic-osdrv-t31/files/script/S95ingenic +++ b/general/package/ingenic-osdrv-t31/files/script/S95ingenic @@ -37,6 +37,7 @@ start() { load_ingenic # # + export SENSOR=$(fw_printenv -n sensor) #load_majestic }