August 2016 - U-Boot

[U-Boot] [PATCH 1/2] net: fm: fix spi flash probe for using driver model
by Gong Qianyu 03 Aug '16

03 Aug '16

The current code would always use the speed and mode set by CONFIG_ENV_SPI_MAX_HZ and CONFIG_ENV_SPI_MODE. But if using SPI driver model it should get the values from DT. Signed-off-by: Gong Qianyu <Qianyu.Gong(a)nxp.com> --- drivers/net/fm/fm.c | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/drivers/net/fm/fm.c b/drivers/net/fm/fm.c index 00cdfd4..6308d22 100644 --- a/drivers/net/fm/fm.c +++ b/drivers/net/fm/fm.c @@ -371,8 +371,18 @@ int fm_init_common(int index, struct ccsr_fman *reg) void *addr = malloc(CONFIG_SYS_QE_FMAN_FW_LENGTH); int ret = 0; +#ifdef CONFIG_DM_SPI_FLASH + struct udevice *new; + + /* Will get the speed and mode from Device Tree */ + ret = spi_flash_probe_bus_cs(CONFIG_ENV_SPI_BUS, CONFIG_ENV_SPI_CS, + 0, 0, &new); + + ucode_flash = dev_get_uclass_priv(new); +#else ucode_flash = spi_flash_probe(CONFIG_ENV_SPI_BUS, CONFIG_ENV_SPI_CS, CONFIG_ENV_SPI_MAX_HZ, CONFIG_ENV_SPI_MODE); +#endif if (!ucode_flash) printf("SF: probe for ucode failed\n"); else { -- 2.1.0.27.g96db324

4 14

[U-Boot] [PATCH v2] driver: spi: fsl-qspi: remove compile Warnings
by Yunhui Cui 03 Aug '16

03 Aug '16

From: Yunhui Cui <yunhui.cui(a)nxp.com> Warnins log: drivers/spi/fsl_qspi.c: In function ‘qspi_ahb_read’: drivers/spi/fsl_qspi.c:400:16: warning: cast to pointer from integer of different size [-Wint-to-pointer-cast] memcpy(rxbuf, (u8 *)(priv->cur_amba_base + priv->sf_addr), len); Signed-off-by: Yunhui Cui <yunhui.cui(a)nxp.com> --- drivers/spi/fsl_qspi.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/drivers/spi/fsl_qspi.c b/drivers/spi/fsl_qspi.c index 75cbab2..2144fca 100644 --- a/drivers/spi/fsl_qspi.c +++ b/drivers/spi/fsl_qspi.c @@ -386,6 +386,7 @@ static inline void qspi_ahb_read(struct fsl_qspi_priv *priv, u8 *rxbuf, int len) { struct fsl_qspi_regs *regs = priv->regs; u32 mcr_reg; + void *rx_addr = NULL; mcr_reg = qspi_read32(priv->flags, &regs->mcr); @@ -393,8 +394,9 @@ static inline void qspi_ahb_read(struct fsl_qspi_priv *priv, u8 *rxbuf, int len) QSPI_MCR_CLR_RXF_MASK | QSPI_MCR_CLR_TXF_MASK | QSPI_MCR_RESERVED_MASK | QSPI_MCR_END_CFD_LE); + rx_addr = (void *)(uintptr_t)(priv->cur_amba_base + priv->sf_addr); /* Read out the data directly from the AHB buffer. */ - memcpy(rxbuf, (u8 *)(priv->cur_amba_base + priv->sf_addr), len); + memcpy(rxbuf, rx_addr, len); qspi_write32(priv->flags, &regs->mcr, mcr_reg); } -- 2.1.0.27.g96db324

3 2

[U-Boot] [PATCH] armv8: ls1043a: add pxe commands
by Wenbin Song 03 Aug '16

03 Aug '16

Configure to support U-boot's pxe. Signed-off-by: Wenbin Song <wenbin.song(a)nxp.com> --- include/configs/ls1043a_common.h | 2 ++ 1 file changed, 2 insertions(+) diff --git a/include/configs/ls1043a_common.h b/include/configs/ls1043a_common.h index b0d4a8d..2083b0d 100644 --- a/include/configs/ls1043a_common.h +++ b/include/configs/ls1043a_common.h @@ -175,6 +175,8 @@ /* Command line configuration */ #define CONFIG_CMD_ENV +#define CONFIG_MENU +#define CONFIG_CMD_PXE /* MMC */ #define CONFIG_MMC -- 2.1.0.27.g96db324

2 1

[U-Boot] [PATCH] ARMv8/fsl-ppa: Consolidate PPA image stored-media flag for XIP
by Zhiqiang Hou 03 Aug '16

03 Aug '16

From: Hou Zhiqiang <Zhiqiang.Hou(a)nxp.com> The PPA binary may be stored on QSPI flash instead of NOR. So, deprecated CONFIG_SYS_LS_PPA_FW_IN_NOR in favour of CONFIG_SYS_LS_PPA_FW_IN_XIP to prevent fragmentation of code by addition of a new QSPI specific flag. Signed-off-by: Hou Zhiqiang <Zhiqiang.Hou(a)nxp.com> Signed-off-by: Abhimanyu Saini <abhimanyu.saini(a)nxp.com> --- arch/arm/cpu/armv8/fsl-layerscape/ppa.c | 2 +- include/configs/ls1043ardb.h | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/arch/arm/cpu/armv8/fsl-layerscape/ppa.c b/arch/arm/cpu/armv8/fsl-layerscape/ppa.c index 541b251..f54ac3f 100644 --- a/arch/arm/cpu/armv8/fsl-layerscape/ppa.c +++ b/arch/arm/cpu/armv8/fsl-layerscape/ppa.c @@ -24,7 +24,7 @@ int ppa_init(void) u32 *boot_loc_ptr_l, *boot_loc_ptr_h; int ret; -#ifdef CONFIG_SYS_LS_PPA_FW_IN_NOR +#ifdef CONFIG_SYS_LS_PPA_FW_IN_XIP ppa_fit_addr = (void *)CONFIG_SYS_LS_PPA_FW_ADDR; #else #error "No CONFIG_SYS_LS_PPA_FW_IN_xxx defined" diff --git a/include/configs/ls1043ardb.h b/include/configs/ls1043ardb.h index 44f86fa..857ad7b 100644 --- a/include/configs/ls1043ardb.h +++ b/include/configs/ls1043ardb.h @@ -14,8 +14,8 @@ #define SEC_FIRMWARE_ERET_ADDR_REVERT #define CONFIG_ARMV8_PSCI -#define CONFIG_SYS_LS_PPA_FW_IN_NOR -#ifdef CONFIG_SYS_LS_PPA_FW_IN_NOR +#define CONFIG_SYS_LS_PPA_FW_IN_XIP +#ifdef CONFIG_SYS_LS_PPA_FW_IN_XIP #define CONFIG_SYS_LS_PPA_FW_ADDR 0x60500000 #endif #endif -- 2.1.0.27.g96db324

2 1

[U-Boot] [PATCH 1/3] arm/PSCI: Removed unused code
by Zhiqiang Hou 03 Aug '16

03 Aug '16

From: Hou Zhiqiang <Zhiqiang.Hou(a)nxp.com> Identify the PSCI node only by its name, so removed the code finding it by compatible string. Signed-off-by: Hou Zhiqiang <Zhiqiang.Hou(a)nxp.com> --- arch/arm/lib/psci-dt.c | 17 ----------------- 1 file changed, 17 deletions(-) diff --git a/arch/arm/lib/psci-dt.c b/arch/arm/lib/psci-dt.c index 8dc31d4..bcd92e7 100644 --- a/arch/arm/lib/psci-dt.c +++ b/arch/arm/lib/psci-dt.c @@ -51,27 +51,10 @@ int fdt_psci(void *fdt) fdt_setprop_string(fdt, tmp, "enable-method", "psci"); } - /* - * The PSCI node might be called "/psci" or might be called something - * else but contain either of the compatible strings - * "arm,psci"/"arm,psci-0.2" - */ nodeoff = fdt_path_offset(fdt, "/psci"); if (nodeoff >= 0) goto init_psci_node; - nodeoff = fdt_node_offset_by_compatible(fdt, -1, "arm,psci"); - if (nodeoff >= 0) - goto init_psci_node; - - nodeoff = fdt_node_offset_by_compatible(fdt, -1, "arm,psci-0.2"); - if (nodeoff >= 0) - goto init_psci_node; - - nodeoff = fdt_node_offset_by_compatible(fdt, -1, "arm,psci-1.0"); - if (nodeoff >= 0) - goto init_psci_node; - nodeoff = fdt_path_offset(fdt, "/"); if (nodeoff < 0) return nodeoff; -- 2.1.0.27.g96db324

3 10

[U-Boot] [PATCH] driver/ddr/fsl: Fix timing_cfg_2
by York Sun 03 Aug '16

03 Aug '16

Commit 5605dc6 tried to fix wr_lat bit in timing_cfg_2, but the change was wrong. wr_lat has 5 bits with MSB at [13] and lower 4 bits at [9:12], in big-endian convention. Signed-off-by: York Sun <york.sun(a)nxp.com> Reported-by: Thomas Schaefer <Thomas.Schaefer(a)kontron.com> --- drivers/ddr/fsl/ctrl_regs.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/ddr/fsl/ctrl_regs.c b/drivers/ddr/fsl/ctrl_regs.c index abd576b..24fd366 100644 --- a/drivers/ddr/fsl/ctrl_regs.c +++ b/drivers/ddr/fsl/ctrl_regs.c @@ -709,7 +709,7 @@ static void set_timing_cfg_2(const unsigned int ctrl_num, | ((add_lat_mclk & 0xf) << 28) | ((cpo & 0x1f) << 23) | ((wr_lat & 0xf) << 19) - | ((wr_lat & 0x10) << 18) + | (((wr_lat & 0x10) >> 4) << 18) | ((rd_to_pre & RD_TO_PRE_MASK) << RD_TO_PRE_SHIFT) | ((wr_data_delay & WR_DATA_DELAY_MASK) << WR_DATA_DELAY_SHIFT) | ((cke_pls & 0x7) << 6) -- 2.7.4

2 1

[U-Boot] [PATCH] board/freescale: Update MAINTAINERS files
by York Sun 03 Aug '16

03 Aug '16

Update maintainers for secure boot targets. Signed-off-by: York Sun <york.sun(a)nxp.com> --- board/freescale/b4860qds/MAINTAINERS | 2 +- board/freescale/bsc9132qds/MAINTAINERS | 2 +- board/freescale/corenet_ds/MAINTAINERS | 2 +- board/freescale/ls1021atwr/MAINTAINERS | 4 ++++ board/freescale/ls1043ardb/MAINTAINERS | 2 +- board/freescale/t1040qds/MAINTAINERS | 2 +- board/freescale/t104xrdb/MAINTAINERS | 6 +++++- board/freescale/t208xqds/MAINTAINERS | 2 +- board/freescale/t208xrdb/MAINTAINERS | 2 +- board/freescale/t4qds/MAINTAINERS | 2 +- 10 files changed, 17 insertions(+), 9 deletions(-) diff --git a/board/freescale/b4860qds/MAINTAINERS b/board/freescale/b4860qds/MAINTAINERS index ac02bb7..97304c5 100644 --- a/board/freescale/b4860qds/MAINTAINERS +++ b/board/freescale/b4860qds/MAINTAINERS @@ -12,6 +12,6 @@ F: configs/B4860QDS_SPIFLASH_defconfig F: configs/B4860QDS_SRIO_PCIE_BOOT_defconfig B4860QDS_SECURE_BOOT BOARD -M: Aneesh Bansal <aneesh.bansal(a)freescale.com> +M: Ruchika Gupta <ruchika.gupta(a)nxp.com> S: Maintained F: configs/B4860QDS_SECURE_BOOT_defconfig diff --git a/board/freescale/bsc9132qds/MAINTAINERS b/board/freescale/bsc9132qds/MAINTAINERS index 3de62d3..c58fc50 100644 --- a/board/freescale/bsc9132qds/MAINTAINERS +++ b/board/freescale/bsc9132qds/MAINTAINERS @@ -13,7 +13,7 @@ F: configs/BSC9132QDS_SPIFLASH_DDRCLK100_defconfig F: configs/BSC9132QDS_SPIFLASH_DDRCLK133_defconfig BSC9132QDS_NAND_DDRCLK100_SECURE BOARD -M: Aneesh Bansal <aneesh.bansal(a)freescale.com> +M: Ruchika Gupta <ruchika.gupta(a)nxp.com> S: Maintained F: configs/BSC9132QDS_NAND_DDRCLK100_SECURE_defconfig F: configs/BSC9132QDS_NAND_DDRCLK133_SECURE_defconfig diff --git a/board/freescale/corenet_ds/MAINTAINERS b/board/freescale/corenet_ds/MAINTAINERS index 73b0553..708e812 100644 --- a/board/freescale/corenet_ds/MAINTAINERS +++ b/board/freescale/corenet_ds/MAINTAINERS @@ -30,7 +30,7 @@ F: configs/P5040DS_SPIFLASH_defconfig F: configs/P5040DS_SECURE_BOOT_defconfig CORENET_DS_SECURE_BOOT BOARD -M: Aneesh Bansal <aneesh.bansal(a)freescale.com> +M: Ruchika Gupta <ruchika.gupta(a)nxp.com> S: Maintained F: configs/P3041DS_NAND_SECURE_BOOT_defconfig F: configs/P5020DS_NAND_SECURE_BOOT_defconfig diff --git a/board/freescale/ls1021atwr/MAINTAINERS b/board/freescale/ls1021atwr/MAINTAINERS index b997bb0..06d888f 100644 --- a/board/freescale/ls1021atwr/MAINTAINERS +++ b/board/freescale/ls1021atwr/MAINTAINERS @@ -9,3 +9,7 @@ F: configs/ls1021atwr_nor_lpuart_defconfig F: configs/ls1021atwr_sdcard_ifc_defconfig F: configs/ls1021atwr_sdcard_qspi_defconfig F: configs/ls1021atwr_qspi_defconfig + +M: Sumit Garg <sumit.garg(a)nxp.com> +S: Maintained +F: configs/ls1021atwr_sdcard_ifc_SECURE_BOOT_defconfig diff --git a/board/freescale/ls1043ardb/MAINTAINERS b/board/freescale/ls1043ardb/MAINTAINERS index 84ffb63..0503a3f 100644 --- a/board/freescale/ls1043ardb/MAINTAINERS +++ b/board/freescale/ls1043ardb/MAINTAINERS @@ -9,6 +9,6 @@ F: configs/ls1043ardb_nand_defconfig F: configs/ls1043ardb_sdcard_defconfig LS1043A_SECURE_BOOT BOARD -M: Aneesh Bansal <aneesh.bansal(a)freescale.com> +M: Ruchika Gupta <ruchika.gupta(a)nxp.com> S: Maintained F: configs/ls1043ardb_SECURE_BOOT_defconfig diff --git a/board/freescale/t1040qds/MAINTAINERS b/board/freescale/t1040qds/MAINTAINERS index 640538f..fb3565a 100644 --- a/board/freescale/t1040qds/MAINTAINERS +++ b/board/freescale/t1040qds/MAINTAINERS @@ -7,6 +7,6 @@ F: configs/T1040QDS_defconfig F: configs/T1040QDS_DDR4_defconfig T1040QDS_SECURE_BOOT BOARD -M: Aneesh Bansal <aneesh.bansal(a)freescale.com> +M: Ruchika Gupta <ruchika.gupta(a)nxp.com> S: Maintained F: configs/T1040QDS_SECURE_BOOT_defconfig diff --git a/board/freescale/t104xrdb/MAINTAINERS b/board/freescale/t104xrdb/MAINTAINERS index 7597800..0578989 100644 --- a/board/freescale/t104xrdb/MAINTAINERS +++ b/board/freescale/t104xrdb/MAINTAINERS @@ -26,9 +26,13 @@ F: configs/T1042D4RDB_SDCARD_defconfig F: configs/T1042RDB_PI_SDCARD_defconfig T1040RDB_SECURE_BOOT BOARD -M: Aneesh Bansal <aneesh.bansal(a)freescale.com> +M: Ruchika Gupta <ruchika.gupta(a)nxp.com> S: Maintained F: configs/T1040RDB_SECURE_BOOT_defconfig F: configs/T1040D4RDB_SECURE_BOOT_defconfig F: configs/T1042RDB_SECURE_BOOT_defconfig F: configs/T1042D4RDB_SECURE_BOOT_defconfig + +M: Sumit Garg <sumit.garg(a)nxp.com> +S: Maintained +F: configs/T1042RDB_PI_NAND_SECURE_BOOT_defconfig diff --git a/board/freescale/t208xqds/MAINTAINERS b/board/freescale/t208xqds/MAINTAINERS index d747de3..790b009 100644 --- a/board/freescale/t208xqds/MAINTAINERS +++ b/board/freescale/t208xqds/MAINTAINERS @@ -15,6 +15,6 @@ F: configs/T2081QDS_SPIFLASH_defconfig F: configs/T2081QDS_SRIO_PCIE_BOOT_defconfig T2080QDS_SECURE_BOOT BOARD -M: Aneesh Bansal <aneesh.bansal(a)freescale.com> +M: Ruchika Gupta <ruchika.gupta(a)nxp.com> S: Maintained F: configs/T2080QDS_SECURE_BOOT_defconfig diff --git a/board/freescale/t208xrdb/MAINTAINERS b/board/freescale/t208xrdb/MAINTAINERS index ccbfbab..f894f77 100644 --- a/board/freescale/t208xrdb/MAINTAINERS +++ b/board/freescale/t208xrdb/MAINTAINERS @@ -10,6 +10,6 @@ F: configs/T2080RDB_SPIFLASH_defconfig F: configs/T2080RDB_SRIO_PCIE_BOOT_defconfig T2080RDB_SECURE_BOOT BOARD -M: Aneesh Bansal <aneesh.bansal(a)freescale.com> +M: Ruchika Gupta <ruchika.gupta(a)nxp.com> S: Maintained F: configs/T2080RDB_SECURE_BOOT_defconfig diff --git a/board/freescale/t4qds/MAINTAINERS b/board/freescale/t4qds/MAINTAINERS index b159113..b288571 100644 --- a/board/freescale/t4qds/MAINTAINERS +++ b/board/freescale/t4qds/MAINTAINERS @@ -12,7 +12,7 @@ F: configs/T4240QDS_SDCARD_defconfig F: configs/T4240QDS_SRIO_PCIE_BOOT_defconfig T4160QDS_SECURE_BOOT BOARD -M: Aneesh Bansal <aneesh.bansal(a)freescale.com> +M: Ruchika Gupta <ruchika.gupta(a)nxp.com> S: Maintained F: configs/T4160QDS_SECURE_BOOT_defconfig F: configs/T4240QDS_SECURE_BOOT_defconfig -- 2.7.4

2 1

[U-Boot] [PATCH 2/2] armv8: ls1012a: Update Refresh cycle for DDR
by Prabhakar Kushwaha 03 Aug '16

03 Aug '16

Refresh cycle value must be selected based on the frequency of DDR. tREFI = 7.8 us as per JEDEC. The value for MDREF[REF_CNT] should be based on round up (tREFI/tCK) formula. For 500MHz, mdref value should be 0x0f3c8000. Signed-off-by: Calvin Johnson <calvin.johnson(a)nxp.com> Signed-off-by: Prabhakar Kushwaha <prabhakar.kushwaha(a)nxp.com> --- include/fsl_mmdc.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/fsl_mmdc.h b/include/fsl_mmdc.h index 833696b..a939d89 100644 --- a/include/fsl_mmdc.h +++ b/include/fsl_mmdc.h @@ -43,7 +43,7 @@ #define CONFIG_SYS_MMDC_CORE_PWR_SAV_CTRL_STAT 0x00001067 -#define CONFIG_SYS_MMDC_CORE_REFRESH_CTL 0x103e8000 +#define CONFIG_SYS_MMDC_CORE_REFRESH_CTL 0x0f3c8000 #define START_REFRESH 0x00000001 -- 1.9.1

2 1

[U-Boot] [PATCH 1/2] armv8: ls1012a: Enable DDR row-bank-column decoding
by Prabhakar Kushwaha 03 Aug '16

03 Aug '16

Enable DDR row-bank-column decoding to decode DDR address as row-bank-column instead of bank-row-column for improving performance of serial data transfers. Signed-off-by: Calvin Johnson <calvin.johnson(a)nxp.com> Signed-off-by: Prabhakar Kushwaha <prabhakar.kushwaha(a)nxp.com> --- include/fsl_mmdc.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/fsl_mmdc.h b/include/fsl_mmdc.h index 281a819..833696b 100644 --- a/include/fsl_mmdc.h +++ b/include/fsl_mmdc.h @@ -12,7 +12,7 @@ #define CONFIG_SYS_MMDC_CORE_TIMING_CFG_1 0xff328f64 #define CONFIG_SYS_MMDC_CORE_TIMING_CFG_2 0x01ff00db -#define CONFIG_SYS_MMDC_CORE_MISC 0x00000680 +#define CONFIG_SYS_MMDC_CORE_MISC 0x00001680 #define CONFIG_SYS_MMDC_PHY_MEASURE_UNIT 0x00000800 #define CONFIG_SYS_MMDC_CORE_RDWR_CMD_DELAY 0x00002000 #define CONFIG_SYS_MMDC_PHY_ODT_CTRL 0x0000022a -- 1.9.1

2 1

[U-Boot] [PATCH] board: ls1012afrdm: overwrite CONFIG_EXTRA_ENV_SETTINGS
by Prabhakar Kushwaha 03 Aug '16

03 Aug '16

LS1012AFRDM has 512MB of DDR. So update Kernel load address as 0x96000000 instead of default 0xa0000000. Signed-off-by: Prabhakar Kushwaha <prabhakar.kushwaha(a)nxp.com> --- include/configs/ls1012afrdm.h | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/include/configs/ls1012afrdm.h b/include/configs/ls1012afrdm.h index ad81142..64dced2 100644 --- a/include/configs/ls1012afrdm.h +++ b/include/configs/ls1012afrdm.h @@ -39,4 +39,20 @@ #define CONFIG_SYS_MEMTEST_START 0x80000000 #define CONFIG_SYS_MEMTEST_END 0x9fffffff +#undef CONFIG_EXTRA_ENV_SETTINGS +#define CONFIG_EXTRA_ENV_SETTINGS \ + "initrd_high=0xffffffff\0" \ + "verify=no\0" \ + "hwconfig=fsl_ddr:bank_intlv=auto\0" \ + "loadaddr=0x80100000\0" \ + "kernel_addr=0x100000\0" \ + "ramdisk_addr=0x800000\0" \ + "ramdisk_size=0x2000000\0" \ + "fdt_high=0xffffffffffffffff\0" \ + "initrd_high=0xffffffffffffffff\0" \ + "kernel_start=0xa00000\0" \ + "kernel_load=0x96000000\0" \ + "kernel_size=0x2800000\0" \ + "console=ttyAMA0,38400n8\0" + #endif /* __LS1012ARDB_H__ */ -- 1.9.1

2 3