From d6eda64c055cc183e849a3e5536ffa485983fddf Mon Sep 17 00:00:00 2001
From: viktorxda <35473052+viktorxda@users.noreply.github.com>
Date: Wed, 22 Jan 2025 18:22:10 +0100
Subject: [PATCH] [no ci] Sigmastar: add initial ssc378qe configuration files
(#1677)
---
.github/workflows/build.yml | 31 ++++----
.../configs/ssc335_initramfs_defconfig | 38 ----------
.../configs/ssc338q_fpv_defconfig | 1 +
.../configs/ssc338q_initramfs_defconfig | 70 -------------------
...e_fpv_defconfig => ssc378qe_fpv_defconfig} | 8 +--
...vdev_defconfig => ssc378qe_lite_defconfig} | 31 ++++----
general/package/msposd/msposd.mk | 3 +
7 files changed, 39 insertions(+), 143 deletions(-)
delete mode 100644 br-ext-chip-sigmastar/configs/ssc335_initramfs_defconfig
delete mode 100644 br-ext-chip-sigmastar/configs/ssc338q_initramfs_defconfig
rename br-ext-chip-sigmastar/configs/{ssc377de_fpv_defconfig => ssc378qe_fpv_defconfig} (93%)
rename br-ext-chip-sigmastar/configs/{ssc338q_fpvdev_defconfig => ssc378qe_lite_defconfig} (75%)
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 777561c4..6bf322fc 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -40,17 +40,13 @@ jobs:
- {"platform": "ssc377d", "release": "lite"}
- {"platform": "ssc377de", "release": "lite"}
- {"platform": "ssc378de", "release": "lite"}
+ - {"platform": "ssc378qe", "release": "lite"}
# Sigmastar [I6E]
- {"platform": "ssc30kd", "release": "lite"}
- {"platform": "ssc30kd", "release": "ultimate"}
- - {"platform": "ssc30kq", "release": "fpv"}
- - {"platform": "ssc30kq", "release": "rubyfpv"}
- {"platform": "ssc30kq", "release": "lite"}
- {"platform": "ssc30kq", "release": "ultimate"}
- - {"platform": "ssc338q", "release": "fpv"}
- - {"platform": "ssc338q", "release": "fpvdev"}
- - {"platform": "ssc338q", "release": "rubyfpv"}
- {"platform": "ssc338q", "release": "lite"}
- {"platform": "ssc338q", "release": "ultimate"}
@@ -101,11 +97,9 @@ jobs:
# Hisilicon [HI3516EV200]
- {"platform": "hi3516dv200", "release": "lite"}
- {"platform": "hi3516ev200", "release": "lte"}
- - {"platform": "hi3516ev200", "release": "fpv"}
- {"platform": "hi3516ev200", "release": "lite"}
- {"platform": "hi3516ev200", "release": "ultimate"}
- {"platform": "hi3516ev300", "release": "lte"}
- - {"platform": "hi3516ev300", "release": "fpv"}
- {"platform": "hi3516ev300", "release": "lite"}
- {"platform": "hi3516ev300", "release": "ultimate"}
- {"platform": "hi3518ev300", "release": "lite"}
@@ -120,7 +114,6 @@ jobs:
- {"platform": "hi3536cv100", "release": "lite"}
# Hisilicon [HI3536DV100]
- - {"platform": "hi3536dv100", "release": "fpv"}
- {"platform": "hi3536dv100", "release": "lite"}
# Goke [GK710X]
@@ -130,18 +123,12 @@ jobs:
# Goke [GK7205V200]
- {"platform": "gk7202v300", "release": "lite"}
- {"platform": "gk7205v200", "release": "lte"}
- - {"platform": "gk7205v200", "release": "fpv"}
- - {"platform": "gk7205v200", "release": "rubyfpv"}
- {"platform": "gk7205v200", "release": "venc"}
- {"platform": "gk7205v200", "release": "lite"}
- {"platform": "gk7205v200", "release": "ultimate"}
- - {"platform": "gk7205v210", "release": "fpv"}
- - {"platform": "gk7205v210", "release": "rubyfpv"}
- {"platform": "gk7205v210", "release": "venc"}
- {"platform": "gk7205v210", "release": "lite"}
- {"platform": "gk7205v300", "release": "lte"}
- - {"platform": "gk7205v300", "release": "fpv"}
- - {"platform": "gk7205v300", "release": "rubyfpv"}
- {"platform": "gk7205v300", "release": "venc"}
- {"platform": "gk7205v300", "release": "lite"}
- {"platform": "gk7205v300", "release": "ultimate"}
@@ -171,6 +158,22 @@ jobs:
- {"platform": "xm530", "release": "lite"}
- {"platform": "xm550", "release": "lite"}
+ # FPV
+ - {"platform": "hi3516ev200", "release": "fpv"}
+ - {"platform": "hi3516ev300", "release": "fpv"}
+ - {"platform": "hi3536dv100", "release": "fpv"}
+ - {"platform": "gk7205v200", "release": "fpv"}
+ - {"platform": "gk7205v210", "release": "fpv"}
+ - {"platform": "gk7205v300", "release": "fpv"}
+ - {"platform": "ssc30kq", "release": "fpv"}
+ - {"platform": "ssc338q", "release": "fpv"}
+ - {"platform": "ssc378qe", "release": "fpv"}
+ - {"platform": "gk7205v200", "release": "rubyfpv"}
+ - {"platform": "gk7205v210", "release": "rubyfpv"}
+ - {"platform": "gk7205v300", "release": "rubyfpv"}
+ - {"platform": "ssc30kq", "release": "rubyfpv"}
+ - {"platform": "ssc338q", "release": "rubyfpv"}
+
steps:
- name: Checkout source
uses: actions/checkout@v4
diff --git a/br-ext-chip-sigmastar/configs/ssc335_initramfs_defconfig b/br-ext-chip-sigmastar/configs/ssc335_initramfs_defconfig
deleted file mode 100644
index 7cfda95a..00000000
--- a/br-ext-chip-sigmastar/configs/ssc335_initramfs_defconfig
+++ /dev/null
@@ -1,38 +0,0 @@
-# Architecture
-BR2_arm=y
-BR2_cortex_a7=y
-BR2_ARM_FPU_NEON_VFPV4=y
-BR2_ARM_INSTRUCTIONS_THUMB2=y
-
-# Local
-BR2_TOOLCHAIN_BUILDROOT_VENDOR="openipc"
-BR2_TOOLCHAIN_BUILDROOT_MUSL=y
-BR2_KERNEL_HEADERS_VERSION=y
-BR2_DEFAULT_KERNEL_VERSION="4.9.84"
-BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_9=y
-BR2_GCC_VERSION_13_X=y
-
-# Kernel
-BR2_LINUX_KERNEL=y
-BR2_LINUX_KERNEL_CUSTOM_TARBALL=y
-BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="https://github.com/openipc/linux/archive/$(OPENIPC_KERNEL).tar.gz"
-BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
-BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="$(EXTERNAL_VENDOR)/board/$(OPENIPC_SOC_FAMILY)/infinity6b0-ssc009a.config"
-BR2_LINUX_KERNEL_UIMAGE=y
-BR2_LINUX_KERNEL_XZ=y
-
-# Filesystem
-BR2_PACKAGE_BUSYBOX_CONFIG="$(BR2_EXTERNAL)/package/busybox/busybox-initramfs.config"
-BR2_TARGET_ROOTFS_INITRAMFS=y
-BR2_TARGET_ROOTFS_SQUASHFS=y
-BR2_TARGET_ROOTFS_SQUASHFS4_XZ=y
-
-# OpenIPC
-BR2_OPENIPC_SOC_VENDOR="sigmastar"
-BR2_OPENIPC_SOC_MODEL="ssc335"
-BR2_OPENIPC_SOC_FAMILY="infinity6b0"
-BR2_OPENIPC_VARIANT="initramfs"
-BR2_OPENIPC_FLASH_SIZE="8"
-
-# Packages
-BR2_PACKAGE_IPCTOOL=y
diff --git a/br-ext-chip-sigmastar/configs/ssc338q_fpv_defconfig b/br-ext-chip-sigmastar/configs/ssc338q_fpv_defconfig
index 1440ece0..369832e6 100644
--- a/br-ext-chip-sigmastar/configs/ssc338q_fpv_defconfig
+++ b/br-ext-chip-sigmastar/configs/ssc338q_fpv_defconfig
@@ -57,6 +57,7 @@ BR2_PACKAGE_LIBCURL_OPENIPC_CURL=y
# BR2_PACKAGE_LIBCURL_OPENIPC_PROXY_SUPPORT is not set
# 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_LIBOGG_OPENIPC=y
BR2_PACKAGE_LINUX_PATCHER_ATHEROS=y
BR2_PACKAGE_MAJESTIC_FONTS=y
diff --git a/br-ext-chip-sigmastar/configs/ssc338q_initramfs_defconfig b/br-ext-chip-sigmastar/configs/ssc338q_initramfs_defconfig
deleted file mode 100644
index c849a9e4..00000000
--- a/br-ext-chip-sigmastar/configs/ssc338q_initramfs_defconfig
+++ /dev/null
@@ -1,70 +0,0 @@
-# Architecture
-BR2_arm=y
-BR2_cortex_a7=y
-BR2_ARM_FPU_NEON_VFPV4=y
-BR2_ARM_INSTRUCTIONS_THUMB2=y
-
-# Toolchain
-BR2_TOOLCHAIN_EXTERNAL=y
-BR2_TOOLCHAIN_EXTERNAL_CUSTOM=y
-BR2_TOOLCHAIN_EXTERNAL_DOWNLOAD=y
-BR2_TOOLCHAIN_EXTERNAL_URL="https://github.com/openipc/firmware/releases/download/$(OPENIPC_TOOLCHAIN).tgz"
-BR2_TOOLCHAIN_EXTERNAL_CUSTOM_PREFIX="arm-openipc-linux-gnueabihf"
-BR2_TOOLCHAIN_EXTERNAL_HEADERS_4_9=y
-BR2_TOOLCHAIN_EXTERNAL_CUSTOM_GLIBC=y
-# BR2_TOOLCHAIN_EXTERNAL_INET_RPC is not set
-BR2_TOOLCHAIN_EXTERNAL_CXX=y
-
-# Kernel
-BR2_LINUX_KERNEL=y
-BR2_LINUX_KERNEL_CUSTOM_TARBALL=y
-BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="https://github.com/openipc/linux/archive/$(OPENIPC_KERNEL).tar.gz"
-BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
-BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="$(EXTERNAL_VENDOR)/board/$(OPENIPC_SOC_FAMILY)/infinity6e-ssc012b.config"
-BR2_LINUX_KERNEL_UIMAGE=y
-BR2_LINUX_KERNEL_XZ=y
-
-# Filesystem
-BR2_PACKAGE_BUSYBOX_CONFIG="$(BR2_EXTERNAL)/package/busybox/busybox.config"
-BR2_PACKAGE_DOSFSTOOLS=y
-BR2_PACKAGE_DOSFSTOOLS_FSCK_FAT=y
-BR2_PACKAGE_EXFATPROGS=y
-BR2_PACKAGE_MTD=y
-BR2_PACKAGE_UBOOT_TOOLS=y
-BR2_PACKAGE_ZLIB=y
-# BR2_PACKAGE_IFUPDOWN_SCRIPTS is not set
-BR2_PACKAGE_WIRELESS_TOOLS=y
-BR2_PACKAGE_WPA_SUPPLICANT=y
-BR2_PACKAGE_WPA_SUPPLICANT_AP_SUPPORT=y
-BR2_PACKAGE_WPA_SUPPLICANT_CLI=y
-BR2_PACKAGE_WPA_SUPPLICANT_PASSPHRASE=y
-BR2_TARGET_ROOTFS_INITRAMFS=y
-
-# OpenIPC
-BR2_OPENIPC_SOC_VENDOR="sigmastar"
-BR2_OPENIPC_SOC_MODEL="ssc338q"
-BR2_OPENIPC_SOC_FAMILY="infinity6e"
-BR2_OPENIPC_VARIANT="lite"
-BR2_OPENIPC_FLASH_SIZE="16"
-
-# Packages
-BR2_PACKAGE_DROPBEAR_OPENIPC=y
-BR2_PACKAGE_EXFAT_OPENIPC=y
-BR2_PACKAGE_IPCTOOL=y
-BR2_PACKAGE_JSONFILTER=y
-BR2_PACKAGE_LIBCURL_OPENIPC_CURL=y
-# BR2_PACKAGE_LIBCURL_OPENIPC_PROXY_SUPPORT is not set
-# 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_LIBOGG_OPENIPC=y
-BR2_PACKAGE_MAJESTIC_FONTS=y
-BR2_PACKAGE_MAJESTIC_WEBUI=y
-BR2_PACKAGE_MAJESTIC=y
-BR2_PACKAGE_OPUS_OPENIPC=y
-BR2_PACKAGE_OPUS_OPENIPC_FIXED_POINT=y
-BR2_PACKAGE_RTL8733BU_OPENIPC=y
-BR2_PACKAGE_SIGMASTAR_OSDRV_INFINITY6E=y
-BR2_PACKAGE_UACME_OPENIPC=y
-BR2_PACKAGE_VTUND_OPENIPC=y
-BR2_PACKAGE_YAML_CLI=y
diff --git a/br-ext-chip-sigmastar/configs/ssc377de_fpv_defconfig b/br-ext-chip-sigmastar/configs/ssc378qe_fpv_defconfig
similarity index 93%
rename from br-ext-chip-sigmastar/configs/ssc377de_fpv_defconfig
rename to br-ext-chip-sigmastar/configs/ssc378qe_fpv_defconfig
index befca5e3..d9be9ba6 100644
--- a/br-ext-chip-sigmastar/configs/ssc377de_fpv_defconfig
+++ b/br-ext-chip-sigmastar/configs/ssc378qe_fpv_defconfig
@@ -29,8 +29,6 @@ BR2_PACKAGE_EXFATPROGS=y
BR2_PACKAGE_UBOOT_TOOLS=y
BR2_PACKAGE_ZLIB=y
# BR2_PACKAGE_IFUPDOWN_SCRIPTS is not set
-BR2_PACKAGE_WIREGUARD_LINUX_COMPAT=y
-BR2_PACKAGE_WIREGUARD_TOOLS=y
BR2_PACKAGE_WIRELESS_REGDB=y
BR2_PACKAGE_WIRELESS_TOOLS=y
BR2_TARGET_ROOTFS_CPIO=y
@@ -39,13 +37,12 @@ BR2_TARGET_ROOTFS_SQUASHFS4_XZ=y
# OpenIPC
BR2_OPENIPC_SOC_VENDOR="sigmastar"
-BR2_OPENIPC_SOC_MODEL="ssc377de"
+BR2_OPENIPC_SOC_MODEL="ssc378qe"
BR2_OPENIPC_SOC_FAMILY="infinity6c"
BR2_OPENIPC_VARIANT="fpv"
BR2_OPENIPC_FLASH_SIZE="16"
# Packages
-BR2_PACKAGE_DIVINUS=y
BR2_PACKAGE_DROPBEAR_OPENIPC=y
BR2_PACKAGE_EXFAT_OPENIPC=y
BR2_PACKAGE_IPCTOOL=y
@@ -55,6 +52,7 @@ BR2_PACKAGE_LIBCURL_OPENIPC_CURL=y
# BR2_PACKAGE_LIBCURL_OPENIPC_PROXY_SUPPORT is not set
# 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_LIBOGG_OPENIPC=y
BR2_PACKAGE_MAJESTIC_FONTS=y
BR2_PACKAGE_MAJESTIC_WEBUI=y
@@ -68,5 +66,5 @@ BR2_PACKAGE_RTL88X2EU_OPENIPC=y
BR2_PACKAGE_RTL8812AU_OPENIPC=y
BR2_PACKAGE_SIGMASTAR_OSDRV_INFINITY6C=y
BR2_PACKAGE_VTUND_OPENIPC=y
-BR2_PACKAGE_WIFIBROADCAST=y
+BR2_PACKAGE_WIFIBROADCAST_NG=y
BR2_PACKAGE_YAML_CLI=y
diff --git a/br-ext-chip-sigmastar/configs/ssc338q_fpvdev_defconfig b/br-ext-chip-sigmastar/configs/ssc378qe_lite_defconfig
similarity index 75%
rename from br-ext-chip-sigmastar/configs/ssc338q_fpvdev_defconfig
rename to br-ext-chip-sigmastar/configs/ssc378qe_lite_defconfig
index 0c4f90c4..070535b0 100644
--- a/br-ext-chip-sigmastar/configs/ssc338q_fpvdev_defconfig
+++ b/br-ext-chip-sigmastar/configs/ssc378qe_lite_defconfig
@@ -1,6 +1,6 @@
# Architecture
BR2_arm=y
-BR2_cortex_a7=y
+BR2_cortex_a35=y
BR2_ARM_FPU_NEON_VFPV4=y
BR2_ARM_INSTRUCTIONS_THUMB2=y
@@ -9,10 +9,9 @@ BR2_TOOLCHAIN_EXTERNAL=y
BR2_TOOLCHAIN_EXTERNAL_CUSTOM=y
BR2_TOOLCHAIN_EXTERNAL_DOWNLOAD=y
BR2_TOOLCHAIN_EXTERNAL_URL="https://github.com/openipc/firmware/releases/download/$(OPENIPC_TOOLCHAIN).tgz"
-BR2_TOOLCHAIN_EXTERNAL_CUSTOM_PREFIX="arm-openipc-linux-gnueabihf"
-BR2_TOOLCHAIN_EXTERNAL_HEADERS_4_9=y
-BR2_TOOLCHAIN_EXTERNAL_CUSTOM_GLIBC=y
-# BR2_TOOLCHAIN_EXTERNAL_INET_RPC is not set
+BR2_TOOLCHAIN_EXTERNAL_CUSTOM_PREFIX="arm-openipc-linux-musleabihf"
+BR2_TOOLCHAIN_EXTERNAL_HEADERS_5_10=y
+BR2_TOOLCHAIN_EXTERNAL_CUSTOM_MUSL=y
BR2_TOOLCHAIN_EXTERNAL_CXX=y
# Kernel
@@ -20,7 +19,7 @@ BR2_LINUX_KERNEL=y
BR2_LINUX_KERNEL_CUSTOM_TARBALL=y
BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="https://github.com/openipc/linux/archive/$(OPENIPC_KERNEL).tar.gz"
BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
-BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="$(EXTERNAL_VENDOR)/board/$(OPENIPC_SOC_FAMILY)/infinity6e-ssc012b.config"
+BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="$(EXTERNAL_VENDOR)/board/$(OPENIPC_SOC_FAMILY)/infinity6c-ssc027d.config"
BR2_LINUX_KERNEL_UIMAGE=y
BR2_LINUX_KERNEL_XZ=y
@@ -30,8 +29,12 @@ BR2_PACKAGE_EXFATPROGS=y
BR2_PACKAGE_UBOOT_TOOLS=y
BR2_PACKAGE_ZLIB=y
# BR2_PACKAGE_IFUPDOWN_SCRIPTS is not set
+BR2_PACKAGE_WIREGUARD_LINUX_COMPAT=y
+BR2_PACKAGE_WIREGUARD_TOOLS=y
+BR2_PACKAGE_WIRELESS_REGDB=y
BR2_PACKAGE_WIRELESS_TOOLS=y
BR2_PACKAGE_WPA_SUPPLICANT=y
+BR2_PACKAGE_WPA_SUPPLICANT_CLI=y
BR2_PACKAGE_WPA_SUPPLICANT_PASSPHRASE=y
BR2_TARGET_ROOTFS_CPIO=y
BR2_TARGET_ROOTFS_SQUASHFS=y
@@ -39,10 +42,10 @@ BR2_TARGET_ROOTFS_SQUASHFS4_XZ=y
# OpenIPC
BR2_OPENIPC_SOC_VENDOR="sigmastar"
-BR2_OPENIPC_SOC_MODEL="ssc338q"
-BR2_OPENIPC_SOC_FAMILY="infinity6e"
-BR2_OPENIPC_VARIANT="fpvdev"
-BR2_OPENIPC_FLASH_SIZE="16"
+BR2_OPENIPC_SOC_MODEL="ssc378qe"
+BR2_OPENIPC_SOC_FAMILY="infinity6c"
+BR2_OPENIPC_VARIANT="lite"
+BR2_OPENIPC_FLASH_SIZE="8"
# Packages
BR2_PACKAGE_DROPBEAR_OPENIPC=y
@@ -54,18 +57,14 @@ BR2_PACKAGE_LIBCURL_OPENIPC_CURL=y
# BR2_PACKAGE_LIBCURL_OPENIPC_PROXY_SUPPORT is not set
# 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_LIBOGG_OPENIPC=y
BR2_PACKAGE_MAJESTIC_FONTS=y
BR2_PACKAGE_MAJESTIC_WEBUI=y
BR2_PACKAGE_MAJESTIC=y
-BR2_PACKAGE_MAVFWD=y
BR2_PACKAGE_MBEDTLS_OPENIPC=y
-BR2_PACKAGE_MSPOSD=y
BR2_PACKAGE_OPUS_OPENIPC=y
BR2_PACKAGE_OPUS_OPENIPC_FIXED_POINT=y
-BR2_PACKAGE_RTL8733BU_OPENIPC=y
-BR2_PACKAGE_RTL8812AU_OPENIPC=y
-BR2_PACKAGE_SIGMASTAR_OSDRV_INFINITY6E=y
+BR2_PACKAGE_SIGMASTAR_OSDRV_INFINITY6C=y
BR2_PACKAGE_VTUND_OPENIPC=y
-BR2_PACKAGE_WIFIBROADCAST_NG=y
BR2_PACKAGE_YAML_CLI=y
diff --git a/general/package/msposd/msposd.mk b/general/package/msposd/msposd.mk
index 2fc62ccc..64e3bf9c 100644
--- a/general/package/msposd/msposd.mk
+++ b/general/package/msposd/msposd.mk
@@ -16,6 +16,9 @@ else ifeq ($(OPENIPC_SOC_FAMILY),hi3516ev200)
else ifeq ($(OPENIPC_SOC_FAMILY),infinity6b0)
MSPOSD_FAMILY = star6b0
MSPOSD_OSDRV = $(SIGMASTAR_OSDRV_INFINITY6B0_PKGDIR)
+else ifeq ($(OPENIPC_SOC_FAMILY),infinity6c)
+ MSPOSD_FAMILY = star6c
+ MSPOSD_OSDRV = $(SIGMASTAR_OSDRV_INFINITY6C_PKGDIR)
else
MSPOSD_FAMILY = star6e
MSPOSD_OSDRV = $(SIGMASTAR_OSDRV_INFINITY6E_PKGDIR)