Whitebox
/
u-boot
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

ata: Migrate CONFIG_FSL_SATA to Kconfig

Browse Source 
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>
master
Tuomas Tynkkynen 7 years ago committed by Tom Rini
parent ad0ac54361
commit 9920d151c4
26 changed files with 24 additions and 20 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 1
      arch/powerpc/cpu/mpc83xx/Kconfig
  2. 13
      arch/powerpc/cpu/mpc85xx/Kconfig
  3. 1
      configs/MPC8315ERDB_defconfig
  4. 1
      configs/MPC837XERDB_defconfig
  5. 1
      configs/controlcenterd_36BIT_SDCARD_DEVELOP_defconfig
  6. 1
      configs/controlcenterd_36BIT_SDCARD_defconfig
  7. 6
      drivers/ata/Kconfig
  8. 1
      include/configs/MPC8315ERDB.h
  9. 1
      include/configs/MPC837XEMDS.h
  10. 1
      include/configs/MPC837XERDB.h
  11. 1
      include/configs/MPC8536DS.h
  12. 1
      include/configs/P1010RDB.h
  13. 1
      include/configs/P1022DS.h
  14. 1
      include/configs/P2041RDB.h
  15. 1
      include/configs/T102xQDS.h
  16. 1
      include/configs/T1040QDS.h
  17. 1
      include/configs/T104xRDB.h
  18. 1
      include/configs/T208xQDS.h
  19. 1
      include/configs/T208xRDB.h
  20. 1
      include/configs/T4240QDS.h
  21. 2
      include/configs/T4240RDB.h
  22. 1
      include/configs/controlcenterd.h
  23. 1
      include/configs/corenet_ds.h
  24. 1
      include/configs/cyrus.h
  25. 1
      include/configs/t4qds.h
  26. 1
      scripts/config_whitelist.txt

1
arch/powerpc/cpu/mpc83xx/Kconfig
Unescape View File

@ -55,6 +55,7 @@ config TARGET_MPC837XEMDS
bool "Support MPC837XEMDS" bool "Support MPC837XEMDS"
select BOARD_EARLY_INIT_F select BOARD_EARLY_INIT_F
imply CMD_SATA imply CMD_SATA
imply FSL_SATA
config TARGET_MPC837XERDB config TARGET_MPC837XERDB
bool "Support MPC837XERDB" bool "Support MPC837XERDB"

13
arch/powerpc/cpu/mpc85xx/Kconfig
Unescape View File

@ -92,6 +92,7 @@ config TARGET_MPC8536DS
# Use DDR3 controller with DDR2 DIMMs on this board # Use DDR3 controller with DDR2 DIMMs on this board
select SYS_FSL_DDRC_GEN3 select SYS_FSL_DDRC_GEN3
imply CMD_SATA imply CMD_SATA
imply FSL_SATA
config TARGET_MPC8541CDS config TARGET_MPC8541CDS
bool "Support MPC8541CDS" bool "Support MPC8541CDS"
@ -148,6 +149,7 @@ config TARGET_P1022DS
select SUPPORT_SPL select SUPPORT_SPL
select SUPPORT_TPL select SUPPORT_TPL
imply CMD_SATA imply CMD_SATA
imply FSL_SATA
config TARGET_P1023RDB config TARGET_P1023RDB
bool "Support P1023RDB" bool "Support P1023RDB"
@ -230,6 +232,7 @@ config TARGET_P2041RDB
select BOARD_LATE_INIT if CHAIN_OF_TRUST select BOARD_LATE_INIT if CHAIN_OF_TRUST
select PHYS_64BIT select PHYS_64BIT
imply CMD_SATA imply CMD_SATA
imply FSL_SATA
config TARGET_QEMU_PPCE500 config TARGET_QEMU_PPCE500
bool "Support qemu-ppce500" bool "Support qemu-ppce500"
@ -244,6 +247,7 @@ config TARGET_T1024QDS
select PHYS_64BIT select PHYS_64BIT
imply CMD_EEPROM imply CMD_EEPROM
imply CMD_SATA imply CMD_SATA
imply FSL_SATA
config TARGET_T1023RDB config TARGET_T1023RDB
bool "Support T1023RDB" bool "Support T1023RDB"
@ -642,6 +646,7 @@ config ARCH_P1010
imply CMD_SATA imply CMD_SATA
imply CMD_PCI imply CMD_PCI
imply CMD_REGINFO imply CMD_REGINFO
imply FSL_SATA
config ARCH_P1011 config ARCH_P1011
bool bool
@ -826,6 +831,7 @@ config ARCH_P3041
imply CMD_NAND imply CMD_NAND
imply CMD_SATA imply CMD_SATA
imply CMD_REGINFO imply CMD_REGINFO
imply FSL_SATA
config ARCH_P4080 config ARCH_P4080
bool bool
@ -887,6 +893,7 @@ config ARCH_P5020
select FSL_ELBC select FSL_ELBC
imply CMD_SATA imply CMD_SATA
imply CMD_REGINFO imply CMD_REGINFO
imply FSL_SATA
config ARCH_P5040 config ARCH_P5040
bool bool
@ -910,6 +917,7 @@ config ARCH_P5040
select FSL_ELBC select FSL_ELBC
imply CMD_SATA imply CMD_SATA
imply CMD_REGINFO imply CMD_REGINFO
imply FSL_SATA
config ARCH_QEMU_E500 config ARCH_QEMU_E500
bool bool
@ -976,6 +984,7 @@ config ARCH_T1040
imply CMD_NAND imply CMD_NAND
imply CMD_SATA imply CMD_SATA
imply CMD_REGINFO imply CMD_REGINFO
imply FSL_SATA
config ARCH_T1042 config ARCH_T1042
bool bool
@ -998,6 +1007,7 @@ config ARCH_T1042
imply CMD_NAND imply CMD_NAND
imply CMD_SATA imply CMD_SATA
imply CMD_REGINFO imply CMD_REGINFO
imply FSL_SATA
config ARCH_T2080 config ARCH_T2080
bool bool
@ -1023,6 +1033,7 @@ config ARCH_T2080
imply CMD_SATA imply CMD_SATA
imply CMD_NAND imply CMD_NAND
imply CMD_REGINFO imply CMD_REGINFO
imply FSL_SATA
config ARCH_T2081 config ARCH_T2081
bool bool
@ -1069,6 +1080,7 @@ config ARCH_T4160
imply CMD_SATA imply CMD_SATA
imply CMD_NAND imply CMD_NAND
imply CMD_REGINFO imply CMD_REGINFO
imply FSL_SATA
config ARCH_T4240 config ARCH_T4240
bool bool
@ -1096,6 +1108,7 @@ config ARCH_T4240
imply CMD_SATA imply CMD_SATA
imply CMD_NAND imply CMD_NAND
imply CMD_REGINFO imply CMD_REGINFO
imply FSL_SATA
config BOOKE config BOOKE
bool bool

1
configs/MPC8315ERDB_defconfig
Unescape View File

@ -19,6 +19,7 @@ CONFIG_CMD_EXT2=y
CONFIG_CMD_MTDPARTS=y CONFIG_CMD_MTDPARTS=y
CONFIG_MTDIDS_DEFAULT="nand0=e0600000.flash" CONFIG_MTDIDS_DEFAULT="nand0=e0600000.flash"
CONFIG_MTDPARTS_DEFAULT="mtdparts=e0600000.flash:512k(uboot),128k(env),6m@1m(kernel),-(fs)" CONFIG_MTDPARTS_DEFAULT="mtdparts=e0600000.flash:512k(uboot),128k(env),6m@1m(kernel),-(fs)"
CONFIG_FSL_SATA=y
# CONFIG_MMC is not set # CONFIG_MMC is not set
CONFIG_MTD_NOR_FLASH=y CONFIG_MTD_NOR_FLASH=y
CONFIG_PHYLIB=y CONFIG_PHYLIB=y

1
configs/MPC837XERDB_defconfig
Unescape View File

@ -17,6 +17,7 @@ CONFIG_CMD_PING=y
CONFIG_CMD_DATE=y CONFIG_CMD_DATE=y
CONFIG_CMD_EXT2=y CONFIG_CMD_EXT2=y
CONFIG_CMD_FAT=y CONFIG_CMD_FAT=y
CONFIG_FSL_SATA=y
CONFIG_MTD_NOR_FLASH=y CONFIG_MTD_NOR_FLASH=y
CONFIG_PHYLIB=y CONFIG_PHYLIB=y
CONFIG_SYS_NS16550=y CONFIG_SYS_NS16550=y

1
configs/controlcenterd_36BIT_SDCARD_DEVELOP_defconfig
Unescape View File

@ -32,6 +32,7 @@ CONFIG_CMD_EXT2=y
CONFIG_CMD_FAT=y CONFIG_CMD_FAT=y
CONFIG_ENV_IS_IN_MMC=y CONFIG_ENV_IS_IN_MMC=y
CONFIG_DM=y CONFIG_DM=y
CONFIG_FSL_SATA=y
CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH=y
CONFIG_SPI_FLASH_STMICRO=y CONFIG_SPI_FLASH_STMICRO=y
CONFIG_PHYLIB=y CONFIG_PHYLIB=y

1
configs/controlcenterd_36BIT_SDCARD_defconfig
Unescape View File

@ -32,6 +32,7 @@ CONFIG_CMD_EXT2=y
CONFIG_CMD_FAT=y CONFIG_CMD_FAT=y
CONFIG_ENV_IS_IN_MMC=y CONFIG_ENV_IS_IN_MMC=y
CONFIG_DM=y CONFIG_DM=y
CONFIG_FSL_SATA=y
CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH=y
CONFIG_SPI_FLASH_STMICRO=y CONFIG_SPI_FLASH_STMICRO=y
CONFIG_PHYLIB=y CONFIG_PHYLIB=y

6
drivers/ata/Kconfig
Unescape View File

@ -47,6 +47,12 @@ config DWC_AHCI
Enable this driver to support Sata devices through Enable this driver to support Sata devices through
Synopsys DWC AHCI module. Synopsys DWC AHCI module.
config FSL_SATA
bool "Enable Freescale SATA controller driver support"
help
Enable this driver to support the SATA controller found in
some Freescale PowerPC SoCs.
config SATA_MV config SATA_MV
bool "Enable Marvell SATA controller driver support" bool "Enable Marvell SATA controller driver support"
help help

1
include/configs/MPC8315ERDB.h
Unescape View File

@ -396,7 +396,6 @@
* SATA * SATA
*/ */
#define CONFIG_LIBATA #define CONFIG_LIBATA
#define CONFIG_FSL_SATA
#define CONFIG_SYS_SATA_MAX_DEVICE 2 #define CONFIG_SYS_SATA_MAX_DEVICE 2
#define CONFIG_SATA1 #define CONFIG_SATA1

1
include/configs/MPC837XEMDS.h
Unescape View File

@ -421,7 +421,6 @@ extern int board_pci_host_broken(void);
* SATA * SATA
*/ */
#define CONFIG_LIBATA #define CONFIG_LIBATA
#define CONFIG_FSL_SATA
#define CONFIG_SYS_SATA_MAX_DEVICE 2 #define CONFIG_SYS_SATA_MAX_DEVICE 2
#define CONFIG_SATA1 #define CONFIG_SATA1

1
include/configs/MPC837XERDB.h
Unescape View File

@ -435,7 +435,6 @@
* SATA * SATA
*/ */
#define CONFIG_LIBATA #define CONFIG_LIBATA
#define CONFIG_FSL_SATA
#define CONFIG_SYS_SATA_MAX_DEVICE 2 #define CONFIG_SYS_SATA_MAX_DEVICE 2
#define CONFIG_SATA1 #define CONFIG_SATA1

1
include/configs/MPC8536DS.h
Unescape View File

@ -509,7 +509,6 @@
/* SATA */ /* SATA */
#define CONFIG_LIBATA #define CONFIG_LIBATA
#define CONFIG_FSL_SATA
#define CONFIG_SYS_SATA_MAX_DEVICE 2 #define CONFIG_SYS_SATA_MAX_DEVICE 2
#define CONFIG_SATA1 #define CONFIG_SATA1

1
include/configs/P1010RDB.h
Unescape View File

@ -634,7 +634,6 @@ extern unsigned long get_sdram_size(void);
#endif /* CONFIG_TSEC_ENET */ #endif /* CONFIG_TSEC_ENET */
/* SATA */ /* SATA */
#define CONFIG_FSL_SATA
#define CONFIG_FSL_SATA_V2 #define CONFIG_FSL_SATA_V2
#define CONFIG_LIBATA #define CONFIG_LIBATA

1
include/configs/P1022DS.h
Unescape View File

@ -483,7 +483,6 @@
/* SATA */ /* SATA */
#define CONFIG_LIBATA #define CONFIG_LIBATA
#define CONFIG_FSL_SATA
#define CONFIG_FSL_SATA_V2 #define CONFIG_FSL_SATA_V2
#define CONFIG_SYS_SATA_MAX_DEVICE 2 #define CONFIG_SYS_SATA_MAX_DEVICE 2

1
include/configs/P2041RDB.h
Unescape View File

@ -527,7 +527,6 @@ unsigned long get_board_sys_clk(unsigned long dummy);
#define CONFIG_FSL_SATA_V2 #define CONFIG_FSL_SATA_V2
#ifdef CONFIG_FSL_SATA_V2 #ifdef CONFIG_FSL_SATA_V2
#define CONFIG_FSL_SATA
#define CONFIG_LIBATA #define CONFIG_LIBATA
#define CONFIG_SYS_SATA_MAX_DEVICE 2 #define CONFIG_SYS_SATA_MAX_DEVICE 2

1
include/configs/T102xQDS.h
Unescape View File

@ -616,7 +616,6 @@ unsigned long get_board_ddr_clk(void);
#define CONFIG_FSL_SATA_V2 #define CONFIG_FSL_SATA_V2
#ifdef CONFIG_FSL_SATA_V2 #ifdef CONFIG_FSL_SATA_V2
#define CONFIG_LIBATA #define CONFIG_LIBATA
#define CONFIG_FSL_SATA
#define CONFIG_SYS_SATA_MAX_DEVICE 1 #define CONFIG_SYS_SATA_MAX_DEVICE 1
#define CONFIG_SATA1 #define CONFIG_SATA1
#define CONFIG_SYS_SATA1 CONFIG_SYS_MPC85xx_SATA1_ADDR #define CONFIG_SYS_SATA1 CONFIG_SYS_MPC85xx_SATA1_ADDR

1
include/configs/T1040QDS.h
Unescape View File

@ -501,7 +501,6 @@ unsigned long get_board_ddr_clk(void);
#define CONFIG_FSL_SATA_V2 #define CONFIG_FSL_SATA_V2
#ifdef CONFIG_FSL_SATA_V2 #ifdef CONFIG_FSL_SATA_V2
#define CONFIG_LIBATA #define CONFIG_LIBATA
#define CONFIG_FSL_SATA
#define CONFIG_SYS_SATA_MAX_DEVICE 2 #define CONFIG_SYS_SATA_MAX_DEVICE 2
#define CONFIG_SATA1 #define CONFIG_SATA1

1
include/configs/T104xRDB.h
Unescape View File

@ -615,7 +615,6 @@ $(SRCTREE)/board/freescale/t104xrdb/t1042d4_sd_rcw.cfg
#define CONFIG_FSL_SATA_V2 #define CONFIG_FSL_SATA_V2
#ifdef CONFIG_FSL_SATA_V2 #ifdef CONFIG_FSL_SATA_V2
#define CONFIG_LIBATA #define CONFIG_LIBATA
#define CONFIG_FSL_SATA
#define CONFIG_SYS_SATA_MAX_DEVICE 1 #define CONFIG_SYS_SATA_MAX_DEVICE 1
#define CONFIG_SATA1 #define CONFIG_SATA1

1
include/configs/T208xQDS.h
Unescape View File

@ -679,7 +679,6 @@ unsigned long get_board_ddr_clk(void);
*/ */
#ifdef CONFIG_FSL_SATA_V2 #ifdef CONFIG_FSL_SATA_V2
#define CONFIG_LIBATA #define CONFIG_LIBATA
#define CONFIG_FSL_SATA
#define CONFIG_SYS_SATA_MAX_DEVICE 2 #define CONFIG_SYS_SATA_MAX_DEVICE 2
#define CONFIG_SATA1 #define CONFIG_SATA1
#define CONFIG_SYS_SATA1 CONFIG_SYS_MPC85xx_SATA1_ADDR #define CONFIG_SYS_SATA1 CONFIG_SYS_MPC85xx_SATA1_ADDR

1
include/configs/T208xRDB.h
Unescape View File

@ -629,7 +629,6 @@ unsigned long get_board_ddr_clk(void);
*/ */
#ifdef CONFIG_FSL_SATA_V2 #ifdef CONFIG_FSL_SATA_V2
#define CONFIG_LIBATA #define CONFIG_LIBATA
#define CONFIG_FSL_SATA
#define CONFIG_SYS_SATA_MAX_DEVICE 2 #define CONFIG_SYS_SATA_MAX_DEVICE 2
#define CONFIG_SATA1 #define CONFIG_SATA1
#define CONFIG_SYS_SATA1 CONFIG_SYS_MPC85xx_SATA1_ADDR #define CONFIG_SYS_SATA1 CONFIG_SYS_MPC85xx_SATA1_ADDR

1
include/configs/T4240QDS.h
Unescape View File

@ -469,7 +469,6 @@ unsigned long get_board_ddr_clk(void);
/* SATA */ /* SATA */
#ifdef CONFIG_FSL_SATA_V2 #ifdef CONFIG_FSL_SATA_V2
#define CONFIG_LIBATA #define CONFIG_LIBATA
#define CONFIG_FSL_SATA
#define CONFIG_SYS_SATA_MAX_DEVICE 2 #define CONFIG_SYS_SATA_MAX_DEVICE 2
#define CONFIG_SATA1 #define CONFIG_SATA1

2
include/configs/T4240RDB.h
Unescape View File

@ -241,7 +241,6 @@
/* SATA */ /* SATA */
#ifdef CONFIG_FSL_SATA_V2 #ifdef CONFIG_FSL_SATA_V2
#define CONFIG_LIBATA #define CONFIG_LIBATA
#define CONFIG_FSL_SATA
#define CONFIG_SYS_SATA_MAX_DEVICE 2 #define CONFIG_SYS_SATA_MAX_DEVICE 2
#define CONFIG_SATA1 #define CONFIG_SATA1
@ -636,7 +635,6 @@ unsigned long get_board_ddr_clk(void);
/* SATA */ /* SATA */
#ifdef CONFIG_FSL_SATA_V2 #ifdef CONFIG_FSL_SATA_V2
#define CONFIG_LIBATA #define CONFIG_LIBATA
#define CONFIG_FSL_SATA
#define CONFIG_SYS_SATA_MAX_DEVICE 2 #define CONFIG_SYS_SATA_MAX_DEVICE 2
#define CONFIG_SATA1 #define CONFIG_SATA1

1
include/configs/controlcenterd.h
Unescape View File

@ -248,7 +248,6 @@
#define CONFIG_LIBATA #define CONFIG_LIBATA
#define CONFIG_LBA48 #define CONFIG_LBA48
#define CONFIG_FSL_SATA
#define CONFIG_SYS_SATA_MAX_DEVICE 2 #define CONFIG_SYS_SATA_MAX_DEVICE 2
#define CONFIG_SATA1 #define CONFIG_SATA1
#define CONFIG_SYS_SATA1 CONFIG_SYS_MPC85xx_SATA1_ADDR #define CONFIG_SYS_SATA1 CONFIG_SYS_MPC85xx_SATA1_ADDR

1
include/configs/corenet_ds.h
Unescape View File

@ -542,7 +542,6 @@
/* SATA */ /* SATA */
#ifdef CONFIG_FSL_SATA_V2 #ifdef CONFIG_FSL_SATA_V2
#define CONFIG_LIBATA #define CONFIG_LIBATA
#define CONFIG_FSL_SATA
#define CONFIG_SYS_SATA_MAX_DEVICE 2 #define CONFIG_SYS_SATA_MAX_DEVICE 2
#define CONFIG_SATA1 #define CONFIG_SATA1

1
include/configs/cyrus.h
Unescape View File

@ -377,7 +377,6 @@
/* SATA */ /* SATA */
#ifdef CONFIG_FSL_SATA_V2 #ifdef CONFIG_FSL_SATA_V2
#define CONFIG_LIBATA #define CONFIG_LIBATA
#define CONFIG_FSL_SATA
#define CONFIG_SYS_SATA_MAX_DEVICE 2 #define CONFIG_SYS_SATA_MAX_DEVICE 2
#define CONFIG_SATA1 #define CONFIG_SATA1

1
include/configs/t4qds.h
Unescape View File

@ -210,7 +210,6 @@
/* SATA */ /* SATA */
#ifdef CONFIG_FSL_SATA_V2 #ifdef CONFIG_FSL_SATA_V2
#define CONFIG_LIBATA #define CONFIG_LIBATA
#define CONFIG_FSL_SATA
#define CONFIG_SYS_SATA_MAX_DEVICE 2 #define CONFIG_SYS_SATA_MAX_DEVICE 2
#define CONFIG_SATA1 #define CONFIG_SATA1

1
scripts/config_whitelist.txt
Unescape View File

@ -754,7 +754,6 @@ CONFIG_FSL_PMIC_MODE
CONFIG_FSL_QIXIS CONFIG_FSL_QIXIS
CONFIG_FSL_QIXIS_CLOCK_MEASUREMENT CONFIG_FSL_QIXIS_CLOCK_MEASUREMENT
CONFIG_FSL_QIXIS_V2 CONFIG_FSL_QIXIS_V2
CONFIG_FSL_SATA
CONFIG_FSL_SATA_V2 CONFIG_FSL_SATA_V2
CONFIG_FSL_SDHC_V2_3 CONFIG_FSL_SDHC_V2_3
CONFIG_FSL_SDRAM_TYPE CONFIG_FSL_SDRAM_TYPE

Write Preview
Loading…
Cancel
Save