leandrof/u-boot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

soc: keystone: Merge into ti specific directory

Browse Source 
Merge drivers/soc/keystone/ into drivers/soc/ti/
and convert CONFIG_TI_KEYSTONE_SERDES into Kconfig.

Signed-off-by: Vignesh R <vigneshr@ti.com>
Reviewed-by: Tom Rini <trini@konsulko.com>
This commit is contained in:
Vignesh R 2019-02-05 17:31:25 +05:30 committed by Tom Rini
parent ffcc66e8fe
commit 91dba55ca6
8 changed files with 16 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
arch/arm/mach-keystone/Kconfig
View File

@ -9,18 +9,24 @@ config TARGET_K2HK_EVM
select SPL_BOARD_INIT if SPL
select CMD_DDR3
imply DM_I2C
imply SOC_TI
imply TI_KEYSTONE_SERDES
config TARGET_K2E_EVM
bool "TI Keystone 2 Edison EVM"
select SPL_BOARD_INIT if SPL
select CMD_DDR3
imply DM_I2C
imply SOC_TI
imply TI_KEYSTONE_SERDES
config TARGET_K2L_EVM
bool "TI Keystone 2 Lamar EVM"
select SPL_BOARD_INIT if SPL
select CMD_DDR3
imply DM_I2C
imply SOC_TI
imply TI_KEYSTONE_SERDES
config TARGET_K2G_EVM
bool "TI Keystone 2 Galileo EVM"
@ -29,6 +35,8 @@ config TARGET_K2G_EVM
select TI_I2C_BOARD_DETECT
select CMD_DDR3
imply DM_I2C
imply SOC_TI
imply TI_KEYSTONE_SERDES
endchoice

1
drivers/soc/Makefile
View File

@ -2,5 +2,4 @@
#
# Makefile for the U-Boot SOC specific device drivers.
obj-$(CONFIG_ARCH_KEYSTONE) += keystone/
obj-$(CONFIG_SOC_TI) += ti/

3
drivers/soc/keystone/Makefile
View File

@ -1,3 +0,0 @@
# SPDX-License-Identifier: GPL-2.0+
obj-$(CONFIG_TI_KEYSTONE_SERDES) += keystone_serdes.o

6
drivers/soc/ti/Kconfig
View File

@ -16,5 +16,11 @@ config TI_K3_NAVSS_RINGACC
and a consumer. There is one RINGACC module per NAVSS on TI AM65x SoCs
If unsure, say N.
config TI_KEYSTONE_SERDES
bool "Keystone SerDes driver for ethernet"
depends on ARCH_KEYSTONE
help
SerDes driver for Keystone SoC used for ethernet support on TI
K2 platforms.
endif # SOC_TI

5
drivers/soc/ti/Makefile
View File

@ -1,5 +1,4 @@
# SPDX-License-Identifier: GPL-2.0+
#
# TI K3 SOC drivers
#
obj-$(CONFIG_TI_K3_NAVSS_RINGACC) += k3-navss-ringacc.o
obj-$(CONFIG_TI_KEYSTONE_SERDES) += keystone_serdes.o

0
drivers/soc/keystone/keystone_serdes.c → drivers/soc/ti/keystone_serdes.c
View File

3
include/configs/ti_armv7_keystone2.h
View File

@ -132,9 +132,6 @@
#define CONFIG_KSNET_SERDES_SGMII2_BASE KS2_SGMII_SERDES2_BASE
#define CONFIG_KSNET_SERDES_LANES_PER_SGMII KS2_LANES_PER_SGMII_SERDES
/* SerDes */
#define CONFIG_TI_KEYSTONE_SERDES
#define CONFIG_AEMIF_CNTRL_BASE KS2_AEMIF_CNTRL_BASE
/* I2C Configuration */

1
scripts/config_whitelist.txt
View File

@ -4399,7 +4399,6 @@ CONFIG_THOR_RESET_OFF
CONFIG_THUNDERX
CONFIG_TIMESTAMP
CONFIG_TIZEN
CONFIG_TI_KEYSTONE_SERDES
CONFIG_TI_KSNAV
CONFIG_TI_SPI_MMAP
CONFIG_TMU_TIMER