mirror of
https://github.com/AsahiLinux/u-boot
synced 2024-12-20 02:03:09 +00:00
b83e285866
_ alignment with kernel DT v6.5 for stm32f429 and stm32f746 _ rework way of displaying ST logo for stm32f746-disco and stm32f769-disco STM32 MPU: _ alignment with kernel DT v6.6-rc1 _ add RNG support for stm32mp13 _ add USB, USB boot and stm32prog command support for stm32mp13 _ add support of USART1 clock for stm32mp1 _ only print RAM and board code with SPL_DISPLAY_PRINT flag for stm32mp1 _ rename update_sf to dh_update_sd_to_sf and add dh_update_sd_to_emmc for stm32mp15xx DHCOR -----BEGIN PGP SIGNATURE----- iQJQBAABCgA6FiEEXyrViUccKBz9c35Jysd4L3sz/6YFAmUdaJccHHBhdHJpY2Uu Y2hvdGFyZEBmb3NzLnN0LmNvbQAKCRDKx3gvezP/ptHxEACdibF5EoRb40qhQCWB mwW50s76xWOyHGOGjSe3l18zxPdBjQ+9rnT8/A+mjaa8he4kMX9EZJyYRogcz7eR QcnSeu9Q4L8bKbqnPBOpKF6TN7rFOIUcu+BWp3o8jZ+7/q7OSJrVLsjbXtCuCLnB q5Pie/in7hmHJsQr6LJ4r31chW6Zm4VDuFiXquuxyE/c94Q8Ue27ag1/RfXL8b/g Ir9aO+PAldGnVdnhPz4e6PZhzMfCVafw+DR7GVx3Zfnx2bg/dajo38UaLBDdEIS1 EIKONU2CBT/W1kPkLFiz+NdaYCzK9EL+RIbN/iG7ms+ds1+wc3zXpWwqZFASfIod ZF788Up+wW+3SrKI2ySFjhQroNzDascn+bbHm4yJuAsORqY0XkxjSuWcSz++q8Hs eMTw/R4uMfEiDvN1A7xlhBMuBrBHk4/6bdCRx2R6nkWes542fsgjXy8tGRWyUgnY nbpTfYU07N8ck6arZ36KThedD7whJHHRcBYtLjhRG+lKbD0epWy67pXgTr9edTLf U6ddH+Tndn4qhx067VhZ8vEXTCzypt4lY61MLcM0b9z8S1nJDn8b8jmiii7IR76L /ocXzuLvNWHfmwNnB2hj/YY+n78vlZhegUxL5/6sH9lNebnewyEzCkVENNELUSYf 8M6vEZprvuhN44Z6hBUWZxXk0w== =1mUx -----END PGP SIGNATURE----- Merge tag 'u-boot-stm32-20231004' of https://source.denx.de/u-boot/custodians/u-boot-stm STM32 MCU: _ alignment with kernel DT v6.5 for stm32f429 and stm32f746 _ rework way of displaying ST logo for stm32f746-disco and stm32f769-disco STM32 MPU: _ alignment with kernel DT v6.6-rc1 _ add RNG support for stm32mp13 _ add USB, USB boot and stm32prog command support for stm32mp13 _ add support of USART1 clock for stm32mp1 _ only print RAM and board code with SPL_DISPLAY_PRINT flag for stm32mp1 _ rename update_sf to dh_update_sd_to_sf and add dh_update_sd_to_emmc for stm32mp15xx DHCOR [ Fix merge conflict at board/st/common/stm32mp_dfu.c ] Signed-off-by: Tom Rini <trini@konsulko.com>
161 lines
3.7 KiB
C
161 lines
3.7 KiB
C
// SPDX-License-Identifier: GPL-2.0+ OR BSD-3-Clause
|
|
/*
|
|
* Copyright (C) 2020, STMicroelectronics - All Rights Reserved
|
|
*/
|
|
|
|
#include <common.h>
|
|
#include <blk.h>
|
|
#include <dm.h>
|
|
#include <dfu.h>
|
|
#include <env.h>
|
|
#include <log.h>
|
|
#include <memalign.h>
|
|
#include <misc.h>
|
|
#include <mtd.h>
|
|
#include <mtd_node.h>
|
|
#include <asm/arch/stm32prog.h>
|
|
#include <linux/printk.h>
|
|
|
|
#define DFU_ALT_BUF_LEN SZ_1K
|
|
|
|
static void board_get_alt_info_mmc(struct udevice *dev, char *buf)
|
|
{
|
|
struct disk_partition info;
|
|
int p, len, devnum;
|
|
bool first = true;
|
|
const char *name;
|
|
struct mmc *mmc;
|
|
struct blk_desc *desc;
|
|
|
|
mmc = mmc_get_mmc_dev(dev);
|
|
if (!mmc)
|
|
return;
|
|
|
|
if (mmc_init(mmc))
|
|
return;
|
|
|
|
desc = mmc_get_blk_desc(mmc);
|
|
if (!desc)
|
|
return;
|
|
|
|
name = blk_get_uclass_name(desc->uclass_id);
|
|
devnum = desc->devnum;
|
|
len = strlen(buf);
|
|
|
|
if (buf[0] != '\0')
|
|
len += snprintf(buf + len,
|
|
DFU_ALT_BUF_LEN - len, "&");
|
|
len += snprintf(buf + len, DFU_ALT_BUF_LEN - len,
|
|
"%s %d=", name, devnum);
|
|
|
|
if (IS_MMC(mmc) && mmc->capacity_boot) {
|
|
len += snprintf(buf + len, DFU_ALT_BUF_LEN - len,
|
|
"%s%d_boot1 raw 0x0 0x%llx mmcpart 1;",
|
|
name, devnum, mmc->capacity_boot);
|
|
len += snprintf(buf + len, DFU_ALT_BUF_LEN - len,
|
|
"%s%d_boot2 raw 0x0 0x%llx mmcpart 2",
|
|
name, devnum, mmc->capacity_boot);
|
|
first = false;
|
|
}
|
|
|
|
for (p = 1; p <= MAX_SEARCH_PARTITIONS; p++) {
|
|
if (part_get_info(desc, p, &info))
|
|
continue;
|
|
if (!first)
|
|
len += snprintf(buf + len, DFU_ALT_BUF_LEN - len, ";");
|
|
first = false;
|
|
len += snprintf(buf + len, DFU_ALT_BUF_LEN - len,
|
|
"%s%d_%s part %d %d",
|
|
name, devnum, info.name, devnum, p);
|
|
}
|
|
}
|
|
|
|
static void board_get_alt_info_mtd(struct mtd_info *mtd, char *buf)
|
|
{
|
|
struct mtd_info *part;
|
|
bool first = true;
|
|
const char *name;
|
|
int len, partnum = 0;
|
|
|
|
name = mtd->name;
|
|
len = strlen(buf);
|
|
|
|
if (buf[0] != '\0')
|
|
len += snprintf(buf + len, DFU_ALT_BUF_LEN - len, "&");
|
|
len += snprintf(buf + len, DFU_ALT_BUF_LEN - len,
|
|
"mtd %s=", name);
|
|
|
|
len += snprintf(buf + len, DFU_ALT_BUF_LEN - len,
|
|
"%s raw 0x0 0x%llx ",
|
|
name, mtd->size);
|
|
|
|
list_for_each_entry(part, &mtd->partitions, node) {
|
|
partnum++;
|
|
if (!first)
|
|
len += snprintf(buf + len, DFU_ALT_BUF_LEN - len, ";");
|
|
first = false;
|
|
|
|
len += snprintf(buf + len, DFU_ALT_BUF_LEN - len,
|
|
"%s_%s part %d",
|
|
name, part->name, partnum);
|
|
}
|
|
}
|
|
|
|
void set_dfu_alt_info(char *interface, char *devstr)
|
|
{
|
|
struct udevice *dev;
|
|
struct mtd_info *mtd;
|
|
|
|
ALLOC_CACHE_ALIGN_BUFFER(char, buf, DFU_ALT_BUF_LEN);
|
|
|
|
if (env_get("dfu_alt_info"))
|
|
return;
|
|
|
|
memset(buf, 0, sizeof(buf));
|
|
|
|
snprintf(buf, DFU_ALT_BUF_LEN,
|
|
"ram 0=%s", CONFIG_DFU_ALT_RAM0);
|
|
|
|
if (CONFIG_IS_ENABLED(MMC)) {
|
|
if (!uclass_get_device(UCLASS_MMC, 0, &dev))
|
|
board_get_alt_info_mmc(dev, buf);
|
|
|
|
if (!uclass_get_device(UCLASS_MMC, 1, &dev))
|
|
board_get_alt_info_mmc(dev, buf);
|
|
}
|
|
|
|
if (IS_ENABLED(CONFIG_MTD)) {
|
|
/* probe all MTD devices */
|
|
mtd_probe_devices();
|
|
|
|
/* probe SPI flash device on a bus */
|
|
if (!uclass_get_device(UCLASS_SPI_FLASH, 0, &dev)) {
|
|
mtd = get_mtd_device_nm("nor0");
|
|
if (!IS_ERR_OR_NULL(mtd))
|
|
board_get_alt_info_mtd(mtd, buf);
|
|
|
|
mtd = get_mtd_device_nm("nor1");
|
|
if (!IS_ERR_OR_NULL(mtd))
|
|
board_get_alt_info_mtd(mtd, buf);
|
|
}
|
|
|
|
mtd = get_mtd_device_nm("nand0");
|
|
if (!IS_ERR_OR_NULL(mtd))
|
|
board_get_alt_info_mtd(mtd, buf);
|
|
|
|
mtd = get_mtd_device_nm("spi-nand0");
|
|
if (!IS_ERR_OR_NULL(mtd))
|
|
board_get_alt_info_mtd(mtd, buf);
|
|
}
|
|
|
|
if (IS_ENABLED(CONFIG_DFU_VIRT)) {
|
|
/* virtual device id 0 is aligned with stm32mp_dfu_virt.c */
|
|
strlcat(buf, "&virt 0=OTP", DFU_ALT_BUF_LEN);
|
|
|
|
if (IS_ENABLED(CONFIG_PMIC_STPMIC1))
|
|
strlcat(buf, "&virt 1=PMIC", DFU_ALT_BUF_LEN);
|
|
}
|
|
|
|
env_set("dfu_alt_info", buf);
|
|
puts("DFU alt info setting: done\n");
|
|
}
|