LM
/
u-boot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

board: stm32mp1: use IS_ENABLED to prevent ifdef in board_key_check 

Use IS_ENABLED to prevent ifdef in board_key_check

Signed-off-by: Patrick Delaunay <patrick.delaunay@st.com>
Reviewed-by: Patrice Chotard <patrice.chotard@st.com>
This commit is contained in:
Patrick Delaunay 2020-07-31 16:31:42 +02:00 committed by Patrice Chotard
parent f3858ce029
commit 00bac2abcd
1 changed files with 27 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
board/st/stm32mp1/stm32mp1.c
View File

@ -135,17 +135,19 @@ int checkboard(void)
static void board_key_check(void) static void board_key_check(void)
{ {
#if defined(CONFIG_FASTBOOT) || defined(CONFIG_CMD_STM32PROG)
ofnode node; ofnode node;
struct gpio_desc gpio; struct gpio_desc gpio;
enum forced_boot_mode boot_mode = BOOT_NORMAL; enum forced_boot_mode boot_mode = BOOT_NORMAL;
if (!IS_ENABLED(CONFIG_FASTBOOT) && !IS_ENABLED(CONFIG_CMD_STM32PROG))
return;
node = ofnode_path("/config"); node = ofnode_path("/config");
if (!ofnode_valid(node)) { if (!ofnode_valid(node)) {
debug("%s: no /config node?\n", __func__); debug("%s: no /config node?\n", __func__);
return; return;
} }
#ifdef CONFIG_FASTBOOT if (IS_ENABLED(CONFIG_FASTBOOT)) {
if (gpio_request_by_name_nodev(node, "st,fastboot-gpios", 0, if (gpio_request_by_name_nodev(node, "st,fastboot-gpios", 0,
&gpio, GPIOD_IS_IN)) { &gpio, GPIOD_IS_IN)) {
debug("%s: could not find a /config/st,fastboot-gpios\n", debug("%s: could not find a /config/st,fastboot-gpios\n",
@ -158,8 +160,8 @@ static void board_key_check(void)
dm_gpio_free(NULL, &gpio); dm_gpio_free(NULL, &gpio);
} }
#endif }
#ifdef CONFIG_CMD_STM32PROG if (IS_ENABLED(CONFIG_CMD_STM32PROG)) {
if (gpio_request_by_name_nodev(node, "st,stm32prog-gpios", 0, if (gpio_request_by_name_nodev(node, "st,stm32prog-gpios", 0,
&gpio, GPIOD_IS_IN)) { &gpio, GPIOD_IS_IN)) {
debug("%s: could not find a /config/st,stm32prog-gpios\n", debug("%s: could not find a /config/st,stm32prog-gpios\n",
@ -171,15 +173,13 @@ static void board_key_check(void)
} }
dm_gpio_free(NULL, &gpio); dm_gpio_free(NULL, &gpio);
} }
#endif }
if (boot_mode != BOOT_NORMAL) { if (boot_mode != BOOT_NORMAL) {
puts("entering download mode...\n"); puts("entering download mode...\n");
clrsetbits_le32(TAMP_BOOT_CONTEXT, clrsetbits_le32(TAMP_BOOT_CONTEXT,
TAMP_BOOT_FORCED_MASK, TAMP_BOOT_FORCED_MASK,
boot_mode); boot_mode);
} }
#endif
} }
#if defined(CONFIG_USB_GADGET) && defined(CONFIG_USB_GADGET_DWC2_OTG) #if defined(CONFIG_USB_GADGET) && defined(CONFIG_USB_GADGET_DWC2_OTG)