소스 검색

Merge branch 'master' of git://git.denx.de/u-boot-samsung

- arndale fixes
Tom Rini 5 년 전
부모
커밋
98b3156b0d
2개의 변경된 파일1개의 추가작업 그리고 10개의 파일을 삭제
  1. 1 2
      configs/arndale_defconfig
  2. 0 8
      include/configs/arndale.h

+ 1 - 2
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

+ 0 - 8
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 */