[PATCH v3 62/81] pci: Use the correct symbol to enable struct members

Simon Glass sjg at chromium.org
Mon Feb 6 20:05:30 CET 2023


This ends up being quite complicated since we have various pieces of code
assuming that it can access the members and the conditions may not line up
with SPL_PCI and serial SPL_ configs.

Fix it by using a PPL condition, so that the condition does not change
when split config is enabled.

Signed-off-by: Simon Glass <sjg at chromium.org>
---

(no changes since v1)

 include/asm-generic/global_data.h | 2 +-
 include/ns16550.h                 | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/include/asm-generic/global_data.h b/include/asm-generic/global_data.h
index ac7640c5ed0..4141bf4d1da 100644
--- a/include/asm-generic/global_data.h
+++ b/include/asm-generic/global_data.h
@@ -315,7 +315,7 @@ struct global_data {
 	 */
 	unsigned long malloc_ptr;
 #endif
-#ifdef CONFIG_PCI
+#ifdef CONFIG_PPL_PCI
 	/**
 	 * @hose: PCI hose for early use
 	 */
diff --git a/include/ns16550.h b/include/ns16550.h
index e7e68663d03..552db4da2ad 100644
--- a/include/ns16550.h
+++ b/include/ns16550.h
@@ -74,7 +74,7 @@ struct ns16550_plat {
 	int clock;
 	u32 fcr;
 	int flags;
-#if defined(CONFIG_PCI) && defined(CONFIG_SPL)
+#if defined(CONFIG_PPL_PCI) && defined(CONFIG_SPL)
 	int bdf;
 #endif
 };
-- 
2.39.1.519.gcb327c4b5f-goog



More information about the U-Boot mailing list