diff options
author | Tom Rini <trini@konsulko.com> | 2020-12-09 11:36:41 -0500 |
---|---|---|
committer | Tom Rini <trini@konsulko.com> | 2020-12-09 11:36:41 -0500 |
commit | 2a42de6df1ac75bd85bdb1dd8580f01895c915cd (patch) | |
tree | 3bb16ff141b97a686c91caacf6b8584f2c2d4c8d /include | |
parent | 19ea606109135c3d9892d86e1b1c2a8fb551cc1b (diff) | |
parent | 9b36b7dc96baedc0ed506246a9822c745cc65b45 (diff) | |
download | u-boot-2a42de6df1ac75bd85bdb1dd8580f01895c915cd.tar.gz u-boot-2a42de6df1ac75bd85bdb1dd8580f01895c915cd.tar.xz u-boot-2a42de6df1ac75bd85bdb1dd8580f01895c915cd.zip |
Merge tag 'u-boot-stm32-20201209' of https://gitlab.denx.de/u-boot/custodians/u-boot-stm
- Manage CONFIG_ENV_EXT4_DEVICE_AND_PART in stm32mp1 board
- Update ARM STI and ARM STM STM32MP Arch maintainers emails
- Enable internal pull-ups for SDMMC1 on DHCOM SoM
Diffstat (limited to 'include')
-rw-r--r-- | include/configs/stih410-b2260.h | 2 | ||||
-rw-r--r-- | include/configs/stm32f429-evaluation.h | 2 | ||||
-rw-r--r-- | include/configs/stm32f469-discovery.h | 2 | ||||
-rw-r--r-- | include/configs/stm32h743-disco.h | 2 | ||||
-rw-r--r-- | include/configs/stm32h743-eval.h | 2 | ||||
-rw-r--r-- | include/dwc3-sti-glue.h | 2 | ||||
-rw-r--r-- | include/stm32_rcc.h | 2 |
7 files changed, 7 insertions, 7 deletions
diff --git a/include/configs/stih410-b2260.h b/include/configs/stih410-b2260.h index 169b9efeec..33b34ee0cd 100644 --- a/include/configs/stih410-b2260.h +++ b/include/configs/stih410-b2260.h @@ -1,7 +1,7 @@ /* SPDX-License-Identifier: GPL-2.0+ */ /* * Copyright (C) 2017, STMicroelectronics - All Rights Reserved - * Author(s): Patrice Chotard, <patrice.chotard@st.com> for STMicroelectronics. + * Author(s): Patrice Chotard, <patrice.chotard@foss.st.com> for STMicroelectronics. */ #ifndef __CONFIG_H diff --git a/include/configs/stm32f429-evaluation.h b/include/configs/stm32f429-evaluation.h index 8390535af0..fefdb2dd15 100644 --- a/include/configs/stm32f429-evaluation.h +++ b/include/configs/stm32f429-evaluation.h @@ -1,7 +1,7 @@ /* SPDX-License-Identifier: GPL-2.0+ */ /* * Copyright (C) STMicroelectronics SA 2017 - * Author(s): Patrice CHOTARD, <patrice.chotard@st.com> for STMicroelectronics. + * Author(s): Patrice CHOTARD, <patrice.chotard@foss.st.com> for STMicroelectronics. */ #ifndef __CONFIG_H diff --git a/include/configs/stm32f469-discovery.h b/include/configs/stm32f469-discovery.h index 57fb6b25af..ba9f05a61b 100644 --- a/include/configs/stm32f469-discovery.h +++ b/include/configs/stm32f469-discovery.h @@ -1,7 +1,7 @@ /* SPDX-License-Identifier: GPL-2.0+ */ /* * Copyright (C) STMicroelectronics SA 2017 - * Author(s): Patrice CHOTARD, <patrice.chotard@st.com> for STMicroelectronics. + * Author(s): Patrice CHOTARD, <patrice.chotard@foss.st.com> for STMicroelectronics. */ #ifndef __CONFIG_H diff --git a/include/configs/stm32h743-disco.h b/include/configs/stm32h743-disco.h index afc98ae791..6e10dbdfe9 100644 --- a/include/configs/stm32h743-disco.h +++ b/include/configs/stm32h743-disco.h @@ -1,7 +1,7 @@ /* SPDX-License-Identifier: GPL-2.0+ */ /* * Copyright (C) 2017, STMicroelectronics - All Rights Reserved - * Author(s): Patrice Chotard, <patrice.chotard@st.com> for STMicroelectronics. + * Author(s): Patrice Chotard, <patrice.chotard@foss.st.com> for STMicroelectronics. */ #ifndef __CONFIG_H diff --git a/include/configs/stm32h743-eval.h b/include/configs/stm32h743-eval.h index 66af8f50d9..268d39c7ad 100644 --- a/include/configs/stm32h743-eval.h +++ b/include/configs/stm32h743-eval.h @@ -1,7 +1,7 @@ /* SPDX-License-Identifier: GPL-2.0+ */ /* * Copyright (C) 2017, STMicroelectronics - All Rights Reserved - * Author(s): Patrice Chotard, <patrice.chotard@st.com> for STMicroelectronics. + * Author(s): Patrice Chotard, <patrice.chotard@foss.st.com> for STMicroelectronics. */ #ifndef __CONFIG_H diff --git a/include/dwc3-sti-glue.h b/include/dwc3-sti-glue.h index 3989a9bb53..546ffbaf7b 100644 --- a/include/dwc3-sti-glue.h +++ b/include/dwc3-sti-glue.h @@ -1,7 +1,7 @@ /* SPDX-License-Identifier: GPL-2.0+ */ /* * Copyright (C) 2017, STMicroelectronics - All Rights Reserved - * Author(s): Patrice Chotard, <patrice.chotard@st.com> for STMicroelectronics. + * Author(s): Patrice Chotard, <patrice.chotard@foss.st.com> for STMicroelectronics. */ #ifndef __DWC3_STI_UBOOT_H_ diff --git a/include/stm32_rcc.h b/include/stm32_rcc.h index a09a09ff95..b559ea7728 100644 --- a/include/stm32_rcc.h +++ b/include/stm32_rcc.h @@ -1,7 +1,7 @@ /* SPDX-License-Identifier: GPL-2.0+ */ /* * Copyright (C) STMicroelectronics SA 2017 - * Author(s): Patrice CHOTARD, <patrice.chotard@st.com> for STMicroelectronics. + * Author(s): Patrice CHOTARD, <patrice.chotard@foss.st.com> for STMicroelectronics. */ #ifndef __STM32_RCC_H_ |