Eric Lee / smarc-uboot

Download as
Browse Code ยป

Commit 9920d151c4b22540a937c4225020069c583a7fad

Authored by Tuomas Tynkkynen
Committed by Tom Rini
1 parent ad0ac54361
Exists in smarc_8mq_lf_v2020.04 and in 20 other branches 8qm-imx_v2020.04_5.4.70_2.3.0, emb_lf-6.6.52-2.2.0, emb_lf_v2022.04, emb_lf_v2023.04, emb_lf_v2024.04, 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-imx6_v2018.03_4.14.98_2.0.0_ga, smarc-imx7_v2018.03_4.14.98_2.0.0_ga, smarc-imx_v2018.03_4.14.78_1.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

ata: Migrate CONFIG_FSL_SATA to Kconfig 

Use 'imply' here liberally to avoid the combinatorial explosion of
defconfig changes in the PowerPC boards.

Signed-off-by: Tuomas Tynkkynen <tuomas.tynkkynen@iki.fi>

Showing 26 changed files with 24 additions and 20 deletions Side-by-side Diff

arch/powerpc/cpu/mpc83xx/Kconfig
Diff comments   View file @ 9920d15
... ... @@ -55,6 +55,7 @@
55 55 bool "Support MPC837XEMDS"
56 56 select BOARD_EARLY_INIT_F
57 57 imply CMD_SATA
  58 + imply FSL_SATA
58 59  
59 60 config TARGET_MPC837XERDB
60 61 bool "Support MPC837XERDB"
arch/powerpc/cpu/mpc85xx/Kconfig
Diff comments   View file @ 9920d15
... ... @@ -92,6 +92,7 @@
92 92 # Use DDR3 controller with DDR2 DIMMs on this board
93 93 select SYS_FSL_DDRC_GEN3
94 94 imply CMD_SATA
  95 + imply FSL_SATA
95 96  
96 97 config TARGET_MPC8541CDS
97 98 bool "Support MPC8541CDS"
... ... @@ -148,6 +149,7 @@
148 149 select SUPPORT_SPL
149 150 select SUPPORT_TPL
150 151 imply CMD_SATA
  152 + imply FSL_SATA
151 153  
152 154 config TARGET_P1023RDB
153 155 bool "Support P1023RDB"
... ... @@ -230,6 +232,7 @@
230 232 select BOARD_LATE_INIT if CHAIN_OF_TRUST
231 233 select PHYS_64BIT
232 234 imply CMD_SATA
  235 + imply FSL_SATA
233 236  
234 237 config TARGET_QEMU_PPCE500
235 238 bool "Support qemu-ppce500"
... ... @@ -244,6 +247,7 @@
244 247 select PHYS_64BIT
245 248 imply CMD_EEPROM
246 249 imply CMD_SATA
  250 + imply FSL_SATA
247 251  
248 252 config TARGET_T1023RDB
249 253 bool "Support T1023RDB"
... ... @@ -642,6 +646,7 @@
642 646 imply CMD_SATA
643 647 imply CMD_PCI
644 648 imply CMD_REGINFO
  649 + imply FSL_SATA
645 650  
646 651 config ARCH_P1011
647 652 bool
... ... @@ -826,6 +831,7 @@
826 831 imply CMD_NAND
827 832 imply CMD_SATA
828 833 imply CMD_REGINFO
  834 + imply FSL_SATA
829 835  
830 836 config ARCH_P4080
831 837 bool
... ... @@ -887,6 +893,7 @@
887 893 select FSL_ELBC
888 894 imply CMD_SATA
889 895 imply CMD_REGINFO
  896 + imply FSL_SATA
890 897  
891 898 config ARCH_P5040
892 899 bool
... ... @@ -910,6 +917,7 @@
910 917 select FSL_ELBC
911 918 imply CMD_SATA
912 919 imply CMD_REGINFO
  920 + imply FSL_SATA
913 921  
914 922 config ARCH_QEMU_E500
915 923 bool
... ... @@ -976,6 +984,7 @@
976 984 imply CMD_NAND
977 985 imply CMD_SATA
978 986 imply CMD_REGINFO
  987 + imply FSL_SATA
979 988  
980 989 config ARCH_T1042
981 990 bool
... ... @@ -998,6 +1007,7 @@
998 1007 imply CMD_NAND
999 1008 imply CMD_SATA
1000 1009 imply CMD_REGINFO
  1010 + imply FSL_SATA
1001 1011  
1002 1012 config ARCH_T2080
1003 1013 bool
... ... @@ -1023,6 +1033,7 @@
1023 1033 imply CMD_SATA
1024 1034 imply CMD_NAND
1025 1035 imply CMD_REGINFO
  1036 + imply FSL_SATA
1026 1037  
1027 1038 config ARCH_T2081
1028 1039 bool
... ... @@ -1069,6 +1080,7 @@
1069 1080 imply CMD_SATA
1070 1081 imply CMD_NAND
1071 1082 imply CMD_REGINFO
  1083 + imply FSL_SATA
1072 1084  
1073 1085 config ARCH_T4240
1074 1086 bool
... ... @@ -1096,6 +1108,7 @@
1096 1108 imply CMD_SATA
1097 1109 imply CMD_NAND
1098 1110 imply CMD_REGINFO
  1111 + imply FSL_SATA
1099 1112  
1100 1113 config BOOKE
1101 1114 bool
configs/MPC8315ERDB_defconfig
Diff comments   View file @ 9920d15
... ... @@ -19,6 +19,7 @@
19 19 CONFIG_CMD_MTDPARTS=y
20 20 CONFIG_MTDIDS_DEFAULT="nand0=e0600000.flash"
21 21 CONFIG_MTDPARTS_DEFAULT="mtdparts=e0600000.flash:512k(uboot),128k(env),6m@1m(kernel),-(fs)"
  22 +CONFIG_FSL_SATA=y
22 23 # CONFIG_MMC is not set
23 24 CONFIG_MTD_NOR_FLASH=y
24 25 CONFIG_PHYLIB=y
configs/MPC837XERDB_defconfig
Diff comments   View file @ 9920d15
... ... @@ -17,6 +17,7 @@
17 17 CONFIG_CMD_DATE=y
18 18 CONFIG_CMD_EXT2=y
19 19 CONFIG_CMD_FAT=y
  20 +CONFIG_FSL_SATA=y
20 21 CONFIG_MTD_NOR_FLASH=y
21 22 CONFIG_PHYLIB=y
22 23 CONFIG_SYS_NS16550=y
configs/controlcenterd_36BIT_SDCARD_DEVELOP_defconfig
Diff comments   View file @ 9920d15
... ... @@ -32,6 +32,7 @@
32 32 CONFIG_CMD_FAT=y
33 33 CONFIG_ENV_IS_IN_MMC=y
34 34 CONFIG_DM=y
  35 +CONFIG_FSL_SATA=y
35 36 CONFIG_SPI_FLASH=y
36 37 CONFIG_SPI_FLASH_STMICRO=y
37 38 CONFIG_PHYLIB=y
configs/controlcenterd_36BIT_SDCARD_defconfig
Diff comments   View file @ 9920d15
... ... @@ -32,6 +32,7 @@
32 32 CONFIG_CMD_FAT=y
33 33 CONFIG_ENV_IS_IN_MMC=y
34 34 CONFIG_DM=y
  35 +CONFIG_FSL_SATA=y
35 36 CONFIG_SPI_FLASH=y
36 37 CONFIG_SPI_FLASH_STMICRO=y
37 38 CONFIG_PHYLIB=y
... ... @@ -47,6 +47,12 @@
47 47 Enable this driver to support Sata devices through
48 48 Synopsys DWC AHCI module.
49 49  
  50 +config FSL_SATA
  51 + bool "Enable Freescale SATA controller driver support"
  52 + help
  53 + Enable this driver to support the SATA controller found in
  54 + some Freescale PowerPC SoCs.
  55 +
50 56 config SATA_MV
51 57 bool "Enable Marvell SATA controller driver support"
52 58 help
include/configs/MPC8315ERDB.h
Diff comments   View file @ 9920d15
... ... @@ -396,7 +396,6 @@
396 396 * SATA
397 397 */
398 398 #define CONFIG_LIBATA
399   -#define CONFIG_FSL_SATA
400 399  
401 400 #define CONFIG_SYS_SATA_MAX_DEVICE 2
402 401 #define CONFIG_SATA1
include/configs/MPC837XEMDS.h
Diff comments   View file @ 9920d15
... ... @@ -421,7 +421,6 @@
421 421 * SATA
422 422 */
423 423 #define CONFIG_LIBATA
424   -#define CONFIG_FSL_SATA
425 424  
426 425 #define CONFIG_SYS_SATA_MAX_DEVICE 2
427 426 #define CONFIG_SATA1
include/configs/MPC837XERDB.h
Diff comments   View file @ 9920d15
... ... @@ -435,7 +435,6 @@
435 435 * SATA
436 436 */
437 437 #define CONFIG_LIBATA
438   -#define CONFIG_FSL_SATA
439 438  
440 439 #define CONFIG_SYS_SATA_MAX_DEVICE 2
441 440 #define CONFIG_SATA1
include/configs/MPC8536DS.h
Diff comments   View file @ 9920d15
... ... @@ -509,7 +509,6 @@
509 509  
510 510 /* SATA */
511 511 #define CONFIG_LIBATA
512   -#define CONFIG_FSL_SATA
513 512  
514 513 #define CONFIG_SYS_SATA_MAX_DEVICE 2
515 514 #define CONFIG_SATA1
include/configs/P1010RDB.h
Diff comments   View file @ 9920d15
... ... @@ -634,7 +634,6 @@
634 634 #endif /* CONFIG_TSEC_ENET */
635 635  
636 636 /* SATA */
637   -#define CONFIG_FSL_SATA
638 637 #define CONFIG_FSL_SATA_V2
639 638 #define CONFIG_LIBATA
640 639  
include/configs/P1022DS.h
Diff comments   View file @ 9920d15
... ... @@ -483,7 +483,6 @@
483 483  
484 484 /* SATA */
485 485 #define CONFIG_LIBATA
486   -#define CONFIG_FSL_SATA
487 486 #define CONFIG_FSL_SATA_V2
488 487  
489 488 #define CONFIG_SYS_SATA_MAX_DEVICE 2
include/configs/P2041RDB.h
Diff comments   View file @ 9920d15
... ... @@ -527,7 +527,6 @@
527 527 #define CONFIG_FSL_SATA_V2
528 528  
529 529 #ifdef CONFIG_FSL_SATA_V2
530   -#define CONFIG_FSL_SATA
531 530 #define CONFIG_LIBATA
532 531  
533 532 #define CONFIG_SYS_SATA_MAX_DEVICE 2
include/configs/T102xQDS.h
Diff comments   View file @ 9920d15
... ... @@ -616,7 +616,6 @@
616 616 #define CONFIG_FSL_SATA_V2
617 617 #ifdef CONFIG_FSL_SATA_V2
618 618 #define CONFIG_LIBATA
619   -#define CONFIG_FSL_SATA
620 619 #define CONFIG_SYS_SATA_MAX_DEVICE 1
621 620 #define CONFIG_SATA1
622 621 #define CONFIG_SYS_SATA1 CONFIG_SYS_MPC85xx_SATA1_ADDR
include/configs/T1040QDS.h
Diff comments   View file @ 9920d15
... ... @@ -501,7 +501,6 @@
501 501 #define CONFIG_FSL_SATA_V2
502 502 #ifdef CONFIG_FSL_SATA_V2
503 503 #define CONFIG_LIBATA
504   -#define CONFIG_FSL_SATA
505 504  
506 505 #define CONFIG_SYS_SATA_MAX_DEVICE 2
507 506 #define CONFIG_SATA1
include/configs/T104xRDB.h
Diff comments   View file @ 9920d15
... ... @@ -615,7 +615,6 @@
615 615 #define CONFIG_FSL_SATA_V2
616 616 #ifdef CONFIG_FSL_SATA_V2
617 617 #define CONFIG_LIBATA
618   -#define CONFIG_FSL_SATA
619 618  
620 619 #define CONFIG_SYS_SATA_MAX_DEVICE 1
621 620 #define CONFIG_SATA1
include/configs/T208xQDS.h
Diff comments   View file @ 9920d15
... ... @@ -679,7 +679,6 @@
679 679 */
680 680 #ifdef CONFIG_FSL_SATA_V2
681 681 #define CONFIG_LIBATA
682   -#define CONFIG_FSL_SATA
683 682 #define CONFIG_SYS_SATA_MAX_DEVICE 2
684 683 #define CONFIG_SATA1
685 684 #define CONFIG_SYS_SATA1 CONFIG_SYS_MPC85xx_SATA1_ADDR
include/configs/T208xRDB.h
Diff comments   View file @ 9920d15
... ... @@ -629,7 +629,6 @@
629 629 */
630 630 #ifdef CONFIG_FSL_SATA_V2
631 631 #define CONFIG_LIBATA
632   -#define CONFIG_FSL_SATA
633 632 #define CONFIG_SYS_SATA_MAX_DEVICE 2
634 633 #define CONFIG_SATA1
635 634 #define CONFIG_SYS_SATA1 CONFIG_SYS_MPC85xx_SATA1_ADDR
include/configs/T4240QDS.h
Diff comments   View file @ 9920d15
... ... @@ -469,7 +469,6 @@
469 469 /* SATA */
470 470 #ifdef CONFIG_FSL_SATA_V2
471 471 #define CONFIG_LIBATA
472   -#define CONFIG_FSL_SATA
473 472  
474 473 #define CONFIG_SYS_SATA_MAX_DEVICE 2
475 474 #define CONFIG_SATA1
include/configs/T4240RDB.h
Diff comments   View file @ 9920d15
... ... @@ -241,7 +241,6 @@
241 241 /* SATA */
242 242 #ifdef CONFIG_FSL_SATA_V2
243 243 #define CONFIG_LIBATA
244   -#define CONFIG_FSL_SATA
245 244  
246 245 #define CONFIG_SYS_SATA_MAX_DEVICE 2
247 246 #define CONFIG_SATA1
... ... @@ -636,7 +635,6 @@
636 635 /* SATA */
637 636 #ifdef CONFIG_FSL_SATA_V2
638 637 #define CONFIG_LIBATA
639   -#define CONFIG_FSL_SATA
640 638  
641 639 #define CONFIG_SYS_SATA_MAX_DEVICE 2
642 640 #define CONFIG_SATA1
include/configs/controlcenterd.h
Diff comments   View file @ 9920d15
... ... @@ -248,7 +248,6 @@
248 248 #define CONFIG_LIBATA
249 249 #define CONFIG_LBA48
250 250  
251   -#define CONFIG_FSL_SATA
252 251 #define CONFIG_SYS_SATA_MAX_DEVICE 2
253 252 #define CONFIG_SATA1
254 253 #define CONFIG_SYS_SATA1 CONFIG_SYS_MPC85xx_SATA1_ADDR
include/configs/corenet_ds.h
Diff comments   View file @ 9920d15
... ... @@ -542,7 +542,6 @@
542 542 /* SATA */
543 543 #ifdef CONFIG_FSL_SATA_V2
544 544 #define CONFIG_LIBATA
545   -#define CONFIG_FSL_SATA
546 545  
547 546 #define CONFIG_SYS_SATA_MAX_DEVICE 2
548 547 #define CONFIG_SATA1
include/configs/cyrus.h
Diff comments   View file @ 9920d15
... ... @@ -377,7 +377,6 @@
377 377 /* SATA */
378 378 #ifdef CONFIG_FSL_SATA_V2
379 379 #define CONFIG_LIBATA
380   -#define CONFIG_FSL_SATA
381 380  
382 381 #define CONFIG_SYS_SATA_MAX_DEVICE 2
383 382 #define CONFIG_SATA1
include/configs/t4qds.h
Diff comments   View file @ 9920d15
... ... @@ -210,7 +210,6 @@
210 210 /* SATA */
211 211 #ifdef CONFIG_FSL_SATA_V2
212 212 #define CONFIG_LIBATA
213   -#define CONFIG_FSL_SATA
214 213  
215 214 #define CONFIG_SYS_SATA_MAX_DEVICE 2
216 215 #define CONFIG_SATA1
scripts/config_whitelist.txt
Diff comments   View file @ 9920d15
... ... @@ -754,7 +754,6 @@
754 754 CONFIG_FSL_QIXIS
755 755 CONFIG_FSL_QIXIS_CLOCK_MEASUREMENT
756 756 CONFIG_FSL_QIXIS_V2
757   -CONFIG_FSL_SATA
758 757 CONFIG_FSL_SATA_V2
759 758 CONFIG_FSL_SDHC_V2_3
760 759 CONFIG_FSL_SDRAM_TYPE