Qubot/pi-u-boot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge tag 'u-boot-imx-master-20240317' of https://gitlab.denx.de/u-boot/custodians/u-boot-imx

Browse Source 
CI:
https://source.denx.de/u-boot/custodians/u-boot-imx/-/pipelines/19974

- Fix build error when SoM detection on Phytec board.
- Fix sc_misc_otp_fuse_read() error check on colibri-imx8x/apalis-imx8.
- Fix NPU/VPU fdt disable fixup on i.MX8M.
This commit is contained in:
Tom Rini 2024-03-17 19:43:02 -04:00
commit 6ec096a711
4 changed files with 21 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
arch/arm/mach-imx/imx8m/soc.c
View File

@ -933,19 +933,28 @@ int disable_vpu_nodes(void *blob)
{
static const char * const nodes_path_8mq[] = {
"/vpu@38300000",
"/soc@0/vpu@38300000"
"/soc@0/vpu@38300000",
"/soc@0/video-codec@38300000",
"/soc@0/video-codec@38310000",
"/soc@0/blk-ctrl@38320000",
};
static const char * const nodes_path_8mm[] = {
"/vpu_g1@38300000",
"/vpu_g2@38310000",
"/vpu_h1@38320000"
"/vpu_h1@38320000",
"/soc@0/video-codec@38300000",
"/soc@0/video-codec@38310000",
"/soc@0/blk-ctrl@38330000",
};
static const char * const nodes_path_8mp[] = {
"/vpu_g1@38300000",
"/vpu_g2@38310000",
"/vpu_vc8000e@38320000"
"/vpu_vc8000e@38320000",
"/soc@0/video-codec@38300000",
"/soc@0/video-codec@38310000",
"/soc@0/blk-ctrl@38330000",
};
if (is_imx8mq())
@ -1100,7 +1109,8 @@ int disable_gpu_nodes(void *blob)
int disable_npu_nodes(void *blob)
{
static const char * const nodes_path_8mp[] = {
"/vipsi@38500000"
"/vipsi@38500000",
"/soc@0/npu@38500000",
};
return disable_fdt_nodes(blob, nodes_path_8mp, ARRAY_SIZE(nodes_path_8mp));

5
board/phytec/common/phytec_som_detection.c
View File

@ -248,4 +248,9 @@ u8 __maybe_unused phytec_get_rev(struct phytec_eeprom_data *data)
return PHYTEC_EEPROM_INVAL;
}
u8 __maybe_unused phytec_get_som_type(struct phytec_eeprom_data *data)
{
return PHYTEC_EEPROM_INVAL;
}
#endif /* IS_ENABLED(CONFIG_PHYTEC_SOM_DETECTION) */

2
board/toradex/apalis-imx8/apalis-imx8.c
View File

@ -133,7 +133,7 @@ void board_mem_get_layout(u64 *phys_sdram_1_start,
struct tdx_user_fuses tdxramfuses;
int scierr = sc_misc_otp_fuse_read(-1, 6, &val);
if (scierr) {
if (!scierr) {
/* QP has one A72 core disabled */
is_quadplus = ((val >> 4) & 0x3) != 0x0;
}

2
board/toradex/colibri-imx8x/colibri-imx8x.c
View File

@ -46,7 +46,7 @@ static int is_imx8dx(void)
u32 val = 0;
int sc_err = sc_misc_otp_fuse_read(-1, 6, &val);
if (sc_err) {
if (!sc_err) {
/* DX has two A35 cores disabled */
return (val & 0xf) != 0x0;
}