summaryrefslogtreecommitdiff
path: root/board
diff options
context:
space:
mode:
Diffstat (limited to 'board')
-rw-r--r--board/Marvell/dreamplug/dreamplug.c2
-rw-r--r--board/Marvell/sheevaplug/MAINTAINERS2
-rw-r--r--board/davinci/da8xxevm/MAINTAINERS2
-rw-r--r--board/ti/am43xx/MAINTAINERS2
-rw-r--r--board/ti/am57xx/MAINTAINERS2
-rw-r--r--board/ti/am64x/MAINTAINERS2
-rw-r--r--board/ti/am64x/evm.c32
-rw-r--r--board/ti/am65x/MAINTAINERS2
-rw-r--r--board/ti/dra7xx/MAINTAINERS2
-rw-r--r--board/ti/j721e/MAINTAINERS2
-rw-r--r--board/ti/omap5_uevm/MAINTAINERS2
-rw-r--r--board/ti/panda/MAINTAINERS2
-rw-r--r--board/ti/sdp4430/MAINTAINERS2
13 files changed, 44 insertions, 12 deletions
diff --git a/board/Marvell/dreamplug/dreamplug.c b/board/Marvell/dreamplug/dreamplug.c
index d5b6b22ddf..7ba14021b2 100644
--- a/board/Marvell/dreamplug/dreamplug.c
+++ b/board/Marvell/dreamplug/dreamplug.c
@@ -163,7 +163,7 @@ void reset_phy(void)
char *eth0_name = "ethernet-controller@72000";
char *eth0_path = "/ocp@f1000000/ethernet-controller@72000/ethernet0-port@0";
char *eth1_name = "ethernet-controller@76000";
- char *eth1_path = "/ocp@f1000000/ethernet-controller@72000/ethernet1-port@0";
+ char *eth1_path = "/ocp@f1000000/ethernet-controller@76000/ethernet1-port@0";
/* configure and initialize both PHY's */
mv_phy_88e1116_init(eth0_name, eth0_path);
diff --git a/board/Marvell/sheevaplug/MAINTAINERS b/board/Marvell/sheevaplug/MAINTAINERS
index 2b0103d07d..282f046667 100644
--- a/board/Marvell/sheevaplug/MAINTAINERS
+++ b/board/Marvell/sheevaplug/MAINTAINERS
@@ -1,5 +1,5 @@
SHEEVAPLUG BOARD
-M: Prafulla Wadaskar <prafulla@marvell.com>
+M: Tony Dinh <mibodhi@gmail.com>
S: Maintained
F: board/Marvell/sheevaplug/
F: include/configs/sheevaplug.h
diff --git a/board/davinci/da8xxevm/MAINTAINERS b/board/davinci/da8xxevm/MAINTAINERS
index 16f1032661..993b22f2f6 100644
--- a/board/davinci/da8xxevm/MAINTAINERS
+++ b/board/davinci/da8xxevm/MAINTAINERS
@@ -8,7 +8,7 @@ F: configs/da850evm_nand_defconfig
F: configs/da850evm_direct_nor_defconfig
OMAPL138_LCDK BOARD
-M: Lokesh Vutla <lokeshvutla@ti.com>
+M: Tom Rini <trini@konsulko.com>
S: Maintained
F: include/configs/omap1l38_lcdk.h
F: configs/omapl138_lcdk_defconfig
diff --git a/board/ti/am43xx/MAINTAINERS b/board/ti/am43xx/MAINTAINERS
index ab9da22c64..5478dd7104 100644
--- a/board/ti/am43xx/MAINTAINERS
+++ b/board/ti/am43xx/MAINTAINERS
@@ -1,5 +1,5 @@
AM43XX BOARD
-M: Lokesh Vutla <lokeshvutla@ti.com>
+M: Tom Rini <trini@konsulko.com>
S: Maintained
F: board/ti/am43xx/
F: include/configs/am43xx_evm.h
diff --git a/board/ti/am57xx/MAINTAINERS b/board/ti/am57xx/MAINTAINERS
index 47b694eb4b..a6f4f168fc 100644
--- a/board/ti/am57xx/MAINTAINERS
+++ b/board/ti/am57xx/MAINTAINERS
@@ -1,5 +1,5 @@
AM57XX EVM
-M: Lokesh Vutla <lokeshvutla@ti.com>
+M: Tom Rini <trini@konsulko.com>
S: Maintained
F: board/ti/am57xx/
F: include/configs/am57xx_evm.h
diff --git a/board/ti/am64x/MAINTAINERS b/board/ti/am64x/MAINTAINERS
index d384a330df..eaca2b865f 100644
--- a/board/ti/am64x/MAINTAINERS
+++ b/board/ti/am64x/MAINTAINERS
@@ -1,6 +1,6 @@
AM64x BOARD
M: Dave Gerlach <d-gerlach@ti.com>
-M: Lokesh Vutla <lokeshvutla@ti.com>
+M: Tom Rini <trini@konsulko.com>
S: Maintained
F: board/ti/am64x/
F: include/configs/am64x_evm.h
diff --git a/board/ti/am64x/evm.c b/board/ti/am64x/evm.c
index 21c58c76d6..1a9f69c6cf 100644
--- a/board/ti/am64x/evm.c
+++ b/board/ti/am64x/evm.c
@@ -10,6 +10,7 @@
#include <common.h>
#include <asm/io.h>
#include <spl.h>
+#include <fdt_support.h>
#include <asm/arch/hardware.h>
#include <asm/arch/sys_proto.h>
#include <env.h>
@@ -60,6 +61,37 @@ int board_fit_config_name_match(const char *name)
}
#endif
+#if defined(CONFIG_SPL_BUILD) && CONFIG_IS_ENABLED(USB_STORAGE)
+static int fixup_usb_boot(const void *fdt_blob)
+{
+ int ret = 0;
+
+ switch (spl_boot_device()) {
+ case BOOT_DEVICE_USB:
+ /*
+ * If the boot mode is host, fixup the dr_mode to host
+ * before cdns3 bind takes place
+ */
+ ret = fdt_find_and_setprop((void *)fdt_blob,
+ "/bus@f4000/cdns-usb@f900000/usb@f400000",
+ "dr_mode", "host", 5, 0);
+ if (ret)
+ printf("%s: fdt_find_and_setprop() failed:%d\n",
+ __func__, ret);
+ fallthrough;
+ default:
+ break;
+ }
+
+ return ret;
+}
+
+void spl_perform_fixups(struct spl_image_info *spl_image)
+{
+ fixup_usb_boot(spl_image->fdt_addr);
+}
+#endif
+
#ifdef CONFIG_TI_I2C_BOARD_DETECT
int do_board_detect(void)
{
diff --git a/board/ti/am65x/MAINTAINERS b/board/ti/am65x/MAINTAINERS
index 6da4182d9f..c52f7c9112 100644
--- a/board/ti/am65x/MAINTAINERS
+++ b/board/ti/am65x/MAINTAINERS
@@ -1,5 +1,5 @@
AM65x BOARD
-M: Lokesh Vutla <lokeshvutla@ti.com>
+M: Tom Rini <trini@konsulko.com>
S: Maintained
F: board/ti/am65x/
F: include/configs/am65x_evm.h
diff --git a/board/ti/dra7xx/MAINTAINERS b/board/ti/dra7xx/MAINTAINERS
index 46b6e82b36..ba3d06dab9 100644
--- a/board/ti/dra7xx/MAINTAINERS
+++ b/board/ti/dra7xx/MAINTAINERS
@@ -1,5 +1,5 @@
DRA7XX BOARD
-M: Lokesh Vutla <lokeshvutla@ti.com>
+M: Tom Rini <trini@konsulko.com>
S: Maintained
F: board/ti/dra7xx/
F: include/configs/dra7xx_evm.h
diff --git a/board/ti/j721e/MAINTAINERS b/board/ti/j721e/MAINTAINERS
index 4b13f46ddc..f5ca7d06a3 100644
--- a/board/ti/j721e/MAINTAINERS
+++ b/board/ti/j721e/MAINTAINERS
@@ -1,5 +1,5 @@
J721E BOARD
-M: Lokesh Vutla <lokeshvutla@ti.com>
+M: Tom Rini <trini@konsulko.com>
S: Maintained
F: board/ti/j721e
F: include/configs/j721e_evm.h
diff --git a/board/ti/omap5_uevm/MAINTAINERS b/board/ti/omap5_uevm/MAINTAINERS
index 280ea2f91f..ce544828f8 100644
--- a/board/ti/omap5_uevm/MAINTAINERS
+++ b/board/ti/omap5_uevm/MAINTAINERS
@@ -1,5 +1,5 @@
OMAP5_UEVM BOARD
-M: Lokesh Vutla <lokeshvutla@ti.com>
+M: Tom Rini <trini@konsulko.com>
S: Maintained
F: board/ti/omap5_uevm/
F: include/configs/omap5_uevm.h
diff --git a/board/ti/panda/MAINTAINERS b/board/ti/panda/MAINTAINERS
index 2142368271..8b8cf7daf6 100644
--- a/board/ti/panda/MAINTAINERS
+++ b/board/ti/panda/MAINTAINERS
@@ -1,5 +1,5 @@
PANDA BOARD
-M: Lokesh Vutla <lokeshvutla@ti.com>
+M: Tom Rini <trini@konsulko.com>
S: Maintained
F: board/ti/panda/
F: include/configs/omap4_panda.h
diff --git a/board/ti/sdp4430/MAINTAINERS b/board/ti/sdp4430/MAINTAINERS
index ac4d0ccc19..d8b8fe600e 100644
--- a/board/ti/sdp4430/MAINTAINERS
+++ b/board/ti/sdp4430/MAINTAINERS
@@ -1,5 +1,5 @@
SDP4430 BOARD
-M: Lokesh Vutla <lokeshvutla@ti.com>
+M: Tom Rini <trini@konsulko.com>
S: Maintained
F: board/ti/sdp4430/
F: include/configs/omap4_sdp4430.h