diff options
| author | Tom Rini <trini@konsulko.com> | 2018-04-10 11:51:53 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2018-04-13 17:06:16 -0400 |
| commit | d291d8235b9fd5049ffeda461ece44f873189513 (patch) | |
| tree | 3540e1af18f101c61ba80b4e9bb6fa1493a9a495 | |
| parent | 3194daa10ba642269a0948282423c48fd02fadce (diff) | |
| download | u-boot-d291d8235b9fd5049ffeda461ece44f873189513.tar.gz | |
configs: Fixup some CPSW-related items
- For am335x_pdu001 we do not want the CPSW driver, drop it
- Re-sync the defconfig for am43xx_evm_rtconly as it came in after the
patch that converted CPSW to Kconfig was posted but before it was
applied.
- Drop empty section / comments from pengwyn
- Drop empty section / comments from baltos and drop unused
CONFIG_SPL_NET_VCI_STRING (it does not enable CONFIG_SPL_NET_SUPPORT
currently and SPL_NET_VCI_STRING has been migrated already).
Cc: Felix Brack <fb@ltec.ch>
Cc: Lokesh Vutla <lokeshvutla@ti.com>
Cc: Yegor Yefremov <yegorslists@googlemail.com>
Cc: Lothar Felten <lothar.felten@gmail.com>
Fixes: f02b8d17619f ("Migrate CONFIG_DRIVER_TI_CPSW to Kconfig")
Signed-off-by: Tom Rini <trini@konsulko.com>
Reviewed-by: Felix Brack <fb@ltec.ch>
Tested-by: Felix Brack <fb@ltec.ch>
| -rw-r--r-- | configs/am335x_pdu001_defconfig | 1 | ||||
| -rw-r--r-- | configs/am43xx_evm_rtconly_defconfig | 2 | ||||
| -rw-r--r-- | include/configs/baltos.h | 13 | ||||
| -rw-r--r-- | include/configs/pengwyn.h | 7 |
4 files changed, 1 insertions, 22 deletions
diff --git a/configs/am335x_pdu001_defconfig b/configs/am335x_pdu001_defconfig index 87ae88ca61..a9d0f8e016 100644 --- a/configs/am335x_pdu001_defconfig +++ b/configs/am335x_pdu001_defconfig @@ -39,7 +39,6 @@ CONFIG_DM_GPIO=y CONFIG_DM_I2C=y CONFIG_MMC_OMAP_HS=y CONFIG_MMC_SDHCI=y -CONFIG_DRIVER_TI_CPSW=y CONFIG_PINCTRL=y CONFIG_PINCTRL_SINGLE=y CONFIG_DM_PMIC=y diff --git a/configs/am43xx_evm_rtconly_defconfig b/configs/am43xx_evm_rtconly_defconfig index f37ceb064b..339a1c6fc3 100644 --- a/configs/am43xx_evm_rtconly_defconfig +++ b/configs/am43xx_evm_rtconly_defconfig @@ -37,7 +37,7 @@ CONFIG_MMC_OMAP_HS=y CONFIG_NAND=y CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH_MACRONIX=y -CONFIG_PHYLIB=y +CONFIG_DRIVER_TI_CPSW=y CONFIG_PHY_GIGE=y CONFIG_DM_SERIAL=y CONFIG_SYS_NS16550=y diff --git a/include/configs/baltos.h b/include/configs/baltos.h index 19db35052e..03559bd4f5 100644 --- a/include/configs/baltos.h +++ b/include/configs/baltos.h @@ -229,11 +229,6 @@ /* SPL */ #ifndef CONFIG_NOR_BOOT -/* USB gadget RNDIS */ - -/* General network SPL, both CPSW and USB gadget RNDIS */ -#define CONFIG_SPL_NET_VCI_STRING "AM335x U-Boot SPL"*/ - #ifdef CONFIG_NAND #define CONFIG_SYS_NAND_5_ADDR_CYCLE #define CONFIG_SYS_NAND_PAGE_COUNT (CONFIG_SYS_NAND_BLOCK_SIZE / \ @@ -271,14 +266,6 @@ #define CONFIG_AM335X_USB1 #define CONFIG_AM335X_USB1_MODE MUSB_OTG -#if defined(CONFIG_SPL_BUILD) && defined(CONFIG_SPL_USB_ETHER) -/* disable host part of MUSB in SPL */ -/* disable EFI partitions and partition UUID support */ -/* - * Disable CPSW SPL support so we fit within the 101KiB limit. - */ -#endif - /* Network. */ #define CONFIG_PHY_SMSC #define CONFIG_MII diff --git a/include/configs/pengwyn.h b/include/configs/pengwyn.h index 545f859e85..863b6e7eb4 100644 --- a/include/configs/pengwyn.h +++ b/include/configs/pengwyn.h @@ -165,16 +165,9 @@ #define CONFIG_AM335X_USB1 #define CONFIG_AM335X_USB1_MODE MUSB_HOST -#if defined(CONFIG_SPL_BUILD) -/* disable host part of MUSB in SPL */ -/* Disable CPSW SPL support so we fit within the 101KiB limit. */ -#endif - /* Network */ #define CONFIG_PHY_RESET 1 #define CONFIG_PHY_NATSEMI #define CONFIG_PHY_REALTEK -/* CPSW support */ - #endif /* ! __CONFIG_PENGWYN_H */ |