Revert "configs: j721s2: merge HS and non-HS defconfigs"

[platform/kernel/u-boot.git] / configs / ten64_tfa_defconfig

diff --git a/configs/ten64_tfa_defconfig b/configs/ten64_tfa_defconfig
index dad6c2d..0209f62 100644 (file)
--- a/configs/ten64_tfa_defconfig
+++ b/configs/ten64_tfa_defconfig
@@ -1,7 +1,7 @@
 CONFIG_ARM=y
 CONFIG_TARGET_TEN64=y
 CONFIG_TFABOOT=y
-CONFIG_SYS_TEXT_BASE=0x82000000
+CONFIG_TEXT_BASE=0x82000000
 CONFIG_NR_DRAM_BANKS=2
 CONFIG_ENV_SIZE=0x80000
 CONFIG_ENV_OFFSET=0x500000
@@ -13,6 +13,7 @@ CONFIG_ARMV8_SEC_FIRMWARE_SUPPORT=y
 CONFIG_SEC_FIRMWARE_ARMV8_PSCI=y
 CONFIG_TEN64_CONTROLLER=y
 CONFIG_AHCI=y
+CONFIG_SYS_FSL_NUM_CC_PLLS=3
 CONFIG_DISTRO_DEFAULTS=y
 CONFIG_MP=y
 CONFIG_FIT_VERBOSE=y
@@ -53,7 +54,6 @@ CONFIG_OF_CONTROL=y
 CONFIG_ENV_IS_IN_MMC=y
 CONFIG_ENV_IS_IN_SPI_FLASH=y
 CONFIG_NET_RANDOM_ETHADDR=y
-CONFIG_DM=y
 CONFIG_SCSI_AHCI=y
 CONFIG_AHCI_PCI=y
 CONFIG_GPIO_HOG=y
@@ -72,11 +72,8 @@ CONFIG_SPI_FLASH_MTD=y
 CONFIG_PHYLIB=y
 CONFIG_PHY_VITESSE=y
 CONFIG_SYS_MEMAC_LITTLE_ENDIAN=y
-CONFIG_DM_ETH=y
-CONFIG_DM_MDIO=y
 CONFIG_E1000=y
 CONFIG_MII=y
-CONFIG_FSL_LS_MDIO=y
 CONFIG_NVME=y
 CONFIG_PCI=y
 CONFIG_DM_PCI_COMPAT=y
@@ -84,7 +81,7 @@ CONFIG_PCIE_LAYERSCAPE_RC=y
 CONFIG_DM_RTC=y
 CONFIG_RTC_RX8025=y
 CONFIG_DM_SCSI=y
-CONFIG_SYS_NS16550=y
+CONFIG_SYS_NS16550_SERIAL=y
 CONFIG_SPI=y
 CONFIG_DM_SPI=y
 CONFIG_FSL_DSPI=y