summaryrefslogtreecommitdiffstats
path: root/board
diff options
context:
space:
mode:
authorTom Rini <trini@ti.com>2014-12-30 09:11:42 -0500
committerTom Rini <trini@ti.com>2014-12-30 09:11:42 -0500
commit87b27c7aa73241d1eb244048f7aee06fc24af4ef (patch)
tree8ca6d21d4f2c10e1682778adf4f25b9c4afe689a /board
parent125738e819a3b9d15210794b3dcef9f4d9bcf866 (diff)
parent66223787869e2059560ac583431e9968ac4cf26f (diff)
downloadtalos-obmc-uboot-87b27c7aa73241d1eb244048f7aee06fc24af4ef.tar.gz
talos-obmc-uboot-87b27c7aa73241d1eb244048f7aee06fc24af4ef.zip
Merge branch 'master' of git://git.denx.de/u-boot-samsung
Diffstat (limited to 'board')
-rw-r--r--board/samsung/smdk5420/Kconfig13
-rw-r--r--board/samsung/smdk5420/smdk5420.c17
2 files changed, 14 insertions, 16 deletions
diff --git a/board/samsung/smdk5420/Kconfig b/board/samsung/smdk5420/Kconfig
index e7aafe5beb..ff28b1df7e 100644
--- a/board/samsung/smdk5420/Kconfig
+++ b/board/samsung/smdk5420/Kconfig
@@ -1,3 +1,16 @@
+if TARGET_ODROID_XU3
+
+config SYS_BOARD
+ default "smdk5420"
+
+config SYS_VENDOR
+ default "samsung"
+
+config SYS_CONFIG_NAME
+ default "odroid_xu3"
+
+endif
+
if TARGET_PEACH_PI
config SYS_BOARD
diff --git a/board/samsung/smdk5420/smdk5420.c b/board/samsung/smdk5420/smdk5420.c
index a691222b8b..1aca9fabd9 100644
--- a/board/samsung/smdk5420/smdk5420.c
+++ b/board/samsung/smdk5420/smdk5420.c
@@ -9,6 +9,7 @@
#include <asm/io.h>
#include <i2c.h>
#include <lcd.h>
+#include <parade.h>
#include <spi.h>
#include <errno.h>
#include <asm/gpio.h>
@@ -21,24 +22,8 @@
DECLARE_GLOBAL_DATA_PTR;
-#ifdef CONFIG_USB_EHCI_EXYNOS
-static int board_usb_vbus_init(void)
-{
- /* Enable VBUS power switch */
- gpio_direction_output(EXYNOS5420_GPIO_X26, 1);
-
- /* VBUS turn ON time */
- mdelay(3);
-
- return 0;
-}
-#endif
-
int exynos_init(void)
{
-#ifdef CONFIG_USB_EHCI_EXYNOS
- board_usb_vbus_init();
-#endif
return 0;
}
OpenPOWER on IntegriCloud