February 2018 - U-Boot

[U-Boot] [PATCH v8 0/4] Generic firmware loader
by tien.fong.chee＠intel.com 26 Feb '18

26 Feb '18

From: Tien Fong Chee <tien.fong.chee(a)intel.com> This patchset contains generic firmware loader which is very close to Linux firmware loader but for U-Boot framework. Generic firmware loader can be used load whatever into target location, and then consumer driver would use it to program whatever, ie. the FPGA. This version mainly resolved comments from Marek Vasut in [v7]. This series is working on top of u-boot.git - http://git.denx.de/u-boot.git . [v7]: https://www.mail-archive.com/u-boot@lists.denx.de/msg276775.html v7 -> v8 changes: ----------------- - Return cmd_ubifs_umount() directly. - Call the UBI functions directly instead of invoking the U-Boot command parser. Patchset history ---------------- [v1]: https://www.mail-archive.com/u-boot@lists.denx.de/msg271905.html [v2]: https://www.mail-archive.com/u-boot@lists.denx.de/msg271979.html [v3]: https://www.mail-archive.com/u-boot@lists.denx.de/msg272039.html [v4]: https://www.mail-archive.com/u-boot@lists.denx.de/msg272432.html [v5]: https://www.mail-archive.com/u-boot@lists.denx.de/msg272771.html [v6]: https://www.mail-archive.com/u-boot@lists.denx.de/msg273961.html Tien Fong Chee (4): spl: Remove static declaration on spl_mmc_find_device function cmd: ubifs: Move ubifs_initialized checking into cmd_ubifs_umount() cmd: ubifs: Factor out some checking codes into cmd_ubifs_mount() common: Generic firmware loader for file system cmd/ubifs.c | 40 +++--- common/Kconfig | 9 ++ common/Makefile | 1 + common/fs_loader.c | 320 +++++++++++++++++++++++++++++++++++++++++++++ common/spl/spl_mmc.c | 2 +- doc/README.firmware_loader | 76 +++++++++++ include/fs_loader.h | 28 ++++ include/spl.h | 2 + include/ubi_uboot.h | 2 + 9 files changed, 462 insertions(+), 18 deletions(-) create mode 100644 common/fs_loader.c create mode 100644 doc/README.firmware_loader create mode 100644 include/fs_loader.h -- 2.2.0

5 18

[U-Boot] [PULL] Please pull u-boot-rockchip/master
by Dr. Philipp Tomsich 26 Feb '18

26 Feb '18

Tom, we have additional fixes ready for you: * the TPL-build process for the Vyasa board was fixed by Jagan (by providing the correct TEXT_BASE) * a regression on Ethernet for the RK3399 and RK3368 has been resolved by adding support for its clocks * a regression on PMIC probing on the RK399 has been resolved by adding support for the assigned-clocks of the PMUCRU Travis report is at https://travis-ci.org/ptomsich/u-boot-rockchip/builds/345699336 Thanks, Philipp. The following changes since commit 0bb430c8494e26e8d258cf6957cdd39d2ce4f309: Merge git://git.denx.de/u-boot-video (2018-02-24 08:02:17 -0500) are available in the git repository at: git://git.denx.de/u-boot-rockchip.git master for you to fetch changes up to 434d5a00a4578f826e7e2cef29bf2388dd760a88: rockchip: clk: rk3399: handle set_rate/get_rate for PLL_PPLL (2018-02-24 18:50:03 +0100) ---------------------------------------------------------------- Jagan Teki (2): rockchip: rk3288: Add TPL_LDSCRIPT rockchip: rk3288: Fix wrong TPL_TEXT_BASE Philipp Tomsich (3): rockchip: clk: rk3399: handle clk_enable requests for GMAC rockchip: clk: rk3368: handle clk_enable requests for GMAC rockchip: clk: rk3399: handle set_rate/get_rate for PLL_PPLL arch/arm/mach-rockchip/Kconfig | 10 ++++++++++ arch/arm/mach-rockchip/rk3288/u-boot-tpl.lds | 10 ++++++++++ configs/vyasa-rk3288_defconfig | 1 - drivers/clk/rockchip/clk_rk3368.c | 19 +++++++++++++++++++ drivers/clk/rockchip/clk_rk3399.c | 19 +++++++++++++++++++ 5 files changed, 58 insertions(+), 1 deletion(-) create mode 100644 arch/arm/mach-rockchip/rk3288/u-boot-tpl.lds

3 2

[U-Boot] [PULL] Please pull u-boot-imx
by Stefano Babic 26 Feb '18

26 Feb '18

Hi Tom, some fixes, please pull from u-boot-imx, thanks! The following changes since commit 02b0895c215e252cff50d9edf53a972d2bbbfd30: Merge git://git.denx.de/u-boot-sh (2018-02-17 16:06:59 -0500) are available in the git repository at: git://www.denx.de/git/u-boot-imx.git master for you to fetch changes up to 3d409153502f25a1ea3b8b4e9940148b7871273d: imx6q: engicam: Use SPL_LOAD_FIT for MMC boards (2018-02-22 14:51:01 +0100) ---------------------------------------------------------------- Breno Lima (2): imx: hab: Keep CAAM clock enabled after authenticating additional images arm: imx: hab: Define HAB_RVT_BASE according to the processor version Fabio Estevam (1): mx6sabresd: Select the CONFIG_EFI_PARTITION option Jagan Teki (3): imx6ul: engicam: Drop isiot-mmc defconfig imx6: engicam: Drop SPL_EXT_SUPPORT imx6q: engicam: Use SPL_LOAD_FIT for MMC boards Maxim Yu. Osipov (1): Revert "mx6: ddr: Allow changing REFSEL and REFR fields" Stefano Babic (1): mx6: fix MAINTAINERS for Engicam i.CoreM6 1.5 MIPI Utkarsh Gupta (3): imx: hab: Ensure the IVT DCD pointer is Null prior to calling HAB authenticate function. imx: hab: Check if CSF is valid before authenticating image imx: hab: Check if CSF contains deprecated commands arch/arm/dts/Makefile | 1 - arch/arm/dts/imx6ul-isiot-mmc.dts | 50 ---------------------------------------- arch/arm/include/asm/mach-imx/hab.h | 27 ++++++++++++++++------ arch/arm/mach-imx/hab.c | 220 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++--------------------------------------------------------------------------------- arch/arm/mach-imx/mx6/Kconfig | 1 - board/compulab/cm_fx6/spl.c | 2 -- board/engicam/imx6q/MAINTAINERS | 8 ++++++- board/engicam/imx6ul/MAINTAINERS | 1 - configs/imx6dl_icore_nand_defconfig | 47 ++++++++++++++++++++++++++++++++++++++ configs/{imx6ul_isiot_mmc_defconfig => imx6q_icore_nand_defconfig} | 23 +++++++++++-------- configs/imx6qdl_icore_mipi_defconfig | 2 +- configs/imx6qdl_icore_mmc_defconfig | 2 +- configs/imx6qdl_icore_rqs_defconfig | 2 +- configs/imx6ul_geam_mmc_defconfig | 1 - configs/imx6ul_isiot_emmc_defconfig | 3 ++- configs/mx6sabresd_defconfig | 1 + 16 files changed, 212 insertions(+), 179 deletions(-) delete mode 100644 arch/arm/dts/imx6ul-isiot-mmc.dts create mode 100644 configs/imx6dl_icore_nand_defconfig rename configs/{imx6ul_isiot_mmc_defconfig => imx6q_icore_nand_defconfig} (64%) -- ===================================================================== DENX Software Engineering GmbH, Managing Director: Wolfgang Denk HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany Phone: +49-8142-66989-53 Fax: +49-8142-66989-80 Email: sbabic(a)denx.de =====================================================================

2 2

[U-Boot] [PATCH v2 0/4] mmc: omap_hsmmc: Reduce the footprint of the driver and fix am335x clock
by Jean-Jacques Hiblot 26 Feb '18

26 Feb '18

This series aims at reducing the footprint of the omap_hsmmc driver in the SPL (1.5 kB gain in the case of the SPL for the am335x evm). It also fixes an issue with the am335x_evm by setting a default maximum frequency if none is defined in the dts. tested on am335x_evm, bbb, bbb (vboot), and dra7 evm Changes in v2: - Use a Kconfig option to compile out the ADMA support instead of relying on the platform architecture Jean-Jacques Hiblot (4): mmc: omap_hsmmc: do not embed struct mmc in struct omap_hsmmc_plat mmc: omap_hsmmc: compile out write support if not needed mmc: omap_hsmmc: make it possible to compile out ADMA support mmc: omap_hsmmc: use a default 52MHz max clock rate if none is specified arch/arm/include/asm/omap_mmc.h | 2 +- drivers/mmc/Kconfig | 9 +++++++++ drivers/mmc/omap_hsmmc.c | 31 ++++++++++++++++++++----------- 3 files changed, 30 insertions(+), 12 deletions(-) -- 1.9.1

4 16

[U-Boot] [PATCH] bootcount: Migrate CONFIG_SYS_BOOTCOUNT_ADDR
by Tom Rini 25 Feb '18

25 Feb '18

Migrate the users of CONFIG_SYS_BOOTCOUNT_ADDR to Kconfig. We can provide a default for BOOTCOUNT_AM33XX as that's a specific part of the RTC in use. We can also provide a default for ARCH_LS1043A and ARCH_LS1021A as they had been previously calculated and their symbols are in Kconfig. In the case of other QE-enabled platforms, they are not so we must update the relevant defconfig files. The previous default only applied in some cases, even on a specific SoC family. Signed-off-by: Tom Rini <trini(a)konsulko.com> --- configs/calimain_defconfig | 1 + configs/dh_imx6_defconfig | 1 + configs/ge_b450v3_defconfig | 1 + configs/ge_b650v3_defconfig | 1 + configs/ge_b850v3_defconfig | 1 + configs/highbank_defconfig | 1 + configs/ids8313_defconfig | 1 + configs/kmcoge4_defconfig | 1 + configs/kmcoge5ne_defconfig | 1 + configs/kmeter1_defconfig | 1 + configs/kmlion1_defconfig | 1 + configs/kmopti2_defconfig | 1 + configs/kmsupx5_defconfig | 1 + configs/kmtegr1_defconfig | 1 + configs/kmtepr2_defconfig | 1 + configs/kmvect1_defconfig | 1 + configs/mx53ppd_defconfig | 1 + configs/socfpga_is1_defconfig | 1 + configs/socfpga_sr1500_defconfig | 1 + configs/suvd3_defconfig | 1 + configs/tqma6s_wru4_mmc_defconfig | 1 + configs/tuge1_defconfig | 1 + configs/tuxx1_defconfig | 1 + configs/x600_defconfig | 1 + drivers/bootcount/Kconfig | 6 ++++-- drivers/bootcount/bootcount.c | 16 ---------------- include/configs/brppt1.h | 3 --- include/configs/calimain.h | 1 - include/configs/dh_imx6.h | 1 - include/configs/ge_bx50v3.h | 2 -- include/configs/highbank.h | 1 - include/configs/ids8313.h | 3 --- include/configs/km/kmp204x-common.h | 3 --- include/configs/socfpga_is1.h | 2 -- include/configs/socfpga_sr1500.h | 2 -- include/configs/ti_am335x_common.h | 7 ------- include/configs/tqma6_wru4.h | 1 - include/configs/x600.h | 4 ---- 38 files changed, 28 insertions(+), 48 deletions(-) diff --git a/configs/calimain_defconfig b/configs/calimain_defconfig index cbb31f6bf321..234b1a593567 100644 --- a/configs/calimain_defconfig +++ b/configs/calimain_defconfig @@ -23,6 +23,7 @@ CONFIG_CMD_DIAG=y CONFIG_ENV_IS_IN_FLASH=y CONFIG_BOOTP_DNS=y CONFIG_BOOTCOUNT_LIMIT=y +CONFIG_SYS_BOOTCOUNT_ADDR=0x01C23000 # CONFIG_MMC is not set CONFIG_MTD_NOR_FLASH=y CONFIG_SYS_NS16550=y diff --git a/configs/dh_imx6_defconfig b/configs/dh_imx6_defconfig index 251fcd01b69a..2b4fe9c2c596 100644 --- a/configs/dh_imx6_defconfig +++ b/configs/dh_imx6_defconfig @@ -35,6 +35,7 @@ CONFIG_CMD_EXT4_WRITE=y CONFIG_ENV_IS_IN_SPI_FLASH=y CONFIG_DWC_AHSATA=y CONFIG_BOOTCOUNT_LIMIT=y +CONFIG_SYS_BOOTCOUNT_ADDR=0x00900000 CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH_SPANSION=y CONFIG_PHYLIB=y diff --git a/configs/ge_b450v3_defconfig b/configs/ge_b450v3_defconfig index ee1cc432e0e0..045380b6de8e 100644 --- a/configs/ge_b450v3_defconfig +++ b/configs/ge_b450v3_defconfig @@ -29,6 +29,7 @@ CONFIG_ENV_IS_IN_SPI_FLASH=y CONFIG_BOOTCOUNT_LIMIT=y CONFIG_BOOTCOUNT_EXT=y CONFIG_SYS_BOOTCOUNT_EXT_DEVPART="1:5" +CONFIG_SYS_BOOTCOUNT_ADDR=0x7000A000 CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH_STMICRO=y CONFIG_NETDEVICES=y diff --git a/configs/ge_b650v3_defconfig b/configs/ge_b650v3_defconfig index 27a89b0be782..9d4b8aeebedc 100644 --- a/configs/ge_b650v3_defconfig +++ b/configs/ge_b650v3_defconfig @@ -29,6 +29,7 @@ CONFIG_ENV_IS_IN_SPI_FLASH=y CONFIG_BOOTCOUNT_LIMIT=y CONFIG_BOOTCOUNT_EXT=y CONFIG_SYS_BOOTCOUNT_EXT_DEVPART="1:5" +CONFIG_SYS_BOOTCOUNT_ADDR=0x7000A000 CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH_STMICRO=y CONFIG_NETDEVICES=y diff --git a/configs/ge_b850v3_defconfig b/configs/ge_b850v3_defconfig index af4ba9754331..94785681be7d 100644 --- a/configs/ge_b850v3_defconfig +++ b/configs/ge_b850v3_defconfig @@ -29,6 +29,7 @@ CONFIG_ENV_IS_IN_SPI_FLASH=y CONFIG_BOOTCOUNT_LIMIT=y CONFIG_BOOTCOUNT_EXT=y CONFIG_SYS_BOOTCOUNT_EXT_DEVPART="1:5" +CONFIG_SYS_BOOTCOUNT_ADDR=0x7000A000 CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH_STMICRO=y CONFIG_NETDEVICES=y diff --git a/configs/highbank_defconfig b/configs/highbank_defconfig index 7b9c0e7d4770..55f83ed1e17c 100644 --- a/configs/highbank_defconfig +++ b/configs/highbank_defconfig @@ -17,6 +17,7 @@ CONFIG_ENV_IS_IN_NVRAM=y CONFIG_SCSI_AHCI=y CONFIG_BOOTCOUNT_LIMIT=y CONFIG_SYS_BOOTCOUNT_SINGLEWORD=y +CONFIG_SYS_BOOTCOUNT_ADDR=0xfff3cf0c # CONFIG_MMC is not set CONFIG_SCSI=y CONFIG_OF_LIBFDT=y diff --git a/configs/ids8313_defconfig b/configs/ids8313_defconfig index 5ca77030104f..44b411cc5932 100644 --- a/configs/ids8313_defconfig +++ b/configs/ids8313_defconfig @@ -36,6 +36,7 @@ CONFIG_BOOTP_HOSTNAME=y CONFIG_BOOTP_SUBNETMASK=y CONFIG_BOOTCOUNT_LIMIT=y CONFIG_BOOTCOUNT_I2C=y +CONFIG_SYS_BOOTCOUNT_ADDR=0x9 # CONFIG_MMC is not set CONFIG_MTD_NOR_FLASH=y CONFIG_PHYLIB=y diff --git a/configs/kmcoge4_defconfig b/configs/kmcoge4_defconfig index fe731dc3c76d..9d22c211a37e 100644 --- a/configs/kmcoge4_defconfig +++ b/configs/kmcoge4_defconfig @@ -35,6 +35,7 @@ CONFIG_BOOTP_BOOTPATH=y CONFIG_BOOTP_GATEWAY=y CONFIG_BOOTP_HOSTNAME=y CONFIG_BOOTCOUNT_LIMIT=y +CONFIG_SYS_BOOTCOUNT_ADDR=0xFB000020 # CONFIG_MMC is not set CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH_SPANSION=y diff --git a/configs/kmcoge5ne_defconfig b/configs/kmcoge5ne_defconfig index c360d06a1e42..3426adf5981b 100644 --- a/configs/kmcoge5ne_defconfig +++ b/configs/kmcoge5ne_defconfig @@ -28,6 +28,7 @@ CONFIG_BOOTP_BOOTPATH=y CONFIG_BOOTP_GATEWAY=y CONFIG_BOOTP_HOSTNAME=y CONFIG_BOOTCOUNT_LIMIT=y +CONFIG_SYS_BOOTCOUNT_ADDR=0xE011BFF8 # CONFIG_MMC is not set CONFIG_MTD_NOR_FLASH=y # CONFIG_PCI is not set diff --git a/configs/kmeter1_defconfig b/configs/kmeter1_defconfig index 3e9ba80e9961..e795ac40d182 100644 --- a/configs/kmeter1_defconfig +++ b/configs/kmeter1_defconfig @@ -27,6 +27,7 @@ CONFIG_BOOTP_BOOTPATH=y CONFIG_BOOTP_GATEWAY=y CONFIG_BOOTP_HOSTNAME=y CONFIG_BOOTCOUNT_LIMIT=y +CONFIG_SYS_BOOTCOUNT_ADDR=0xE011BFF8 # CONFIG_MMC is not set CONFIG_MTD_NOR_FLASH=y # CONFIG_PCI is not set diff --git a/configs/kmlion1_defconfig b/configs/kmlion1_defconfig index 9d4f3d7395a5..12c06cc54486 100644 --- a/configs/kmlion1_defconfig +++ b/configs/kmlion1_defconfig @@ -35,6 +35,7 @@ CONFIG_BOOTP_BOOTPATH=y CONFIG_BOOTP_GATEWAY=y CONFIG_BOOTP_HOSTNAME=y CONFIG_BOOTCOUNT_LIMIT=y +CONFIG_SYS_BOOTCOUNT_ADDR=0xFB000020 # CONFIG_MMC is not set CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH_SPANSION=y diff --git a/configs/kmopti2_defconfig b/configs/kmopti2_defconfig index 484804ab0c3c..f3babb6a7e57 100644 --- a/configs/kmopti2_defconfig +++ b/configs/kmopti2_defconfig @@ -27,6 +27,7 @@ CONFIG_BOOTP_BOOTPATH=y CONFIG_BOOTP_GATEWAY=y CONFIG_BOOTP_HOSTNAME=y CONFIG_BOOTCOUNT_LIMIT=y +CONFIG_SYS_BOOTCOUNT_ADDR=0xE0113FF8 # CONFIG_MMC is not set CONFIG_MTD_NOR_FLASH=y # CONFIG_PCI is not set diff --git a/configs/kmsupx5_defconfig b/configs/kmsupx5_defconfig index 0a82ca344736..ac3f336204db 100644 --- a/configs/kmsupx5_defconfig +++ b/configs/kmsupx5_defconfig @@ -27,6 +27,7 @@ CONFIG_BOOTP_BOOTPATH=y CONFIG_BOOTP_GATEWAY=y CONFIG_BOOTP_HOSTNAME=y CONFIG_BOOTCOUNT_LIMIT=y +CONFIG_SYS_BOOTCOUNT_ADDR=0xE0113FF8 # CONFIG_MMC is not set CONFIG_MTD_NOR_FLASH=y # CONFIG_PCI is not set diff --git a/configs/kmtegr1_defconfig b/configs/kmtegr1_defconfig index 1b2d3df78593..a5930ef6a764 100644 --- a/configs/kmtegr1_defconfig +++ b/configs/kmtegr1_defconfig @@ -29,6 +29,7 @@ CONFIG_BOOTP_BOOTPATH=y CONFIG_BOOTP_GATEWAY=y CONFIG_BOOTP_HOSTNAME=y CONFIG_BOOTCOUNT_LIMIT=y +CONFIG_SYS_BOOTCOUNT_ADDR=0xE0113FF8 # CONFIG_MMC is not set CONFIG_MTD_NOR_FLASH=y # CONFIG_PCI is not set diff --git a/configs/kmtepr2_defconfig b/configs/kmtepr2_defconfig index c3dcf86e32f4..7441e4a888cc 100644 --- a/configs/kmtepr2_defconfig +++ b/configs/kmtepr2_defconfig @@ -27,6 +27,7 @@ CONFIG_BOOTP_BOOTPATH=y CONFIG_BOOTP_GATEWAY=y CONFIG_BOOTP_HOSTNAME=y CONFIG_BOOTCOUNT_LIMIT=y +CONFIG_SYS_BOOTCOUNT_ADDR=0xE0113FF8 # CONFIG_MMC is not set CONFIG_MTD_NOR_FLASH=y # CONFIG_PCI is not set diff --git a/configs/kmvect1_defconfig b/configs/kmvect1_defconfig index 0dc165e31297..b415c9d2030f 100644 --- a/configs/kmvect1_defconfig +++ b/configs/kmvect1_defconfig @@ -28,6 +28,7 @@ CONFIG_BOOTP_BOOTPATH=y CONFIG_BOOTP_GATEWAY=y CONFIG_BOOTP_HOSTNAME=y CONFIG_BOOTCOUNT_LIMIT=y +CONFIG_SYS_BOOTCOUNT_ADDR=0xE0113FF8 # CONFIG_MMC is not set CONFIG_MTD_NOR_FLASH=y # CONFIG_PCI is not set diff --git a/configs/mx53ppd_defconfig b/configs/mx53ppd_defconfig index 8fb512651f5a..f4a0b9b639ff 100644 --- a/configs/mx53ppd_defconfig +++ b/configs/mx53ppd_defconfig @@ -25,6 +25,7 @@ CONFIG_CMD_FS_GENERIC=y CONFIG_BOOTCOUNT_LIMIT=y CONFIG_BOOTCOUNT_EXT=y CONFIG_SYS_BOOTCOUNT_EXT_DEVPART="0:5" +CONFIG_SYS_BOOTCOUNT_ADDR=0x7000A000 CONFIG_NETDEVICES=y CONFIG_RTC_S35392A=y CONFIG_USB=y diff --git a/configs/socfpga_is1_defconfig b/configs/socfpga_is1_defconfig index 4da9356baf68..53b5c34fd4c1 100644 --- a/configs/socfpga_is1_defconfig +++ b/configs/socfpga_is1_defconfig @@ -34,6 +34,7 @@ CONFIG_ENV_IS_IN_SPI_FLASH=y CONFIG_SPL_DM=y CONFIG_SPL_DM_SEQ_ALIAS=y CONFIG_BOOTCOUNT_LIMIT=y +CONFIG_SYS_BOOTCOUNT_ADDR=0xfffffff8 CONFIG_FPGA_SOCFPGA=y CONFIG_DM_GPIO=y CONFIG_DWAPB_GPIO=y diff --git a/configs/socfpga_sr1500_defconfig b/configs/socfpga_sr1500_defconfig index bdc12e4a6af9..d7df688f5012 100644 --- a/configs/socfpga_sr1500_defconfig +++ b/configs/socfpga_sr1500_defconfig @@ -38,6 +38,7 @@ CONFIG_ENV_IS_IN_SPI_FLASH=y CONFIG_SPL_DM=y CONFIG_SPL_DM_SEQ_ALIAS=y CONFIG_BOOTCOUNT_LIMIT=y +CONFIG_SYS_BOOTCOUNT_ADDR=0xfffffff8 CONFIG_FPGA_SOCFPGA=y CONFIG_DM_GPIO=y CONFIG_DWAPB_GPIO=y diff --git a/configs/suvd3_defconfig b/configs/suvd3_defconfig index c75c8022408b..0213101d2fbf 100644 --- a/configs/suvd3_defconfig +++ b/configs/suvd3_defconfig @@ -27,6 +27,7 @@ CONFIG_BOOTP_BOOTPATH=y CONFIG_BOOTP_GATEWAY=y CONFIG_BOOTP_HOSTNAME=y CONFIG_BOOTCOUNT_LIMIT=y +CONFIG_SYS_BOOTCOUNT_ADDR=0xE0113FF8 # CONFIG_MMC is not set CONFIG_MTD_NOR_FLASH=y # CONFIG_PCI is not set diff --git a/configs/tqma6s_wru4_mmc_defconfig b/configs/tqma6s_wru4_mmc_defconfig index b6f5974fd49f..995a1ced0f5e 100644 --- a/configs/tqma6s_wru4_mmc_defconfig +++ b/configs/tqma6s_wru4_mmc_defconfig @@ -34,6 +34,7 @@ CONFIG_CMD_FAT=y CONFIG_CMD_FS_GENERIC=y CONFIG_ENV_IS_IN_MMC=y CONFIG_BOOTCOUNT_LIMIT=y +CONFIG_SYS_BOOTCOUNT_ADDR=0x00900000 CONFIG_LED_STATUS=y CONFIG_LED_STATUS0=y CONFIG_LED_STATUS_BIT=0 diff --git a/configs/tuge1_defconfig b/configs/tuge1_defconfig index 262a5c54793c..278d35ae61a5 100644 --- a/configs/tuge1_defconfig +++ b/configs/tuge1_defconfig @@ -27,6 +27,7 @@ CONFIG_BOOTP_BOOTPATH=y CONFIG_BOOTP_GATEWAY=y CONFIG_BOOTP_HOSTNAME=y CONFIG_BOOTCOUNT_LIMIT=y +CONFIG_SYS_BOOTCOUNT_ADDR=0xE0113FF8 # CONFIG_MMC is not set CONFIG_MTD_NOR_FLASH=y # CONFIG_PCI is not set diff --git a/configs/tuxx1_defconfig b/configs/tuxx1_defconfig index a2c101e275a0..6414ac29364b 100644 --- a/configs/tuxx1_defconfig +++ b/configs/tuxx1_defconfig @@ -27,6 +27,7 @@ CONFIG_BOOTP_BOOTPATH=y CONFIG_BOOTP_GATEWAY=y CONFIG_BOOTP_HOSTNAME=y CONFIG_BOOTCOUNT_LIMIT=y +CONFIG_SYS_BOOTCOUNT_ADDR=0xE0113FF8 # CONFIG_MMC is not set CONFIG_MTD_NOR_FLASH=y # CONFIG_PCI is not set diff --git a/configs/x600_defconfig b/configs/x600_defconfig index d1711e01fd45..b63bf41c2452 100644 --- a/configs/x600_defconfig +++ b/configs/x600_defconfig @@ -38,6 +38,7 @@ CONFIG_MTDPARTS_DEFAULT="mtdparts=nand:64M(ubi0),64M(ubi1)" CONFIG_CMD_UBI=y CONFIG_ENV_IS_IN_FLASH=y CONFIG_BOOTCOUNT_LIMIT=y +CONFIG_SYS_BOOTCOUNT_ADDR=0xD2801FF8 CONFIG_FPGA_XILINX=y CONFIG_SYS_I2C_DW=y # CONFIG_MMC is not set diff --git a/drivers/bootcount/Kconfig b/drivers/bootcount/Kconfig index c41b1316cd09..73972b7f9c37 100644 --- a/drivers/bootcount/Kconfig +++ b/drivers/bootcount/Kconfig @@ -111,8 +111,10 @@ config SYS_BOOTCOUNT_EXT_NAME config SYS_BOOTCOUNT_ADDR hex "RAM address used for reading and writing the boot counter" - default 0x7000A000 - depends on BOOTCOUNT_EXT + default 0x44E3E000 if BOOTCOUNT_AM33XX + default 0xE0115FF8 if ARCH_LS1043A || ARCH_LS1021A + depends on BOOTCOUNT_AM33XX || BOOTCOUNT_GENERIC || BOOTCOUNT_EXT || \ + BOOTCOUNT_I2C help Set the address used for reading and writing the boot counter. diff --git a/drivers/bootcount/bootcount.c b/drivers/bootcount/bootcount.c index 8b499fe12861..67554fa4a9b8 100644 --- a/drivers/bootcount/bootcount.c +++ b/drivers/bootcount/bootcount.c @@ -8,22 +8,7 @@ #include <bootcount.h> #include <linux/compiler.h> -/* - * Only override CONFIG_SYS_BOOTCOUNT_ADDR if not already defined. This - * way, some boards can define it directly in their config header. - */ -#if !defined(CONFIG_SYS_BOOTCOUNT_ADDR) - -#if defined(CONFIG_QE) -#include <linux/immap_qe.h> -#define CONFIG_SYS_BOOTCOUNT_ADDR (CONFIG_SYS_IMMR + 0x110000 + \ - QE_MURAM_SIZE - 2 * sizeof(u32)) -#endif /* defined(CONFIG_QE) */ - -#endif /* !defined(CONFIG_SYS_BOOTCOUNT_ADDR) */ - /* Now implement the generic default functions */ -#if defined(CONFIG_SYS_BOOTCOUNT_ADDR) __weak void bootcount_store(ulong a) { void *reg = (void *)CONFIG_SYS_BOOTCOUNT_ADDR; @@ -54,4 +39,3 @@ __weak ulong bootcount_load(void) return raw_bootcount_load(reg); #endif /* defined(CONFIG_SYS_BOOTCOUNT_SINGLEWORD) */ } -#endif /* defined(CONFIG_SYS_BOOTCOUNT_ADDR) */ diff --git a/include/configs/brppt1.h b/include/configs/brppt1.h index 30ea2d22e894..02e989ad7ad0 100644 --- a/include/configs/brppt1.h +++ b/include/configs/brppt1.h @@ -20,9 +20,6 @@ #define CONFIG_LCD_DT_SIMPLEFB #define LCD_BPP LCD_COLOR32 -/* Bootcount using the RTC block */ -#define CONFIG_SYS_BOOTCOUNT_ADDR 0x44E3E000 - /* memory */ #define CONFIG_SYS_MALLOC_LEN (5 * 1024 * 1024) diff --git a/include/configs/calimain.h b/include/configs/calimain.h index 854dc1ffedf0..364066feb21b 100644 --- a/include/configs/calimain.h +++ b/include/configs/calimain.h @@ -274,7 +274,6 @@ #define CONFIG_SYS_INIT_SP_ADDR (0x8001ff00) #define CONFIG_SYS_BOOTCOUNT_LE /* Use little-endian accessors */ -#define CONFIG_SYS_BOOTCOUNT_ADDR DAVINCI_RTC_BASE #ifndef __ASSEMBLY__ int calimain_get_osc_freq(void); diff --git a/include/configs/dh_imx6.h b/include/configs/dh_imx6.h index 1f7fccad3fbc..abe393e44c94 100644 --- a/include/configs/dh_imx6.h +++ b/include/configs/dh_imx6.h @@ -42,7 +42,6 @@ #define CONFIG_SYS_MALLOC_LEN (4 * SZ_1M) /* Bootcounter */ -#define CONFIG_SYS_BOOTCOUNT_ADDR IRAM_BASE_ADDR #define CONFIG_SYS_BOOTCOUNT_BE /* FEC ethernet */ diff --git a/include/configs/ge_bx50v3.h b/include/configs/ge_bx50v3.h index e4673d812dc2..cbfe30d536d0 100644 --- a/include/configs/ge_bx50v3.h +++ b/include/configs/ge_bx50v3.h @@ -263,6 +263,4 @@ #define CONFIG_BCH -#define CONFIG_SYS_BOOTCOUNT_ADDR 0x7000A000 - #endif /* __GE_BX50V3_CONFIG_H */ diff --git a/include/configs/highbank.h b/include/configs/highbank.h index 0aa59bcafde1..785cad7762e9 100644 --- a/include/configs/highbank.h +++ b/include/configs/highbank.h @@ -25,7 +25,6 @@ #define CONFIG_CONS_INDEX 0 #define CONFIG_SYS_BOOTCOUNT_LE /* Use little-endian accessors */ -#define CONFIG_SYS_BOOTCOUNT_ADDR 0xfff3cf0c #define CONFIG_MISC_INIT_R #define CONFIG_SCSI_AHCI_PLAT diff --git a/include/configs/ids8313.h b/include/configs/ids8313.h index 12c3aff4166d..a4acaa65b2d5 100644 --- a/include/configs/ids8313.h +++ b/include/configs/ids8313.h @@ -508,9 +508,6 @@ /* UBI Support */ #define CONFIG_MTD_PARTITIONS -/* bootcount support */ -#define CONFIG_SYS_BOOTCOUNT_ADDR 0x9 - #define CONFIG_IMAGE_FORMAT_LEGACY #endif /* __CONFIG_H */ diff --git a/include/configs/km/kmp204x-common.h b/include/configs/km/kmp204x-common.h index 7f735e0ac67e..f49f4361204f 100644 --- a/include/configs/km/kmp204x-common.h +++ b/include/configs/km/kmp204x-common.h @@ -188,9 +188,6 @@ unsigned long get_board_sys_clk(unsigned long dummy); #define CONFIG_SYS_BR1_PRELIM CONFIG_SYS_QRIO_BR_PRELIM /* QRIO Base Address */ #define CONFIG_SYS_OR1_PRELIM CONFIG_SYS_QRIO_OR_PRELIM /* QRIO Options */ -/* bootcounter in QRIO */ -#define CONFIG_SYS_BOOTCOUNT_ADDR (CONFIG_SYS_QRIO_BASE + 0x20) - #define CONFIG_BOARD_EARLY_INIT_R /* call board_early_init_r function */ #define CONFIG_MISC_INIT_F #define CONFIG_MISC_INIT_R diff --git a/include/configs/socfpga_is1.h b/include/configs/socfpga_is1.h index f2c3f405549a..88f9d4a46d07 100644 --- a/include/configs/socfpga_is1.h +++ b/include/configs/socfpga_is1.h @@ -30,8 +30,6 @@ /* * Bootcounter */ -/* last 2 lwords in OCRAM */ -#define CONFIG_SYS_BOOTCOUNT_ADDR 0xfffffff8 #define CONFIG_SYS_BOOTCOUNT_BE #endif /* __CONFIG_SOCFPGA_IS1_H__ */ diff --git a/include/configs/socfpga_sr1500.h b/include/configs/socfpga_sr1500.h index 8879817b3020..492869bd37f6 100644 --- a/include/configs/socfpga_sr1500.h +++ b/include/configs/socfpga_sr1500.h @@ -29,8 +29,6 @@ /* * Bootcounter */ -/* last 2 lwords in OCRAM */ -#define CONFIG_SYS_BOOTCOUNT_ADDR 0xfffffff8 #define CONFIG_SYS_BOOTCOUNT_BE /* Environment setting for SPI flash */ diff --git a/include/configs/ti_am335x_common.h b/include/configs/ti_am335x_common.h index 6c93fd3f9b6f..8251ceb63fa0 100644 --- a/include/configs/ti_am335x_common.h +++ b/include/configs/ti_am335x_common.h @@ -38,13 +38,6 @@ #define CONFIG_DRIVER_TI_CPSW /* Driver for IP block */ /* - * RTC related defines. To use bootcount you must set bootlimit in the - * environment to a non-zero value and enable CONFIG_BOOTCOUNT_LIMIT - * in the board config. - */ -#define CONFIG_SYS_BOOTCOUNT_ADDR 0x44E3E000 - -/* * SPL related defines. The Public RAM memory map the ROM defines the * area between 0x402F0400 and 0x4030B800 as a download area and * 0x4030B800 to 0x4030CE00 as a public stack area. The ROM also diff --git a/include/configs/tqma6_wru4.h b/include/configs/tqma6_wru4.h index d94f790148dc..24b62e701c10 100644 --- a/include/configs/tqma6_wru4.h +++ b/include/configs/tqma6_wru4.h @@ -34,7 +34,6 @@ /* LED */ /* Bootcounter */ -#define CONFIG_SYS_BOOTCOUNT_ADDR IRAM_BASE_ADDR #define CONFIG_SYS_BOOTCOUNT_BE #endif /* __CONFIG_TQMA6_WRU4_H */ diff --git a/include/configs/x600.h b/include/configs/x600.h index 4bf8b1051e58..485522cd8729 100644 --- a/include/configs/x600.h +++ b/include/configs/x600.h @@ -116,10 +116,6 @@ #define CONFIG_SYS_MALLOC_LEN (8 << 20) #define CONFIG_SYS_LOAD_ADDR 0x00800000 -/* Use last 2 lwords in internal SRAM for bootcounter */ -#define CONFIG_SYS_BOOTCOUNT_ADDR (CONFIG_SRAM_BASE + \ - CONFIG_SRAM_SIZE) - #define CONFIG_HOSTNAME x600 #define CONFIG_UBI_PART ubi0 #define CONFIG_UBIFS_VOLUME rootfs -- 2.7.4

3 6

[U-Boot] [PATCH v3 00/11] Convert bootcount drivers to Kconfig
by Alex Kiernan 25 Feb '18

25 Feb '18

This patch set converts bootcount drivers to Kconfig, it also merges CONFIG_BOOTCOUNT and CONFIG_BOOTCOUNT_LIMIT. Green Travis build: https://travis-ci.org/akiernan/u-boot/builds/342294699 This patch has been applied on top of u-boot/master: SHA1: f116634cd17952a18efb7c8cc6f6a7ef42dd4b8b Changes in v3: - Improve commit messages - Split rename of CONFIG_SYS_BOOTCOUNT_ADDR out to a separate series Changes in v2: - Fix erroneously removed line in README - Convert CONFIG_BOOTCOUNT_EXT too - it had only been partially done - Reword CONFIG_BOOTCOUNT_DRAM - Update README for AT91 driver - Remove CONFIG_BOOTCOUNT_LIMIT and CONFIG_SYS_BOOTCOUNT_SINGLEWORD from whitelist - Rename CONFIG_SYS_BOOTCOUNT_ADDR to BOOTCOUNT_ADDR and remove from Kconfig - Migrate CONFIG_BOOTCOUNT_ALEN to Kconfig Alex Kiernan (11): Merge CONFIG_BOOTCOUNT and CONFIG_BOOTCOUNT_LIMIT Prepare for multiple bootcount drivers Convert CONFIG_BOOTCOUNT_AM33XX to Kconfig Convert CONFIG_BOOTCOUNT_ENV to Kconfig Convert CONFIG_BOOTCOUNT_RAM to Kconfig Convert CONFIG_BOOTCOUNT_I2C to Kconfig Convert CONFIG_BOOTCOUNT_EXT to Kconfig Integrate AT91 bootcount driver Migrate generic bootcount to Kconfig Migrate CONFIG_BOOTCOUNT_ALEN to Kconfig Remove CONFIG_SYS_BOOTCOUNT_SINGLEWORD README | 32 ------------ configs/draco_defconfig | 1 + configs/etamin_defconfig | 1 + configs/ge_b450v3_defconfig | 2 + configs/ge_b650v3_defconfig | 2 + configs/ge_b850v3_defconfig | 2 + configs/ids8313_defconfig | 1 + configs/km_kirkwood_128m16_defconfig | 1 + configs/km_kirkwood_defconfig | 1 + configs/km_kirkwood_pci_defconfig | 1 + configs/kmcoge5un_defconfig | 1 + configs/kmnusa_defconfig | 1 + configs/kmsugp1_defconfig | 1 + configs/kmsuv31_defconfig | 1 + configs/mgcoge3un_defconfig | 1 + configs/mx53ppd_defconfig | 1 - configs/portl2_defconfig | 1 + configs/pxm2_defconfig | 1 + configs/rastaban_defconfig | 1 + configs/rut_defconfig | 1 + configs/theadorable_debug_defconfig | 1 + configs/thuban_defconfig | 1 + drivers/bootcount/Kconfig | 89 ++++++++++++++++++++++++++-------- drivers/bootcount/Makefile | 5 +- include/configs/am335x_evm.h | 1 - include/configs/am335x_sl50.h | 1 - include/configs/baltos.h | 2 - include/configs/bav335x.h | 1 - include/configs/brppt1.h | 1 - include/configs/chiliboard.h | 1 - include/configs/ge_bx50v3.h | 4 -- include/configs/ids8313.h | 2 - include/configs/km/km_arm.h | 2 - include/configs/siemens-am33x-common.h | 2 - include/configs/theadorable.h | 1 - scripts/config_whitelist.txt | 7 --- 36 files changed, 94 insertions(+), 81 deletions(-) -- 2.7.4

2 22

[U-Boot] [PATCH v2 0/9] rockchip: rk3288-vyasa: dts fixes/additions
by Jagan Teki 25 Feb '18

25 Feb '18

Series add new dts nodes like gmac, usb, io_domains and fixed existing regulator, pmic stuff as per schematic. Changes for v2: - Collect Acked-by and Reviewed-by tags from Philipp - Add eMMC boot support - Add missing commit message - Remove RK_GPIO8 macro to sync with Linux Jagan Teki (9): ARM: dts: rockchip: Sync rk3288-vyasa dts from Linux ARM: dts: rockchip: rk3288-vyasa: Remove vdd_log from rk808, DCDC_REG1 ARM: dts: rockchip: rk3288-vyasa: Use vmmc-supply from PMIC ARM: dts: rockchip: Add regulators for rk3288-vyasa ARM: dts: rockchip: Add gmac support for rk3288-vyasa board rockchip: rk3288-vyasa: defconfig: Enable gmac support ARM: dts: rockchip: Add usb host for rk3288-vyasa ARM: dts: rockchip: Add usb otg for rk3288-vyasa rk3288: vyasa: Add eMMC boot support arch/arm/dts/rk3288-vyasa-u-boot.dtsi | 33 ++++ arch/arm/dts/rk3288-vyasa.dts | 303 +++++++++++++++++++++++------- board/amarula/vyasa-rk3288/MAINTAINERS | 2 + board/amarula/vyasa-rk3288/vyasa-rk3288.c | 7 + configs/vyasa-rk3288_defconfig | 3 + 5 files changed, 277 insertions(+), 71 deletions(-) create mode 100644 arch/arm/dts/rk3288-vyasa-u-boot.dtsi -- 2.7.4

3 25

[U-Boot] [PATCH] rockchip: clk: rk3399: handle set_rate/get_rate for PLL_PPLL
by Philipp Tomsich 25 Feb '18

25 Feb '18

The device-tree node for the PMU clk controller assigns to its parent (i.e. PLL_PPLL) even though this clock currently is set up statically by an init-function. In order to avoid unexpected failures, a simple implementation of set_rate (which accepts requests, but notifies the caller of the preset frequency in its return value) and get_rate (which always returns the preset frequency) are added. Note that this is required for the RK808 PMIC to probe successfully on the RK3399-Q7, following the support for the assigned-clocks property. References: commit f4fcba5c5baa ("clk: implement clk_set_defaults()") Signed-off-by: Philipp Tomsich <philipp.tomsich(a)theobroma-systems.com> Tested-by: Klaus Goger <klaus.goger(a)theobroma-systems.com> --- drivers/clk/rockchip/clk_rk3399.c | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/drivers/clk/rockchip/clk_rk3399.c b/drivers/clk/rockchip/clk_rk3399.c index 42926ba..37237e3 100644 --- a/drivers/clk/rockchip/clk_rk3399.c +++ b/drivers/clk/rockchip/clk_rk3399.c @@ -1236,6 +1236,8 @@ static ulong rk3399_pmuclk_get_rate(struct clk *clk) ulong rate = 0; switch (clk->id) { + case PLL_PPLL: + return PPLL_HZ; case PCLK_RKPWM_PMU: rate = rk3399_pwm_get_clk(priv->pmucru); break; @@ -1257,7 +1259,13 @@ static ulong rk3399_pmuclk_set_rate(struct clk *clk, ulong rate) ulong ret = 0; switch (clk->id) { + case PLL_PPLL: + /* + * This has already been set up and we don't want/need + * to change it here. Accept the request though, as the + * device-tree has this in an 'assigned-clocks' list. + */ + return PPLL_HZ; case SCLK_I2C0_PMU: case SCLK_I2C4_PMU: case SCLK_I2C8_PMU: -- 2.1.4

1 1

[U-Boot] [PATCH 1/2] Makefile: add u-boot-elf.srec if CONFIG_REMAKE_ELF is defined
by Marek Vasut 25 Feb '18

25 Feb '18

From: Masaru Nagai <masaru.nagai.vx(a)renesas.com> The u-boot-elf.srec is needed for some platforms, conveniently generate this file. Signed-off-by: Masaru Nagai <masaru.nagai.vx(a)renesas.com> Signed-off-by: Hiroyuki Yokoyama <hiroyuki.yokoyama.vx(a)renesas.com> Signed-off-by: Marek Vasut <marek.vasut+renesas(a)gmail.com> Cc: Hiroyuki Yokoyama <hiroyuki.yokoyama.vx(a)renesas.com> Cc: Nobuhiro Iwamatsu <iwamatsu(a)nigauri.org> --- Makefile | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 57cb4b87d9..cd464c0e69 100644 --- a/Makefile +++ b/Makefile @@ -792,7 +792,7 @@ ALL-$(CONFIG_OF_HOSTFILE) += u-boot.dtb ifneq ($(CONFIG_SPL_TARGET),) ALL-$(CONFIG_SPL) += $(CONFIG_SPL_TARGET:"%"=%) endif -ALL-$(CONFIG_REMAKE_ELF) += u-boot.elf +ALL-$(CONFIG_REMAKE_ELF) += u-boot.elf u-boot-elf.srec ALL-$(CONFIG_EFI_APP) += u-boot-app.efi ALL-$(CONFIG_EFI_STUB) += u-boot-payload.efi @@ -926,6 +926,11 @@ OBJCOPYFLAGS_u-boot.srec := -O srec u-boot.hex u-boot.srec: u-boot FORCE $(call if_changed,objcopy) +OBJCOPYFLAGS_u-boot-elf.srec := $(OBJCOPYFLAGS_u-boot.srec) + +u-boot-elf.srec: u-boot.elf FORCE + $(call if_changed,objcopy) + OBJCOPYFLAGS_u-boot-nodtb.bin := -O binary \ $(if $(CONFIG_X86_16BIT_INIT),-R .start16 -R .resetvec) -- 2.16.1

2 6

[U-Boot] [PATCH v3] imx: spl: Partially revert "spl: eMMC/SD: Provide one __weak spl_boot_mode() function"
by Fabio Estevam 24 Feb '18

24 Feb '18

Commit d695d6627803 ("spl: eMMC/SD: Provide one __weak spl_boot_mode() function") breaks the boot on several i.MX6 boards, such as cuboxi and wandboard: U-Boot SPL 2018.03-rc1-00212-g48914fc119 (Feb 10 2018 - 11:04:33 +1300) Trying to boot from MMC1 Failed to mount ext2 filesystem... spl_load_image_ext: ext4fs mount err - 0 Partially revert it so that we can boot U-Boot again on these i.MX6 platforms. Reported-by: Jonathan Gray <jsg(a)jsg.id.au> Signed-off-by: Fabio Estevam <fabio.estevam(a)nxp.com> --- Changes since v2: - Do a partiall revert instead of full revert (Lukasz) arch/arm/mach-imx/spl.c | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/arch/arm/mach-imx/spl.c b/arch/arm/mach-imx/spl.c index a9079fc..b2521b2 100644 --- a/arch/arm/mach-imx/spl.c +++ b/arch/arm/mach-imx/spl.c @@ -132,6 +132,29 @@ int g_dnl_bind_fixup(struct usb_device_descriptor *dev, const char *name) } #endif +#if defined(CONFIG_SPL_MMC_SUPPORT) +/* called from spl_mmc to see type of boot mode for storage (RAW or FAT) */ +u32 spl_boot_mode(const u32 boot_device) +{ + switch (spl_boot_device()) { + /* for MMC return either RAW or FAT mode */ + case BOOT_DEVICE_MMC1: + case BOOT_DEVICE_MMC2: +#if defined(CONFIG_SPL_FAT_SUPPORT) + return MMCSD_MODE_FS; +#elif defined(CONFIG_SUPPORT_EMMC_BOOT) + return MMCSD_MODE_EMMCBOOT; +#else + return MMCSD_MODE_RAW; +#endif + break; + default: + puts("spl: ERROR: unsupported device\n"); + hang(); + } +} +#endif + #if defined(CONFIG_SECURE_BOOT) /* -- 2.7.4

4 3