diff options
| author | Tom Rini <trini@konsulko.com> | 2021-08-03 16:07:01 +0300 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2021-08-03 16:07:01 +0300 |
| commit | b91c70433386d133c842729c5d9b109cdcc79399 (patch) | |
| tree | 26ec8aeb2cf89311f4894a8dafc79ce242ac4674 /configs | |
| parent | 3b64774323298362f9833aac75bb4639b4f98999 (diff) | |
| parent | 18f3afa4be879a9f591518a8f623b30f8b39917d (diff) | |
| download | u-boot-b91c70433386d133c842729c5d9b109cdcc79399.tar.xz | |
Merge https://source.denx.de/u-boot/custodians/u-boot-samsung
Diffstat (limited to 'configs')
| -rw-r--r-- | configs/arndale_defconfig | 1 | ||||
| -rw-r--r-- | configs/odroid-xu3_defconfig | 1 | ||||
| -rw-r--r-- | configs/peach-pi_defconfig | 1 | ||||
| -rw-r--r-- | configs/peach-pit_defconfig | 1 | ||||
| -rw-r--r-- | configs/smdk5250_defconfig | 1 | ||||
| -rw-r--r-- | configs/smdk5420_defconfig | 1 | ||||
| -rw-r--r-- | configs/smdkv310_defconfig | 1 | ||||
| -rw-r--r-- | configs/snow_defconfig | 3 | ||||
| -rw-r--r-- | configs/spring_defconfig | 1 |
9 files changed, 2 insertions, 9 deletions
diff --git a/configs/arndale_defconfig b/configs/arndale_defconfig index a3e74ab626..133c0eb888 100644 --- a/configs/arndale_defconfig +++ b/configs/arndale_defconfig @@ -37,7 +37,6 @@ CONFIG_MMC_SDHCI=y CONFIG_MMC_SDHCI_S5P=y CONFIG_MTD=y CONFIG_SMC911X=y -CONFIG_SMC911X_BASE=0x5000000 CONFIG_SOUND=y CONFIG_I2S=y CONFIG_I2S_SAMSUNG=y diff --git a/configs/odroid-xu3_defconfig b/configs/odroid-xu3_defconfig index 99ac4170a1..f56dfb7d8e 100644 --- a/configs/odroid-xu3_defconfig +++ b/configs/odroid-xu3_defconfig @@ -46,7 +46,6 @@ CONFIG_SUPPORT_EMMC_BOOT=y CONFIG_MMC_DW=y CONFIG_MTD=y CONFIG_SMC911X=y -CONFIG_SMC911X_BASE=0x5000000 CONFIG_DM_PMIC=y CONFIG_PMIC_S2MPS11=y CONFIG_DM_REGULATOR=y diff --git a/configs/peach-pi_defconfig b/configs/peach-pi_defconfig index 45162a5b16..92d6be43f8 100644 --- a/configs/peach-pi_defconfig +++ b/configs/peach-pi_defconfig @@ -53,7 +53,6 @@ CONFIG_SF_DEFAULT_SPEED=50000000 CONFIG_SPI_FLASH_GIGADEVICE=y CONFIG_SPI_FLASH_WINBOND=y CONFIG_SMC911X=y -CONFIG_SMC911X_BASE=0x5000000 CONFIG_DM_PMIC=y CONFIG_PMIC_TPS65090=y CONFIG_DM_REGULATOR=y diff --git a/configs/peach-pit_defconfig b/configs/peach-pit_defconfig index 1354aa78ae..824a664904 100644 --- a/configs/peach-pit_defconfig +++ b/configs/peach-pit_defconfig @@ -52,7 +52,6 @@ CONFIG_SF_DEFAULT_SPEED=50000000 CONFIG_SPI_FLASH_GIGADEVICE=y CONFIG_SPI_FLASH_WINBOND=y CONFIG_SMC911X=y -CONFIG_SMC911X_BASE=0x5000000 CONFIG_DM_PMIC=y CONFIG_PMIC_TPS65090=y CONFIG_DM_REGULATOR=y diff --git a/configs/smdk5250_defconfig b/configs/smdk5250_defconfig index 0a7f1c515f..3ed1947fd6 100644 --- a/configs/smdk5250_defconfig +++ b/configs/smdk5250_defconfig @@ -48,7 +48,6 @@ CONFIG_SF_DEFAULT_SPEED=50000000 CONFIG_SPI_FLASH_GIGADEVICE=y CONFIG_SPI_FLASH_WINBOND=y CONFIG_SMC911X=y -CONFIG_SMC911X_BASE=0x5000000 CONFIG_DM_PMIC=y CONFIG_DM_PMIC_MAX77686=y CONFIG_DM_REGULATOR=y diff --git a/configs/smdk5420_defconfig b/configs/smdk5420_defconfig index b3cb188f5f..7b739400a5 100644 --- a/configs/smdk5420_defconfig +++ b/configs/smdk5420_defconfig @@ -43,7 +43,6 @@ CONFIG_SF_DEFAULT_SPEED=50000000 CONFIG_SPI_FLASH_GIGADEVICE=y CONFIG_SPI_FLASH_WINBOND=y CONFIG_SMC911X=y -CONFIG_SMC911X_BASE=0x5000000 CONFIG_DM_PMIC=y CONFIG_DM_REGULATOR=y CONFIG_EXYNOS_SPI=y diff --git a/configs/smdkv310_defconfig b/configs/smdkv310_defconfig index fcc655c1f5..ac84fde7d3 100644 --- a/configs/smdkv310_defconfig +++ b/configs/smdkv310_defconfig @@ -28,5 +28,4 @@ CONFIG_MMC_SDHCI_SDMA=y CONFIG_MMC_SDHCI_S5P=y CONFIG_MTD=y CONFIG_SMC911X=y -CONFIG_SMC911X_BASE=0x5000000 CONFIG_USB=y diff --git a/configs/snow_defconfig b/configs/snow_defconfig index d6b16802b1..a5fbd1d346 100644 --- a/configs/snow_defconfig +++ b/configs/snow_defconfig @@ -58,7 +58,6 @@ CONFIG_SF_DEFAULT_SPEED=50000000 CONFIG_SPI_FLASH_GIGADEVICE=y CONFIG_SPI_FLASH_WINBOND=y CONFIG_SMC911X=y -CONFIG_SMC911X_BASE=0x5000000 CONFIG_DM_PMIC=y CONFIG_DM_PMIC_MAX77686=y CONFIG_PMIC_S5M8767=y @@ -92,3 +91,5 @@ CONFIG_VIDEO_BRIDGE_NXP_PTN3460=y CONFIG_LCD=y CONFIG_TPM=y CONFIG_ERRNO_STR=y +CONFIG_UNIT_TEST=y +# CONFIG_UT_LIB_ASN1 is not set diff --git a/configs/spring_defconfig b/configs/spring_defconfig index a6cc2b42bf..53c375e5b4 100644 --- a/configs/spring_defconfig +++ b/configs/spring_defconfig @@ -58,7 +58,6 @@ CONFIG_SF_DEFAULT_SPEED=50000000 CONFIG_SPI_FLASH_GIGADEVICE=y CONFIG_SPI_FLASH_WINBOND=y CONFIG_SMC911X=y -CONFIG_SMC911X_BASE=0x5000000 CONFIG_DM_PMIC=y CONFIG_DM_PMIC_MAX77686=y CONFIG_PMIC_S5M8767=y |