Eric Lee / smarc-uboot

Download as
Browse Code ยป

Commit 8701eceffdf77e2908d0b58add0dabc16edf6087

Authored by Scott Wood
Committed by Wolfgang Denk
1 parent 83863df04b
Exists in master and in 55 other branches 8qm-imx_v2020.04_5.4.70_2.3.0, emb_lf_v2022.04, emb_lf_v2023.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

PQ2FADS: Enable PCI. 

PCI on PQ2FADS is very similar to PCI on MPC8272ADS.

Signed-off-by: Scott Wood <scottwood@freescale.com>

Showing 2 changed files with 15 additions and 4 deletions Side-by-side Diff

... ... @@ -258,6 +258,8 @@
258 258 immap->im_siu_conf.sc_siumcr =
259 259 (immap->im_siu_conf.sc_siumcr & ~SIUMCR_LBPC11)
260 260 | SIUMCR_LBPC01;
  261 +#elif defined(CONFIG_ADSTYPE) && CONFIG_ADSTYPE == CONFIG_SYS_PQ2FADS
  262 +/* nothing to do for this board here */
261 263 #elif defined CONFIG_MPC8272
262 264 immap->im_siu_conf.sc_siumcr = (immap->im_siu_conf.sc_siumcr &
263 265 ~SIUMCR_BBD &
include/configs/MPC8260ADS.h
Diff comments   View file @ 8701ece
... ... @@ -67,6 +67,13 @@
67 67  
68 68 #if CONFIG_ADSTYPE == CONFIG_SYS_8272ADS
69 69 #define CONFIG_MPC8272 1
  70 +#elif CONFIG_ADSTYPE == CONFIG_SYS_PQ2FADS
  71 +/*
  72 + * Actually MPC8275, but the code is littered with ifdefs that
  73 + * apply to both, or which use this ifdef to assume board-specific
  74 + * details. :-(
  75 + */
  76 +#define CONFIG_MPC8272 1
70 77 #else
71 78 #define CONFIG_MPC8260 1
72 79 #endif /* CONFIG_ADSTYPE == CONFIG_SYS_8272ADS */
... ... @@ -176,7 +183,7 @@
176 183 #endif /* CONFIG_ADSTYPE >= CONFIG_SYS_PQ2FADS */
177 184  
178 185 /*PCI*/
179   -#ifdef CONFIG_MPC8272
  186 +#if CONFIG_ADSTYPE >= CONFIG_SYS_PQ2FADS
180 187 #define CONFIG_PCI
181 188 #define CONFIG_PCI_PNP
182 189 #define CONFIG_PCI_BOOTDELAY 0
... ... @@ -244,7 +251,6 @@
244 251 #elif CONFIG_ADSTYPE >= CONFIG_SYS_PQ2FADS
245 252 #undef CONFIG_CMD_SDRAM
246 253 #undef CONFIG_CMD_I2C
247   - #undef CONFIG_CMD_PCI
248 254  
249 255 #else
250 256 #undef CONFIG_CMD_PCI
... ... @@ -318,7 +324,7 @@
318 324  
319 325 #define CONFIG_SYS_IMMR 0xF0000000
320 326 #define CONFIG_SYS_BCSR 0xF4500000
321   -#if CONFIG_ADSTYPE == CONFIG_SYS_8272ADS
  327 +#if CONFIG_ADSTYPE >= CONFIG_SYS_PQ2FADS
322 328 #define CONFIG_SYS_PCI_INT 0xF8200000
323 329 #endif
324 330 #define CONFIG_SYS_SDRAM_BASE 0x00000000
... ... @@ -413,6 +419,9 @@
413 419 #if CONFIG_ADSTYPE == CONFIG_SYS_8272ADS
414 420 #define CONFIG_SYS_BR3_PRELIM (CONFIG_SYS_PCI_INT | 0x1801) /* PCI interrupt controller */
415 421 #define CONFIG_SYS_OR3_PRELIM 0xFFFF8010
  422 +#elif CONFIG_ADSTYPE == CONFIG_SYS_PQ2FADS
  423 +#define CONFIG_SYS_BR8_PRELIM (CONFIG_SYS_PCI_INT | 0x1801) /* PCI interrupt controller */
  424 +#define CONFIG_SYS_OR8_PRELIM 0xFFFF8010
416 425 #endif
417 426  
418 427 #define CONFIG_SYS_RMR RMR_CSRE
... ... @@ -447,7 +456,7 @@
447 456  
448 457 #define CONFIG_SYS_RESET_ADDRESS 0x04400000
449 458  
450   -#if CONFIG_ADSTYPE == CONFIG_SYS_8272ADS
  459 +#if CONFIG_ADSTYPE >= CONFIG_SYS_PQ2FADS
451 460  
452 461 /* PCI Memory map (if different from default map */
453 462 #define CONFIG_SYS_PCI_SLV_MEM_LOCAL CONFIG_SYS_SDRAM_BASE /* Local base */