September 2018 - U-Boot

[U-Boot] [PATCH] binman: fix a few typos in documentation
by Michael Heimpold 28 Sep '18

28 Sep '18

This fixes four small typos in the README file. Signed-off-by: Michael Heimpold <mhei(a)heimpold.de> Cc: Simon Glass <sjg(a)chromium.org> --- tools/binman/README | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/tools/binman/README b/tools/binman/README index cb34171e5f..9d9d1832ee 100644 --- a/tools/binman/README +++ b/tools/binman/README @@ -130,9 +130,9 @@ called from the U-Boot build system for this reason. Binman considers the output files created by mkimage to be binary blobs which it can place in an image. Binman does not replace the mkimage tool or -this purpose. It would be possible in some situtions to create a new entry +this purpose. It would be possible in some situations to create a new entry type for the images in mkimage, but this would not add functionality. It -seems better to use the mkiamge tool to generate binaries and avoid blurring +seems better to use the mkimage tool to generate binaries and avoid blurring the boundaries between building input files (mkimage) and packaging then into a final image (binman). @@ -169,7 +169,7 @@ Example use of binman for x86 In most cases x86 images have a lot of binary blobs, 'black-box' code provided by Intel which must be run for the platform to work. Typically these blobs are not relocatable and must be placed at fixed areas in the -firmare image. +firmware image. Currently this is handled by ifdtool, which places microcode, FSP, MRC, VGA BIOS, reference code and Intel ME binaries into a u-boot.rom file. @@ -406,7 +406,7 @@ either by using a unit number suffix (u-boot@0, u-boot@1) or by using a different name for each and specifying the type with the 'type' attribute. -Sections and hiearchical images +Sections and hierachical images ------------------------------- Sometimes it is convenient to split an image into several pieces, each of which -- 2.17.1

3 3

[U-Boot] [PATCH] dm: uclass: Adding missing child_pre_probe description
by Bin Meng 28 Sep '18

28 Sep '18

The comment of child_pre_probe, one of the 'struct uclass_driver' members, is currently missing. Signed-off-by: Bin Meng <bmeng.cn(a)gmail.com> --- include/dm/uclass.h | 1 + 1 file changed, 1 insertion(+) diff --git a/include/dm/uclass.h b/include/dm/uclass.h index 0e882ce..6e7c1cd 100644 --- a/include/dm/uclass.h +++ b/include/dm/uclass.h @@ -58,6 +58,7 @@ struct udevice; * @post_probe: Called after a new device is probed * @pre_remove: Called before a device is removed * @child_post_bind: Called after a child is bound to a device in this uclass + * @child_pre_probe: Called before a child is probed in this uclass * @init: Called to set up the uclass * @destroy: Called to destroy the uclass * @priv_auto_alloc_size: If non-zero this is the size of the private data -- 2.7.4

2 3

[U-Boot] [PATCH v2] sandbox: Build with -fPIC
by Andy Shevchenko 28 Sep '18

28 Sep '18

Sandbox is not a real bootloader and it does require a position independent code to be supported. Thus, build it with -fPIC explicitly. Fixes: 16940f720f9b ("Makefile: Don't generate position independent code") Signed-off-by: Andy Shevchenko <andriy.shevchenko(a)linux.intel.com> Reported-by: Simon Glass <sjg(a)chromium.org> Tested-by: Bin Meng <bmeng.cn(a)gmail.com> --- - rebased on top of latest u-boot/master - added Bin's Tb tag arch/sandbox/config.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/arch/sandbox/config.mk b/arch/sandbox/config.mk index 2babcde881..95f9e3ff63 100644 --- a/arch/sandbox/config.mk +++ b/arch/sandbox/config.mk @@ -3,6 +3,7 @@ PLATFORM_CPPFLAGS += -D__SANDBOX__ -U_FORTIFY_SOURCE PLATFORM_CPPFLAGS += -DCONFIG_ARCH_MAP_SYSMEM +PLATFORM_CPPFLAGS += -fPIC PLATFORM_LIBS += -lrt # Define this to avoid linking with SDL, which requires SDL libraries -- 2.18.0

2 2

[U-Boot] [PATCH] dm: fix alignment of help message of "dm" command
by Masahiro Yamada 28 Sep '18

28 Sep '18

Currently, "help dm" shows as follows: => help dm dm - Driver model low level access Usage: dm tree Dump driver model tree ('*' = activated) dm uclass Dump list of instances for each uclass dm devres Dump list of device resources for each device Signed-off-by: Masahiro Yamada <yamada.masahiro(a)socionext.com> --- test/dm/cmd_dm.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/dm/cmd_dm.c b/test/dm/cmd_dm.c index 624fc82..7b271db 100644 --- a/test/dm/cmd_dm.c +++ b/test/dm/cmd_dm.c @@ -82,7 +82,7 @@ static int do_dm(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) U_BOOT_CMD( dm, 3, 1, do_dm, "Driver model low level access", - "tree Dump driver model tree ('*' = activated)\n" + "tree Dump driver model tree ('*' = activated)\n" "dm uclass Dump list of instances for each uclass\n" "dm devres Dump list of device resources for each device" ); -- 2.7.4

3 2

[U-Boot] [PATCH v3 0/8] Device tree support for PowerPC in U-Boot
by Jagdish Gediya 28 Sep '18

28 Sep '18

In current implementation, PowerPC does not support device tree in U-Boot. This patch enables device tree support for PowerPC platform . T2080AQDS board used as first platform. Dtb is embedded in the U-Boot following below steps using binmam tool. 1. Remove bootpg and resetvec section if required 2. Append dtb using binman 3. Append bootpg and resetvec section back if removed in 1st step. To enable binman tool, 'binman' node has been added in the device tree. Jagdish Gediya (8): powerpc/dts: Define '_end' symbol in mpc85xx U-Boot lds files powerpc/dts: Makefile changes to clean and build dts binman: Add a new "skip-at-start" property in Section class binman: Add support for PowerPC mpc85xx 'bootpg + resetvec' entry powerpc: mpc85xx: Select BINMAN by default powerpc: mpc85xx: Use binman to embed dtb inside U-Boot powerpc: dts: Add u-boot.dtsi to use binman for MPC85xx boards powerpc: dts: Enable device tree support for T2080QDS Makefile | 23 +++++++- arch/powerpc/Kconfig | 1 + arch/powerpc/cpu/mpc85xx/Kconfig | 4 ++ arch/powerpc/cpu/mpc85xx/u-boot-nand.lds | 1 + arch/powerpc/cpu/mpc85xx/u-boot-nand_spl.lds | 1 + arch/powerpc/cpu/mpc85xx/u-boot-spl.lds | 1 + arch/powerpc/cpu/mpc85xx/u-boot.lds | 1 + arch/powerpc/dts/Makefile | 14 +++++ arch/powerpc/dts/e6500_power_isa.dtsi | 39 ++++++++++++++ arch/powerpc/dts/t2080.dtsi | 62 ++++++++++++++++++++++ arch/powerpc/dts/t2080qds.dts | 17 ++++++ arch/powerpc/dts/u-boot.dtsi | 32 +++++++++++ board/freescale/t208xqds/README | 19 +++++++ configs/T2080QDS_NAND_defconfig | 3 +- configs/T2080QDS_SDCARD_defconfig | 3 +- configs/T2080QDS_SPIFLASH_defconfig | 3 +- configs/T2080QDS_defconfig | 4 +- dts/Makefile | 2 +- tools/binman/README | 9 ++++ tools/binman/README.entries | 14 ++++- tools/binman/bsection.py | 15 ++++-- .../etype/powerpc_mpc85xx_bootpg_resetvec.py | 25 +++++++++ tools/binman/ftest.py | 16 ++++++ .../test/80_4gb_and_skip_at_start_together.dts | 21 ++++++++ .../test/81_powerpc_mpc85xx_bootpg_resetvec.dts | 16 ++++++ 25 files changed, 335 insertions(+), 11 deletions(-) create mode 100644 arch/powerpc/dts/Makefile create mode 100644 arch/powerpc/dts/e6500_power_isa.dtsi create mode 100644 arch/powerpc/dts/t2080.dtsi create mode 100644 arch/powerpc/dts/t2080qds.dts create mode 100644 arch/powerpc/dts/u-boot.dtsi create mode 100644 tools/binman/etype/powerpc_mpc85xx_bootpg_resetvec.py create mode 100644 tools/binman/test/80_4gb_and_skip_at_start_together.dts create mode 100644 tools/binman/test/81_powerpc_mpc85xx_bootpg_resetvec.dts -- 2.7.4

4 21

[U-Boot] [PATCH v3 1/2] qe: Kconfig: Move CONFIG_U_QE to Kconfig
by Ran Wang 28 Sep '18

28 Sep '18

This patch moves CONFIG_U_QE to Kconfig Signed-off-by: Ran Wang <ran.wang_1(a)nxp.com> --- Change in v3: - Combine 1/3 and 2/3 patch of v2 - Remove unnecessary space in front of U-QE in drivers/qe/Kconfig - Remove CONFIG_U_QE in scripts/config_whitelist.txt Change in v2: Add more conditional define to support more platforms. drivers/Kconfig | 2 ++ drivers/qe/Kconfig | 12 ++++++++++++ include/configs/T102xQDS.h | 1 - include/configs/T102xRDB.h | 1 - include/configs/T1040QDS.h | 1 - include/configs/ls1021aqds.h | 1 - include/configs/ls1021atwr.h | 1 - include/configs/ls1043ardb.h | 7 ------- scripts/config_whitelist.txt | 1 - 9 files changed, 14 insertions(+), 13 deletions(-) create mode 100644 drivers/qe/Kconfig diff --git a/drivers/Kconfig b/drivers/Kconfig index 56536c4b19..884a945a19 100644 --- a/drivers/Kconfig +++ b/drivers/Kconfig @@ -74,6 +74,8 @@ source "drivers/power/Kconfig" source "drivers/pwm/Kconfig" +source "drivers/qe/Kconfig" + source "drivers/ram/Kconfig" source "drivers/remoteproc/Kconfig" diff --git a/drivers/qe/Kconfig b/drivers/qe/Kconfig new file mode 100644 index 0000000000..49a6e32b16 --- /dev/null +++ b/drivers/qe/Kconfig @@ -0,0 +1,12 @@ +# +# QUICC Engine Drivers +# +config U_QE + bool "Enable support for U QUICC Engine" + default y if (ARCH_LS1021A && !SD_BOOT && !NAND_BOOT && !QSPI_BOOT) \ + || (TARGET_T1024QDS) \ + || (TARGET_T1024RDB) \ + || (TARGET_T1040QDS && !NOBQFMAN) \ + || (TARGET_LS1043ARDB && !SPL_NO_QE && !NAND_BOOT && !QSPI_BOOT) + help + Choose this option to add support for U QUICC Engine. diff --git a/include/configs/T102xQDS.h b/include/configs/T102xQDS.h index 8a38c5e19c..191616b8b0 100644 --- a/include/configs/T102xQDS.h +++ b/include/configs/T102xQDS.h @@ -659,7 +659,6 @@ unsigned long get_board_ddr_clk(void); #define CONFIG_SYS_DPAA_FMAN #define CONFIG_QE -#define CONFIG_U_QE /* Default address of microcode for the Linux FMan driver */ #if defined(CONFIG_SPIFLASH) /* diff --git a/include/configs/T102xRDB.h b/include/configs/T102xRDB.h index f7a54f7a97..ac5de8d164 100644 --- a/include/configs/T102xRDB.h +++ b/include/configs/T102xRDB.h @@ -669,7 +669,6 @@ unsigned long get_board_ddr_clk(void); #ifdef CONFIG_TARGET_T1024RDB #define CONFIG_QE -#define CONFIG_U_QE #endif /* Default address of microcode for the Linux FMan driver */ #if defined(CONFIG_SPIFLASH) diff --git a/include/configs/T1040QDS.h b/include/configs/T1040QDS.h index e890860b7e..25615be40e 100644 --- a/include/configs/T1040QDS.h +++ b/include/configs/T1040QDS.h @@ -549,7 +549,6 @@ unsigned long get_board_ddr_clk(void); #define CONFIG_SYS_DPAA_PME #define CONFIG_QE -#define CONFIG_U_QE /* Default address of microcode for the Linux Fman driver */ #if defined(CONFIG_SPIFLASH) /* diff --git a/include/configs/ls1021aqds.h b/include/configs/ls1021aqds.h index 994e6ca362..7f7ffdede1 100644 --- a/include/configs/ls1021aqds.h +++ b/include/configs/ls1021aqds.h @@ -107,7 +107,6 @@ unsigned long get_board_ddr_clk(void); #if !defined(CONFIG_SD_BOOT) && !defined(CONFIG_NAND_BOOT) && \ !defined(CONFIG_QSPI_BOOT) -#define CONFIG_U_QE #define CONFIG_SYS_QE_FMAN_FW_IN_NOR #endif diff --git a/include/configs/ls1021atwr.h b/include/configs/ls1021atwr.h index 75b2e2fbbd..ddd024e8c0 100644 --- a/include/configs/ls1021atwr.h +++ b/include/configs/ls1021atwr.h @@ -106,7 +106,6 @@ #if !defined(CONFIG_SD_BOOT) && !defined(CONFIG_NAND_BOOT) && \ !defined(CONFIG_QSPI_BOOT) -#define CONFIG_U_QE #define CONFIG_SYS_QE_FMAN_FW_IN_NOR #endif diff --git a/include/configs/ls1043ardb.h b/include/configs/ls1043ardb.h index bc639e586f..ffd92dbb43 100644 --- a/include/configs/ls1043ardb.h +++ b/include/configs/ls1043ardb.h @@ -268,13 +268,6 @@ #endif #endif -/* QE */ -#ifndef SPL_NO_QE -#if !defined(CONFIG_NAND_BOOT) && !defined(CONFIG_QSPI_BOOT) -#define CONFIG_U_QE -#endif -#endif - /* SATA */ #ifndef SPL_NO_SATA #ifndef CONFIG_CMD_EXT2 diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt index 94953d8738..cf97b64296 100644 --- a/scripts/config_whitelist.txt +++ b/scripts/config_whitelist.txt @@ -4635,7 +4635,6 @@ CONFIG_USE_SPIFLASH CONFIG_UTBIPAR_INIT_TBIPA CONFIG_U_BOOT_HDR_ADDR CONFIG_U_BOOT_HDR_SIZE -CONFIG_U_QE CONFIG_VAL CONFIG_VAR_SIZE_SPL CONFIG_VCT_NOR -- 2.17.1

2 4

[U-Boot] [v3 patch] net: fman: Support both new and legacy FMan Compatibles
by Zhao Qiang 28 Sep '18

28 Sep '18

Recently the FMan Port and MAC compatibles were changed. This patch aligns the FMan Port and MAC compatibles to the new FMan device tree binding document. The FMan device tree binding document can be found in the Linux kernel: version 3.18.0 commit 297d35fd2a7d3fbd4e5c0f0c1c18213117ba11ba ./Documentation/devicetree/bindings/powerpc/fsl/fman.txt This patch doesn't affect legacy compatibles support. Signed-off-by: Zhao Qiang <qiang.zhao(a)nxp.com> --- Changes for v2 - add kernel version and commit id modifing the binding Changes for v3 - put "fsl,fman-xgec" before "fsl,fman-tgec" - because it use the former in latest kernel version drivers/net/fm/init.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/drivers/net/fm/init.c b/drivers/net/fm/init.c index 147d043..f896e80 100644 --- a/drivers/net/fm/init.c +++ b/drivers/net/fm/init.c @@ -328,7 +328,8 @@ void fdt_fixup_fman_ethernet(void *blob) ft_fixup_port(blob, &fm_info[i], "fsl,fman-1g-mac"); } else { - if (ft_fixup_port(blob, &fm_info[i], "fsl,fman-tgec")) + if (ft_fixup_port(blob, &fm_info[i], "fsl,fman-xgec") && + ft_fixup_port(blob, &fm_info[i], "fsl,fman-tgec")) ft_fixup_port(blob, &fm_info[i], "fsl,fman-10g-mac"); } -- 1.7.1

3 3

[U-Boot] [PATCH] ls2080ardb: remove dhcp function from env as boot source
by Priyanka Jain 28 Sep '18

28 Sep '18

Signed-off-by: Priyanka Jain <priyanka.jain(a)nxp.com> --- include/configs/ls2080ardb.h | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/include/configs/ls2080ardb.h b/include/configs/ls2080ardb.h index 3d53a69..05c02df 100644 --- a/include/configs/ls2080ardb.h +++ b/include/configs/ls2080ardb.h @@ -323,8 +323,7 @@ unsigned long get_board_sys_clk(void); #define BOOT_TARGET_DEVICES(func) \ func(USB, usb, 0) \ func(MMC, mmc, 0) \ - func(SCSI, scsi, 0) \ - func(DHCP, dhcp, na) + func(SCSI, scsi, 0) #include <config_distro_bootcmd.h> #ifdef CONFIG_QSPI_BOOT -- 2.7.4

2 1

[U-Boot] [PATCH] ls1088a: remove dhcp function from u-boot env as boot source
by Pramod Kumar 28 Sep '18

28 Sep '18

Signed-off-by: Pramod Kumar <pramod.kumar_1(a)nxp.com> --- include/configs/ls1088ardb.h | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/include/configs/ls1088ardb.h b/include/configs/ls1088ardb.h index eb220bf6e9..363154a40b 100644 --- a/include/configs/ls1088ardb.h +++ b/include/configs/ls1088ardb.h @@ -455,8 +455,7 @@ #define BOOT_TARGET_DEVICES(func) \ func(MMC, mmc, 0) \ - func(SCSI, scsi, 0) \ - func(DHCP, dhcp, na) + func(SCSI, scsi, 0) #include <config_distro_bootcmd.h> #endif -- 2.17.1

2 1

[U-Boot] [PATCH] ls1012a: remove debug info from u-boot log.
by Pramod Kumar 28 Sep '18

28 Sep '18

Signed-off-by: Pramod Kumar <pramod.kumar_1(a)nxp.com> --- drivers/net/pfe_eth/pfe_mdio.c | 1 - 1 file changed, 1 deletion(-) diff --git a/drivers/net/pfe_eth/pfe_mdio.c b/drivers/net/pfe_eth/pfe_mdio.c index b53edb741f..2dde9e7ac8 100644 --- a/drivers/net/pfe_eth/pfe_mdio.c +++ b/drivers/net/pfe_eth/pfe_mdio.c @@ -162,7 +162,6 @@ static void pfe_configure_serdes(struct pfe_eth_dev *priv) if (gem->phy_mode == PHY_INTERFACE_MODE_SGMII_2500) sgmii_2500 = 1; - printf("%s %d\n", __func__, priv->gemac_port); /* PCS configuration done with corresponding GEMAC */ bus.priv = gem_info[priv->gemac_port].gemac_base; -- 2.17.1

2 1