diff --git a/board/ti/j721s2/evm.c b/board/ti/j721s2/evm.c
index 301e11231d..f5586d070b 100644
--- a/board/ti/j721s2/evm.c
+++ b/board/ti/j721s2/evm.c
@@ -73,43 +73,41 @@ int dram_init_banksize(void)
 	return 0;
 }
 
-#if CONFIG_IS_ENABLED(DM_GPIO) && CONFIG_IS_ENABLED(OF_LIBFDT)
 /* Enables the spi-nand dts node, if onboard mux is set to spinand */
 static void __maybe_unused detect_enable_spinand(void *blob)
 {
-	struct gpio_desc desc = {0};
-	char *ospi_mux_sel_gpio = "6";
-	int nand_offset, nor_offset;
+	if (IS_ENABLED(CONFIG_DM_GPIO) && IS_ENABLED(CONFIG_OF_LIBFDT)) {
+		struct gpio_desc desc = {0};
+		char *ospi_mux_sel_gpio = "6";
+		int nand_offset, nor_offset;
 
-	if (dm_gpio_lookup_name(ospi_mux_sel_gpio, &desc))
-		return;
+		if (dm_gpio_lookup_name(ospi_mux_sel_gpio, &desc))
+			return;
 
-	if (dm_gpio_request(&desc, ospi_mux_sel_gpio))
-		return;
+		if (dm_gpio_request(&desc, ospi_mux_sel_gpio))
+			return;
 
-	if (dm_gpio_set_dir_flags(&desc, GPIOD_IS_IN))
-		return;
+		if (dm_gpio_set_dir_flags(&desc, GPIOD_IS_IN))
+			return;
 
-	nand_offset = fdt_node_offset_by_compatible(blob, -1, "spi-nand");
-	nor_offset = fdt_node_offset_by_compatible(blob,
-						   fdt_parent_offset(blob, nand_offset),
-						   "jedec,spi-nor");
+		nand_offset = fdt_node_offset_by_compatible(blob, -1, "spi-nand");
+		nor_offset = fdt_node_offset_by_compatible(blob,
+							   fdt_parent_offset(blob, nand_offset),
+							   "jedec,spi-nor");
 
-	if (dm_gpio_get_value(&desc)) {
-		fdt_status_okay(blob, nand_offset);
-		fdt_del_node(blob, nor_offset);
-	} else {
-		fdt_del_node(blob, nand_offset);
+		if (dm_gpio_get_value(&desc)) {
+			fdt_status_okay(blob, nand_offset);
+			fdt_del_node(blob, nor_offset);
+		} else {
+			fdt_del_node(blob, nand_offset);
+		}
 	}
 }
-#endif
 
-#if defined(CONFIG_SPL_BUILD) && (defined(CONFIG_TARGET_J721S2_A72_EVM) || \
-				  defined(CONFIG_TARGET_J721S2_R5_EVM))
+#if defined(CONFIG_SPL_BUILD)
 void spl_perform_fixups(struct spl_image_info *spl_image)
 {
-	if (IS_ENABLED(CONFIG_DM_GPIO) && IS_ENABLED(CONFIG_OF_LIBFDT))
-		detect_enable_spinand(spl_image->fdt_addr);
+	detect_enable_spinand(spl_image->fdt_addr);
 }
 #endif
 
@@ -125,8 +123,7 @@ int ft_board_setup(void *blob, struct bd_info *bd)
 	if (ret)
 		printf("%s: fixing up msmc ram failed %d\n", __func__, ret);
 
-	if (IS_ENABLED(CONFIG_DM_GPIO) && IS_ENABLED(CONFIG_OF_LIBFDT))
-		detect_enable_spinand(blob);
+	detect_enable_spinand(blob);
 
 	return ret;
 }