From 85fbd2b1ee805b763a651ef4585e1e1d5c01f9f2 Mon Sep 17 00:00:00 2001 From: Piotr Dymacz Date: Thu, 3 Mar 2016 15:30:51 +0100 Subject: [PATCH] Change GPIO_RST_BUTTON_* define names --- u-boot/Makefile | 70 ++++++++++++++--------------- u-boot/board/ar7240/common/common.c | 8 ++-- u-boot/include/configs/ap121.h | 6 +-- u-boot/include/configs/ap143.h | 6 +-- u-boot/include/configs/db12x.h | 6 +-- 5 files changed, 48 insertions(+), 48 deletions(-) diff --git a/u-boot/Makefile b/u-boot/Makefile index 004bbb4..e9f81ad 100644 --- a/u-boot/Makefile +++ b/u-boot/Makefile @@ -349,7 +349,7 @@ hornet_common_config : common_config wr703n_config : unconfig hornet_common_config @/bin/echo -e '\e[32m> Configuring for TP-Link TL-WR703N at:' `date` '\e[0m' @echo "#define CONFIG_FOR_TPLINK_WR703N_V1 1" >> include/config.h - @echo "#define GPIO_RST_BUTTON_BIT 11" >> include/config.h + @echo "#define CONFIG_GPIO_RESET_BTN 11" >> include/config.h @echo "#define CONFIG_DEFAULT_FLASH_SIZE_IN_MB 4" >> include/config.h @echo "#define CONFIG_TPLINK_IMAGE_HEADER 1" >> include/config.h @echo "#define CONFIG_BOARD_CUSTOM_STRING \"TP-Link TL-WR703N\"" >> include/config.h @@ -359,7 +359,7 @@ wr703n_config : unconfig hornet_common_config wr720n_v3_CN_config : unconfig hornet_common_config @/bin/echo -e '\e[32m> Configuring for TP-Link TL-WR720N v3 CN at:' `date` '\e[0m' @echo "#define CONFIG_FOR_TPLINK_WR720N_V3 1" >> include/config.h - @echo "#define GPIO_RST_BUTTON_BIT 11" >> include/config.h + @echo "#define CONFIG_GPIO_RESET_BTN 11" >> include/config.h @echo "#define CONFIG_DEFAULT_FLASH_SIZE_IN_MB 4" >> include/config.h @echo "#define CONFIG_TPLINK_IMAGE_HEADER 1" >> include/config.h @echo "#define CONFIG_BOARD_CUSTOM_STRING \"TP-Link TL-WR720N v3 CN\"" >> include/config.h @@ -369,7 +369,7 @@ wr720n_v3_CN_config : unconfig hornet_common_config wr710n_config : unconfig hornet_common_config @/bin/echo -e '\e[32m> Configuring for TP-Link TL-WR710N at:' `date` '\e[0m' @echo "#define CONFIG_FOR_TPLINK_WR710N_V1 1" >> include/config.h - @echo "#define GPIO_RST_BUTTON_BIT 11" >> include/config.h + @echo "#define CONFIG_GPIO_RESET_BTN 11" >> include/config.h @echo "#define CONFIG_DEFAULT_FLASH_SIZE_IN_MB 8" >> include/config.h @echo "#define CONFIG_TPLINK_IMAGE_HEADER 1" >> include/config.h @echo "#define CONFIG_BOARD_CUSTOM_STRING \"TP-Link TL-WR710N\"" >> include/config.h @@ -379,7 +379,7 @@ wr710n_config : unconfig hornet_common_config mr3020_config : unconfig hornet_common_config @/bin/echo -e '\e[32m> Configuring for TP-Link TL-MR3020 at:' `date`.'\e[0m' @echo "#define CONFIG_FOR_TPLINK_MR3020_V1 1" >> include/config.h - @echo "#define GPIO_RST_BUTTON_BIT 11" >> include/config.h + @echo "#define CONFIG_GPIO_RESET_BTN 11" >> include/config.h @echo "#define CONFIG_DEFAULT_FLASH_SIZE_IN_MB 4" >> include/config.h @echo "#define CONFIG_TPLINK_IMAGE_HEADER 1" >> include/config.h @echo "#define CONFIG_BOARD_CUSTOM_STRING \"TP-Link TL-MR3020\"" >> include/config.h @@ -389,7 +389,7 @@ mr3020_config : unconfig hornet_common_config mr3040_config : unconfig hornet_common_config @/bin/echo -e '\e[32m> Configuring for TP-Link TL-MR3040 at:' `date` '\e[0m' @echo "#define CONFIG_FOR_TPLINK_MR3040_V1V2 1" >> include/config.h - @echo "#define GPIO_RST_BUTTON_BIT 11" >> include/config.h + @echo "#define CONFIG_GPIO_RESET_BTN 11" >> include/config.h @echo "#define CONFIG_DEFAULT_FLASH_SIZE_IN_MB 4" >> include/config.h @echo "#define CONFIG_TPLINK_IMAGE_HEADER 1" >> include/config.h @echo "#define CONFIG_BOARD_CUSTOM_STRING \"TP-Link TL-MR3040\"" >> include/config.h @@ -399,7 +399,7 @@ mr3040_config : unconfig hornet_common_config mr10u_config : unconfig hornet_common_config @/bin/echo -e '\e[32m> Configuring for TP-Link TL-MR10U at:' `date` '\e[0m' @echo "#define CONFIG_FOR_TPLINK_MR10U_V1 1" >> include/config.h - @echo "#define GPIO_RST_BUTTON_BIT 11" >> include/config.h + @echo "#define CONFIG_GPIO_RESET_BTN 11" >> include/config.h @echo "#define CONFIG_DEFAULT_FLASH_SIZE_IN_MB 4" >> include/config.h @echo "#define CONFIG_TPLINK_IMAGE_HEADER 1" >> include/config.h @echo "#define CONFIG_BOARD_CUSTOM_STRING \"TP-Link TL-MR10U\"" >> include/config.h @@ -409,7 +409,7 @@ mr10u_config : unconfig hornet_common_config mr13u_config : unconfig hornet_common_config @/bin/echo -e '\e[32m> Configuring for TP-Link TL-MR13U at:' `date` '\e[0m' @echo "#define CONFIG_FOR_TPLINK_MR13U_V1 1" >> include/config.h - @echo "#define GPIO_RST_BUTTON_BIT 11" >> include/config.h + @echo "#define CONFIG_GPIO_RESET_BTN 11" >> include/config.h @echo "#define CONFIG_DEFAULT_FLASH_SIZE_IN_MB 4" >> include/config.h @echo "#define CONFIG_TPLINK_IMAGE_HEADER 1" >> include/config.h @echo "#define CONFIG_BOARD_CUSTOM_STRING \"TP-Link TL-MR13U\"" >> include/config.h @@ -419,7 +419,7 @@ mr13u_config : unconfig hornet_common_config wr740n_v4_config : unconfig hornet_common_config @/bin/echo -e '\e[32m> Configuring for TP-Link TL-WR740N v4 at:' `date` '\e[0m' @echo "#define CONFIG_FOR_TPLINK_WR740N_V4 1" >> include/config.h - @echo "#define GPIO_RST_BUTTON_BIT 11" >> include/config.h + @echo "#define CONFIG_GPIO_RESET_BTN 11" >> include/config.h @echo "#define CONFIG_DEFAULT_FLASH_SIZE_IN_MB 4" >> include/config.h @echo "#define CONFIG_TPLINK_IMAGE_HEADER 1" >> include/config.h @echo "#define CONFIG_BOARD_CUSTOM_STRING \"TP-Link TL-WR74xN/D v4\"" >> include/config.h @@ -429,7 +429,7 @@ wr740n_v4_config : unconfig hornet_common_config mr3220_v2_config : unconfig hornet_common_config @/bin/echo -e '\e[32m> Configuring for TP-Link TL-MR3220 v2 at:' `date` '\e[0m' @echo "#define CONFIG_FOR_TPLINK_MR3220_V2 1" >> include/config.h - @echo "#define GPIO_RST_BUTTON_BIT 11" >> include/config.h + @echo "#define CONFIG_GPIO_RESET_BTN 11" >> include/config.h @echo "#define CONFIG_DEFAULT_FLASH_SIZE_IN_MB 4" >> include/config.h @echo "#define CONFIG_TPLINK_IMAGE_HEADER 1" >> include/config.h @echo "#define CONFIG_BOARD_CUSTOM_STRING \"TP-Link TL-MR3220 v2\"" >> include/config.h @@ -439,8 +439,8 @@ mr3220_v2_config : unconfig hornet_common_config dir505_config : unconfig hornet_common_config @/bin/echo -e '\e[32m> Configuring for D-Link DIR-505 at:' `date` '\e[0m' @echo "#define CONFIG_FOR_DLINK_DIR505_A1 1" >> include/config.h - @echo "#define GPIO_RST_BUTTON_BIT 11" >> include/config.h - @echo "#define GPIO_RST_BUTTON_IS_ACTIVE_LOW 1" >> include/config.h + @echo "#define CONFIG_GPIO_RESET_BTN 11" >> include/config.h + @echo "#define CONFIG_GPIO_RESET_BTN_ACTIVE_LOW 1" >> include/config.h @echo "#define CONFIG_DEFAULT_FLASH_SIZE_IN_MB 8" >> include/config.h @echo "#define CONFIG_BOARD_CUSTOM_STRING \"D-Link DIR-505\"" >> include/config.h @@ -449,7 +449,7 @@ dir505_config : unconfig hornet_common_config gs_oolite_v1_dev_config : unconfig hornet_common_config @/bin/echo -e '\e[32m> Configuring for GS-Oolite v1 with dev board at:' `date` '\e[0m' @echo "#define CONFIG_FOR_GS_OOLITE_V1_DEV 1" >> include/config.h - @echo "#define GPIO_RST_BUTTON_BIT 11" >> include/config.h + @echo "#define CONFIG_GPIO_RESET_BTN 11" >> include/config.h @echo "#define CONFIG_DEFAULT_FLASH_SIZE_IN_MB 16" >> include/config.h @echo "#define CONFIG_BOARD_CUSTOM_STRING \"Gainstrong GS-Oolite v1\"" >> include/config.h @@ -458,8 +458,8 @@ gs_oolite_v1_dev_config : unconfig hornet_common_config black_swift_board_config : unconfig hornet_common_config @echo '======= Configuring for Black Swift board (128K compressed) at:' `date` '=======' @echo "#define CONFIG_FOR_BLACK_SWIFT_BOARD 1" >> include/config.h - @echo "#define GPIO_RST_BUTTON_BIT 11" >> include/config.h - @echo "#define GPIO_RST_BUTTON_IS_ACTIVE_LOW 1" >> include/config.h + @echo "#define CONFIG_GPIO_RESET_BTN 11" >> include/config.h + @echo "#define CONFIG_GPIO_RESET_BTN_ACTIVE_LOW 1" >> include/config.h @echo "#define CONFIG_DEFAULT_FLASH_SIZE_IN_MB 16" >> include/config.h @echo "#define CONFIG_BOARD_CUSTOM_STRING \"Black Swift board\"" >> include/config.h @@ -470,8 +470,8 @@ carambola2_config : unconfig hornet_common_config @echo "#define CONFIG_FOR_8DEVICES_CARAMBOLA2 1" >> include/config.h @echo "#undef COMPRESSED_UBOOT" >> include/config.h @echo "#define CONFIG_40MHZ_XTAL_SUPPORT 1" >> include/config.h - @echo "#define GPIO_RST_BUTTON_BIT 11" >> include/config.h - @echo "#define GPIO_RST_BUTTON_IS_ACTIVE_LOW 1" >> include/config.h + @echo "#define CONFIG_GPIO_RESET_BTN 11" >> include/config.h + @echo "#define CONFIG_GPIO_RESET_BTN_ACTIVE_LOW 1" >> include/config.h @echo "#define CONFIG_DEFAULT_FLASH_SIZE_IN_MB 16" >> include/config.h @echo "#define CONFIG_BOARD_CUSTOM_STRING \"8devices Carambola2 v1\"" >> include/config.h @@ -481,8 +481,8 @@ dragino_v2_ms14_config : unconfig hornet_common_config @/bin/echo -e '\e[32m> Configuring for Dragino Dragino v2 (MS14) at:' `date` '\e[0m' @echo "#define CONFIG_FOR_DRAGINO_V2 1" >> include/config.h @echo "#undef COMPRESSED_UBOOT" >> include/config.h - @echo "#define GPIO_RST_BUTTON_BIT 11" >> include/config.h - @echo "#define GPIO_RST_BUTTON_IS_ACTIVE_LOW 1" >> include/config.h + @echo "#define CONFIG_GPIO_RESET_BTN 11" >> include/config.h + @echo "#define CONFIG_GPIO_RESET_BTN_ACTIVE_LOW 1" >> include/config.h @echo "#define CONFIG_DEFAULT_FLASH_SIZE_IN_MB 16" >> include/config.h @echo "#define WEBFAILSAFE_DISABLE_ART_UPGRADE 1" >> include/config.h @echo "#define WEBFAILSAFE_DISABLE_UBOOT_UPGRADE 1" >> include/config.h @@ -494,8 +494,8 @@ villagetelco_mp2_config : unconfig hornet_common_config @/bin/echo -e '\e[32m> Configuring for Village Telco Mesh Potato 2 at:' `date` '\e[0m' @echo "#define CONFIG_FOR_MESH_POTATO_V2 1" >> include/config.h @echo "#undef COMPRESSED_UBOOT" >> include/config.h - @echo "#define GPIO_RST_BUTTON_BIT 11" >> include/config.h - @echo "#define GPIO_RST_BUTTON_IS_ACTIVE_LOW 1" >> include/config.h + @echo "#define CONFIG_GPIO_RESET_BTN 11" >> include/config.h + @echo "#define CONFIG_GPIO_RESET_BTN_ACTIVE_LOW 1" >> include/config.h @echo "#define CONFIG_DEFAULT_FLASH_SIZE_IN_MB 16" >> include/config.h @echo "#define WEBFAILSAFE_DISABLE_ART_UPGRADE 1" >> include/config.h @echo "#define WEBFAILSAFE_DISABLE_UBOOT_UPGRADE 1" >> include/config.h @@ -506,7 +506,7 @@ villagetelco_mp2_config : unconfig hornet_common_config gl-inet_config : unconfig hornet_common_config @/bin/echo -e '\e[32m> Configuring for GL.iNet at:' `date` '\e[0m' @echo "#define CONFIG_FOR_GL_INET 1" >> include/config.h - @echo "#define GPIO_RST_BUTTON_BIT 11" >> include/config.h + @echo "#define CONFIG_GPIO_RESET_BTN 11" >> include/config.h @echo "#define CONFIG_DEFAULT_FLASH_SIZE_IN_MB 8" >> include/config.h @echo "#define CONFIG_BOARD_CUSTOM_STRING \"GL.iNet\"" >> include/config.h @@ -524,8 +524,8 @@ wdr3600_43x0_config : unconfig wasp_common_config @echo "#define CFG_ATHRS17_PHY 1" >> include/config.h @echo "#define CFG_AG7240_NMACS 1" >> include/config.h @echo "#define CFG_DUAL_PHY_SUPPORT 1" >> include/config.h - @echo "#define GPIO_RST_BUTTON_BIT 16" >> include/config.h - @echo "#define GPIO_RST_BUTTON_IS_ACTIVE_LOW 1" >> include/config.h + @echo "#define CONFIG_GPIO_RESET_BTN 16" >> include/config.h + @echo "#define CONFIG_GPIO_RESET_BTN_ACTIVE_LOW 1" >> include/config.h @echo "#define CONFIG_DEFAULT_FLASH_SIZE_IN_MB 8" >> include/config.h @echo "#define CONFIG_TPLINK_IMAGE_HEADER 1" >> include/config.h @echo "#define CONFIG_BOARD_CUSTOM_STRING \"TP-Link TL-WDR3600/43x0\"" >> include/config.h @@ -539,8 +539,8 @@ wdr3500_config : unconfig wasp_common_config @echo "#define DDR2_32BIT_SUPPORT 1" >> include/config.h @echo "#define CFG_ATHRS27_PHY 1" >> include/config.h @echo "#define CFG_AG7240_NMACS 2" >> include/config.h - @echo "#define GPIO_RST_BUTTON_BIT 16" >> include/config.h - @echo "#define GPIO_RST_BUTTON_IS_ACTIVE_LOW 1" >> include/config.h + @echo "#define CONFIG_GPIO_RESET_BTN 16" >> include/config.h + @echo "#define CONFIG_GPIO_RESET_BTN_ACTIVE_LOW 1" >> include/config.h @echo "#define CONFIG_DEFAULT_FLASH_SIZE_IN_MB 8" >> include/config.h @echo "#define CONFIG_TPLINK_IMAGE_HEADER 1" >> include/config.h @echo "#define CONFIG_BOARD_CUSTOM_STRING \"TP-Link TL-WDR3500\"" >> include/config.h @@ -555,8 +555,8 @@ mr3420_v2_config : unconfig wasp_common_config @echo "#define DDR2_32BIT_SUPPORT 1" >> include/config.h @echo "#define CFG_ATHRS27_PHY 1" >> include/config.h @echo "#define CFG_AG7240_NMACS 2" >> include/config.h - @echo "#define GPIO_RST_BUTTON_BIT 17" >> include/config.h - @echo "#define GPIO_RST_BUTTON_IS_ACTIVE_LOW 1" >> include/config.h + @echo "#define CONFIG_GPIO_RESET_BTN 17" >> include/config.h + @echo "#define CONFIG_GPIO_RESET_BTN_ACTIVE_LOW 1" >> include/config.h @echo "#define CONFIG_DEFAULT_FLASH_SIZE_IN_MB 4" >> include/config.h @echo "#define CONFIG_TPLINK_IMAGE_HEADER 1" >> include/config.h @echo "#define CONFIG_BOARD_CUSTOM_STRING \"TP-Link TL-MR3420 v2\"" >> include/config.h @@ -571,8 +571,8 @@ wr841n_v8_config : unconfig wasp_common_config @echo "#define DDR2_32BIT_SUPPORT 1" >> include/config.h @echo "#define CFG_ATHRS27_PHY 1" >> include/config.h @echo "#define CFG_AG7240_NMACS 2" >> include/config.h - @echo "#define GPIO_RST_BUTTON_BIT 17" >> include/config.h - @echo "#define GPIO_RST_BUTTON_IS_ACTIVE_LOW 1" >> include/config.h + @echo "#define CONFIG_GPIO_RESET_BTN 17" >> include/config.h + @echo "#define CONFIG_GPIO_RESET_BTN_ACTIVE_LOW 1" >> include/config.h @echo "#define CONFIG_DEFAULT_FLASH_SIZE_IN_MB 4" >> include/config.h @echo "#define CONFIG_TPLINK_IMAGE_HEADER 1" >> include/config.h @echo "#define CONFIG_BOARD_CUSTOM_STRING \"TP-Link TL-WR841N/D v8\"" >> include/config.h @@ -587,8 +587,8 @@ wa830re_v2_wa801nd_v2_config : unconfig wasp_common_config @echo "#define DDR2_32BIT_SUPPORT 1" >> include/config.h @echo "#define CFG_ATHRS27_PHY 1" >> include/config.h @echo "#define CFG_AG7240_NMACS 2" >> include/config.h - @echo "#define GPIO_RST_BUTTON_BIT 17" >> include/config.h - @echo "#define GPIO_RST_BUTTON_IS_ACTIVE_LOW 1" >> include/config.h + @echo "#define CONFIG_GPIO_RESET_BTN 17" >> include/config.h + @echo "#define CONFIG_GPIO_RESET_BTN_ACTIVE_LOW 1" >> include/config.h @echo "#define CONFIG_DEFAULT_FLASH_SIZE_IN_MB 4" >> include/config.h @echo "#define CONFIG_TPLINK_IMAGE_HEADER 1" >> include/config.h @echo "#define CONFIG_BOARD_CUSTOM_STRING \"TP-Link TL-WA830RE/TL-WA801ND v2\"" >> include/config.h @@ -606,8 +606,8 @@ wr820n_CN_config : unconfig ap143_common_config @echo "#define CFG_ATHRS27_PHY 1" >> include/config.h @echo "#define CFG_ATH_GMAC_NMACS 2" >> include/config.h @echo "#define CONFIG_DEFAULT_FLASH_SIZE_IN_MB 4" >> include/config.h - @echo "#define GPIO_RST_BUTTON_BIT 12" >> include/config.h - @echo "#define GPIO_RST_BUTTON_IS_ACTIVE_LOW 1" >> include/config.h + @echo "#define CONFIG_GPIO_RESET_BTN 12" >> include/config.h + @echo "#define CONFIG_GPIO_RESET_BTN_ACTIVE_LOW 1" >> include/config.h @echo "#define CONFIG_TPLINK_IMAGE_HEADER 1" >> include/config.h @echo "#define CONFIG_BOARD_CUSTOM_STRING \"TP-Link TL-WR820N CN\"" >> include/config.h @@ -620,8 +620,8 @@ wr841n_v9_config : unconfig ap143_common_config @echo "#define CFG_ATHRS27_PHY 1" >> include/config.h @echo "#define CFG_ATH_GMAC_NMACS 2" >> include/config.h @echo "#define CONFIG_DEFAULT_FLASH_SIZE_IN_MB 4" >> include/config.h - @echo "#define GPIO_RST_BUTTON_BIT 12" >> include/config.h - @echo "#define GPIO_RST_BUTTON_IS_ACTIVE_LOW 1" >> include/config.h + @echo "#define CONFIG_GPIO_RESET_BTN 12" >> include/config.h + @echo "#define CONFIG_GPIO_RESET_BTN_ACTIVE_LOW 1" >> include/config.h @echo "#define CONFIG_TPLINK_IMAGE_HEADER 1" >> include/config.h @echo "#define CONFIG_BOARD_CUSTOM_STRING \"TP-Link TL-WR841N/D v9\"" >> include/config.h diff --git a/u-boot/board/ar7240/common/common.c b/u-boot/board/ar7240/common/common.c index 9cfe673..b2aa70f 100644 --- a/u-boot/board/ar7240/common/common.c +++ b/u-boot/board/ar7240/common/common.c @@ -148,19 +148,19 @@ void macaddr_init(u8 *mac_addr) */ int reset_button_status(void) { -#ifdef GPIO_RST_BUTTON_BIT +#ifdef CONFIG_GPIO_RESET_BTN u32 gpio; gpio = qca_soc_reg_read(QCA_GPIO_IN_REG); - if (gpio & (1 << GPIO_RST_BUTTON_BIT)) { - #if defined(GPIO_RST_BUTTON_IS_ACTIVE_LOW) + if (gpio & (1 << CONFIG_GPIO_RESET_BTN)) { + #if defined(CONFIG_GPIO_RESET_BTN_ACTIVE_LOW) return 0; #else return 1; #endif } else { - #if defined(GPIO_RST_BUTTON_IS_ACTIVE_LOW) + #if defined(CONFIG_GPIO_RESET_BTN_ACTIVE_LOW) return 1; #else return 0; diff --git a/u-boot/include/configs/ap121.h b/u-boot/include/configs/ap121.h index e18507e..5c25430 100644 --- a/u-boot/include/configs/ap121.h +++ b/u-boot/include/configs/ap121.h @@ -337,11 +337,11 @@ /* * For PLL/clocks recovery use reset button by default */ -#ifdef GPIO_RST_BUTTON_BIT - #define CONFIG_QCA_GPIO_OC_RECOVERY_BTN GPIO_RST_BUTTON_BIT +#ifdef CONFIG_GPIO_RESET_BTN + #define CONFIG_QCA_GPIO_OC_RECOVERY_BTN CONFIG_GPIO_RESET_BTN #endif -#ifdef GPIO_RST_BUTTON_IS_ACTIVE_LOW +#ifdef CONFIG_GPIO_RESET_BTN_ACTIVE_LOW #define CONFIG_QCA_GPIO_OC_RECOVERY_BTN_ACTIVE_LOW 1 #endif diff --git a/u-boot/include/configs/ap143.h b/u-boot/include/configs/ap143.h index 0d56416..f8b39f8 100644 --- a/u-boot/include/configs/ap143.h +++ b/u-boot/include/configs/ap143.h @@ -143,11 +143,11 @@ /* * For PLL/clocks recovery use reset button by default */ -#ifdef GPIO_RST_BUTTON_BIT - #define CONFIG_QCA_GPIO_OC_RECOVERY_BTN GPIO_RST_BUTTON_BIT +#ifdef CONFIG_GPIO_RESET_BTN + #define CONFIG_QCA_GPIO_OC_RECOVERY_BTN CONFIG_GPIO_RESET_BTN #endif -#ifdef GPIO_RST_BUTTON_IS_ACTIVE_LOW +#ifdef CONFIG_GPIO_RESET_BTN_ACTIVE_LOW #define CONFIG_QCA_GPIO_OC_RECOVERY_BTN_ACTIVE_LOW 1 #endif diff --git a/u-boot/include/configs/db12x.h b/u-boot/include/configs/db12x.h index faed4a4..72ccff3 100644 --- a/u-boot/include/configs/db12x.h +++ b/u-boot/include/configs/db12x.h @@ -135,11 +135,11 @@ /* * For PLL/clocks recovery use reset button by default */ -#ifdef GPIO_RST_BUTTON_BIT - #define CONFIG_QCA_GPIO_OC_RECOVERY_BTN GPIO_RST_BUTTON_BIT +#ifdef CONFIG_GPIO_RESET_BTN + #define CONFIG_QCA_GPIO_OC_RECOVERY_BTN CONFIG_GPIO_RESET_BTN #endif -#ifdef GPIO_RST_BUTTON_IS_ACTIVE_LOW +#ifdef CONFIG_GPIO_RESET_BTN_ACTIVE_LOW #define CONFIG_QCA_GPIO_OC_RECOVERY_BTN_ACTIVE_LOW 1 #endif -- 2.25.1