From c454bc6c28fce09544ec984e895420757519dd23 Mon Sep 17 00:00:00 2001
From: "Igor Zalatov (from Citadel PC)" <flyrouter@gmail.com>
Date: Sun, 31 Oct 2021 17:35:25 +0300
Subject: [PATCH] Some updates for HI3516CV300

---
 .../11_fix_yylloc_for_modern_computers.patch  |  6 +-
 ...nown_unknown_hi3516cv200_openipc_defconfig |  1 -
 ...nown_unknown_hi3516cv300_openipc_defconfig | 95 +++++++++++++++++++
 ...nown_unknown_hi3516cv300_unknown_defconfig | 20 ----
 ...nown_unknown_hi3518ev200_openipc_defconfig |  1 -
 building.sh                                   |  3 +-
 6 files changed, 100 insertions(+), 26 deletions(-)
 create mode 100644 br-ext-chip-hisilicon/configs/unknown_unknown_hi3516cv300_openipc_defconfig
 delete mode 100644 br-ext-chip-hisilicon/configs/unknown_unknown_hi3516cv300_unknown_defconfig

diff --git a/br-ext-chip-hisilicon/board/hi3516cv300/kernel/patches/11_fix_yylloc_for_modern_computers.patch b/br-ext-chip-hisilicon/board/hi3516cv300/kernel/patches/11_fix_yylloc_for_modern_computers.patch
index b4e1d793..2a670230 100644
--- a/br-ext-chip-hisilicon/board/hi3516cv300/kernel/patches/11_fix_yylloc_for_modern_computers.patch
+++ b/br-ext-chip-hisilicon/board/hi3516cv300/kernel/patches/11_fix_yylloc_for_modern_computers.patch
@@ -1,11 +1,11 @@
---- a/scripts/dtc/dtc-lexer.lex.c	2021-10-31 13:51:18.858858304 +0300
-+++ b/scripts/dtc/dtc-lexer.lex.c	2021-10-31 13:54:53.017440216 +0300
+--- a/scripts/dtc/dtc-lexer.lex.c_shipped	2016-08-28 13:19:20.000000000 +0300
++++ b/scripts/dtc/dtc-lexer.lex.c_shipped	2021-04-02 00:06:02.972781070 +0300
 @@ -637,7 +637,7 @@
  #include "srcpos.h"
  #include "dtc-parser.tab.h"
  
 -YYLTYPE yylloc;
 +extern YYLTYPE yylloc;
+ extern bool treesource_error;
  
  /* CAUTION: this will stop working if we ever use yyless() or yyunput() */
- #define	YY_USER_ACTION \
diff --git a/br-ext-chip-hisilicon/configs/unknown_unknown_hi3516cv200_openipc_defconfig b/br-ext-chip-hisilicon/configs/unknown_unknown_hi3516cv200_openipc_defconfig
index d8555c8f..3acbcca4 100644
--- a/br-ext-chip-hisilicon/configs/unknown_unknown_hi3516cv200_openipc_defconfig
+++ b/br-ext-chip-hisilicon/configs/unknown_unknown_hi3516cv200_openipc_defconfig
@@ -1,7 +1,6 @@
 # Architecture
 BR2_arm=y
 BR2_cortex_a7=y
-BR2_ARM_EABI=y
 BR2_ARM_INSTRUCTIONS_THUMB=y
 BR2_KERNEL_HEADERS_VERSION=y
 BR2_DEFAULT_KERNEL_VERSION="4.9.37"
diff --git a/br-ext-chip-hisilicon/configs/unknown_unknown_hi3516cv300_openipc_defconfig b/br-ext-chip-hisilicon/configs/unknown_unknown_hi3516cv300_openipc_defconfig
new file mode 100644
index 00000000..f2905e21
--- /dev/null
+++ b/br-ext-chip-hisilicon/configs/unknown_unknown_hi3516cv300_openipc_defconfig
@@ -0,0 +1,95 @@
+# Architecture
+BR2_arm=y
+BR2_cortex_a7=y
+BR2_ARM_INSTRUCTIONS_THUMB=y
+BR2_KERNEL_HEADERS_VERSION=y
+BR2_DEFAULT_KERNEL_VERSION="3.18.20"
+BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_3_18=y
+
+# Toolchain
+BR2_PER_PACKAGE_DIRECTORIES=y
+BR2_GCC_VERSION_7_X=y
+# BR2_TOOLCHAIN_USES_UCLIBC is not set
+# BR2_TOOLCHAIN_BUILDROOT_UCLIBC is not set
+# BR2_TOOLCHAIN_BUILDROOT_LIBC="uclibc"
+BR2_TOOLCHAIN_USES_MUSL=y
+BR2_TOOLCHAIN_BUILDROOT_MUSL=y
+BR2_TOOLCHAIN_BUILDROOT_LIBC="musl"
+# BR2_TOOLCHAIN_BUILDROOT_CXX is not set
+BR2_TOOLCHAIN_BUILDROOT_LOCALE=y
+BR2_TOOLCHAIN_BUILDROOT_USE_SSP=y
+
+# Kernel
+BR2_LINUX_KERNEL=y
+BR2_LINUX_KERNEL_CUSTOM_VERSION=y
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.18.20"
+BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
+BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="$(BR2_EXTERNAL_HISILICON_PATH)/board/hi3516cv300/kernel/hi3516cv300.generic.config"
+BR2_LINUX_KERNEL_UIMAGE=y
+BR2_LINUX_KERNEL_XZ=y
+BR2_LINUX_KERNEL_EXT_HISI_PATCHER=y
+BR2_LINUX_KERNEL_EXT_HISI_PATCHER_LIST="$(BR2_EXTERNAL_HISILICON_PATH)/board/hi3516cv300/kernel/patches/ $(BR2_EXTERNAL_HISILICON_PATH)/board/hi3516cv300/kernel/overlay"
+
+# Filesystem
+# BR2_TARGET_TZ_INFO is not set
+BR2_TARGET_ROOTFS_CPIO=y
+BR2_TARGET_ROOTFS_SQUASHFS=y
+BR2_TARGET_ROOTFS_SQUASHFS4_XZ=y
+BR2_ROOTFS_OVERLAY="$(TOPDIR)/../general/overlay"
+BR2_ROOTFS_POST_BUILD_SCRIPT="$(TOPDIR)/../scripts/executing_commands_for_$(BR2_TOOLCHAIN_BUILDROOT_LIBC).sh"
+
+# OpenIPC configuration
+BR2_TOOLCHAIN_BUILDROOT_VENDOR="openipc"
+BR2_TARGET_GENERIC_ISSUE="Welcome to OpenIPC v2.1"
+BR2_TARGET_GENERIC_HOSTNAME="openipc-hi3516ev300"
+BR2_GLOBAL_PATCH_DIR="$(TOPDIR)/../general/package/all-patches"
+
+# OpenIPC packages
+BR2_PACKAGE_BUSYBOX_CONFIG="$(TOPDIR)/../general/package/busybox/busybox.config"
+BR2_PACKAGE_DROPBEAR=y
+# BR2_PACKAGE_FDK_AAC_OPENIPC is not set
+BR2_PACKAGE_FWPRINTENV_OPENIPC=y
+BR2_PACKAGE_HASERL=y
+BR2_PACKAGE_HISI_GPIO=y
+BR2_PACKAGE_HISILICON_OSDRV_HI3516EV300=y
+BR2_PACKAGE_IPCTOOL=y
+BR2_PACKAGE_JSON_C=y
+BR2_PACKAGE_LAME_OPENIPC=y
+BR2_PACKAGE_LIBCURL_OPENIPC=y
+BR2_PACKAGE_LIBCURL_OPENIPC_CURL=y
+# BR2_PACKAGE_LIBCURL_OPENIPC_VERBOSE is not set
+# 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_LIBCURL_OPENIPC_MBEDTLS=y
+BR2_PACKAGE_LIBEVENT_OPENIPC=y
+BR2_PACKAGE_LIBEVENT_OPENIPC_REMOVE_PYSCRIPT=y
+BR2_PACKAGE_LIBOGG_OPENIPC=y
+BR2_PACKAGE_LIBYAML=y
+BR2_PACKAGE_MAJESTIC_HI3516EV300=y
+BR2_PACKAGE_MBEDTLS_OPENIPC=y
+# BR2_PACKAGE_MBEDTLS_OPENIPC_PROGRAMS is not set
+# BR2_PACKAGE_MBEDTLS_OPENIPC_COMPRESSION is not set
+BR2_PACKAGE_MICROBE_WEB=y
+# BR2_PACKAGE_MINI_SNMPD is not set
+BR2_PACKAGE_MOTORS=y
+BR2_PACKAGE_OPUS_OPENIPC=y
+BR2_PACKAGE_OPUS_OPENIPC_FIXED_POINT=y
+# BR2_PACKAGE_SSHPASS is not set
+BR2_PACKAGE_UACME_OPENIPC=y
+BR2_PACKAGE_VTUND_OPENIPC=y
+BR2_PACKAGE_YAML_CLI=y
+
+# WiFi
+BR2_PACKAGE_WIRELESS_TOOLS=y
+BR2_PACKAGE_WPA_SUPPLICANT=y
+BR2_PACKAGE_WPA_SUPPLICANT_CLI=y
+BR2_PACKAGE_WPA_SUPPLICANT_NL80211=y
+BR2_PACKAGE_WPA_SUPPLICANT_PASSPHRASE=y
+BR2_PACKAGE_LINUX_FIRMWARE=y
+BR2_PACKAGE_LINUX_FIRMWARE_MEDIATEK_MT7601U=y
+# BR2_PACKAGE_RTL8188EU is not set
+
+# WIREGUARD
+BR2_PACKAGE_WIREGUARD_LINUX_COMPAT=y
+BR2_PACKAGE_WIREGUARD_TOOLS=y
diff --git a/br-ext-chip-hisilicon/configs/unknown_unknown_hi3516cv300_unknown_defconfig b/br-ext-chip-hisilicon/configs/unknown_unknown_hi3516cv300_unknown_defconfig
deleted file mode 100644
index c8777398..00000000
--- a/br-ext-chip-hisilicon/configs/unknown_unknown_hi3516cv300_unknown_defconfig
+++ /dev/null
@@ -1,20 +0,0 @@
-BR2_arm=y
-BR2_ARM_INSTRUCTIONS_THUMB=y
-BR2_KERNEL_HEADERS_VERSION=y
-BR2_DEFAULT_KERNEL_VERSION="3.18.20"
-BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_3_18=y
-BR2_TOOLCHAIN_BUILDROOT_LOCALE=y
-BR2_TOOLCHAIN_BUILDROOT_USE_SSP=y
-BR2_GCC_VERSION_7_X=y
-BR2_LINUX_KERNEL=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.18.20"
-BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
-BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="$(BR2_EXTERNAL_HISILICON_PATH)/board/hi3516cv300/kernel/hi3516cv300.generic.config"
-BR2_LINUX_KERNEL_UIMAGE=y
-BR2_LINUX_KERNEL_XZ=y
-BR2_TARGET_ROOTFS_SQUASHFS=y
-BR2_TARGET_ROOTFS_SQUASHFS4_XZ=y
-BR2_LINUX_KERNEL_EXT_HISI_PATCHER=y
-BR2_LINUX_KERNEL_EXT_HISI_PATCHER_LIST="$(BR2_EXTERNAL_HISILICON_PATH)/board/hi3516cv300/kernel/patches/ $(BR2_EXTERNAL_HISILICON_PATH)/board/hi3516cv300/kernel/overlay"
-BR2_ROOTFS_POST_BUILD_SCRIPT="$(TOPDIR)/../scripts/executing_commands_for_$(BR2_TOOLCHAIN_BUILDROOT_LIBC).sh"
diff --git a/br-ext-chip-hisilicon/configs/unknown_unknown_hi3518ev200_openipc_defconfig b/br-ext-chip-hisilicon/configs/unknown_unknown_hi3518ev200_openipc_defconfig
index 0aaa2920..5e067f0d 100644
--- a/br-ext-chip-hisilicon/configs/unknown_unknown_hi3518ev200_openipc_defconfig
+++ b/br-ext-chip-hisilicon/configs/unknown_unknown_hi3518ev200_openipc_defconfig
@@ -1,7 +1,6 @@
 # Architecture
 BR2_arm=y
 BR2_cortex_a7=y
-BR2_ARM_EABI=y
 BR2_ARM_INSTRUCTIONS_THUMB=y
 BR2_KERNEL_HEADERS_VERSION=y
 BR2_DEFAULT_KERNEL_VERSION="4.9.37"
diff --git a/building.sh b/building.sh
index cec2352f..998635fa 100755
--- a/building.sh
+++ b/building.sh
@@ -92,7 +92,8 @@ hi3518ev200() {
 
 hi3516cv300() {
   soc="hi3516cv300"
-  fresh && make PLATFORM=hisilicon BOARD=unknown_unknown_${soc}_unknown all && rename
+  fresh && make PLATFORM=hisilicon BOARD=unknown_unknown_${soc}_openipc all && rename
+  #PLATFORM=hisilicon make br-linux-{dirclean,rebuild}
 }
 
 hi3516cv500() {