February 2018 - U-Boot

[U-Boot] [PATCH 1/2] armv8: ls1088a: Add clock related function in CONFIG_SPL_BUILD
by Ashish Kumar 21 Mar '18

21 Mar '18

get_board_ddr_clk(), get_board_sys_clk() and if_board_diff_clk() is now valid for CONFIG_SPL_BUILD Signed-off-by: Ashish Kumar <Ashish.Kumar(a)nxp.com> --- board/freescale/ls1088a/ls1088a.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/board/freescale/ls1088a/ls1088a.c b/board/freescale/ls1088a/ls1088a.c index 0769e90..16e7083 100644 --- a/board/freescale/ls1088a/ls1088a.c +++ b/board/freescale/ls1088a/ls1088a.c @@ -168,6 +168,7 @@ int checkboard(void) return 0; } +#endif bool if_board_diff_clk(void) { @@ -221,7 +222,6 @@ unsigned long get_board_ddr_clk(void) return 66666666; } -#endif int select_i2c_ch_pca9547(u8 ch) { -- 2.7.4

2 3

[U-Boot] [PATCH] armv8: ls1088qds: Remove CONFIG_ from local defines for FPGA
by Ashish Kumar 21 Mar '18

21 Mar '18

Signed-off-by: Ashish Kumar <Ashish.Kumar(a)nxp.com> --- include/configs/ls1088aqds.h | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/include/configs/ls1088aqds.h b/include/configs/ls1088aqds.h index 5674a5d..1f2161b 100644 --- a/include/configs/ls1088aqds.h +++ b/include/configs/ls1088aqds.h @@ -197,7 +197,7 @@ unsigned long get_board_ddr_clk(void); | CSPR_MSEL_GPCM \ | CSPR_V) -#define CONFIG_SYS_FPGA_AMASK IFC_AMASK(64*1024) +#define SYS_FPGA_AMASK IFC_AMASK(64 * 1024) #if defined(CONFIG_QSPI_BOOT) || defined(CONFIG_SD_BOOT_QSPI) #define CONFIG_SYS_FPGA_CSOR CSOR_GPCM_ADM_SHIFT(0) #else @@ -226,7 +226,7 @@ unsigned long get_board_ddr_clk(void); #define CONFIG_SYS_CSPR2_EXT CONFIG_SYS_FPGA_CSPR_EXT #define CONFIG_SYS_CSPR2 CONFIG_SYS_FPGA_CSPR #define CONFIG_SYS_CSPR2_FINAL SYS_FPGA_CSPR_FINAL -#define CONFIG_SYS_AMASK2 CONFIG_SYS_FPGA_AMASK +#define CONFIG_SYS_AMASK2 SYS_FPGA_AMASK #define CONFIG_SYS_CSOR2 CONFIG_SYS_FPGA_CSOR #define CONFIG_SYS_CS2_FTIM0 SYS_FPGA_CS_FTIM0 #define CONFIG_SYS_CS2_FTIM1 SYS_FPGA_CS_FTIM1 @@ -262,13 +262,13 @@ unsigned long get_board_ddr_clk(void); #define CONFIG_SYS_CS2_FTIM3 CONFIG_SYS_NAND_FTIM3 #define CONFIG_SYS_CSPR3_EXT CONFIG_SYS_FPGA_CSPR_EXT #define CONFIG_SYS_CSPR3 CONFIG_SYS_FPGA_CSPR -#define CONFIG_SYS_CSPR3_FINAL CONFIG_SYS_FPGA_CSPR_FINAL -#define CONFIG_SYS_AMASK3 CONFIG_SYS_FPGA_AMASK +#define CONFIG_SYS_CSPR3_FINAL SYS_FPGA_CSPR_FINAL +#define CONFIG_SYS_AMASK3 SYS_FPGA_AMASK #define CONFIG_SYS_CSOR3 CONFIG_SYS_FPGA_CSOR -#define CONFIG_SYS_CS3_FTIM0 CONFIG_SYS_FPGA_CS_FTIM0 -#define CONFIG_SYS_CS3_FTIM1 CONFIG_SYS_FPGA_CS_FTIM1 -#define CONFIG_SYS_CS3_FTIM2 CONFIG_SYS_FPGA_CS_FTIM2 -#define CONFIG_SYS_CS3_FTIM3 CONFIG_SYS_FPGA_CS_FTIM3 +#define CONFIG_SYS_CS3_FTIM0 SYS_FPGA_CS_FTIM0 +#define CONFIG_SYS_CS3_FTIM1 SYS_FPGA_CS_FTIM1 +#define CONFIG_SYS_CS3_FTIM2 SYS_FPGA_CS_FTIM2 +#define CONFIG_SYS_CS3_FTIM3 SYS_FPGA_CS_FTIM3 #endif #define CONFIG_SYS_LS_MC_BOOT_TIMEOUT_MS 5000 -- 2.7.4

2 1

[U-Boot] [PATCH] arm: imx6: configure NoC on i.MX6DQP
by Filip Brozovic 20 Mar '18

20 Mar '18

The i.MX6DP and i.MX6QP incorporate NoC interconnect logic which needs to be configured in order to use external DDR memory. This patch enables the SPL to configure the necessary registers in accordance with the NXP engineering bulletin EB828. Signed-off-by: Filip Brozovic <fbrozovic(a)gmail.com> --- arch/arm/cpu/armv7/mx6/ddr.c | 69 +++++++++++++++++++++++++++++++++ arch/arm/include/asm/arch-mx6/mx6-ddr.h | 19 +++++++++ 2 files changed, 88 insertions(+) diff --git a/arch/arm/cpu/armv7/mx6/ddr.c b/arch/arm/cpu/armv7/mx6/ddr.c index 7beb7ea..60bfd08 100644 --- a/arch/arm/cpu/armv7/mx6/ddr.c +++ b/arch/arm/cpu/armv7/mx6/ddr.c @@ -1181,6 +1181,8 @@ void mx6_ddr3_cfg(const struct mx6_ddr_sysinfo *sysinfo, { volatile struct mmdc_p_regs *mmdc0; volatile struct mmdc_p_regs *mmdc1; + struct src *src_regs = (struct src *)SRC_BASE_ADDR; + u8 soc_boot_cfg3 = ((readl(&src_regs->sbmr1) & 0xff0000) >> 16) & 0xff; u32 val; u8 tcke, tcksrx, tcksre, txpdll, taofpd, taonpd, trrd; u8 todtlon, taxpd, tanpd, tcwl, txp, tfaw, tcl; @@ -1473,6 +1475,73 @@ void mx6_ddr3_cfg(const struct mx6_ddr_sysinfo *sysinfo, /* Step 12: Configure and activate periodic refresh */ mmdc0->mdref = (sysinfo->refsel << 14) | (sysinfo->refr << 11); + /* + * i.MX6DQP only: If the NoC scheduler is enabled, + * configure it and disable MMDC arbitration/reordering (see EB828) + */ + if (is_mx6dqp() && ((soc_boot_cfg3 & 0x30) == 0x00 || + (soc_boot_cfg3 & 0x33) == 0x31)) { + struct mx6dqp_noc_sched_regs *noc_sched = + (struct mx6dqp_noc_sched_regs *)MX6DQP_NOC_SCHED_BASE; + + /* These values are fixed based on integration parameters and + * should not be modified */ + noc_sched->rlat = 0x00000040; + noc_sched->ipu1 = 0x00000020; + noc_sched->ipu2 = 0x00000020; + + noc_sched->activate = (1 << 10) | /* FawBank */ + (tfaw << 4) | + (trrd << 0); + noc_sched->ddrtiming = (((sysinfo->dsize == 1) ? 1 : 0) << 31) | + ((tcwl + twtr) << 26) | + ((tcl - tcwl + 2) << 21) | + (4 << 18) | /* Burst Length = 8 */ + ((tcwl + twr + trp + trcd) << 12) | + ((trtp + trp + trcd - 4) << 6) | + (trc << 0); + + if (sysinfo->dsize == 2) { + if (ddr3_cfg->coladdr == 10) { + if (ddr3_cfg->rowaddr == 15 && + sysinfo->ncs == 2) + noc_sched->ddrconf = 4; + else + noc_sched->ddrconf = 0; + } else if (ddr3_cfg->coladdr == 11) { + noc_sched->ddrconf = 1; + } + } else { + if (ddr3_cfg->coladdr == 9) { + if (ddr3_cfg->rowaddr == 13) + noc_sched->ddrconf = 2; + else if (ddr3_cfg->rowaddr == 14) + noc_sched->ddrconf = 15; + } else if (ddr3_cfg->coladdr == 10) { + if (ddr3_cfg->rowaddr == 14 && + sysinfo->ncs == 2) + noc_sched->ddrconf = 14; + else if (ddr3_cfg->rowaddr == 15 && + sysinfo->ncs == 2) + noc_sched->ddrconf = 9; + else + noc_sched->ddrconf = 3; + } else if (ddr3_cfg->coladdr == 11) { + if (ddr3_cfg->rowaddr == 15 && + sysinfo->ncs == 2) + noc_sched->ddrconf = 4; + else + noc_sched->ddrconf = 0; + } else if (ddr3_cfg->coladdr == 12) { + if (ddr3_cfg->rowaddr == 14) + noc_sched->ddrconf = 1; + } + } + + /* Disable MMDC arbitration/reordering */ + mmdc0->maarcr = 0x14420000; + } + /* Step 13: Deassert config request - init complete */ mmdc0->mdscr = 0x00000000; diff --git a/arch/arm/include/asm/arch-mx6/mx6-ddr.h b/arch/arm/include/asm/arch-mx6/mx6-ddr.h index 9922409..c881782 100644 --- a/arch/arm/include/asm/arch-mx6/mx6-ddr.h +++ b/arch/arm/include/asm/arch-mx6/mx6-ddr.h @@ -307,6 +307,25 @@ struct mx6dq_iomux_grp_regs { u32 grp_b6ds; }; +/* + * NoC scheduler registers - only on IMX6DQP + */ +#define MX6DQP_NOC_SCHED_BASE 0x00bb0000 +struct mx6dqp_noc_sched_regs { + u32 coreid; + u32 revid; + u32 ddrconf; + u32 ddrtiming; + u32 ddrmode; + u32 rlat; + u32 res1[4]; + u32 ipu1; + u32 ipu2; + u32 res2[2]; + u32 activate; + u32 res3[16]; +}; + #define MX6SDL_IOM_DDR_BASE 0x020e0400 struct mx6sdl_iomux_ddr_regs { u32 res1[25]; -- 2.1.4

3 2

[U-Boot] [PATCH 0/2] usb: kbd: implement special keys
by Heinrich Schuchardt 20 Mar '18

20 Mar '18

Correct support for arrow keys: use the standard xterm escape sequences. Provide support for F1-F12, Insert, Delete, Home, End, Page Up, Page Down. Signed-off-by: Heinrich Schuchardt <xypron.glpk(a)gmx.de> Heinrich Schuchardt (2): usb: kbd: allow multibyte sequences to be put into ring buffer usb: kbd: implement special keys common/usb_kbd.c | 161 +++++++++++++++++++++++++++++++++++++++---------------- 1 file changed, 114 insertions(+), 47 deletions(-) -- 2.14.2

4 15

[U-Boot] [PATCH v2] SPL: Add signature verification when loading image
by Jun Nie 19 Mar '18

19 Mar '18

U-boot proper signature is not verified by SPL on most platforms even config SPL_FIT_SIGNATURE is enabled. Only fsl-layerscape platform support secure boot in platform specific code. So verified boot cannot be achieved if u-boot proper is loaded by SPL. This patch add signature verification to u-boot proper images when loading FIT image in SPL. It is tested on Allwinner bananapi zero board with H2+ SoC. Signed-off-by: Jun Nie <jun.nie(a)linaro.org> --- common/image-fit.c | 56 +++++++++++++++++++++++++++++++--------------------- common/spl/spl_fit.c | 12 +++++++++++ include/image.h | 2 ++ 3 files changed, 48 insertions(+), 22 deletions(-) diff --git a/common/image-fit.c b/common/image-fit.c index f6e956a..4b03390 100644 --- a/common/image-fit.c +++ b/common/image-fit.c @@ -1068,34 +1068,14 @@ static int fit_image_check_hash(const void *fit, int noffset, const void *data, return 0; } -/** - * fit_image_verify - verify data integrity - * @fit: pointer to the FIT format image header - * @image_noffset: component image node offset - * - * fit_image_verify() goes over component image hash nodes, - * re-calculates each data hash and compares with the value stored in hash - * node. - * - * returns: - * 1, if all hashes are valid - * 0, otherwise (or on error) - */ -int fit_image_verify(const void *fit, int image_noffset) +int fit_image_verify_with_data(const void *fit, int image_noffset, + const void *data, size_t size) { - const void *data; - size_t size; int noffset = 0; char *err_msg = ""; int verify_all = 1; int ret; - /* Get image data and data length */ - if (fit_image_get_data(fit, image_noffset, &data, &size)) { - err_msg = "Can't get image data/size"; - goto error; - } - /* Verify all required signatures */ if (IMAGE_ENABLE_VERIFY && fit_image_verify_required_sigs(fit, image_noffset, data, size, @@ -1153,6 +1133,38 @@ error: } /** + * fit_image_verify - verify data integrity + * @fit: pointer to the FIT format image header + * @image_noffset: component image node offset + * + * fit_image_verify() goes over component image hash nodes, + * re-calculates each data hash and compares with the value stored in hash + * node. + * + * returns: + * 1, if all hashes are valid + * 0, otherwise (or on error) + */ +int fit_image_verify(const void *fit, int image_noffset) +{ + const void *data; + size_t size; + int noffset = 0; + char *err_msg = ""; + + /* Get image data and data length */ + if (fit_image_get_data(fit, image_noffset, &data, &size)) { + err_msg = "Can't get image data/size"; + printf("error!\n%s for '%s' hash node in '%s' image node\n", + err_msg, fit_get_name(fit, noffset, NULL), + fit_get_name(fit, image_noffset, NULL)); + return 0; + } + + return fit_image_verify_with_data(fit, image_noffset, data, size); +} + +/** * fit_all_image_verify - verify data integrity for all images * @fit: pointer to the FIT format image header * diff --git a/common/spl/spl_fit.c b/common/spl/spl_fit.c index cc07fbc..8d382eb 100644 --- a/common/spl/spl_fit.c +++ b/common/spl/spl_fit.c @@ -174,6 +174,9 @@ static int spl_load_fit_image(struct spl_load_info *info, ulong sector, uint8_t image_comp = -1, type = -1; const void *data; bool external_data = false; +#ifdef CONFIG_SPL_FIT_SIGNATURE + int ret; +#endif if (IS_ENABLED(CONFIG_SPL_OS_BOOT) && IS_ENABLED(CONFIG_SPL_GZIP)) { if (fit_image_get_comp(fit, node, &image_comp)) @@ -252,7 +255,16 @@ static int spl_load_fit_image(struct spl_load_info *info, ulong sector, image_info->entry_point = fdt_getprop_u32(fit, node, "entry"); } +#ifdef CONFIG_SPL_FIT_SIGNATURE + printf("## Checking hash(es) for Image %s ...\n", + fit_get_name(fit, node, NULL)); + ret = fit_image_verify_with_data(fit, node, + (const void *)load_addr, length); + printf("\n"); + return !ret; +#else return 0; +#endif } static int spl_fit_append_fdt(struct spl_image_info *spl_image, diff --git a/include/image.h b/include/image.h index 325b014..77c11f8 100644 --- a/include/image.h +++ b/include/image.h @@ -1013,6 +1013,8 @@ int fit_add_verification_data(const char *keydir, void *keydest, void *fit, const char *comment, int require_keys, const char *engine_id); +int fit_image_verify_with_data(const void *fit, int image_noffset, + const void *data, size_t size); int fit_image_verify(const void *fit, int noffset); int fit_config_verify(const void *fit, int conf_noffset); int fit_all_image_verify(const void *fit); -- 1.9.1

2 1

[U-Boot] [PATCH 0/3] bmips: add support for bcm6318 usbh phy
by Álvaro Fernández Rojas 19 Mar '18

19 Mar '18

Add support for BCM6318 usbh phy. Álvaro Fernández Rojas (3): phy: add support for bcm6318 usbh phy mips: bmips: add support for bcm6318 usb mips: bmips: add ar-5315 usb support arch/mips/dts/brcm,bcm6318.dtsi | 30 +++++++ arch/mips/dts/comtrend,ar-5315u.dts | 12 +++ configs/comtrend_ar5315u_ram_defconfig | 9 +++ drivers/phy/Kconfig | 7 ++ drivers/phy/Makefile | 1 + drivers/phy/bcm6318-usbh-phy.c | 144 +++++++++++++++++++++++++++++++++ include/configs/bmips_bcm6318.h | 7 ++ 7 files changed, 210 insertions(+) create mode 100644 drivers/phy/bcm6318-usbh-phy.c -- 2.11.0

2 9

[U-Boot] [PATCH 0/9] bmips: add support for bcm6368 usbh phy
by Álvaro Fernández Rojas 19 Mar '18

19 Mar '18

Add support for BCM 6328/6362/6368/63268 usbh phy. Álvaro Fernández Rojas (9): phy: add support for bcm6368 usbh phy mips: bmips: add support for bcm6368 usb mips: bmips: add wap-5813n usb support mips: bmips: add support for bcm6328 usb mips: bmips: add ar-5387un usb support mips: bmips: add support for bcm6362 usb mips: bmips: add dgnd3700v2 usb support mips: bmips: add support for bcm63268 usb mips: bmips: add vr-3032u usb support arch/mips/dts/brcm,bcm63268.dtsi | 30 +++++ arch/mips/dts/brcm,bcm6328.dtsi | 30 +++++ arch/mips/dts/brcm,bcm6362.dtsi | 30 +++++ arch/mips/dts/brcm,bcm6368.dtsi | 29 +++++ arch/mips/dts/comtrend,ar-5387un.dts | 12 ++ arch/mips/dts/comtrend,vr-3032u.dts | 12 ++ arch/mips/dts/comtrend,wap-5813n.dts | 12 ++ arch/mips/dts/netgear,dgnd3700v2.dts | 12 ++ configs/comtrend_ar5387un_ram_defconfig | 9 ++ configs/comtrend_vr3032u_ram_defconfig | 9 ++ configs/comtrend_wap5813n_ram_defconfig | 9 ++ configs/netgear_dgnd3700v2_ram_defconfig | 9 ++ drivers/phy/Kconfig | 6 + drivers/phy/Makefile | 1 + drivers/phy/bcm6368-usbh-phy.c | 203 +++++++++++++++++++++++++++++++ include/configs/bmips_bcm63268.h | 7 ++ include/configs/bmips_bcm6328.h | 7 ++ include/configs/bmips_bcm6362.h | 7 ++ include/configs/bmips_bcm6368.h | 7 ++ 19 files changed, 441 insertions(+) create mode 100644 drivers/phy/bcm6368-usbh-phy.c -- 2.11.0

2 22

[U-Boot] [PATCH 0/4] bmips: add support for bcm6358 usbh phy
by Álvaro Fernández Rojas 19 Mar '18

19 Mar '18

Add support for BCM6358 usbh phy. Álvaro Fernández Rojas (4): phy: add support for bcm6358 usbh phy mips: bmips: add support for bcm6358 usb mips: bmips: add hg556a usb support mips: bmips: add nb4-ser usb support arch/mips/dts/brcm,bcm6358.dtsi | 27 +++++++++++ arch/mips/dts/huawei,hg556a.dts | 12 +++++ arch/mips/dts/sfr,nb4-ser.dts | 12 +++++ configs/huawei_hg556a_ram_defconfig | 9 ++++ configs/sfr_nb4-ser_ram_defconfig | 9 ++++ drivers/phy/Kconfig | 6 +++ drivers/phy/Makefile | 1 + drivers/phy/bcm6358-usbh-phy.c | 94 +++++++++++++++++++++++++++++++++++++ include/configs/bmips_bcm6358.h | 7 +++ 9 files changed, 177 insertions(+) create mode 100644 drivers/phy/bcm6358-usbh-phy.c -- 2.11.0

2 6

[U-Boot] [PATCH 0/3] bmips: add support for bcm6348 usbh phy
by Álvaro Fernández Rojas 19 Mar '18

19 Mar '18

Add support for BCM6348 usbh phy. Álvaro Fernández Rojas (3): phy: add support for bcm6348 usbh phy mips: bmips: add support for bcm6348 usb mips: bmips: add ct-5361 usb support arch/mips/dts/brcm,bcm6348.dtsi | 20 ++++++++ arch/mips/dts/comtrend,ct-5361.dts | 8 +++ configs/comtrend_ct5361_ram_defconfig | 7 +++ drivers/phy/Kconfig | 6 +++ drivers/phy/Makefile | 1 + drivers/phy/bcm6348-usbh-phy.c | 94 +++++++++++++++++++++++++++++++++++ include/configs/bmips_bcm6348.h | 5 ++ 7 files changed, 141 insertions(+) create mode 100644 drivers/phy/bcm6348-usbh-phy.c -- 2.11.0

2 7

[U-Boot] [PATCH 0/2] Move the iomux definitions into pinctrl-driver
by Alexander Kochetkov 19 Mar '18

19 Mar '18

Two patches similar to commit 301fff4e574d373a139dd47aceabc5b4259873da. Alexander Kochetkov (2): rockchip: pinctrl: rk3036: Move the iomux definitions into pinctrl-driver rockchip: pinctrl: rk3188: Move the iomux definitions into pinctrl-driver arch/arm/include/asm/arch-rockchip/grf_rk3036.h | 409 ---------------------- arch/arm/include/asm/arch-rockchip/grf_rk3188.h | 380 --------------------- drivers/pinctrl/rockchip/pinctrl_rk3036.c | 410 +++++++++++++++++++++++ drivers/pinctrl/rockchip/pinctrl_rk3188.c | 380 +++++++++++++++++++++ 4 files changed, 790 insertions(+), 789 deletions(-) -- 1.7.9.5

2 8