Convert CONFIG_SYS_PCI_64BIT to Kconfig

This converts the following to Kconfig:
   CONFIG_SYS_PCI_64BIT

Signed-off-by: Tom Rini <trini@konsulko.com>

diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index 85c964b7a18233ad45027a9c84c5fa89883bd3f7..26c96ed635cebadb721ad0a5a06f329a7ac12647 100644 (file)
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -1909,6 +1909,7 @@ config ARCH_OCTEONTX
        select OF_LIVE
        select BOARD_LATE_INIT
        select SYS_CACHE_SHIFT_7
+       select SYS_PCI_64BIT if PCI
        imply OF_HAS_PRIOR_STAGE
 
 config ARCH_OCTEONTX2
@@ -1921,6 +1922,7 @@ config ARCH_OCTEONTX2
        select OF_LIVE
        select BOARD_LATE_INIT
        select SYS_CACHE_SHIFT_7
+       select SYS_PCI_64BIT if PCI
        imply OF_HAS_PRIOR_STAGE
 
 config TARGET_THUNDERX_88XX

diff --git a/arch/arm/cpu/armv8/fsl-layerscape/Kconfig b/arch/arm/cpu/armv8/fsl-layerscape/Kconfig
index a499a9f56b4705fca50f45bd118b1d5132d7fe99..0b0e2ea7ab2df56383b271610a30259fc849ce0e 100644 (file)
--- a/arch/arm/cpu/armv8/fsl-layerscape/Kconfig
+++ b/arch/arm/cpu/armv8/fsl-layerscape/Kconfig
@@ -262,6 +262,7 @@ config ARCH_LX2162A
        select SYS_FSL_HAS_DDR4
        select SYS_FSL_SEC_COMPAT_5
        select SYS_FSL_SEC_LE
+       select SYS_PCI_64BIT if PCI
        select ARCH_EARLY_INIT_R
        select BOARD_EARLY_INIT_F
        select SYS_I2C_MXC
@@ -301,6 +302,7 @@ config ARCH_LX2160A
        select SYS_FSL_HAS_DDR4
        select SYS_FSL_SEC_COMPAT_5
        select SYS_FSL_SEC_LE
+       select SYS_PCI_64BIT if PCI
        select ARCH_EARLY_INIT_R
        select BOARD_EARLY_INIT_F
        select SYS_I2C_MXC

diff --git a/arch/arm/mach-octeontx/Kconfig b/arch/arm/mach-octeontx/Kconfig
index 28ecf9821f9d0a79012e22f595fad1f9babfe46b..542f4804760779c8984ea2b94a22353d013372fb 100644 (file)
--- a/arch/arm/mach-octeontx/Kconfig
+++ b/arch/arm/mach-octeontx/Kconfig
@@ -16,8 +16,4 @@ config SYS_SOC
        string
        default "octeontx"
 
-config SYS_PCI_64BIT
-       bool
-       default y
-
 endif

diff --git a/arch/arm/mach-octeontx2/Kconfig b/arch/arm/mach-octeontx2/Kconfig
index 8e5cb0f6380e89e8c7a0e5e61c7f93553d65cbf4..f6158df9086588350dc544cadb1ddfa07d7ed12f 100644 (file)
--- a/arch/arm/mach-octeontx2/Kconfig
+++ b/arch/arm/mach-octeontx2/Kconfig
@@ -16,8 +16,4 @@ config SYS_SOC
        string
        default "octeontx2"
 
-config SYS_PCI_64BIT
-       bool
-       default y
-
 endif

diff --git a/configs/MPC837XERDB_defconfig b/configs/MPC837XERDB_defconfig
index 16d425124a87fe0bdf3e104e6db57feea679e065..192bcae704e0c0bd6de7ad0e68d9166da201226a 100644 (file)
--- a/configs/MPC837XERDB_defconfig
+++ b/configs/MPC837XERDB_defconfig
@@ -5,6 +5,7 @@ CONFIG_ENV_SIZE=0x4000
 CONFIG_ENV_SECT_SIZE=0x10000
 CONFIG_DEFAULT_DEVICE_TREE="mpc8379erdb"
 CONFIG_SYS_CLK_FREQ=66666667
+# CONFIG_SYS_PCI_64BIT is not set
 CONFIG_MPC83xx=y
 CONFIG_HIGH_BATS=y
 CONFIG_TARGET_MPC837XERDB=y

diff --git a/configs/durian_defconfig b/configs/durian_defconfig
index 158fec2dc432cae283ed2e83d25686eee0a9b795..b44fd90df53c2f1b5a988a8f1c935c5a7372e1c4 100644 (file)
--- a/configs/durian_defconfig
+++ b/configs/durian_defconfig
@@ -7,6 +7,7 @@ CONFIG_NR_DRAM_BANKS=1
 CONFIG_ENV_SIZE=0x1000
 CONFIG_DEFAULT_DEVICE_TREE="phytium-durian"
 # CONFIG_PSCI_RESET is not set
+CONFIG_SYS_PCI_64BIT=y
 CONFIG_AHCI=y
 CONFIG_DISTRO_DEFAULTS=y
 CONFIG_SYS_LOAD_ADDR=0x90000000

diff --git a/configs/sifive_unmatched_defconfig b/configs/sifive_unmatched_defconfig
index dddc25cb27babd060fece69cb0ae305c147b17af..cbada15dfc8cb1c7dc09691fda13faa70cbadf43 100644 (file)
--- a/configs/sifive_unmatched_defconfig
+++ b/configs/sifive_unmatched_defconfig
@@ -10,6 +10,7 @@ CONFIG_SPL_MMC=y
 CONFIG_SPL=y
 CONFIG_SPL_SPI_FLASH_SUPPORT=y
 CONFIG_SPL_SPI=y
+CONFIG_SYS_PCI_64BIT=y
 CONFIG_AHCI=y
 CONFIG_TARGET_SIFIVE_UNMATCHED=y
 CONFIG_ARCH_RV64I=y

diff --git a/configs/socrates_defconfig b/configs/socrates_defconfig
index f2e927107c429c2876b0b9409f4c962ca5c2e532..ea0224d650358226bb2a682a0696bcae56eeea18 100644 (file)
--- a/configs/socrates_defconfig
+++ b/configs/socrates_defconfig
@@ -3,6 +3,7 @@ CONFIG_SYS_TEXT_BASE=0xfff80000
 CONFIG_ENV_SIZE=0x4000
 CONFIG_ENV_SECT_SIZE=0x20000
 CONFIG_DEFAULT_DEVICE_TREE="socrates"
+# CONFIG_SYS_PCI_64BIT is not set
 CONFIG_MPC85xx=y
 # CONFIG_CMD_ERRATA is not set
 CONFIG_TARGET_SOCRATES=y

diff --git a/drivers/pci/Kconfig b/drivers/pci/Kconfig
index cc139af6cb573f792687b82a2ca454a1146c1223..42f8cb6be0dcdd1a8f11f98c6e6d1f3bc1fa890c 100644 (file)
--- a/drivers/pci/Kconfig
+++ b/drivers/pci/Kconfig
@@ -19,6 +19,12 @@ config DM_PCI_COMPAT
          measure when porting a board to use driver model for PCI. Once the
          board is fully supported, this option should be disabled.
 
+config SYS_PCI_64BIT
+       bool "Enable 64-bit PCI resources"
+       default y if PPC
+       help
+         Enable 64-bit PCI resource access.
+
 config PCI_AARDVARK
        bool "Enable Aardvark PCIe driver"
        depends on DM_GPIO

diff --git a/include/configs/MPC8540ADS.h b/include/configs/MPC8540ADS.h
index bedb12b56ec77daa750bd92ff1424ad332d5fe2d..94ac0526b1df6454a061cebdfb23c1728acab68d 100644 (file)
--- a/include/configs/MPC8540ADS.h
+++ b/include/configs/MPC8540ADS.h
@@ -26,8 +26,6 @@
 #define CONFIG_HAS_FEC         1       /* 8540 has FEC */
 #endif
 
-#define CONFIG_SYS_PCI_64BIT   1       /* enable 64-bit PCI resources */
-
 /*
  * sysclk for MPC85xx
  *

diff --git a/include/configs/MPC8548CDS.h b/include/configs/MPC8548CDS.h
index abf3b513a830e2c31183e51752a7f31502f00542..c5cefd47410fcc4fcefe53f7a01ee607ef4329ab 100644 (file)
--- a/include/configs/MPC8548CDS.h
+++ b/include/configs/MPC8548CDS.h
@@ -19,7 +19,6 @@
 #define CONFIG_PCI1            /* PCI controller 1 */
 #define CONFIG_PCIE1           /* PCIE controller 1 (slot 1) */
 #undef CONFIG_PCI2
-#define CONFIG_SYS_PCI_64BIT   1       /* enable 64-bit PCI resources */
 
 #define CONFIG_INTERRUPTS              /* enable pci, srio, ddr interrupts */
 

diff --git a/include/configs/MPC8560ADS.h b/include/configs/MPC8560ADS.h
index d66acd1efa83598fe76d33914427bdaab529f488..32b0f40ceca811e943de06ec2de1141caf854b1d 100644 (file)
--- a/include/configs/MPC8560ADS.h
+++ b/include/configs/MPC8560ADS.h
@@ -27,7 +27,6 @@
  * assume U-Boot is less than 0.5MB
  */
 
-#define CONFIG_SYS_PCI_64BIT   1       /* enable 64-bit PCI resources */
 #define CONFIG_RESET_PHY_R     1       /* Call reset_phy() */
 
 /*

diff --git a/include/configs/P1010RDB.h b/include/configs/P1010RDB.h
index 297246a0bc3daf5b800d225f1f2cbf958df8a4e3..3a9672bf53e7dfc2f6c4e19ba81afd8e938f1a2a 100644 (file)
--- a/include/configs/P1010RDB.h
+++ b/include/configs/P1010RDB.h
@@ -114,7 +114,6 @@
 #if defined(CONFIG_PCI)
 #define CONFIG_PCIE1                   /* PCIE controller 1 (slot 1) */
 #define CONFIG_PCIE2                   /* PCIE controller 2 (slot 2) */
-#define CONFIG_SYS_PCI_64BIT           /* enable 64-bit PCI resources */
 
 /*
  * PCI Windows

diff --git a/include/configs/P2041RDB.h b/include/configs/P2041RDB.h
index d217a9545a8ecc8cb9fdacad94cfe24923abf4ac..d5f1ffe371b60f9f368204668f4142cbe630fa09 100644 (file)
--- a/include/configs/P2041RDB.h
+++ b/include/configs/P2041RDB.h
@@ -36,7 +36,6 @@
 #define CONFIG_PCIE1                   /* PCIE controller 1 */
 #define CONFIG_PCIE2                   /* PCIE controller 2 */
 #define CONFIG_PCIE3                   /* PCIE controller 3 */
-#define CONFIG_SYS_PCI_64BIT           /* enable 64-bit PCI resources */
 
 #define CONFIG_SYS_SRIO
 #define CONFIG_SRIO1                   /* SRIO port 1 */

diff --git a/include/configs/T102xRDB.h b/include/configs/T102xRDB.h
index b543b8647a8a504453d8b4a0f9897d996e2433d4..99a357e0a297babc580daaf4e88b0ad66ffdb7bf 100644 (file)
--- a/include/configs/T102xRDB.h
+++ b/include/configs/T102xRDB.h
@@ -416,7 +416,6 @@ unsigned long get_board_sys_clk(void);
 #define CONFIG_PCIE1           /* PCIE controller 1 */
 #define CONFIG_PCIE2           /* PCIE controller 2 */
 #define CONFIG_PCIE3           /* PCIE controller 3 */
-#define CONFIG_SYS_PCI_64BIT   /* enable 64-bit PCI resources */
 
 #ifdef CONFIG_PCI
 /* controller 1, direct to uli, tgtid 3, Base address 20000 */

diff --git a/include/configs/T104xRDB.h b/include/configs/T104xRDB.h
index a0db427f87e5cad2f7f9a2aef42dda5dfb939171..e3f6d6219870e9cfc910471dbfe75dff20b1b86b 100644 (file)
--- a/include/configs/T104xRDB.h
+++ b/include/configs/T104xRDB.h
@@ -85,8 +85,6 @@
 #define CONFIG_PCIE3                   /* PCIE controller 3 */
 #define CONFIG_PCIE4                   /* PCIE controller 4 */
 
-#define CONFIG_SYS_PCI_64BIT           /* enable 64-bit PCI resources */
-
 #if defined(CONFIG_SPIFLASH)
 #elif defined(CONFIG_MTD_RAW_NAND)
 #ifdef CONFIG_NXP_ESBC

diff --git a/include/configs/T208xQDS.h b/include/configs/T208xQDS.h
index 0542db562af9537064598c9ba1f922c5f106d337..5cc08bcf2f1a9d2a2dfa0100773c6c6777b3211b 100644 (file)
--- a/include/configs/T208xQDS.h
+++ b/include/configs/T208xQDS.h
@@ -414,7 +414,6 @@ unsigned long get_board_sys_clk(void);
 #define CONFIG_PCIE2           /* PCIE controller 2 */
 #define CONFIG_PCIE3           /* PCIE controller 3 */
 #define CONFIG_PCIE4           /* PCIE controller 4 */
-#define CONFIG_SYS_PCI_64BIT   /* enable 64-bit PCI resources */
 /* controller 1, direct to uli, tgtid 3, Base address 20000 */
 #define CONFIG_SYS_PCIE1_MEM_VIRT      0x80000000
 #define CONFIG_SYS_PCIE1_MEM_PHYS      0xc00000000ull

diff --git a/include/configs/T208xRDB.h b/include/configs/T208xRDB.h
index 1a8d51c0b9c8afc8397837a78bb2429e19d636fe..54833c425107abccdcbf4393b910fd01a3d62bec 100644 (file)
--- a/include/configs/T208xRDB.h
+++ b/include/configs/T208xRDB.h
@@ -366,7 +366,6 @@ unsigned long get_board_sys_clk(void);
 #define CONFIG_PCIE2           /* PCIE controller 2 */
 #define CONFIG_PCIE3           /* PCIE controller 3 */
 #define CONFIG_PCIE4           /* PCIE controller 4 */
-#define CONFIG_SYS_PCI_64BIT   /* enable 64-bit PCI resources */
 /* controller 1, direct to uli, tgtid 3, Base address 20000 */
 #define CONFIG_SYS_PCIE1_MEM_VIRT      0x80000000
 #define CONFIG_SYS_PCIE1_MEM_PHYS      0xc00000000ull

diff --git a/include/configs/T4240RDB.h b/include/configs/T4240RDB.h
index 6a6721248364b0ee19634fa6819da12585e061a1..fc8c33ac57134de10b6788818d8d40d7363ec83b 100644 (file)
--- a/include/configs/T4240RDB.h
+++ b/include/configs/T4240RDB.h
@@ -60,7 +60,6 @@
 #define CONFIG_PCIE1                   /* PCIE controller 1 */
 #define CONFIG_PCIE2                   /* PCIE controller 2 */
 #define CONFIG_PCIE3                   /* PCIE controller 3 */
-#define CONFIG_SYS_PCI_64BIT           /* enable 64-bit PCI resources */
 
 /*
  * These can be toggled for performance analysis, otherwise use default.

diff --git a/include/configs/bcm_ns3.h b/include/configs/bcm_ns3.h
index 7d6edbd65df6dc843692f07a2120c8595c206b9c..81b4218c88822cade30c7d80862717cd3e5ec34d 100644 (file)
--- a/include/configs/bcm_ns3.h
+++ b/include/configs/bcm_ns3.h
@@ -44,7 +44,6 @@
 /* Access eMMC Boot_1 and Boot_2 partitions */
 
 /* enable 64-bit PCI resources */
-#define CONFIG_SYS_PCI_64BIT           1
 
 #define CONSOLE_ARGS "console_args=console=ttyS0,115200n8\0"
 #define MAX_CPUS "max_cpus=maxcpus=8\0"

diff --git a/include/configs/corenet_ds.h b/include/configs/corenet_ds.h
index 95383420d5b621a11d7fccbd45f9cfa32a2a00ab..c8f46ebdb2d59ec364d5d1dead4aad14aededac8 100644 (file)
--- a/include/configs/corenet_ds.h
+++ b/include/configs/corenet_ds.h
@@ -47,7 +47,6 @@
 #define CONFIG_SYS_NUM_CPC             CONFIG_SYS_NUM_DDR_CTLRS
 #define CONFIG_PCIE1                   /* PCIE controller 1 */
 #define CONFIG_PCIE2                   /* PCIE controller 2 */
-#define CONFIG_SYS_PCI_64BIT           /* enable 64-bit PCI resources */
 
 #if defined(CONFIG_SPIFLASH)
 #elif defined(CONFIG_SDCARD)

diff --git a/include/configs/durian.h b/include/configs/durian.h
index 1dec09b4cea88c987c089a5c1f096b88d401d6db..c0ea42e180a3fa38bf0d0211be891906d7136021 100644 (file)
--- a/include/configs/durian.h
+++ b/include/configs/durian.h
@@ -16,7 +16,6 @@
 #define CONFIG_SYS_INIT_SP_ADDR                (0x88000000 - 0x100000)
 
 /* PCI CONFIG */
-#define CONFIG_SYS_PCI_64BIT    1
 #define CONFIG_PCI_SCAN_SHOW
 
 /* SCSI */

diff --git a/include/configs/kmcent2.h b/include/configs/kmcent2.h
index 24dc4c912282e97c1f4c393d307121b1325b0550..45371ee72361375b14d5c4733f2b896000cdb0a6 100644 (file)
--- a/include/configs/kmcent2.h
+++ b/include/configs/kmcent2.h
@@ -141,7 +141,6 @@
 #define CONFIG_SYS_FSL_CPC             /* Corenet Platform Cache */
 #define CONFIG_SYS_NUM_CPC             CONFIG_SYS_NUM_DDR_CTLRS
 #define CONFIG_PCIE1                   /* PCIE controller 1 */
-#define CONFIG_SYS_PCI_64BIT           /* enable 64-bit PCI resources */
 
 /* Environment in parallel NOR-Flash */
 #define CONFIG_ENV_TOTAL_SIZE          0x040000

diff --git a/include/configs/lx2160a_common.h b/include/configs/lx2160a_common.h
index 7247736a0d28fb85af12e45c14282393e8991bdc..767980fa94e5db1f59469c24045b9c93e344b003 100644 (file)
--- a/include/configs/lx2160a_common.h
+++ b/include/configs/lx2160a_common.h
@@ -104,7 +104,6 @@
 
 /* PCI */
 #ifdef CONFIG_PCI
-#define CONFIG_SYS_PCI_64BIT
 #define CONFIG_PCI_SCAN_SHOW
 #endif
 

diff --git a/include/configs/p1_p2_rdb_pc.h b/include/configs/p1_p2_rdb_pc.h
index b31e11d085866f4a8561bdc00431f3027cb2bde9..33f052d7dde099eec5f593eb62c0da93762de703 100644 (file)
--- a/include/configs/p1_p2_rdb_pc.h
+++ b/include/configs/p1_p2_rdb_pc.h
@@ -140,7 +140,6 @@
 
 #define CONFIG_PCIE1   /* PCIE controller 1 (slot 1) */
 #define CONFIG_PCIE2   /* PCIE controller 2 (slot 2) */
-#define CONFIG_SYS_PCI_64BIT   /* enable 64-bit PCI resources */
 
 #define CONFIG_SYS_SATA_MAX_DEVICE     2
 #define CONFIG_LBA48

diff --git a/include/configs/qemu-ppce500.h b/include/configs/qemu-ppce500.h
index 169d79c1faf0f12c1d41714b2abe7736375dc746..7d8db6f60ddf4df37c4056db147dfa1af33fc582 100644 (file)
--- a/include/configs/qemu-ppce500.h
+++ b/include/configs/qemu-ppce500.h
@@ -13,8 +13,6 @@
 
 #define CONFIG_SYS_RAMBOOT
 
-#define CONFIG_SYS_PCI_64BIT           /* enable 64-bit PCI resources */
-
 #define CONFIG_ENABLE_36BIT_PHYS
 
 /* Needed to fill the ccsrbar pointer */

diff --git a/include/configs/sifive-unmatched.h b/include/configs/sifive-unmatched.h
index 574821cdeac2aabbd04b44fcab659315147b42d0..30adfe948f14b2a01484d5562d42cf20d53e628a 100644 (file)
--- a/include/configs/sifive-unmatched.h
+++ b/include/configs/sifive-unmatched.h
@@ -32,8 +32,6 @@
 
 #define CONFIG_STANDALONE_LOAD_ADDR    0x80200000
 
-#define CONFIG_SYS_PCI_64BIT           1       /* enable 64-bit resources */
-
 #define CONFIG_SYS_SCSI_MAX_SCSI_ID    4
 
 /* Environment options */

diff --git a/include/configs/synquacer.h b/include/configs/synquacer.h
index 2347ec2fe0cfb68c691603025a6d5e6dc93c57d5..04095891525fd15f884023ffe18b989fb0db7aff 100644 (file)
--- a/include/configs/synquacer.h
+++ b/include/configs/synquacer.h
@@ -46,7 +46,6 @@
 #define CONFIG_SYS_PBSIZE              (CONFIG_SYS_CBSIZE + sizeof(CONFIG_SYS_PROMPT) + 16)
 
 /* Since U-Boot 64bit PCIe support is limited, disable 64bit MMIO support */
-/* #define CONFIG_SYS_PCI_64BIT                1 */
 
 #define DEFAULT_DFU_ALT_INFO "dfu_alt_info="                           \
                        "mtd nor1=u-boot.bin raw 200000 100000;"        \

diff --git a/include/configs/uniphier.h b/include/configs/uniphier.h
index b91b0db2c474288ca01bc203683a63408f9a7f77..fb7b83d285d3336b3bee1e9f2de46104dd7b757a 100644 (file)
--- a/include/configs/uniphier.h
+++ b/include/configs/uniphier.h
@@ -198,6 +198,4 @@
 
 #define CONFIG_SPL_PAD_TO                      0x20000
 
-#define CONFIG_SYS_PCI_64BIT
-
 #endif /* __CONFIG_UNIPHIER_H__ */