From 91df33f194552b8e11efc695a242abbc589b1a2d Mon Sep 17 00:00:00 2001 From: Igor Zalatov Date: Fri, 25 Nov 2022 08:55:04 +0300 Subject: [PATCH] Fix old hisi-gpio utils (#580) --- br-ext-chip-goke/Config.in | 1 + br-ext-chip-goke/package/hisi-gpio | 1 + br-ext-chip-hisilicon/Config.in | 2 +- br-ext-chip-hisilicon/package/hisi-gpio | 1 + br-ext-chip-hisilicon/package/hisi_gpio | 1 - .../{hisi_gpio => hisi-gpio}/Config.in | 2 +- general/package/hisi-gpio/hisi-gpio.mk | 26 +++++++++++++++++++ .../src/hisi-gpio-scanner.c} | 0 .../src/hisi-gpio-watcher.c} | 0 general/package/hisi_gpio/hisi_gpio.mk | 26 ------------------- general/package/mavfwd/mavfwd.mk | 2 +- 11 files changed, 32 insertions(+), 30 deletions(-) create mode 120000 br-ext-chip-goke/package/hisi-gpio create mode 120000 br-ext-chip-hisilicon/package/hisi-gpio delete mode 120000 br-ext-chip-hisilicon/package/hisi_gpio rename general/package/{hisi_gpio => hisi-gpio}/Config.in (89%) create mode 100644 general/package/hisi-gpio/hisi-gpio.mk rename general/package/{hisi_gpio/src/hisi_gpio_scanner.c => hisi-gpio/src/hisi-gpio-scanner.c} (100%) rename general/package/{hisi_gpio/src/hisi_gpio_watcher.c => hisi-gpio/src/hisi-gpio-watcher.c} (100%) delete mode 100644 general/package/hisi_gpio/hisi_gpio.mk diff --git a/br-ext-chip-goke/Config.in b/br-ext-chip-goke/Config.in index c077512d..e01b4b8a 100644 --- a/br-ext-chip-goke/Config.in +++ b/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" diff --git a/br-ext-chip-goke/package/hisi-gpio b/br-ext-chip-goke/package/hisi-gpio new file mode 120000 index 00000000..5fdb7267 --- /dev/null +++ b/br-ext-chip-goke/package/hisi-gpio @@ -0,0 +1 @@ +../../general/package/hisi-gpio \ No newline at end of file diff --git a/br-ext-chip-hisilicon/Config.in b/br-ext-chip-hisilicon/Config.in index 09b7e0ee..e5dffe11 100644 --- a/br-ext-chip-hisilicon/Config.in +++ b/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" diff --git a/br-ext-chip-hisilicon/package/hisi-gpio b/br-ext-chip-hisilicon/package/hisi-gpio new file mode 120000 index 00000000..5fdb7267 --- /dev/null +++ b/br-ext-chip-hisilicon/package/hisi-gpio @@ -0,0 +1 @@ +../../general/package/hisi-gpio \ No newline at end of file diff --git a/br-ext-chip-hisilicon/package/hisi_gpio b/br-ext-chip-hisilicon/package/hisi_gpio deleted file mode 120000 index 22206b24..00000000 --- a/br-ext-chip-hisilicon/package/hisi_gpio +++ /dev/null @@ -1 +0,0 @@ -../../general/package/hisi_gpio \ No newline at end of file diff --git a/general/package/hisi_gpio/Config.in b/general/package/hisi-gpio/Config.in similarity index 89% rename from general/package/hisi_gpio/Config.in rename to general/package/hisi-gpio/Config.in index d512789b..6aa9d643 100644 --- a/general/package/hisi_gpio/Config.in +++ b/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 diff --git a/general/package/hisi-gpio/hisi-gpio.mk b/general/package/hisi-gpio/hisi-gpio.mk new file mode 100644 index 00000000..e476ef67 --- /dev/null +++ b/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)) diff --git a/general/package/hisi_gpio/src/hisi_gpio_scanner.c b/general/package/hisi-gpio/src/hisi-gpio-scanner.c similarity index 100% rename from general/package/hisi_gpio/src/hisi_gpio_scanner.c rename to general/package/hisi-gpio/src/hisi-gpio-scanner.c diff --git a/general/package/hisi_gpio/src/hisi_gpio_watcher.c b/general/package/hisi-gpio/src/hisi-gpio-watcher.c similarity index 100% rename from general/package/hisi_gpio/src/hisi_gpio_watcher.c rename to general/package/hisi-gpio/src/hisi-gpio-watcher.c diff --git a/general/package/hisi_gpio/hisi_gpio.mk b/general/package/hisi_gpio/hisi_gpio.mk deleted file mode 100644 index 669f6667..00000000 --- a/general/package/hisi_gpio/hisi_gpio.mk +++ /dev/null @@ -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)) diff --git a/general/package/mavfwd/mavfwd.mk b/general/package/mavfwd/mavfwd.mk index 57f8ca78..6303b4e4 100644 --- a/general/package/mavfwd/mavfwd.mk +++ b/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