December 2019 - U-Boot

[U-Boot] [GIT] Pull request: u-boot-dfu (29.11.2019)
by Lukasz Majewski 01 Dec '19

01 Dec '19

Dear Marek, The following changes since commit dbcbdad92caf4b42a6279da6e65180532bc45620: sandbox: enable USB_KEYBOARD_FN_KEYS (2019-11-25 13:28:53 +0100) are available in the Git repository at: git@gitlab.denx.de:u-boot/custodians/u-boot-dfu.git BRANCH: master https://gitlab.denx.de/u-boot/custodians/u-boot-dfu/commits/master Merge tag info: - Add optional timeout (in seconds) parameter to DFU command. After this timeout the dfu ends its execution (to avoid waiting forever) Note: I would prefer if you add those patches into your USB -next branch. for you to fetch changes up to 28e360c6b511a3599ecbfbc33e2d6e96f305985f: x86: edison: Enable DFU timeout (2019-11-29 10:06:40 +0100) Travis-CI: https://travis-ci.org/lmajewski/u-boot-dfu/builds/618507384 ---------------------------------------------------------------- Andy Shevchenko (4): dfu: Drop unused prototype of dfu_trigger_reset() dfu: Refactor do_dfu() to handle optional argument dfu: Add optional timeout parameter x86: edison: Enable DFU timeout cmd/dfu.c | 28 +++++++++++++++++++++------- common/dfu.c | 17 +++++++++++++++++ configs/edison_defconfig | 1 + doc/README.dfu | 8 ++++++-- drivers/dfu/Kconfig | 6 ++++++ drivers/dfu/dfu.c | 15 +++++++++++++++ include/dfu.h | 6 +++++- 7 files changed, 71 insertions(+), 10 deletions(-) Best regards, Lukasz Majewski -- DENX Software Engineering GmbH, Managing Director: Wolfgang Denk HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany Phone: (+49)-8142-66989-59 Fax: (+49)-8142-66989-80 Email: lukma(a)denx.de

2 3

[U-Boot] [PATCH] ARM: socfpga: Fix FPGA bitstream loading code
by Marek Vasut 01 Dec '19

01 Dec '19

According to SoCFPGA Cyclone V datasheet rev.2018.01.26 page 175 (Chapter 5, FPGA Manager, data register) and Arria10 datasheet rev.2017.07.22 page 211 (Chapter 5.4.1.2, FPGA Manager, img_data_w register), the FPGA data register must be written with writes with non-incrementing address. The current code increments the address in 32-byte bursts. Fix the code so it does not increment the address and writes the register repeatedly instead. Signed-off-by: Marek Vasut <marex(a)denx.de> Cc: Chin Liang See <chin.liang.see(a)intel.com> Cc: Dinh Nguyen <dinguyen(a)kernel.org> Cc: Simon Goldschmidt <simon.k.r.goldschmidt(a)gmail.com> Cc: Tien Fong Chee <tien.fong.chee(a)intel.com> --- drivers/fpga/socfpga.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/drivers/fpga/socfpga.c b/drivers/fpga/socfpga.c index 685957626b..6ecea771ce 100644 --- a/drivers/fpga/socfpga.c +++ b/drivers/fpga/socfpga.c @@ -55,8 +55,7 @@ void fpgamgr_program_write(const void *rbf_data, size_t rbf_size) " cmp %2, #0\n" " beq 2f\n" "1: ldmia %0!, {r0-r7}\n" - " stmia %1!, {r0-r7}\n" - " sub %1, #32\n" + " stmia %1, {r0-r7}\n" " subs %2, #1\n" " bne 1b\n" "2: cmp %3, #0\n" -- 2.20.1

4 17

[U-Boot] [PATCH 1/4] doc: rockchip: Update build instruction for rk3308
by Andy Yan 01 Dec '19

01 Dec '19

After commit d8765e2422cd ("Enable building of u-boot.itb on Rockchip platform"), u-boot.itb will automatically generated by "make all" command, manually command "make u-boot.itb" is no longer needed. Signed-off-by: Andy Yan <andy.yan(a)rock-chips.com> --- doc/README.rockchip | 1 - 1 file changed, 1 deletion(-) diff --git a/doc/README.rockchip b/doc/README.rockchip index 67c14006a3..dae4ebc8e4 100644 --- a/doc/README.rockchip +++ b/doc/README.rockchip @@ -108,7 +108,6 @@ For example: => export BL31=/path/to/rkbin/bin/rk33/rk3308_bl31_v2.22.elf => make roc-rk3308-cc_defconfig => make CROSS_COMPILE=aarch64-linux-gnu- all - => make CROSS_COMPILE=aarch64-linux-gnu- u-boot.itb => ./tools/mkimage -n rk3308 -T rksd -d /path/to/rkbin/bin/rk33/rk3308_ddr_589MHz_uart2_m0_v1.26.bin idbloader.img => cat spl/u-boot-spl.bin >> idbloader.img -- 2.17.1

3 8

[U-Boot] [PATCH v2 1/3] rockchip: px30: Fixup PMUGRF registers layout order
by Paul Kocialkowski 01 Dec '19

01 Dec '19

According to the PX30 TRM, the iomux registers come first, before the pull and strength control registers. Signed-off-by: Paul Kocialkowski <paul.kocialkowski(a)bootlin.com> Reviewed-by: Kever Yang <kever.yang(a)rock-chips.com> Reviewed-by: Heiko Stuebner <heiko.stuebner(a)theobroma-systems.com> --- arch/arm/include/asm/arch-rockchip/grf_px30.h | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/arch/arm/include/asm/arch-rockchip/grf_px30.h b/arch/arm/include/asm/arch-rockchip/grf_px30.h index c167bb42fac9..3d2a8770322e 100644 --- a/arch/arm/include/asm/arch-rockchip/grf_px30.h +++ b/arch/arm/include/asm/arch-rockchip/grf_px30.h @@ -112,18 +112,18 @@ struct px30_grf { check_member(px30_grf, mac_con1, 0x904); struct px30_pmugrf { - unsigned int gpio0a_e; - unsigned int gpio0b_e; - unsigned int gpio0c_e; - unsigned int gpio0d_e; - unsigned int gpio0a_p; - unsigned int gpio0b_p; - unsigned int gpio0c_p; - unsigned int gpio0d_p; unsigned int gpio0al_iomux; unsigned int gpio0bl_iomux; unsigned int gpio0cl_iomux; unsigned int gpio0dl_iomux; + unsigned int gpio0a_p; + unsigned int gpio0b_p; + unsigned int gpio0c_p; + unsigned int gpio0d_p; + unsigned int gpio0a_e; + unsigned int gpio0b_e; + unsigned int gpio0c_e; + unsigned int gpio0d_e; unsigned int gpio0l_sr; unsigned int gpio0h_sr; unsigned int gpio0l_smt; -- 2.24.0

2 3

[U-Boot] [PATCH 1/2] rockchip: misc: don't fail if eth_addr already set
by Heiko Stuebner 01 Dec '19

01 Dec '19

From: Heiko Stuebner <heiko.stuebner(a)theobroma-systems.com> rockchip_setup_macaddr() runs from an initcall, so returning an error code will make that initcall fail thus breaking the boot process. And if an ethernet address is already set this is definitly not a cause for that, so just return success in that case. Fixes: 04825384999f ("rockchip: rk3399: derive ethaddr from cpuid"); Signed-off-by: Heiko Stuebner <heiko.stuebner(a)theobroma-systems.com> --- arch/arm/mach-rockchip/misc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/arm/mach-rockchip/misc.c b/arch/arm/mach-rockchip/misc.c index bed4317f7e..d0fb3d07a7 100644 --- a/arch/arm/mach-rockchip/misc.c +++ b/arch/arm/mach-rockchip/misc.c @@ -29,7 +29,7 @@ int rockchip_setup_macaddr(void) /* Only generate a MAC address, if none is set in the environment */ if (env_get("ethaddr")) - return -1; + return 0; if (!cpuid) { debug("%s: could not retrieve 'cpuid#'\n", __func__); -- 2.24.0

2 3