mirror of
https://github.com/Fishwaldo/u-boot.git
synced 2025-03-18 13:11:31 +00:00
- Disable CONFIG_NET flag for MCU STM32
- Fix ramdisk_addr_r for stm32f746-disco - Fix USB product id for stm32mp1 -----BEGIN PGP SIGNATURE----- iQEzBAABCgAdFiEE56Yx6b9SnloYCWtD4rK92eCqk3UFAl2wHd8ACgkQ4rK92eCq k3UEBQgAkVeXgew8P7Z/ATK6jGArMWF+OGbh+Eveb1/vD1opcizyvVm4gxg/RRQA +yDuXhd0fXoaug4okDXplJXg7j6YRVr2PUPVoGYMcaLOX4TUcXXf+6rYycC4mzVS 5vF5Fb9k+Wu/5rI+7y0IJH2zoAvLtEJ1+8vDwH3oCIBgsTYn54FwOXU76ni9NzA/ n5Gs8Xn09TJb5BtZ/CNdBYgJ+4bDystzhVTbmaAUYSX075wMl4+Dax9EZLwc5941 3Ix5yzsDRYObrLhvZgSr3EaVcoxa6y7E3488D9o5voPbDsO5XMXf72MVFjMGJClQ 03q2RP1rNnDYzfGvPTztWPpSvgxC0A== =UmF/ -----END PGP SIGNATURE----- Merge tag 'u-boot-stm32-2019-10-23' of https://gitlab.denx.de/u-boot/custodians/u-boot-stm - Disable CONFIG_NET flag for MCU STM32 - Fix ramdisk_addr_r for stm32f746-disco - Fix USB product id for stm32mp1
This commit is contained in:
commit
680023c5fa
7 changed files with 23 additions and 3 deletions
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
||||
/*
|
||||
|
|
Loading…
Add table
Reference in a new issue