From 6600859eaeb66961ced7c69d06c70cb08957844a Mon Sep 17 00:00:00 2001 From: Patrice Chotard Date: Tue, 17 Sep 2019 10:09:41 +0200 Subject: [PATCH 1/7] configs: stm32f429-discovery: Disable CONFIG_NET flag Network support was never added on this board, disable CONFIG_NET flag to avoid following warning: ===================== WARNING ====================== This board does not use CONFIG_DM_ETH (Driver Model for Ethernet drivers). Please update the board to use CONFIG_DM_ETH before the v2020.07 release. Failure to update by the deadline may result in board removal. See doc/driver-model/migration.rst for more info. ==================================================== Signed-off-by: Patrice Chotard Acked-by: Patrick Delaunay --- configs/stm32f429-discovery_defconfig | 1 + 1 file changed, 1 insertion(+) diff --git a/configs/stm32f429-discovery_defconfig b/configs/stm32f429-discovery_defconfig index 3c3501566c6..45fdb9d2ad7 100644 --- a/configs/stm32f429-discovery_defconfig +++ b/configs/stm32f429-discovery_defconfig @@ -21,5 +21,6 @@ CONFIG_CMD_TIMER=y CONFIG_OF_CONTROL=y CONFIG_DEFAULT_DEVICE_TREE="stm32f429-disco" CONFIG_ENV_IS_IN_FLASH=y +# CONFIG_NET is not set # CONFIG_MMC is not set CONFIG_MTD_NOR_FLASH=y From fd697a63e2406dde052113ff800d20655dbfdb7f Mon Sep 17 00:00:00 2001 From: Patrice Chotard Date: Tue, 17 Sep 2019 10:09:42 +0200 Subject: [PATCH 2/7] configs: stm32f429-evaluation: Disable CONFIG_NET flag Network support was never added on this board, disable CONFIG_NET flag to avoid following warning: ===================== WARNING ====================== This board does not use CONFIG_DM_ETH (Driver Model for Ethernet drivers). Please update the board to use CONFIG_DM_ETH before the v2020.07 release. Failure to update by the deadline may result in board removal. See doc/driver-model/migration.rst for more info. ==================================================== Signed-off-by: Patrice Chotard Acked-by: Patrick Delaunay --- configs/stm32f429-evaluation_defconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configs/stm32f429-evaluation_defconfig b/configs/stm32f429-evaluation_defconfig index 51f587f629d..2b118a0dffc 100644 --- a/configs/stm32f429-evaluation_defconfig +++ b/configs/stm32f429-evaluation_defconfig @@ -17,12 +17,12 @@ CONFIG_CMD_GPT=y # CONFIG_RANDOM_UUID is not set CONFIG_CMD_MMC=y # CONFIG_CMD_SETEXPR is not set -# CONFIG_CMD_MII is not set CONFIG_CMD_CACHE=y CONFIG_CMD_TIMER=y # CONFIG_ISO_PARTITION is not set CONFIG_OF_CONTROL=y CONFIG_DEFAULT_DEVICE_TREE="stm32429i-eval" +# CONFIG_NET is not set CONFIG_DM_MMC=y CONFIG_ARM_PL180_MMCI=y CONFIG_MTD_NOR_FLASH=y From e15ed9e4364f0e0aee7141dd35b0a3a2f7540e54 Mon Sep 17 00:00:00 2001 From: Patrice Chotard Date: Tue, 17 Sep 2019 10:09:43 +0200 Subject: [PATCH 3/7] configs: stm32f469-discovery: Disable CONFIG_NET flag Network support was never added on this board, disable CONFIG_NET flag to avoid following warning: ===================== WARNING ====================== This board does not use CONFIG_DM_ETH (Driver Model for Ethernet drivers). Please update the board to use CONFIG_DM_ETH before the v2020.07 release. Failure to update by the deadline may result in board removal. See doc/driver-model/migration.rst for more info. ==================================================== Signed-off-by: Patrice Chotard Acked-by: Patrick Delaunay --- configs/stm32f469-discovery_defconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configs/stm32f469-discovery_defconfig b/configs/stm32f469-discovery_defconfig index dcd06976773..5cedb765d13 100644 --- a/configs/stm32f469-discovery_defconfig +++ b/configs/stm32f469-discovery_defconfig @@ -18,12 +18,12 @@ CONFIG_CMD_GPT=y CONFIG_CMD_MMC=y CONFIG_CMD_SF=y # CONFIG_CMD_SETEXPR is not set -# CONFIG_CMD_MII is not set CONFIG_CMD_CACHE=y CONFIG_CMD_TIMER=y # CONFIG_ISO_PARTITION is not set CONFIG_OF_CONTROL=y CONFIG_DEFAULT_DEVICE_TREE="stm32f469-disco" +# CONFIG_NET is not set CONFIG_DM_MMC=y CONFIG_ARM_PL180_MMCI=y CONFIG_MTD=y From 5413b33afdb3779560cd28e04bca47559ec35955 Mon Sep 17 00:00:00 2001 From: Patrice Chotard Date: Tue, 17 Sep 2019 10:09:44 +0200 Subject: [PATCH 4/7] configs: stm32h743-disco: Disable CONFIG_NET flag Network support was never added on this board, disable CONFIG_NET flag to avoid following warning: ===================== WARNING ====================== This board does not use CONFIG_DM_ETH (Driver Model for Ethernet drivers). Please update the board to use CONFIG_DM_ETH before the v2020.07 release. Failure to update by the deadline may result in board removal. See doc/driver-model/migration.rst for more info. ==================================================== Signed-off-by: Patrice Chotard Acked-by: Patrick Delaunay --- configs/stm32h743-disco_defconfig | 1 + 1 file changed, 1 insertion(+) diff --git a/configs/stm32h743-disco_defconfig b/configs/stm32h743-disco_defconfig index 1053dbcd5b4..64aba95186c 100644 --- a/configs/stm32h743-disco_defconfig +++ b/configs/stm32h743-disco_defconfig @@ -24,6 +24,7 @@ CONFIG_CMD_EXT4_WRITE=y # CONFIG_ISO_PARTITION is not set CONFIG_OF_CONTROL=y CONFIG_DEFAULT_DEVICE_TREE="stm32h743i-disco" +# CONFIG_NET is not set CONFIG_DM_MMC=y CONFIG_STM32_SDMMC2=y # CONFIG_PINCTRL_FULL is not set From b7fe6fd01fbebdeaa5c64d0f0124212f1bf859a8 Mon Sep 17 00:00:00 2001 From: Patrice Chotard Date: Tue, 17 Sep 2019 10:09:45 +0200 Subject: [PATCH 5/7] configs: stm32h743-eval: Disable CONFIG_NET flag Network support was never added on this board, disable CONFIG_NET flag to avoid following warning: ===================== WARNING ====================== This board does not use CONFIG_DM_ETH (Driver Model for Ethernet drivers). Please update the board to use CONFIG_DM_ETH before the v2020.07 release. Failure to update by the deadline may result in board removal. See doc/driver-model/migration.rst for more info. ==================================================== Signed-off-by: Patrice Chotard Acked-by: Patrick Delaunay --- configs/stm32h743-eval_defconfig | 1 + 1 file changed, 1 insertion(+) diff --git a/configs/stm32h743-eval_defconfig b/configs/stm32h743-eval_defconfig index 4d88ed3f8a1..e148014cdad 100644 --- a/configs/stm32h743-eval_defconfig +++ b/configs/stm32h743-eval_defconfig @@ -24,6 +24,7 @@ CONFIG_CMD_EXT4_WRITE=y # CONFIG_ISO_PARTITION is not set CONFIG_OF_CONTROL=y CONFIG_DEFAULT_DEVICE_TREE="stm32h743i-eval" +# CONFIG_NET is not set CONFIG_DM_MMC=y CONFIG_STM32_SDMMC2=y # CONFIG_PINCTRL_FULL is not set From f77b9ab97c8512a98e5f7b72dd58e7da817ff2c1 Mon Sep 17 00:00:00 2001 From: Patrice Chotard Date: Mon, 16 Sep 2019 10:56:51 +0200 Subject: [PATCH 6/7] configs: stm32f746-disco: Fix ramdisk_addr_r Set ramdisk_addr_r to 0xC0600000. Reported-by: Christophe Priouzeau Signed-off-by: Patrice Chotard Acked-by: Patrick Delaunay --- include/configs/stm32f746-disco.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/configs/stm32f746-disco.h b/include/configs/stm32f746-disco.h index a24127d1a79..cc26f83e746 100644 --- a/include/configs/stm32f746-disco.h +++ b/include/configs/stm32f746-disco.h @@ -55,7 +55,7 @@ "pxefile_addr_r=0xC0008000\0" \ "fdt_high=0xffffffffffffffff\0" \ "initrd_high=0xffffffffffffffff\0" \ - "ramdisk_addr_r=0xD0900000\0" \ + "ramdisk_addr_r=0xC0600000\0" \ BOOTENV /* From fb90fcf82628f0328649e55c7bf0c41f79872505 Mon Sep 17 00:00:00 2001 From: Patrick Delaunay Date: Fri, 13 Sep 2019 15:24:17 +0200 Subject: [PATCH 7/7] board: stm32mp1: fixup the usb product id for USB download gadget Select the correct USB product id used by the download gadget for ST stm32mp1 boards. The board stm32mp1 select the correct product id, as defined in http://www.linux-usb.org/usb.ids for the STMicroelectronics vendor id = 0x0483 (CONFIG_USB_GADGET_VENDOR_NUM): - dfu = 0xdf11 : STM Device in DFU mode it is the value used by ROM code and reused for stm32prog command - fasboot = 0x0afb : Android Fastboot device - others = 0x5720 (CONFIG_USB_GADGET_PRODUCT_NUM) Mass Storage Device it is used for UMS command / usb_dnl_ums This patch avoid conflict when the same USB VID/PID is used for ums, fastboot or dfu command (two different protocols associated to the same PID). Signed-off-by: Patrick Delaunay Acked-by: Patrice Chotard --- board/st/stm32mp1/stm32mp1.c | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/board/st/stm32mp1/stm32mp1.c b/board/st/stm32mp1/stm32mp1.c index 18f9b848765..126af301732 100644 --- a/board/st/stm32mp1/stm32mp1.c +++ b/board/st/stm32mp1/stm32mp1.c @@ -233,6 +233,23 @@ int g_dnl_board_usb_cable_connected(void) return dwc2_udc_B_session_valid(dwc2_udc_otg); } + +#define STM32MP1_G_DNL_DFU_PRODUCT_NUM 0xdf11 +#define STM32MP1_G_DNL_FASTBOOT_PRODUCT_NUM 0x0afb + +int g_dnl_bind_fixup(struct usb_device_descriptor *dev, const char *name) +{ + if (!strcmp(name, "usb_dnl_dfu")) + put_unaligned(STM32MP1_G_DNL_DFU_PRODUCT_NUM, &dev->idProduct); + else if (!strcmp(name, "usb_dnl_fastboot")) + put_unaligned(STM32MP1_G_DNL_FASTBOOT_PRODUCT_NUM, + &dev->idProduct); + else + put_unaligned(CONFIG_USB_GADGET_PRODUCT_NUM, &dev->idProduct); + + return 0; +} + #endif /* CONFIG_USB_GADGET */ #ifdef CONFIG_LED