Eric Lee / smarc-uboot

Download as
Browse Code ยป

Commit 9760b274df8fdc5a6d124f3192535ebe281a78a6

Authored by Zang Roy-R61911
Committed by Andy Fleming
1 parent d607b9684b
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

powerpc/corenet_ds: move SATA config to board configuration 

board configuration file is included before asm/config_mpc85xx.h.
however, CONFIG_FSL_SATA_V2 is defined in asm/config_mpc85xx.h.
it will never take effective in the board configuration file for
this kind of code :

 #ifdef CONFIG_FSL_SATA_V2
 ...
 #endif

To solve this problem, move CONFIG_FSL_SATA_V2 to board
configuration header file.

This patch reverts Timur's
commit:3e0529f742e893653848494ffb9f7cd0d91304bf

Signed-off-by: Roy Zang <tie-fei.zang@freescale.com>
Signed-off-by: Andy Fleming <afleming@freescale.com>

Showing 6 changed files with 7 additions and 8 deletions Side-by-side Diff

arch/powerpc/include/asm/config_mpc85xx.h
Diff comments   View file @ 9760b27
... ... @@ -137,7 +137,6 @@
137 137 #define CONFIG_SYS_PPC_E500_DEBUG_TLB 3
138 138 #define CONFIG_TSECV2
139 139 #define CONFIG_SYS_FSL_SEC_COMPAT 4
140   -#define CONFIG_FSL_SATA_V2
141 140 #define CONFIG_SYS_FSL_ERRATUM_ESDHC111
142 141 #define CONFIG_NUM_DDR_CONTROLLERS 1
143 142 #define CONFIG_SYS_CCSRBAR_DEFAULT 0xff700000
... ... @@ -181,7 +180,6 @@
181 180 #define CONFIG_SYS_PPC_E500_DEBUG_TLB 2
182 181 #define CONFIG_TSECV2
183 182 #define CONFIG_SYS_FSL_SEC_COMPAT 2
184   -#define CONFIG_FSL_SATA_V2
185 183 #define CONFIG_SYS_CCSRBAR_DEFAULT 0xff700000
186 184 #define CONFIG_SYS_FSL_ERRATUM_ELBC_A001
187 185 #define CONFIG_SYS_FSL_ERRATUM_ESDHC111
... ... @@ -194,7 +192,6 @@
194 192 #define CONFIG_SYS_PPC_E500_DEBUG_TLB 3
195 193 #define CONFIG_TSECV2
196 194 #define CONFIG_SYS_FSL_SEC_COMPAT 4
197   -#define CONFIG_FSL_SATA_V2
198 195 #define CONFIG_SYS_FSL_ERRATUM_ESDHC111
199 196 #define CONFIG_NUM_DDR_CONTROLLERS 1
200 197 #define CONFIG_SYS_CCSRBAR_DEFAULT 0xff700000
... ... @@ -248,7 +245,6 @@
248 245 #define CONFIG_SYS_PPC_E500_DEBUG_TLB 2
249 246 #define CONFIG_TSECV2
250 247 #define CONFIG_SYS_FSL_SEC_COMPAT 2
251   -#define CONFIG_FSL_SATA_V2
252 248 #define CONFIG_SYS_CCSRBAR_DEFAULT 0xff700000
253 249 #define CONFIG_SYS_FSL_ERRATUM_ELBC_A001
254 250 #define CONFIG_SYS_FSL_ERRATUM_ESDHC111
... ... @@ -324,7 +320,6 @@
324 320 #define CONFIG_SYS_FSL_NUM_CC_PLLS 2
325 321 #define CONFIG_SYS_FSL_NUM_LAWS 32
326 322 #define CONFIG_SYS_FSL_SEC_COMPAT 4
327   -#define CONFIG_FSL_SATA_V2
328 323 #define CONFIG_SYS_NUM_FMAN 1
329 324 #define CONFIG_SYS_NUM_FM1_DTSEC 5
330 325 #define CONFIG_SYS_NUM_FM1_10GEC 1
... ... @@ -357,7 +352,6 @@
357 352 #define CONFIG_SYS_FSL_NUM_CC_PLLS 2
358 353 #define CONFIG_SYS_FSL_NUM_LAWS 32
359 354 #define CONFIG_SYS_FSL_SEC_COMPAT 4
360   -#define CONFIG_FSL_SATA_V2
361 355 #define CONFIG_SYS_NUM_FMAN 1
362 356 #define CONFIG_SYS_NUM_FM1_DTSEC 5
363 357 #define CONFIG_SYS_NUM_FM1_10GEC 1
... ... @@ -435,7 +429,6 @@
435 429 #define CONFIG_SYS_FSL_NUM_CC_PLLS 2
436 430 #define CONFIG_SYS_FSL_NUM_LAWS 32
437 431 #define CONFIG_SYS_FSL_SEC_COMPAT 4
438   -#define CONFIG_FSL_SATA_V2
439 432 #define CONFIG_SYS_NUM_FMAN 1
440 433 #define CONFIG_SYS_NUM_FM1_DTSEC 5
441 434 #define CONFIG_SYS_NUM_FM1_10GEC 1
include/configs/P1010RDB.h
Diff comments   View file @ 9760b27
... ... @@ -553,6 +553,7 @@
553 553  
554 554 /* SATA */
555 555 #define CONFIG_FSL_SATA
  556 +#define CONFIG_FSL_SATA_V2
556 557 #define CONFIG_LIBATA
557 558  
558 559 #ifdef CONFIG_FSL_SATA
include/configs/P1022DS.h
Diff comments   View file @ 9760b27
... ... @@ -360,6 +360,7 @@
360 360 /* SATA */
361 361 #define CONFIG_LIBATA
362 362 #define CONFIG_FSL_SATA
  363 +#define CONFIG_FSL_SATA_V2
363 364  
364 365 #define CONFIG_SYS_SATA_MAX_DEVICE 2
365 366 #define CONFIG_SATA1
include/configs/P2041RDB.h
Diff comments   View file @ 9760b27
... ... @@ -566,8 +566,10 @@
566 566 #endif /* CONFIG_PCI */
567 567  
568 568 /* SATA */
  569 +#define CONFIG_FSL_SATA_V2
  570 +
  571 +#ifdef CONFIG_FSL_SATA_V2
569 572 #define CONFIG_FSL_SATA
570   -#ifdef CONFIG_FSL_SATA
571 573 #define CONFIG_LIBATA
572 574  
573 575 #define CONFIG_SYS_SATA_MAX_DEVICE 2
include/configs/P3041DS.h
Diff comments   View file @ 9760b27
... ... @@ -32,6 +32,7 @@
32 32  
33 33 #define CONFIG_MMC
34 34 #define CONFIG_NAND_FSL_ELBC
  35 +#define CONFIG_FSL_SATA_V2
35 36 #define CONFIG_PCIE3
36 37 #define CONFIG_PCIE4
37 38 #define CONFIG_SYS_DPAA_RMAN
include/configs/P5020DS.h
Diff comments   View file @ 9760b27
... ... @@ -32,6 +32,7 @@
32 32  
33 33 #define CONFIG_MMC
34 34 #define CONFIG_NAND_FSL_ELBC
  35 +#define CONFIG_FSL_SATA_V2
35 36 #define CONFIG_PCIE3
36 37 #define CONFIG_PCIE4
37 38 #define CONFIG_SYS_FSL_RAID_ENGINE