Fix old hisi-gpio utils (#580)

br-ext-chip-goke/Config.in

@@ -9,6 +9,7 @@ source "$BR2_EXTERNAL_GOKE_PATH/package/ffmpeg-openipc/Config.in"
 source "$BR2_EXTERNAL_GOKE_PATH/package/fwprintenv-openipc/Config.in"
 source "$BR2_EXTERNAL_GOKE_PATH/package/goke-osdrv-gk710x/Config.in"
 source "$BR2_EXTERNAL_GOKE_PATH/package/goke-osdrv-gk7205v200/Config.in"
+source "$BR2_EXTERNAL_GOKE_PATH/package/hisi-gpio/Config.in"
 source "$BR2_EXTERNAL_GOKE_PATH/package/hisilicon-opensdk/Config.in"
 source "$BR2_EXTERNAL_GOKE_PATH/package/i2c-telemetry/Config.in"
 source "$BR2_EXTERNAL_GOKE_PATH/package/ipctool/Config.in"

br-ext-chip-goke/package/hisi-gpio

@@ -0,0 +1 @@
+../../general/package/hisi-gpio

br-ext-chip-hisilicon/Config.in

@@ -11,7 +11,7 @@ source "$BR2_EXTERNAL_HISILICON_PATH/package/fdk-aac-openipc/Config.in"
 source "$BR2_EXTERNAL_HISILICON_PATH/package/ffmpeg-openipc/Config.in"
 source "$BR2_EXTERNAL_HISILICON_PATH/package/fwprintenv-openipc/Config.in"
 source "$BR2_EXTERNAL_HISILICON_PATH/package/gdbserver-lite/Config.in"
-source "$BR2_EXTERNAL_HISILICON_PATH/package/hisi_gpio/Config.in"
+source "$BR2_EXTERNAL_HISILICON_PATH/package/hisi-gpio/Config.in"
 source "$BR2_EXTERNAL_HISILICON_PATH/package/hisilicon-opensdk/Config.in"
 source "$BR2_EXTERNAL_HISILICON_PATH/package/hisilicon-osdrv-hi3516av100/Config.in"
 source "$BR2_EXTERNAL_HISILICON_PATH/package/hisilicon-osdrv-hi3516cv100/Config.in"

br-ext-chip-hisilicon/package/hisi-gpio

@@ -0,0 +1 @@
+../../general/package/hisi-gpio

br-ext-chip-hisilicon/package/hisi_gpio

@@ -1 +0,0 @@
-../../general/package/hisi_gpio

general/package/hisi-gpio/Config.in

@@ -1,5 +1,5 @@
 config BR2_PACKAGE_HISI_GPIO
-	bool "hisi_gpio"
+	bool "hisi-gpio"
 	default n
 	help
 	  Utility for diagnosing, displaying GPIO statuses and running

general/package/hisi-gpio/hisi-gpio.mk

@@ -0,0 +1,26 @@
+################################################################################
+#
+# hisi-gpio | updated 2022.08.10
+
+#
+################################################################################
+
+HISI_GPIO_LICENSE = MIT
+HISI_GPIO_LICENSE_FILES = LICENSE
+
+define HISI_GPIO_EXTRACT_CMDS
+	cp ../general/package/hisi-gpio/src/hisi-gpio-scanner.c $(@D)/
+	cp ../general/package/hisi-gpio/src/hisi-gpio-watcher.c $(@D)/
+endef
+
+define HISI_GPIO_BUILD_CMDS
+	(cd $(@D); $(TARGET_CC) -Os -s hisi-gpio-scanner.c -o hisi-gpio-scanner)
+	(cd $(@D); $(TARGET_CC) -Os -s hisi-gpio-watcher.c -o hisi-gpio-watcher)
+endef
+
+define HISI_GPIO_INSTALL_TARGET_CMDS
+	install -m 0755 -D $(@D)/hisi-gpio-scanner $(TARGET_DIR)/usr/bin/hisi-gpio-scanner
+	install -m 0755 -D $(@D)/hisi-gpio-watcher $(TARGET_DIR)/usr/bin/hisi-gpio-watcher
+endef
+
+$(eval $(generic-package))

general/package/hisi_gpio/hisi_gpio.mk

@@ -1,26 +0,0 @@
-################################################################################
-#
-# hisi_gpio | updated 2022.08.10
-
-#
-################################################################################
-
-HISI_GPIO_LICENSE = MIT
-HISI_GPIO_LICENSE_FILES = LICENSE
-
-define HISI_GPIO_EXTRACT_CMDS
-	cp $(BR2_EXTERNAL_HISILICON_PATH)/package/hisi_gpio/src/hisi_gpio_scanner.c $(@D)/
-	cp $(BR2_EXTERNAL_HISILICON_PATH)/package/hisi_gpio/src/hisi_gpio_watcher.c $(@D)/
-endef
-
-define HISI_GPIO_BUILD_CMDS
-	(cd $(@D); $(TARGET_CC) -Os -s hisi_gpio_scanner.c -o hisi_gpio_scanner)
-	(cd $(@D); $(TARGET_CC) -Os -s hisi_gpio_watcher.c -o hisi_gpio_watcher)
-endef
-
-define HISI_GPIO_INSTALL_TARGET_CMDS
-	install -m 0755 -D $(@D)/hisi_gpio_scanner $(TARGET_DIR)/usr/bin/hisi_gpio_scanner
-	install -m 0755 -D $(@D)/hisi_gpio_watcher $(TARGET_DIR)/usr/bin/hisi_gpio_watcher
-endef
-
-$(eval $(generic-package))

general/package/mavfwd/mavfwd.mk

@@ -16,7 +16,7 @@ define MAVFWD_BUILD_CMDS
 endef
 
 define MAVFWD_INSTALL_TARGET_CMDS
-    $(INSTALL) -m 755 -d $(TARGET_DIR)/usr/bin
+    $(INSTALL) -m 755 -d $(TARGET_DIR)/usr/sbin
     $(INSTALL) -m 0755 -D $(@D)/mavfwd $(TARGET_DIR)/usr/sbin/mavfwd
 endef