From: Ovidiu Panait <ovidiu.panait@windriver.com>
Date: Sat, 1 Jan 2022 17:13:31 +0000 (+0200)
Subject: common: board_r: drop ifdefs around header includes
X-Git-Tag: v2022.04-rc1~25^2~4
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ae435aefbcb5064a82ba94ec0b22cfe1315b243c;p=pandora-u-boot.git

common: board_r: drop ifdefs around header includes

Drop the remaining ifdefs around header includes, to fix an old TODO.

Reviewed-by: Simon Glass <sjg@chromium.org>
Signed-off-by: Ovidiu Panait <ovidiu.panait@windriver.com>
---

diff --git a/common/board_r.c b/common/board_r.c
index f607ce780bb..60eced6f7f9 100644
--- a/common/board_r.c
+++ b/common/board_r.c
@@ -33,16 +33,11 @@
 #include <ide.h>
 #include <init.h>
 #include <initcall.h>
-/* TODO: can we just include all these headers whether needed or not? */
-#if defined(CONFIG_CMD_KGDB)
 #include <kgdb.h>
-#endif
 #include <irq_func.h>
 #include <malloc.h>
 #include <mapmem.h>
-#ifdef CONFIG_BITBANGMII
 #include <miiphy.h>
-#endif
 #include <mmc.h>
 #include <mux.h>
 #include <nand.h>
@@ -56,9 +51,7 @@
 #include <timer.h>
 #include <trace.h>
 #include <watchdog.h>
-#ifdef CONFIG_XEN
 #include <xen.h>
-#endif
 #include <asm/sections.h>
 #include <dm/root.h>
 #include <dm/ofnode.h>
@@ -67,9 +60,7 @@
 #include <efi_loader.h>
 #include <wdt.h>
 #include <asm-generic/gpio.h>
-#ifdef CONFIG_EFI_SETUP_EARLY
 #include <efi_loader.h>
-#endif
 
 DECLARE_GLOBAL_DATA_PTR;