Mirrors/u-boot
2
0
Fork 0
mirror of https://github.com/AsahiLinux/u-boot synced 2024-11-10 23:24:38 +00:00
Code Issues Projects Releases Packages Wiki Activity

board: stm32mp1: use IS_ENABLED to prevent ifdef in board_late_init

Browse source 
Use IS_ENABLED to prevent ifdef in board_late_init.

Signed-off-by: Patrick Delaunay <patrick.delaunay@st.com>
Reviewed-by: Patrice Chotard <patrice.chotard@st.com>
This commit is contained in:
Patrick Delaunay 2020-07-31 16:31:48 +02:00 committed by Patrice Chotard
parent e817c8eca5
commit 72b099897a
1 changed files with 30 additions and 30 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

60
board/st/stm32mp1/stm32mp1.c
View file

@ -654,47 +654,47 @@ int board_init(void)
int board_late_init(void) int board_late_init(void)
{ {
#ifdef CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG
const void *fdt_compat; const void *fdt_compat;
int fdt_compat_len; int fdt_compat_len;
int ret; int ret;
u32 otp; u32 otp;
struct udevice *dev; struct udevice *dev;
char buf[10]; char buf[10];
char dtb_name[256];
int buf_len;
fdt_compat = fdt_getprop(gd->fdt_blob, 0, "compatible", if (IS_ENABLED(CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG)) {
&fdt_compat_len); fdt_compat = fdt_getprop(gd->fdt_blob, 0, "compatible",
if (fdt_compat && fdt_compat_len) { &fdt_compat_len);
if (strncmp(fdt_compat, "st,", 3) != 0) { if (fdt_compat && fdt_compat_len) {
env_set("board_name", fdt_compat); if (strncmp(fdt_compat, "st,", 3) != 0) {
} else { env_set("board_name", fdt_compat);
char dtb_name[256]; } else {
int buf_len = sizeof(dtb_name); env_set("board_name", fdt_compat + 3);
env_set("board_name", fdt_compat + 3); buf_len = sizeof(dtb_name);
strncpy(dtb_name, fdt_compat + 3, buf_len);
buf_len -= strlen(fdt_compat + 3);
strncat(dtb_name, ".dtb", buf_len);
env_set("fdtfile", dtb_name);
}
}
ret = uclass_get_device_by_driver(UCLASS_MISC,
DM_GET_DRIVER(stm32mp_bsec),
&dev);
strncpy(dtb_name, fdt_compat + 3, buf_len); if (!ret)
buf_len -= strlen(fdt_compat + 3); ret = misc_read(dev, STM32_BSEC_SHADOW(BSEC_OTP_BOARD),
strncat(dtb_name, ".dtb", buf_len); &otp, sizeof(otp));
env_set("fdtfile", dtb_name); if (ret > 0 && otp) {
snprintf(buf, sizeof(buf), "0x%04x", otp >> 16);
env_set("board_id", buf);
snprintf(buf, sizeof(buf), "0x%04x",
((otp >> 8) & 0xF) - 1 + 0xA);
env_set("board_rev", buf);
} }
} }
ret = uclass_get_device_by_driver(UCLASS_MISC,
DM_GET_DRIVER(stm32mp_bsec),
&dev);
if (!ret)
ret = misc_read(dev, STM32_BSEC_SHADOW(BSEC_OTP_BOARD),
&otp, sizeof(otp));
if (ret > 0 && otp) {
snprintf(buf, sizeof(buf), "0x%04x", otp >> 16);
env_set("board_id", buf);
snprintf(buf, sizeof(buf), "0x%04x",
((otp >> 8) & 0xF) - 1 + 0xA);
env_set("board_rev", buf);
}
#endif
/* for DK1/DK2 boards */ /* for DK1/DK2 boards */
board_check_usb_power(); board_check_usb_power();