aboutsummaryrefslogtreecommitdiff
path: root/board
diff options
context:
space:
mode:
Diffstat (limited to 'board')
-rw-r--r--board/st/common/cmd_stboard.c4
-rw-r--r--board/st/stm32f429-discovery/MAINTAINERS1
-rw-r--r--board/st/stm32f429-evaluation/MAINTAINERS1
-rw-r--r--board/st/stm32f469-discovery/MAINTAINERS1
-rw-r--r--board/st/stm32f746-disco/MAINTAINERS5
-rw-r--r--board/st/stm32f746-disco/stm32f746-disco.c2
-rw-r--r--board/st/stm32h743-disco/MAINTAINERS1
-rw-r--r--board/st/stm32h743-eval/MAINTAINERS1
-rw-r--r--board/st/stm32h750-art-pi/MAINTAINERS1
-rw-r--r--board/st/stm32mp1/stm32mp1.c7
10 files changed, 21 insertions, 3 deletions
diff --git a/board/st/common/cmd_stboard.c b/board/st/common/cmd_stboard.c
index c1ecd643b00..e12669b8628 100644
--- a/board/st/common/cmd_stboard.c
+++ b/board/st/common/cmd_stboard.c
@@ -92,14 +92,14 @@ static int do_stboard(struct cmd_tbl *cmdtp, int flag, int argc,
&otp, sizeof(otp));
if (ret != sizeof(otp)) {
- puts("OTP read error");
+ puts("OTP read error\n");
return CMD_RET_FAILURE;
}
ret = misc_read(dev, STM32_BSEC_LOCK(BSEC_OTP_BOARD),
&lock, sizeof(lock));
if (ret != sizeof(lock)) {
- puts("LOCK read error");
+ puts("LOCK read error\n");
return CMD_RET_FAILURE;
}
diff --git a/board/st/stm32f429-discovery/MAINTAINERS b/board/st/stm32f429-discovery/MAINTAINERS
index fdb62e98e89..7661a15fdde 100644
--- a/board/st/stm32f429-discovery/MAINTAINERS
+++ b/board/st/stm32f429-discovery/MAINTAINERS
@@ -1,6 +1,7 @@
STM32F429-DISCOVERY BOARD
M: Kamil Lulko <kamil.lulko@gmail.com>
S: Maintained
+F: doc/board/st/
F: board/st/stm32f429-discovery/
F: include/configs/stm32f429-discovery.h
F: configs/stm32f429-discovery_defconfig
diff --git a/board/st/stm32f429-evaluation/MAINTAINERS b/board/st/stm32f429-evaluation/MAINTAINERS
index 29d00ef27ed..b272893ef7b 100644
--- a/board/st/stm32f429-evaluation/MAINTAINERS
+++ b/board/st/stm32f429-evaluation/MAINTAINERS
@@ -1,6 +1,7 @@
STM32F429-EVALUATION BOARD
M: Patrice Chotard <patrice.chotard@foss.st.com>
S: Maintained
+F: doc/board/st/
F: board/st/stm32f429-evaluation/
F: include/configs/stm32f429-evaluation.h
F: configs/stm32f429-evaluation_defconfig
diff --git a/board/st/stm32f469-discovery/MAINTAINERS b/board/st/stm32f469-discovery/MAINTAINERS
index 5a6a78b39ef..a95f93f6f6c 100644
--- a/board/st/stm32f469-discovery/MAINTAINERS
+++ b/board/st/stm32f469-discovery/MAINTAINERS
@@ -1,6 +1,7 @@
STM32F469-DISCOVERY BOARD
M: Patrice Chotard <patrice.chotard@foss.st.com>
S: Maintained
+F: doc/board/st/
F: board/st/stm32f469-discovery/
F: include/configs/stm32f469-discovery.h
F: configs/stm32f469-discovery_defconfig
diff --git a/board/st/stm32f746-disco/MAINTAINERS b/board/st/stm32f746-disco/MAINTAINERS
index 3bbb513ad7a..18e4c99c4fb 100644
--- a/board/st/stm32f746-disco/MAINTAINERS
+++ b/board/st/stm32f746-disco/MAINTAINERS
@@ -1,7 +1,12 @@
STM32F746 DISCOVERY BOARD
M: Vikas Manocha <vikas.manocha@st.com>
S: Maintained
+F: doc/board/st/
F: board/st/stm32f746-disco
F: include/configs/stm32f746-disco.h
F: configs/stm32f746-disco_defconfig
+F: configs/stm32f746-disco_spl_defconfig
+F: configs/stm32746g-eval_defconfig
+F: configs/stm32746g-eval_spl_defconfig
F: configs/stm32f769-disco_defconfig
+F: configs/stm32f769-disco_spl_defconfig
diff --git a/board/st/stm32f746-disco/stm32f746-disco.c b/board/st/stm32f746-disco/stm32f746-disco.c
index 69f657c54b8..2ab23f2f4f7 100644
--- a/board/st/stm32f746-disco/stm32f746-disco.c
+++ b/board/st/stm32f746-disco/stm32f746-disco.c
@@ -29,7 +29,7 @@ DECLARE_GLOBAL_DATA_PTR;
int dram_init(void)
{
-#ifndef CONFIG_SUPPORT_SPL
+#ifndef CONFIG_SPL_BUILD
int rv;
struct udevice *dev;
rv = uclass_get_device(UCLASS_RAM, 0, &dev);
diff --git a/board/st/stm32h743-disco/MAINTAINERS b/board/st/stm32h743-disco/MAINTAINERS
index 60fbe344f83..f4ecef3aa50 100644
--- a/board/st/stm32h743-disco/MAINTAINERS
+++ b/board/st/stm32h743-disco/MAINTAINERS
@@ -1,6 +1,7 @@
STM32H743 DISCOVERY BOARD
M: Patrice Chotard <patrice.chotard@foss.st.com>
S: Maintained
+F: doc/board/st/
F: board/st/stm32h743-disco
F: include/configs/stm32h743-disco.h
F: configs/stm32h743-disco_defconfig
diff --git a/board/st/stm32h743-eval/MAINTAINERS b/board/st/stm32h743-eval/MAINTAINERS
index fda93db7774..b69e0d4abbb 100644
--- a/board/st/stm32h743-eval/MAINTAINERS
+++ b/board/st/stm32h743-eval/MAINTAINERS
@@ -1,6 +1,7 @@
STM32H743 EVALUATION BOARD
M: Patrice Chotard <patrice.chotard@foss.st.com>
S: Maintained
+F: doc/board/st/
F: board/st/stm32h743-eval
F: include/configs/stm32h743-eval.h
F: configs/stm32h743-eval_defconfig
diff --git a/board/st/stm32h750-art-pi/MAINTAINERS b/board/st/stm32h750-art-pi/MAINTAINERS
index 9578833068b..2fd69e6d1ca 100644
--- a/board/st/stm32h750-art-pi/MAINTAINERS
+++ b/board/st/stm32h750-art-pi/MAINTAINERS
@@ -1,6 +1,7 @@
STM32H750 ART PI BOARD
M: Dillon Min <dillon.minfei@gmail.com>
S: Maintained
+F: doc/board/st/
F: board/st/stm32h750-art-pi
F: include/configs/stm32h750-art-pi.h
F: configs/stm32h750-art-pi_defconfig
diff --git a/board/st/stm32mp1/stm32mp1.c b/board/st/stm32mp1/stm32mp1.c
index 7466e1c732a..07b1a63db7d 100644
--- a/board/st/stm32mp1/stm32mp1.c
+++ b/board/st/stm32mp1/stm32mp1.c
@@ -199,6 +199,13 @@ int g_dnl_board_usb_cable_connected(void)
if (!IS_ENABLED(CONFIG_USB_GADGET_DWC2_OTG))
return -ENODEV;
+ /*
+ * In case of USB boot device is detected, consider USB cable is
+ * connected
+ */
+ if ((get_bootmode() & TAMP_BOOT_DEVICE_MASK) == BOOT_SERIAL_USB)
+ return true;
+
/* if typec stusb160x is present, means DK1 or DK2 board */
ret = stusb160x_cable_connected();
if (ret >= 0)