summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorMario Six <mario.six@gdsys.cc>2019-01-21 09:17:51 +0100
committerMario Six <mario.six@gdsys.cc>2019-05-21 07:51:40 +0200
commit1cbc10c8158d22d65bb5ccc7550186036bb9f17a (patch)
tree72081cfe8e8bc503f8a5e1d3c7789829cffcddcb /include
parent47a1b3f446de751ce9cacf57d43681ea43402ea4 (diff)
mpc83xx: Migrate legacy PCI options to Kconfig
The MPC83xx include files contain some settings of the PCI subsystem. Migrate these to Kconfig until a proper DM PCI driver exists. Signed-off-by: Mario Six <mario.six@gdsys.cc>
Diffstat (limited to 'include')
-rw-r--r--include/configs/MPC8349EMDS.h11
-rw-r--r--include/configs/MPC8349EMDS_SDRAM.h11
-rw-r--r--include/configs/TQM834x.h2
-rw-r--r--include/configs/caddy2.h8
-rw-r--r--include/configs/sbc8349.h10
-rw-r--r--include/configs/vme8349.h10
6 files changed, 7 insertions, 45 deletions
diff --git a/include/configs/MPC8349EMDS.h b/include/configs/MPC8349EMDS.h
index fe2b81b905..40e5c1997d 100644
--- a/include/configs/MPC8349EMDS.h
+++ b/include/configs/MPC8349EMDS.h
@@ -285,13 +285,6 @@
#if defined(CONFIG_PCI)
-#define PCI_ONE_PCI1
-#if defined(PCI_64BIT)
-#undef PCI_ALL_PCI1
-#undef PCI_TWO_PCI1
-#undef PCI_ONE_PCI1
-#endif
-
#define CONFIG_83XX_PCI_STREAMING
#undef CONFIG_EEPRO100
@@ -436,7 +429,7 @@
HRCWH_TSEC1M_IN_GMII |\
HRCWH_TSEC2M_IN_GMII)
#else
-#if defined(PCI_64BIT)
+#if defined(CONFIG_PCI_64BIT)
#define CONFIG_SYS_HRCW_HIGH (\
HRCWH_PCI_HOST |\
HRCWH_64_BIT_PCI |\
@@ -462,7 +455,7 @@
HRCWH_ROM_LOC_LOCAL_16BIT |\
HRCWH_TSEC1M_IN_GMII |\
HRCWH_TSEC2M_IN_GMII)
-#endif /* PCI_64BIT */
+#endif /* CONFIG_PCI_64BIT */
#endif /* CONFIG_PCISLAVE */
/*
diff --git a/include/configs/MPC8349EMDS_SDRAM.h b/include/configs/MPC8349EMDS_SDRAM.h
index b610b555a7..15f10492a5 100644
--- a/include/configs/MPC8349EMDS_SDRAM.h
+++ b/include/configs/MPC8349EMDS_SDRAM.h
@@ -357,13 +357,6 @@
#if defined(CONFIG_PCI)
-#define PCI_ONE_PCI1
-#if defined(PCI_64BIT)
-#undef PCI_ALL_PCI1
-#undef PCI_TWO_PCI1
-#undef PCI_ONE_PCI1
-#endif
-
#define CONFIG_83XX_PCI_STREAMING
#undef CONFIG_EEPRO100
@@ -508,7 +501,7 @@
HRCWH_TSEC1M_IN_GMII |\
HRCWH_TSEC2M_IN_GMII)
#else
-#if defined(PCI_64BIT)
+#if defined(CONFIG_PCI_64BIT)
#define CONFIG_SYS_HRCW_HIGH (\
HRCWH_PCI_HOST |\
HRCWH_64_BIT_PCI |\
@@ -534,7 +527,7 @@
HRCWH_ROM_LOC_LOCAL_16BIT |\
HRCWH_TSEC1M_IN_GMII |\
HRCWH_TSEC2M_IN_GMII)
-#endif /* PCI_64BIT */
+#endif /* CONFIG_PCI_64BIT */
#endif /* CONFIG_PCISLAVE */
/*
diff --git a/include/configs/TQM834x.h b/include/configs/TQM834x.h
index 2b82bd82eb..949e370150 100644
--- a/include/configs/TQM834x.h
+++ b/include/configs/TQM834x.h
@@ -270,7 +270,7 @@
HRCWL_VCO_1X2 |\
HRCWL_CORE_TO_CSB_2X1)
-#if defined(PCI_64BIT)
+#if defined(CONFIG_PCI_64BIT)
#define CONFIG_SYS_HRCW_HIGH (\
HRCWH_PCI_HOST |\
HRCWH_64_BIT_PCI |\
diff --git a/include/configs/caddy2.h b/include/configs/caddy2.h
index a7bbbbdd0b..a8f692d5ea 100644
--- a/include/configs/caddy2.h
+++ b/include/configs/caddy2.h
@@ -212,14 +212,6 @@
#if defined(CONFIG_PCI)
-#define PCI_64BIT
-#define PCI_ONE_PCI1
-#if defined(PCI_64BIT)
-#undef PCI_ALL_PCI1
-#undef PCI_TWO_PCI1
-#undef PCI_ONE_PCI1
-#endif
-
#undef CONFIG_EEPRO100
#undef CONFIG_TULIP
diff --git a/include/configs/sbc8349.h b/include/configs/sbc8349.h
index 6ae11185cb..60eb2cf831 100644
--- a/include/configs/sbc8349.h
+++ b/include/configs/sbc8349.h
@@ -307,14 +307,6 @@
#if defined(CONFIG_PCI)
-#define PCI_64BIT
-#define PCI_ONE_PCI1
-#if defined(PCI_64BIT)
-#undef PCI_ALL_PCI1
-#undef PCI_TWO_PCI1
-#undef PCI_ONE_PCI1
-#endif
-
#undef CONFIG_EEPRO100
#undef CONFIG_TULIP
@@ -435,7 +427,7 @@
HRCWL_CORE_TO_CSB_1X1)
#endif
-#if defined(PCI_64BIT)
+#if defined(CONFIG_PCI_64BIT)
#define CONFIG_SYS_HRCW_HIGH (\
HRCWH_PCI_HOST |\
HRCWH_64_BIT_PCI |\
diff --git a/include/configs/vme8349.h b/include/configs/vme8349.h
index 6c3ad76e52..ea08058752 100644
--- a/include/configs/vme8349.h
+++ b/include/configs/vme8349.h
@@ -212,14 +212,6 @@
#if defined(CONFIG_PCI)
-#define PCI_64BIT
-#define PCI_ONE_PCI1
-#if defined(PCI_64BIT)
-#undef PCI_ALL_PCI1
-#undef PCI_TWO_PCI1
-#undef PCI_ONE_PCI1
-#endif
-
#undef CONFIG_EEPRO100
#undef CONFIG_TULIP
@@ -316,7 +308,7 @@
HRCWL_VCO_1X2 |\
HRCWL_CORE_TO_CSB_2X1)
-#if defined(PCI_64BIT)
+#if defined(CONFIG_PCI_64BIT)
#define CONFIG_SYS_HRCW_HIGH (\
HRCWH_PCI_HOST |\
HRCWH_64_BIT_PCI |\