Eric Lee / smarc-uboot

Download as
Browse Code ยป

Commit be9b56df02168ca97562d6b9ec791136e4cd925a

Authored by Kim Phillips
1 parent 94978e19f3
Exists in master and in 54 other branches 8qm-imx_v2020.04_5.4.70_2.3.0, emb_lf_v2022.04, imx_v2015.04_4.1.15_1.0.0_ga, pitx_8mp_lf_v2020.04, smarc-8m-android-10.0.0_2.6.0, smarc-8m-android-11.0.0_2.0.0, smarc-8mp-android-11.0.0_2.0.0, smarc-emmc-imx_v2014.04_3.10.53_1.1.0_ga, smarc-emmc-imx_v2014.04_3.14.28_1.0.0_ga, smarc-imx-l5.0.0_1.0.0-ga, smarc-imx6_v2018.03_4.14.98_2.0.0_ga, smarc-imx7_v2017.03_4.9.11_1.0.0_ga, smarc-imx7_v2018.03_4.14.98_2.0.0_ga, smarc-imx_v2014.04_3.14.28_1.0.0_ga, smarc-imx_v2015.04_4.1.15_1.0.0_ga, smarc-imx_v2017.03_4.9.11_1.0.0_ga, smarc-imx_v2017.03_4.9.88_2.0.0_ga, smarc-imx_v2017.03_o8.1.0_1.3.0_8m, smarc-imx_v2018.03_4.14.78_1.0.0_ga, smarc-m6.0.1_2.1.0-ga, smarc-n7.1.2_2.0.0-ga, smarc-rel_imx_4.1.15_2.0.0_ga, smarc_8m-imx_v2018.03_4.14.98_2.0.0_ga, smarc_8m-imx_v2019.04_4.19.35_1.1.0, smarc_8m_00d0-imx_v2018.03_4.14.98_2.0.0_ga, smarc_8mm-imx_v2018.03_4.14.98_2.0.0_ga, smarc_8mm-imx_v2019.04_4.19.35_1.1.0, smarc_8mm-imx_v2020.04_5.4.24_2.1.0, smarc_8mp_lf_v2020.04, smarc_8mq-imx_v2020.04_5.4.24_2.1.0, smarc_8mq_lf_v2020.04, ti-u-boot-2015.07, u-boot-2013.01.y, v2013.10, v2013.10-smarct33, v2013.10-smartmen, v2014.01, v2014.04, v2014.04-smarct33, v2014.04-smarct33-emmc, v2014.04-smartmen, v2014.07, v2014.07-smarct33, v2014.07-smartmen, v2015.07-smarct33, v2015.07-smarct33-emmc, v2015.07-smarct4x, v2016.05-dlt, v2016.05-smarct3x, v2016.05-smarct3x-emmc, v2016.05-smarct4x, v2017.01-smarct3x, v2017.01-smarct3x-emmc, v2017.01-smarct4x

mpc83xx: CONFIG_83XX_GENERIC_PCI is now synonymous with CONFIG_PCI; remove the former 

Signed-off-by: Kim Phillips <kim.phillips@freescale.com>

Showing 15 changed files with 5 additions and 22 deletions Side-by-side Diff

cpu/mpc83xx/Makefile
Diff comments   View file @ be9b56d
... ... @@ -38,8 +38,8 @@
38 38 COBJS-y += ecc.o
39 39 COBJS-$(CONFIG_QE) += qe_io.o
40 40 COBJS-$(CONFIG_FSL_SERDES) += serdes.o
41   -COBJS-$(CONFIG_83XX_GENERIC_PCI) += pci.o
42   -COBJS-$(CONFIG_83XX_GENERIC_PCIE) += pcie.o
  41 +COBJS-$(CONFIG_PCI) += pci.o
  42 +COBJS-$(CONFIG_PCIE) += pcie.o
43 43 COBJS-$(CONFIG_OF_LIBFDT) += fdt.o
44 44  
45 45 COBJS := $(COBJS-y)
include/configs/MPC8313ERDB.h
Diff comments   View file @ be9b56d
... ... @@ -36,7 +36,6 @@
36 36 #define CONFIG_MPC8313ERDB 1
37 37  
38 38 #define CONFIG_PCI
39   -#define CONFIG_83XX_GENERIC_PCI
40 39  
41 40 #define CONFIG_MISC_INIT_R
42 41  
include/configs/MPC8315ERDB.h
Diff comments   View file @ be9b56d
... ... @@ -332,8 +332,7 @@
332 332 #define CONFIG_SYS_PCIE2_IO_SIZE 0x00800000
333 333  
334 334 #define CONFIG_PCI
335   -#define CONFIG_83XX_GENERIC_PCI 1 /* Use generic PCI setup */
336   -#define CONFIG_83XX_GENERIC_PCIE 1
  335 +#define CONFIG_PCIE
337 336  
338 337 #define CONFIG_NET_MULTI
339 338 #define CONFIG_PCI_PNP /* do pci plug-and-play */
include/configs/MPC8323ERDB.h
Diff comments   View file @ be9b56d
... ... @@ -18,7 +18,6 @@
18 18 #define CONFIG_MPC832x 1 /* MPC832x CPU specific */
19 19  
20 20 #define CONFIG_PCI 1
21   -#define CONFIG_83XX_GENERIC_PCI 1
22 21  
23 22 /*
24 23 * System Clock Setup
include/configs/MPC832XEMDS.h
Diff comments   View file @ be9b56d
... ... @@ -334,7 +334,6 @@
334 334  
335 335 #define CONFIG_NET_MULTI
336 336 #define CONFIG_PCI_PNP /* do pci plug-and-play */
337   -#define CONFIG_83XX_GENERIC_PCI
338 337 #define CONFIG_83XX_PCI_STREAMING
339 338  
340 339 #undef CONFIG_EEPRO100
include/configs/MPC8349EMDS.h
Diff comments   View file @ be9b56d
... ... @@ -38,9 +38,6 @@
38 38 #define CONFIG_MPC8349 1 /* MPC8349 specific */
39 39 #define CONFIG_MPC8349EMDS 1 /* MPC8349EMDS board specific */
40 40  
41   -#undef CONFIG_PCI
42   -#undef CONFIG_MPC83XX_PCI2 /* support for 2nd PCI controller */
43   -
44 41 #define PCI_66M
45 42 #ifdef PCI_66M
46 43 #define CONFIG_83XX_CLKIN 66000000 /* in Hz */
... ... @@ -374,7 +371,6 @@
374 371  
375 372 #define CONFIG_NET_MULTI
376 373 #define CONFIG_PCI_PNP /* do pci plug-and-play */
377   -#define CONFIG_83XX_GENERIC_PCI
378 374 #define CONFIG_83XX_PCI_STREAMING
379 375  
380 376 #undef CONFIG_EEPRO100
include/configs/MPC8349ITX.h
Diff comments   View file @ be9b56d
... ... @@ -382,7 +382,6 @@
382 382  
383 383 #define CONFIG_NET_MULTI
384 384 #define CONFIG_PCI_PNP /* do pci plug-and-play */
385   -#define CONFIG_83XX_GENERIC_PCI
386 385  
387 386 #ifndef CONFIG_PCI_PNP
388 387 #define PCI_ENET0_IOADDR 0x00000000
include/configs/MPC8360EMDS.h
Diff comments   View file @ be9b56d
... ... @@ -369,7 +369,6 @@
369 369  
370 370 #define CONFIG_NET_MULTI
371 371 #define CONFIG_PCI_PNP /* do pci plug-and-play */
372   -#define CONFIG_83XX_GENERIC_PCI
373 372 #define CONFIG_83XX_PCI_STREAMING
374 373  
375 374 #undef CONFIG_EEPRO100
include/configs/MPC8360ERDK.h
Diff comments   View file @ be9b56d
... ... @@ -277,7 +277,6 @@
277 277 * Addresses are mapped 1-1.
278 278 */
279 279 #define CONFIG_PCI
280   -#define CONFIG_83XX_GENERIC_PCI 1
281 280  
282 281 #define CONFIG_SYS_PCI1_MEM_BASE 0x80000000
283 282 #define CONFIG_SYS_PCI1_MEM_PHYS CONFIG_SYS_PCI1_MEM_BASE
include/configs/MPC837XEMDS.h
Diff comments   View file @ be9b56d
... ... @@ -381,8 +381,7 @@
381 381 #ifndef __ASSEMBLY__
382 382 extern int board_pci_host_broken(void);
383 383 #endif
384   -#define CONFIG_83XX_GENERIC_PCI 1 /* Use generic PCI setup */
385   -#define CONFIG_83XX_GENERIC_PCIE 1
  384 +#define CONFIG_PCIE
386 385 #define CONFIG_PQ_MDS_PIB 1 /* PQ MDS Platform IO Board */
387 386  
388 387 #define CONFIG_HAS_FSL_DR_USB 1 /* fixup device tree for the DR USB */
include/configs/MPC837XERDB.h
Diff comments   View file @ be9b56d
... ... @@ -49,8 +49,7 @@
49 49 #define CONFIG_83XX_PCICLK 66666667 /* in HZ */
50 50 #else
51 51 #define CONFIG_83XX_CLKIN 66666667 /* in Hz */
52   -#define CONFIG_83XX_GENERIC_PCI 1
53   -#define CONFIG_83XX_GENERIC_PCIE 1
  52 +#define CONFIG_PCIE
54 53 #endif
55 54  
56 55 #ifndef CONFIG_SYS_CLK_FREQ
include/configs/MVBLM7.h
Diff comments   View file @ be9b56d
... ... @@ -40,7 +40,6 @@
40 40 #define CONFIG_SYS_IMMR 0xE0000000
41 41  
42 42 #define CONFIG_PCI
43   -#define CONFIG_83XX_GENERIC_PCI
44 43 #define CONFIG_PCI_SKIP_HOST_BRIDGE
45 44 #define CONFIG_HARD_I2C
46 45 #define CONFIG_TSEC_ENET
include/configs/SIMPC8313.h
Diff comments   View file @ be9b56d
... ... @@ -37,7 +37,6 @@
37 37 #define CONFIG_MPC8313 1
38 38  
39 39 #define CONFIG_PCI
40   -#define CONFIG_83XX_GENERIC_PCI
41 40  
42 41 #define CONFIG_MISC_INIT_R
43 42  
include/configs/TQM834x.h
Diff comments   View file @ be9b56d
... ... @@ -247,7 +247,6 @@
247 247 #if defined(CONFIG_PCI)
248 248  
249 249 #define CONFIG_PCI_PNP /* do pci plug-and-play */
250   -#define CONFIG_83XX_GENERIC_PCI
251 250 #define CONFIG_PCI_SCAN_SHOW /* show pci devices on startup */
252 251  
253 252 /* PCI1 host bridge */
include/configs/sbc8349.h
Diff comments   View file @ be9b56d
... ... @@ -329,7 +329,6 @@
329 329  
330 330 #define CONFIG_NET_MULTI
331 331 #define CONFIG_PCI_PNP /* do pci plug-and-play */
332   -#define CONFIG_83XX_GENERIC_PCI
333 332  
334 333 #undef CONFIG_EEPRO100
335 334 #undef CONFIG_TULIP