From 99685ac5fb14e4a2fb830b477b525b4d636e3dbc Mon Sep 17 00:00:00 2001
From: viktorxda <35473052+viktorxda@users.noreply.github.com>
Date: Tue, 3 Dec 2024 14:41:34 +0100
Subject: [PATCH] [no ci] Hisilicon: set glibc for hi3536dv100 toolchain
 (#1630)

---
 br-ext-chip-hisilicon/configs/hi3536dv100_fpv_defconfig  | 6 +++---
 br-ext-chip-hisilicon/configs/hi3536dv100_lite_defconfig | 7 +++----
 2 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/br-ext-chip-hisilicon/configs/hi3536dv100_fpv_defconfig b/br-ext-chip-hisilicon/configs/hi3536dv100_fpv_defconfig
index 2d76a96b..723cbbca 100644
--- a/br-ext-chip-hisilicon/configs/hi3536dv100_fpv_defconfig
+++ b/br-ext-chip-hisilicon/configs/hi3536dv100_fpv_defconfig
@@ -3,15 +3,15 @@ BR2_arm=y
 BR2_cortex_a7=y
 BR2_ARM_EABI=y
 BR2_ARM_FPU_NEON_VFPV4=y
-BR2_ARM_INSTRUCTIONS_THUMB2=y
 
 # Toolchain
 BR2_TOOLCHAIN_EXTERNAL=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-musleabi"
+BR2_TOOLCHAIN_EXTERNAL_CUSTOM_PREFIX="arm-openipc-linux-gnueabi"
 BR2_TOOLCHAIN_EXTERNAL_HEADERS_4_9=y
-BR2_TOOLCHAIN_EXTERNAL_CUSTOM_MUSL=y
+BR2_TOOLCHAIN_EXTERNAL_CUSTOM_GLIBC=y
+# BR2_TOOLCHAIN_EXTERNAL_INET_RPC is not set
 BR2_TOOLCHAIN_EXTERNAL_CXX=y
 
 # Kernel
diff --git a/br-ext-chip-hisilicon/configs/hi3536dv100_lite_defconfig b/br-ext-chip-hisilicon/configs/hi3536dv100_lite_defconfig
index b6f9c4b0..f7ff9eaa 100644
--- a/br-ext-chip-hisilicon/configs/hi3536dv100_lite_defconfig
+++ b/br-ext-chip-hisilicon/configs/hi3536dv100_lite_defconfig
@@ -3,15 +3,15 @@ BR2_arm=y
 BR2_cortex_a7=y
 BR2_ARM_EABI=y
 BR2_ARM_FPU_NEON_VFPV4=y
-BR2_ARM_INSTRUCTIONS_THUMB2=y
 
 # Toolchain
 BR2_TOOLCHAIN_EXTERNAL=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-musleabi"
+BR2_TOOLCHAIN_EXTERNAL_CUSTOM_PREFIX="arm-openipc-linux-gnueabi"
 BR2_TOOLCHAIN_EXTERNAL_HEADERS_4_9=y
-BR2_TOOLCHAIN_EXTERNAL_CUSTOM_MUSL=y
+BR2_TOOLCHAIN_EXTERNAL_CUSTOM_GLIBC=y
+# BR2_TOOLCHAIN_EXTERNAL_INET_RPC is not set
 BR2_TOOLCHAIN_EXTERNAL_CXX=y
 
 # Kernel
@@ -46,7 +46,6 @@ BR2_OPENIPC_FLASH_SIZE="8"
 
 # Packages
 BR2_PACKAGE_DROPBEAR_OPENIPC=y
-BR2_PACKAGE_HISILICON_OSDRV_HI3536DV100=y
 BR2_PACKAGE_IPCTOOL=y
 BR2_PACKAGE_JSONFILTER=y
 BR2_PACKAGE_LIBCURL_OPENIPC=y