summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTom Rini <trini@konsulko.com>2019-05-16 07:09:59 -0400
committerTom Rini <trini@konsulko.com>2019-05-16 07:09:59 -0400
commit98b3156b0df4b0df9cb3a0bbfc240d0c4edd2638 (patch)
treef25105138859cf9300c68d5e08e36d3000e5304b
parentb51d103cab173f4480d66b6b93c62d36e2f5fded (diff)
parentf4b2ab97ed37ea6b202aaa951d31dab9187e3720 (diff)
Merge branch 'master' of git://git.denx.de/u-boot-samsung
- arndale fixes
-rw-r--r--configs/arndale_defconfig3
-rw-r--r--include/configs/arndale.h8
2 files changed, 1 insertions, 10 deletions
diff --git a/configs/arndale_defconfig b/configs/arndale_defconfig
index 9727d28c12..37ad6accc3 100644
--- a/configs/arndale_defconfig
+++ b/configs/arndale_defconfig
@@ -25,7 +25,6 @@ CONFIG_CMD_SOUND=y
CONFIG_CMD_EXT4_WRITE=y
CONFIG_DEFAULT_DEVICE_TREE="exynos5250-arndale"
CONFIG_ENV_IS_IN_MMC=y
-CONFIG_DM_I2C_COMPAT=y
CONFIG_SUPPORT_EMMC_BOOT=y
CONFIG_MMC_DW=y
CONFIG_MMC_SDHCI=y
@@ -43,4 +42,4 @@ CONFIG_USB_XHCI_HCD=y
CONFIG_USB_XHCI_DWC3=y
CONFIG_USB_EHCI_HCD=y
CONFIG_USB_HOST_ETHER=y
-CONFIG_USB_ETHER_ASIX88179=y
+CONFIG_USB_ETHER_ASIX=y
diff --git a/include/configs/arndale.h b/include/configs/arndale.h
index dd321c4748..841f361648 100644
--- a/include/configs/arndale.h
+++ b/include/configs/arndale.h
@@ -29,10 +29,6 @@
#define CONFIG_SYS_INIT_SP_ADDR CONFIG_IRAM_STACK
-/* PMIC */
-#define CONFIG_POWER
-#define CONFIG_POWER_I2C
-
#define CONFIG_PREBOOT
#define CONFIG_S5P_PA_SYSRAM 0x02020000
@@ -41,8 +37,4 @@
/* The PERIPHBASE in the CBAR register is wrong on the Arndale, so override it */
#define CONFIG_ARM_GIC_BASE_ADDRESS 0x10480000
-/* Power */
-#define CONFIG_POWER
-#define CONFIG_POWER_I2C
-
#endif /* __CONFIG_H */