From: Patrice CHOTARD Date: Thu, 13 Aug 2020 07:51:09 +0000 Subject: [Uboot-stm32] [PATCH 01/11] board: stm32mp1: use IS_ENABLED to prevent ifdef in board_key_check In-Reply-To: <20200731143152.8812-1-patrick.delaunay@st.com> References: <20200731143152.8812-1-patrick.delaunay@st.com> Message-ID: <8d341ec4-a292-e04e-90ba-55eb7c816553@st.com> List-Id: MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit To: u-boot@lists.denx.de Hi Patrick On 7/31/20 4:31 PM, Patrick Delaunay wrote: > Use IS_ENABLED to prevent ifdef in board_key_check > > Signed-off-by: Patrick Delaunay > --- > > board/st/stm32mp1/stm32mp1.c | 52 ++++++++++++++++++------------------ > 1 file changed, 26 insertions(+), 26 deletions(-) > > diff --git a/board/st/stm32mp1/stm32mp1.c b/board/st/stm32mp1/stm32mp1.c > index 1d274c3157..1ad41796fb 100644 > --- a/board/st/stm32mp1/stm32mp1.c > +++ b/board/st/stm32mp1/stm32mp1.c > @@ -135,51 +135,51 @@ int checkboard(void) > > static void board_key_check(void) > { > -#if defined(CONFIG_FASTBOOT) || defined(CONFIG_CMD_STM32PROG) > ofnode node; > struct gpio_desc gpio; > enum forced_boot_mode boot_mode = BOOT_NORMAL; > > + if (!IS_ENABLED(CONFIG_FASTBOOT) && !IS_ENABLED(CONFIG_CMD_STM32PROG)) > + return; > + > node = ofnode_path("/config"); > if (!ofnode_valid(node)) { > debug("%s: no /config node?\n", __func__); > return; > } > -#ifdef CONFIG_FASTBOOT > - if (gpio_request_by_name_nodev(node, "st,fastboot-gpios", 0, > - &gpio, GPIOD_IS_IN)) { > - debug("%s: could not find a /config/st,fastboot-gpios\n", > - __func__); > - } else { > - if (dm_gpio_get_value(&gpio)) { > - puts("Fastboot key pressed, "); > - boot_mode = BOOT_FASTBOOT; > - } > + if (IS_ENABLED(CONFIG_FASTBOOT)) { > + if (gpio_request_by_name_nodev(node, "st,fastboot-gpios", 0, > + &gpio, GPIOD_IS_IN)) { > + debug("%s: could not find a /config/st,fastboot-gpios\n", > + __func__); > + } else { > + if (dm_gpio_get_value(&gpio)) { > + puts("Fastboot key pressed, "); > + boot_mode = BOOT_FASTBOOT; > + } > > - dm_gpio_free(NULL, &gpio); > + dm_gpio_free(NULL, &gpio); > + } > } > -#endif > -#ifdef CONFIG_CMD_STM32PROG > - if (gpio_request_by_name_nodev(node, "st,stm32prog-gpios", 0, > - &gpio, GPIOD_IS_IN)) { > - debug("%s: could not find a /config/st,stm32prog-gpios\n", > - __func__); > - } else { > - if (dm_gpio_get_value(&gpio)) { > - puts("STM32Programmer key pressed, "); > - boot_mode = BOOT_STM32PROG; > + if (IS_ENABLED(CONFIG_CMD_STM32PROG)) { > + if (gpio_request_by_name_nodev(node, "st,stm32prog-gpios", 0, > + &gpio, GPIOD_IS_IN)) { > + debug("%s: could not find a /config/st,stm32prog-gpios\n", > + __func__); > + } else { > + if (dm_gpio_get_value(&gpio)) { > + puts("STM32Programmer key pressed, "); > + boot_mode = BOOT_STM32PROG; > + } > + dm_gpio_free(NULL, &gpio); > } > - dm_gpio_free(NULL, &gpio); > } > -#endif > - > if (boot_mode != BOOT_NORMAL) { > puts("entering download mode...\n"); > clrsetbits_le32(TAMP_BOOT_CONTEXT, > TAMP_BOOT_FORCED_MASK, > boot_mode); > } > -#endif > } > > #if defined(CONFIG_USB_GADGET) && defined(CONFIG_USB_GADGET_DWC2_OTG) Reviewed-by: Patrice Chotard Thanks Patrice