December 2020 - U-Boot

[PATCH v2] armv8: lx2162aqds: disable non existing pcie controllers
by Wasim Khan 11 Dec '20

11 Dec '20

disable non existing pcie controllers on lx2162aqds Signed-off-by: Wasim Khan <wasim.khan(a)nxp.com> --- Changes in v2: - Rebased to u-boot-fsl-qoriq arch/arm/dts/fsl-lx2162a-qds.dts | 22 ++++++++++------------ 1 file changed, 10 insertions(+), 12 deletions(-) diff --git a/arch/arm/dts/fsl-lx2162a-qds.dts b/arch/arm/dts/fsl-lx2162a-qds.dts index b165265..a2592c9 100644 --- a/arch/arm/dts/fsl-lx2162a-qds.dts +++ b/arch/arm/dts/fsl-lx2162a-qds.dts @@ -13,22 +13,20 @@ / { model = "NXP Layerscape LX2162AQDS Board"; compatible = "fsl,lx2162aqds", "fsl,lx2160a"; +}; - aliases { - pcie@3500000 { - status = "disabled"; - }; +&usb1 { + status = "disabled"; +}; - pcie@3800000 { - status = "disabled"; - }; +&pcie2 { + status = "disabled"; +}; - pcie@3900000 { - status = "disabled"; - }; - }; +&pcie5 { + status = "disabled"; }; -&usb1 { +&pcie6 { status = "disabled"; }; -- 2.7.4

1 0

[PATCH] configs: lx2162a: Enable OPTEE support
by Gaurav Jain 11 Dec '20

11 Dec '20

From: Ruchika Gupta <ruchika.gupta(a)nxp.com> Enable support to compile OPTEE driver, access AVB TA and RPMB API's access via RPC from OPTEE for lx2162 Signed-off-by: Ruchika Gupta <ruchika.gupta(a)nxp.com> Signed-off-by: Gaurav Jain <gaurav.jain(a)nxp.com> --- Depends-on: <http://patchwork.ozlabs.org/project/uboot/patch/1599473527-21511-3-git-send…> configs/lx2162aqds_tfa_defconfig | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/configs/lx2162aqds_tfa_defconfig b/configs/lx2162aqds_tfa_defconfig index 33ca543396..dcf8c4a924 100644 --- a/configs/lx2162aqds_tfa_defconfig +++ b/configs/lx2162aqds_tfa_defconfig @@ -93,3 +93,8 @@ CONFIG_CMD_DATE=y CONFIG_RTC_PCF2127=y CONFIG_I2C_MUX=y CONFIG_I2C_MUX_PCA954x=y +CONFIG_TEE=y +CONFIG_OPTEE=y +CONFIG_OPTEE_TA_AVB=y +CONFIG_SUPPORT_EMMC_RPMB=y +CONFIG_CMD_OPTEE_RPMB=y -- 2.17.1

2 1

configs: lx2162aqds: enable CONFIG_BOARD_EARLY_INIT_R
by Yangbo Lu 11 Dec '20

11 Dec '20

From: Guanhua Gao <guanhua.gao(a)nxp.com> From: Yangbo Lu <yangbo.lu(a)nxp.com> Enable CONFIG_BOARD_EARLY_INIT_R for SDHC adapter card identification and configuration. Signed-off-by: Yangbo Lu <yangbo.lu(a)nxp.com> diff --git a/configs/lx2162aqds_tfa_SECURE_BOOT_defconfig b/configs/lx2162aqds_tfa_SECURE_BOOT_defconfig index 9b1850c..e658592 100644 --- a/configs/lx2162aqds_tfa_SECURE_BOOT_defconfig +++ b/configs/lx2162aqds_tfa_SECURE_BOOT_defconfig @@ -16,6 +16,7 @@ CONFIG_OF_STDOUT_VIA_ALIAS=y CONFIG_USE_BOOTARGS=y CONFIG_BOOTARGS="console=ttyAMA0,115200 root=/dev/ram0 earlycon=pl011,mmio32,0x21c0000 ramdisk_size=0x2000000 default_hugepagesz=1024m hugepagesz=1024m hugepages=2 pci=pcie_bus_perf" # CONFIG_USE_BOOTCOMMAND is not set +CONFIG_BOARD_EARLY_INIT_R=y CONFIG_MISC_INIT_R=y CONFIG_CMD_GREPENV=y CONFIG_CMD_EEPROM=y diff --git a/configs/lx2162aqds_tfa_defconfig b/configs/lx2162aqds_tfa_defconfig index 07837b9..ade6b7b 100644 --- a/configs/lx2162aqds_tfa_defconfig +++ b/configs/lx2162aqds_tfa_defconfig @@ -18,6 +18,7 @@ CONFIG_BOOTDELAY=10 CONFIG_USE_BOOTARGS=y CONFIG_BOOTARGS="console=ttyAMA0,115200 root=/dev/ram0 earlycon=pl011,mmio32,0x21c0000 ramdisk_size=0x2000000 default_hugepagesz=1024m hugepagesz=1024m hugepages=2 pci=pcie_bus_perf" # CONFIG_USE_BOOTCOMMAND is not set +CONFIG_BOARD_EARLY_INIT_R=y CONFIG_MISC_INIT_R=y CONFIG_CMD_GREPENV=y CONFIG_CMD_EEPROM=y diff --git a/configs/lx2162aqds_tfa_verified_boot_defconfig b/configs/lx2162aqds_tfa_verified_boot_defconfig index 5d4ad47..3131fb3 100644 --- a/configs/lx2162aqds_tfa_verified_boot_defconfig +++ b/configs/lx2162aqds_tfa_verified_boot_defconfig @@ -20,6 +20,7 @@ CONFIG_BOOTDELAY=10 CONFIG_USE_BOOTARGS=y CONFIG_BOOTARGS="console=ttyAMA0,115200 root=/dev/ram0 earlycon=pl011,mmio32,0x21c0000 ramdisk_size=0x2000000 default_hugepagesz=1024m hugepagesz=1024m hugepages=2 pci=pcie_bus_perf" # CONFIG_USE_BOOTCOMMAND is not set +CONFIG_BOARD_EARLY_INIT_R=y CONFIG_MISC_INIT_R=y CONFIG_CMD_GREPENV=y CONFIG_CMD_EEPROM=y

2 2

[v2] configs: lx2162aqds: enable eMMC HS400 mode support
by Yangbo Lu 11 Dec '20

11 Dec '20

Enable eMMC HS400 mode support on LX2162AQDS. Signed-off-by: Yangbo Lu <yangbo.lu(a)nxp.com> --- Depends on http://patchwork.ozlabs.org/project/uboot/list/?series=199900&state=* Changes for v2: - Fix typo. --- configs/lx2162aqds_tfa_SECURE_BOOT_defconfig | 1 + configs/lx2162aqds_tfa_defconfig | 1 + configs/lx2162aqds_tfa_verified_boot_defconfig | 1 + 3 files changed, 3 insertions(+) diff --git a/configs/lx2162aqds_tfa_SECURE_BOOT_defconfig b/configs/lx2162aqds_tfa_SECURE_BOOT_defconfig index 0b48b19..6adf8bd 100644 --- a/configs/lx2162aqds_tfa_SECURE_BOOT_defconfig +++ b/configs/lx2162aqds_tfa_SECURE_BOOT_defconfig @@ -37,6 +37,7 @@ CONFIG_NET_RANDOM_ETHADDR=y CONFIG_DM=y CONFIG_SATA_CEVA=y CONFIG_DM_MMC=y +CONFIG_MMC_HS400_SUPPORT=y CONFIG_FSL_ESDHC=y CONFIG_MTD=y CONFIG_DM_SPI_FLASH=y diff --git a/configs/lx2162aqds_tfa_defconfig b/configs/lx2162aqds_tfa_defconfig index 1f5b318..6c51d0d 100644 --- a/configs/lx2162aqds_tfa_defconfig +++ b/configs/lx2162aqds_tfa_defconfig @@ -43,6 +43,7 @@ CONFIG_DM=y CONFIG_SATA_CEVA=y CONFIG_FSL_CAAM=y CONFIG_DM_MMC=y +CONFIG_MMC_HS400_SUPPORT=y CONFIG_FSL_ESDHC=y CONFIG_MTD=y CONFIG_DM_SPI_FLASH=y diff --git a/configs/lx2162aqds_tfa_verified_boot_defconfig b/configs/lx2162aqds_tfa_verified_boot_defconfig index 5ee627a..be9c242 100644 --- a/configs/lx2162aqds_tfa_verified_boot_defconfig +++ b/configs/lx2162aqds_tfa_verified_boot_defconfig @@ -45,6 +45,7 @@ CONFIG_DM=y CONFIG_SATA_CEVA=y CONFIG_FSL_CAAM=y CONFIG_DM_MMC=y +CONFIG_MMC_HS400_SUPPORT=y CONFIG_FSL_ESDHC=y CONFIG_MTD=y CONFIG_DM_SPI_FLASH=y -- 2.7.4

2 1

[PATCH] pci: layerscape: fix a dead loop issue
by Zhiqiang Hou 11 Dec '20

11 Dec '20

From: Hou Zhiqiang <Zhiqiang.Hou(a)nxp.com> The commit 8ec619f8fd84 added the PCIe EP nodes fixup of LX2160A, but it didn't update the condition value when there isn't a property 'apio-wins'. Fixes: 8ec619f8fd84 ("pci: layerscape: Fixup PCIe EP mode DT nodes for LX2160A rev2") Signed-off-by: Hou Zhiqiang <Zhiqiang.Hou(a)nxp.com> --- drivers/pci/pcie_layerscape_fixup_common.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/drivers/pci/pcie_layerscape_fixup_common.c b/drivers/pci/pcie_layerscape_fixup_common.c index 0a42997696..b97c67ad84 100644 --- a/drivers/pci/pcie_layerscape_fixup_common.c +++ b/drivers/pci/pcie_layerscape_fixup_common.c @@ -99,6 +99,8 @@ int lx2_board_fix_fdt(void *fdt) if (!prop) { printf("%s: Failed to fixup PCIe EP node @0x%x\n", __func__, off); + off = fdt_node_offset_by_compatible(fdt, off, + "fsl,lx2160a-pcie-ep"); continue; } -- 2.17.1

2 1

[PATCH] board/freescale/common: fix a bug that failed to read/write eeprom on ls1021atsn
by Biwen Li 11 Dec '20

11 Dec '20

From: Biwen Li <biwen.li(a)nxp.com> Fix a bug that failed to read/write eeprom on ls1021atsn Signed-off-by: Biwen Li <biwen.li(a)nxp.com> --- board/freescale/common/sys_eeprom.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/board/freescale/common/sys_eeprom.c b/board/freescale/common/sys_eeprom.c index c487e3a515..f14602af20 100644 --- a/board/freescale/common/sys_eeprom.c +++ b/board/freescale/common/sys_eeprom.c @@ -173,9 +173,11 @@ static int read_eeprom(void) struct udevice *dev; #ifdef CONFIG_SYS_EEPROM_BUS_NUM ret = i2c_get_chip_for_busnum(CONFIG_SYS_EEPROM_BUS_NUM, - CONFIG_SYS_I2C_EEPROM_ADDR, 1, &dev); + CONFIG_SYS_I2C_EEPROM_ADDR, + CONFIG_SYS_I2C_EEPROM_ADDR_LEN, &dev); #else - ret = i2c_get_chip_for_busnum(0, CONFIG_SYS_I2C_EEPROM_ADDR, 1, &dev); + ret = i2c_get_chip_for_busnum(0, CONFIG_SYS_I2C_EEPROM_ADDR, + CONFIG_SYS_I2C_EEPROM_ADDR_LEN, &dev); #endif if (!ret) ret = dm_i2c_read(dev, 0, (void *)&e, sizeof(e)); -- 2.17.1

3 2

[v2] include/configs: ls1012aqds: add default environment variable
by Biwen Li 11 Dec '20

11 Dec '20

From: Biwen Li <biwen.li(a)nxp.com> This adds default environment variable for ls1012aqds Signed-off-by: Biwen Li <biwen.li(a)nxp.com> --- Change in v2: - fix checkpatch error include/configs/ls1012aqds.h | 62 ++++++++++++++++++++++++++++++++++++ 1 file changed, 62 insertions(+) diff --git a/include/configs/ls1012aqds.h b/include/configs/ls1012aqds.h index df2a613eaf..c4c9b7f501 100644 --- a/include/configs/ls1012aqds.h +++ b/include/configs/ls1012aqds.h @@ -102,5 +102,67 @@ #define CONFIG_PCI_SCAN_SHOW +#undef CONFIG_EXTRA_ENV_SETTINGS +#define CONFIG_EXTRA_ENV_SETTINGS \ + "verify=no\0" \ + "fdt_addr=0x00f00000\0" \ + "kernel_addr=0x01000000\0" \ + "kernelheader_addr=0x600000\0" \ + "scriptaddr=0x80000000\0" \ + "scripthdraddr=0x80080000\0" \ + "fdtheader_addr_r=0x80100000\0" \ + "kernelheader_addr_r=0x80200000\0" \ + "kernel_addr_r=0x96000000\0" \ + "fdt_addr_r=0x90000000\0" \ + "load_addr=0xa0000000\0" \ + "kernel_size=0x2800000\0" \ + "kernelheader_size=0x40000\0" \ + "console=ttyS0,115200\0" \ + BOOTENV \ + "boot_scripts=ls1012aqds_boot.scr\0" \ + "boot_script_hdr=hdr_ls1012aqds_bs.out\0" \ + "scan_dev_for_boot_part=" \ + "part list ${devtype} ${devnum} devplist; " \ + "env exists devplist || setenv devplist 1; " \ + "for distro_bootpart in ${devplist}; do " \ + "if fstype ${devtype} " \ + "${devnum}:${distro_bootpart} " \ + "bootfstype; then " \ + "run scan_dev_for_boot; " \ + "fi; " \ + "done\0" \ + "scan_dev_for_boot=" \ + "echo Scanning ${devtype} " \ + "${devnum}:${distro_bootpart}...; " \ + "for prefix in ${boot_prefixes}; do " \ + "run scan_dev_for_scripts; " \ + "done;" \ + "\0" \ + "boot_a_script=" \ + "load ${devtype} ${devnum}:${distro_bootpart} " \ + "${scriptaddr} ${prefix}${script}; " \ + "env exists secureboot && load ${devtype} " \ + "${devnum}:${distro_bootpart} " \ + "${scripthdraddr} ${prefix}${boot_script_hdr}; " \ + "env exists secureboot " \ + "&& esbc_validate ${scripthdraddr};" \ + "source ${scriptaddr}\0" \ + "qspi_bootcmd=pfe stop; echo Trying load from qspi..;" \ + "sf probe 0:0 && sf read $load_addr " \ + "$kernel_addr $kernel_size; env exists secureboot " \ + "&& sf read $kernelheader_addr_r $kernelheader_addr " \ + "$kernelheader_size && esbc_validate ${kernelheader_addr_r}; " \ + "bootm $load_addr#$board\0" + +#undef CONFIG_BOOTCOMMAND +#ifdef CONFIG_TFABOOT +#undef QSPI_NOR_BOOTCOMMAND +#define QSPI_NOR_BOOTCOMMAND "pfe stop; run distro_bootcmd; run qspi_bootcmd; "\ + "env exists secureboot && esbc_halt;" +#else +#define CONFIG_BOOTCOMMAND "pfe stop; run distro_bootcmd; run qspi_bootcmd; "\ + "env exists secureboot && esbc_halt;" +#endif + #include <asm/fsl_secure_boot.h> #endif /* __LS1012AQDS_H__ */ -- 2.17.1

2 1

[PATCH 1/1] board: freescale: vid.c: Initialize variable 'i2caddress'
by Priyanka Singh 11 Dec '20

11 Dec '20

Initialize variable 'i2caddress' in adjust_vdd() to zero Signed-off-by: Priyanka Singh <priyanka.singh(a)nxp.com> --- board/freescale/common/vid.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/board/freescale/common/vid.c b/board/freescale/common/vid.c index bfd24c43b4..755108e385 100644 --- a/board/freescale/common/vid.c +++ b/board/freescale/common/vid.c @@ -447,7 +447,7 @@ int adjust_vdd(ulong vdd_override) u8 vid; #endif int vdd_target, vdd_current, vdd_last; - int ret, i2caddress; + int ret, i2caddress = 0; unsigned long vdd_string_override; char *vdd_string; #if defined(CONFIG_ARCH_LX2160A) || defined(CONFIG_ARCH_LX2162A) -- 2.17.1

2 1

[PATCH 0/2] board: freescale: cover all RGMII modes on DPAA 1 boards
by Madalin Bucur 11 Dec '20

11 Dec '20

Make sure all RGMII internal delay modes are covered. Madalin Bucur (2): armv8: ls1043/ls1046aqds: add support for all RGMII modes board: freescale: powerpc: add support for all RGMII modes board/freescale/corenet_ds/eth_hydra.c | 6 ++++++ board/freescale/corenet_ds/eth_p4080.c | 6 ++++++ board/freescale/corenet_ds/eth_superhydra.c | 12 ++++++++++++ board/freescale/ls1043aqds/eth.c | 2 ++ board/freescale/ls1046aqds/eth.c | 2 ++ board/freescale/p2041rdb/eth.c | 29 +++++++++++++++++++---------- board/freescale/t102xrdb/eth_t102xrdb.c | 3 +++ board/freescale/t104xrdb/eth.c | 3 +++ board/freescale/t208xqds/eth_t208xqds.c | 3 +++ board/freescale/t208xrdb/eth_t208xrdb.c | 3 +++ 10 files changed, 59 insertions(+), 10 deletions(-) -- 2.1.0

2 3

[PATCH 1/1] layerscape: fdt.c: Check for NULL return value from fdt_getprop()
by Priyanka Singh 11 Dec '20

11 Dec '20

Check for NULL return value from fdt_getprop() in fdt_fixup_remove_jr() Signed-off-by: Priyanka Singh <priyanka.singh(a)nxp.com> --- arch/arm/cpu/armv8/fsl-layerscape/fdt.c | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/arch/arm/cpu/armv8/fsl-layerscape/fdt.c b/arch/arm/cpu/armv8/fsl-layerscape/fdt.c index f5f75fa452..5fc17a7233 100644 --- a/arch/arm/cpu/armv8/fsl-layerscape/fdt.c +++ b/arch/arm/cpu/armv8/fsl-layerscape/fdt.c @@ -391,10 +391,13 @@ void fdt_fixup_remove_jr(void *blob) while (jr_node != -FDT_ERR_NOTFOUND) { reg = (fdt32_t *)fdt_getprop(blob, jr_node, "reg", &len); - jr_offset = fdt_read_number(reg, addr_cells); - if (jr_offset == used_jr) { - fdt_del_node(blob, jr_node); - break; + if(reg != NULL) + { + jr_offset = fdt_read_number(reg, addr_cells); + if (jr_offset == used_jr) { + fdt_del_node(blob, jr_node); + break; + } } jr_node = fdt_node_offset_by_compatible(blob, jr_node, "fsl,sec-v4.0-job-ring"); -- 2.17.1

2 1