May 2018 - U-Boot

[U-Boot] [PATCH 01/12] ARM: socfpga: Sync A10 clock manager binding parser
by Marek Vasut 18 May '18

18 May '18

The A10 clock manager parsed DT bindings generated by Quartus the bsp-editor to configure the A10 clocks. Sadly, those DT bindings changed at some point. The clock manager patch used the old ones, this patch replaces the bindings parser with one for the new set. 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> --- arch/arm/mach-socfpga/clock_manager_arria10.c | 158 ++++++++++++++------- .../include/mach/clock_manager_arria10.h | 2 +- 2 files changed, 111 insertions(+), 49 deletions(-) diff --git a/arch/arm/mach-socfpga/clock_manager_arria10.c b/arch/arm/mach-socfpga/clock_manager_arria10.c index 4ee6a82b5f..defa2f6261 100644 --- a/arch/arm/mach-socfpga/clock_manager_arria10.c +++ b/arch/arm/mach-socfpga/clock_manager_arria10.c @@ -9,6 +9,9 @@ #include <dm.h> #include <asm/arch/clock_manager.h> +static const struct socfpga_clock_manager *clock_manager_base = + (struct socfpga_clock_manager *)SOCFPGA_CLKMGR_ADDRESS; + static u32 eosc1_hz; static u32 cb_intosc_hz; static u32 f2s_free_hz; @@ -64,89 +67,150 @@ struct perpll_cfg { u32 cntr8clk_cnt; u32 cntr8clk_src; u32 cntr9clk_cnt; + u32 cntr9clk_src; u32 emacctl_emac0sel; u32 emacctl_emac1sel; u32 emacctl_emac2sel; u32 gpiodiv_gpiodbclk; }; -struct alteragrp_cfg { - u32 nocclk; - u32 mpuclk; +struct strtou32 { + const char *str; + const u32 val; }; -static const struct socfpga_clock_manager *clock_manager_base = - (struct socfpga_clock_manager *)SOCFPGA_CLKMGR_ADDRESS; +static const struct strtou32 mainpll_cfg_tab[] = { + { "vco0-psrc", offsetof(struct mainpll_cfg, vco0_psrc) }, + { "vco1-denom", offsetof(struct mainpll_cfg, vco1_denom) }, + { "vco1-numer", offsetof(struct mainpll_cfg, vco1_numer) }, + { "mpuclk-cnt", offsetof(struct mainpll_cfg, mpuclk_cnt) }, + { "mpuclk-src", offsetof(struct mainpll_cfg, mpuclk_src) }, + { "nocclk-cnt", offsetof(struct mainpll_cfg, nocclk_cnt) }, + { "nocclk-src", offsetof(struct mainpll_cfg, nocclk_src) }, + { "cntr2clk-cnt", offsetof(struct mainpll_cfg, cntr2clk_cnt) }, + { "cntr3clk-cnt", offsetof(struct mainpll_cfg, cntr3clk_cnt) }, + { "cntr4clk-cnt", offsetof(struct mainpll_cfg, cntr4clk_cnt) }, + { "cntr5clk-cnt", offsetof(struct mainpll_cfg, cntr5clk_cnt) }, + { "cntr6clk-cnt", offsetof(struct mainpll_cfg, cntr6clk_cnt) }, + { "cntr7clk-cnt", offsetof(struct mainpll_cfg, cntr7clk_cnt) }, + { "cntr7clk-src", offsetof(struct mainpll_cfg, cntr7clk_src) }, + { "cntr8clk-cnt", offsetof(struct mainpll_cfg, cntr8clk_cnt) }, + { "cntr9clk-cnt", offsetof(struct mainpll_cfg, cntr9clk_cnt) }, + { "cntr9clk-src", offsetof(struct mainpll_cfg, cntr9clk_src) }, + { "cntr15clk-cnt", offsetof(struct mainpll_cfg, cntr15clk_cnt) }, + { "nocdiv-l4mainclk", offsetof(struct mainpll_cfg, nocdiv_l4mainclk) }, + { "nocdiv-l4mpclk", offsetof(struct mainpll_cfg, nocdiv_l4mpclk) }, + { "nocdiv-l4spclk", offsetof(struct mainpll_cfg, nocdiv_l4spclk) }, + { "nocdiv-csatclk", offsetof(struct mainpll_cfg, nocdiv_csatclk) }, + { "nocdiv-cstraceclk", offsetof(struct mainpll_cfg, nocdiv_cstraceclk) }, + { "nocdiv-cspdbgclk", offsetof(struct mainpll_cfg, nocdiv_cspdbclk) }, +}; + +static const struct strtou32 perpll_cfg_tab[] = { + { "vco0-psrc", offsetof(struct perpll_cfg, vco0_psrc) }, + { "vco1-denom", offsetof(struct perpll_cfg, vco1_denom) }, + { "vco1-numer", offsetof(struct perpll_cfg, vco1_numer) }, + { "cntr2clk-cnt", offsetof(struct perpll_cfg, cntr2clk_cnt) }, + { "cntr2clk-src", offsetof(struct perpll_cfg, cntr2clk_src) }, + { "cntr3clk-cnt", offsetof(struct perpll_cfg, cntr3clk_cnt) }, + { "cntr3clk-src", offsetof(struct perpll_cfg, cntr3clk_src) }, + { "cntr4clk-cnt", offsetof(struct perpll_cfg, cntr4clk_cnt) }, + { "cntr4clk-src", offsetof(struct perpll_cfg, cntr4clk_src) }, + { "cntr5clk-cnt", offsetof(struct perpll_cfg, cntr5clk_cnt) }, + { "cntr5clk-src", offsetof(struct perpll_cfg, cntr5clk_src) }, + { "cntr6clk-cnt", offsetof(struct perpll_cfg, cntr6clk_cnt) }, + { "cntr6clk-src", offsetof(struct perpll_cfg, cntr6clk_src) }, + { "cntr7clk-cnt", offsetof(struct perpll_cfg, cntr7clk_cnt) }, + { "cntr8clk-cnt", offsetof(struct perpll_cfg, cntr8clk_cnt) }, + { "cntr8clk-src", offsetof(struct perpll_cfg, cntr8clk_src) }, + { "cntr9clk-cnt", offsetof(struct perpll_cfg, cntr9clk_cnt) }, + { "emacctl-emac0sel", offsetof(struct perpll_cfg, emacctl_emac0sel) }, + { "emacctl-emac1sel", offsetof(struct perpll_cfg, emacctl_emac1sel) }, + { "emacctl-emac2sel", offsetof(struct perpll_cfg, emacctl_emac2sel) }, + { "gpiodiv-gpiodbclk", offsetof(struct perpll_cfg, gpiodiv_gpiodbclk) }, +}; + +static const struct strtou32 alteragrp_cfg_tab[] = { + { "nocclk", offsetof(struct mainpll_cfg, nocclk) }, + { "mpuclk", offsetof(struct mainpll_cfg, mpuclk) }, +}; + +struct strtopu32 { + const char *str; + u32 *p; +}; + +const struct strtopu32 dt_to_val[] = { + { "/clocks/altera_arria10_hps_eosc1", &eosc1_hz}, + { "/clocks/altera_arria10_hps_cb_intosc_ls", &cb_intosc_hz}, + { "/clocks/altera_arria10_hps_f2h_free", &f2s_free_hz}, +}; -static int of_to_struct(const void *blob, int node, int cfg_len, void *cfg) +static int of_to_struct(const void *blob, int node, const struct strtou32 *cfg_tab, + int cfg_tab_len, void *cfg) { - if (fdtdec_get_int_array(blob, node, "altr,of_reg_value", - (u32 *)cfg, cfg_len)) { - /* could not find required property */ - return -EINVAL; + int i; + u32 val; + + for (i = 0; i < cfg_tab_len; i++) { + if (fdtdec_get_int_array(blob, node, cfg_tab[i].str, &val, 1)) { + /* could not find required property */ + return -EINVAL; + } + *(u32 *)(cfg + cfg_tab[i].val) = val; } return 0; } -static int of_get_input_clks(const void *blob, int node, u32 *val) +static void of_get_input_clks(const void *blob) { - *val = fdtdec_get_uint(blob, node, "clock-frequency", 0); - if (!*val) - return -EINVAL; + int node, i; - return 0; + for (i = 0; i < ARRAY_SIZE(dt_to_val); i++) { + node = fdt_path_offset(blob, dt_to_val[i].str); + + if (node < 0) + continue; + + fdtdec_get_int_array(blob, node, "clock-frequency", + dt_to_val[i].p, 1); + } } static int of_get_clk_cfg(const void *blob, struct mainpll_cfg *main_cfg, - struct perpll_cfg *per_cfg, - struct alteragrp_cfg *altrgrp_cfg) + struct perpll_cfg *per_cfg) { int node, child, len; const char *node_name; - node = fdtdec_next_compatible(blob, 0, COMPAT_ALTERA_SOCFPGA_CLK); + of_get_input_clks(blob); + + node = fdtdec_next_compatible(blob, 0, COMPAT_ALTERA_SOCFPGA_CLK_INIT); + if (node < 0) return -EINVAL; child = fdt_first_subnode(blob, node); - if (child < 0) - return -EINVAL; - child = fdt_first_subnode(blob, child); if (child < 0) return -EINVAL; node_name = fdt_get_name(blob, child, &len); while (node_name) { - if (!strcmp(node_name, "osc1")) { - if (of_get_input_clks(blob, child, &eosc1_hz)) + if (!strcmp(node_name, "mainpll")) { + if (of_to_struct(blob, child, mainpll_cfg_tab, + ARRAY_SIZE(mainpll_cfg_tab), main_cfg)) return -EINVAL; - } else if (!strcmp(node_name, "cb_intosc_ls_clk")) { - if (of_get_input_clks(blob, child, &cb_intosc_hz)) + } else if (!strcmp(node_name, "perpll")) { + if (of_to_struct(blob, child, perpll_cfg_tab, + ARRAY_SIZE(perpll_cfg_tab), per_cfg)) return -EINVAL; - } else if (!strcmp(node_name, "f2s_free_clk")) { - if (of_get_input_clks(blob, child, &f2s_free_hz)) + } else if (!strcmp(node_name, "alteragrp")) { + if (of_to_struct(blob, child, alteragrp_cfg_tab, + ARRAY_SIZE(alteragrp_cfg_tab), main_cfg)) return -EINVAL; - } else if (!strcmp(node_name, "main_pll")) { - if (of_to_struct(blob, child, - sizeof(*main_cfg)/sizeof(u32), - main_cfg)) - return -EINVAL; - } else if (!strcmp(node_name, "periph_pll")) { - if (of_to_struct(blob, child, - sizeof(*per_cfg)/sizeof(u32), - per_cfg)) - return -EINVAL; - } else if (!strcmp(node_name, "altera")) { - if (of_to_struct(blob, child, - sizeof(*altrgrp_cfg)/sizeof(u32), - altrgrp_cfg)) - return -EINVAL; - - main_cfg->mpuclk = altrgrp_cfg->mpuclk; - main_cfg->nocclk = altrgrp_cfg->nocclk; } child = fdt_next_subnode(blob, child); @@ -878,15 +942,13 @@ int cm_basic_init(const void *blob) { struct mainpll_cfg main_cfg; struct perpll_cfg per_cfg; - struct alteragrp_cfg altrgrp_cfg; int rval; /* initialize to zero for use case of optional node */ memset(&main_cfg, 0, sizeof(main_cfg)); memset(&per_cfg, 0, sizeof(per_cfg)); - memset(&altrgrp_cfg, 0, sizeof(altrgrp_cfg)); - rval = of_get_clk_cfg(blob, &main_cfg, &per_cfg, &altrgrp_cfg); + rval = of_get_clk_cfg(blob, &main_cfg, &per_cfg); if (rval) return rval; diff --git a/arch/arm/mach-socfpga/include/mach/clock_manager_arria10.h b/arch/arm/mach-socfpga/include/mach/clock_manager_arria10.h index a3289ee2da..cb2306e5bc 100644 --- a/arch/arm/mach-socfpga/include/mach/clock_manager_arria10.h +++ b/arch/arm/mach-socfpga/include/mach/clock_manager_arria10.h @@ -107,7 +107,7 @@ unsigned int cm_get_spi_controller_clk_hz(void); #define CLKMGR_ALTERAGRP_MPU_CLK_OFFSET 0x140 #define CLKMGR_MAINPLL_NOC_CLK_OFFSET 0x144 -#define LOCKED_MASK (CLKMGR_CLKMGR_STAT_MAINPLLLOCKED_SET_MSK | \ +#define LOCKED_MASK (CLKMGR_CLKMGR_STAT_MAINPLLLOCKED_SET_MSK | \ CLKMGR_CLKMGR_STAT_PERPLLLOCKED_SET_MSK) /* value */ -- 2.16.2

3 24

[U-Boot] [PATCH v2] arm64: zynqmp: Show reset reason
by Michal Simek 18 May '18

18 May '18

Read reset reason reg and show it in log and also save it as variable. Clearing reset reason when it is read to show only one status Signed-off-by: Michal Simek <michal.simek(a)xilinx.com> --- Changes in v2: - Clear stats after read - Remove print argument - Sync table order to fit with macros arch/arm/include/asm/arch-zynqmp/hardware.h | 12 +++++- board/xilinx/zynqmp/zynqmp.c | 43 +++++++++++++++++++++ 2 files changed, 54 insertions(+), 1 deletion(-) diff --git a/arch/arm/include/asm/arch-zynqmp/hardware.h b/arch/arm/include/asm/arch-zynqmp/hardware.h index 3f1f9498e356..7961a247e196 100644 --- a/arch/arm/include/asm/arch-zynqmp/hardware.h +++ b/arch/arm/include/asm/arch-zynqmp/hardware.h @@ -33,6 +33,14 @@ #define PS_MODE2 BIT(2) #define PS_MODE3 BIT(3) +#define RESET_REASON_DEBUG_SYS BIT(6) +#define RESET_REASON_SOFT BIT(5) +#define RESET_REASON_SRST BIT(4) +#define RESET_REASON_PSONLY BIT(3) +#define RESET_REASON_PMU BIT(2) +#define RESET_REASON_INTERNAL BIT(1) +#define RESET_REASON_EXTERNAL BIT(0) + struct crlapb_regs { u32 reserved0[36]; u32 cpu_r5_ctrl; /* 0x90 */ @@ -40,7 +48,9 @@ struct crlapb_regs { u32 timestamp_ref_ctrl; /* 0x128 */ u32 reserved2[53]; u32 boot_mode; /* 0x200 */ - u32 reserved3[14]; + u32 reserved3_0[7]; + u32 reset_reason; /* 0x220 */ + u32 reserved3_1[6]; u32 rst_lpd_top; /* 0x23C */ u32 reserved4[4]; u32 boot_pin_ctrl; /* 0x250 */ diff --git a/board/xilinx/zynqmp/zynqmp.c b/board/xilinx/zynqmp/zynqmp.c index 551921b888a0..f909c663357d 100644 --- a/board/xilinx/zynqmp/zynqmp.c +++ b/board/xilinx/zynqmp/zynqmp.c @@ -476,6 +476,47 @@ static int create_mmc_boot_commands(void) return 0; } +static const struct { + u32 bit; + const char *name; +} reset_reasons[] = { + { RESET_REASON_DEBUG_SYS, "DEBUG" }, + { RESET_REASON_SOFT, "SOFT" }, + { RESET_REASON_SRST, "SRST" }, + { RESET_REASON_PSONLY, "PS-ONLY" }, + { RESET_REASON_PMU, "PMU" }, + { RESET_REASON_INTERNAL, "INTERNAL" }, + { RESET_REASON_EXTERNAL, "EXTERNAL" }, + {} +}; + +static u32 reset_reason(void) +{ + u32 ret; + int i; + const char *reason = NULL; + + ret = readl(&crlapb_base->reset_reason); + + puts("Reset reason:\t"); + + for (i = 0; i < ARRAY_SIZE(reset_reasons); i++) { + if (ret & reset_reasons[i].bit) { + reason = reset_reasons[i].name; + printf("%s ", reset_reasons[i].name); + break; + } + } + + puts("\n"); + + env_set("reset_reason", reason); + + writel(~0, &crlapb_base->reset_reason); + + return ret; +} + int board_late_init(void) { u32 reg = 0; @@ -593,6 +634,8 @@ int board_late_init(void) env_set("boot_targets", new_targets); + reset_reason(); + return 0; } -- 2.17.0

1 0

[U-Boot] [PATCH] arm: dts: sunxi: enable Ethernet on NanoPi Neo Plus2
by Jonathan A. Kollasch 18 May '18

18 May '18

Signed-off-by: Jonathan A. Kollasch <jakllsch(a)kollasch.net> --- arch/arm/dts/sun50i-h5-nanopi-neo-plus2.dts | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/arch/arm/dts/sun50i-h5-nanopi-neo-plus2.dts b/arch/arm/dts/sun50i-h5-nanopi-neo-plus2.dts index f1406c224b..1dde153669 100644 --- a/arch/arm/dts/sun50i-h5-nanopi-neo-plus2.dts +++ b/arch/arm/dts/sun50i-h5-nanopi-neo-plus2.dts @@ -104,3 +104,18 @@ &usbphy { status = "okay"; }; + +&emac { + pinctrl-names = "default"; + pinctrl-0 = <&emac_rgmii_pins>; + phy-mode = "rgmii"; + phy-handle = <&ext_rgmii_phy>; + status = "okay"; +}; + +&external_mdio { + ext_rgmii_phy: ethernet-phy@7 { + compatible = "ethernet-phy-ieee802.3-c22"; + reg = <7>; + }; +}; -- 2.11.0

2 1

[U-Boot] [PATCH] pylibfdt: Add missing CC and LD to Makefile
by Marek Vasut 18 May '18

18 May '18

Add missing CC and LDSHARED variables to the Makefile to pass the correct C compiler and linker path to the build of _libfdt.so . Signed-off-by: Marek Vasut <marex(a)denx.de> Cc: Tom Rini <trini(a)konsulko.com> Cc: Masahiro Yamada <yamada.masahiro(a)socionext.com> Cc: Simon Glass <sjg(a)chromium.org> --- Note: This fixes the long standing issue when building U-Boot with OE for qemux86 or qemux86_64, where the build will try to use the host compiler, which OE will block and thus the build will crash on missing compiler/linker binary. With this patch, the OE will correctly pass in the compiler/linker generated during the build, just like it does for all the other tools. --- scripts/dtc/pylibfdt/Makefile | 1 + 1 file changed, 1 insertion(+) diff --git a/scripts/dtc/pylibfdt/Makefile b/scripts/dtc/pylibfdt/Makefile index 01d5e0ffe3..e6f6e9f633 100644 --- a/scripts/dtc/pylibfdt/Makefile +++ b/scripts/dtc/pylibfdt/Makefile @@ -15,6 +15,7 @@ PYLIBFDT_srcs = $(addprefix $(LIBFDT_srcdir)/,$(LIBFDT_SRCS)) \ quiet_cmd_pymod = PYMOD $@ cmd_pymod = unset CC; unset CROSS_COMPILE; unset CFLAGS;\ + CC="$(HOSTCC)" LDSHARED="$(HOSTCC) -shared " \ LDFLAGS="$(HOSTLDFLAGS)" \ VERSION="u-boot-$(UBOOTVERSION)" \ CPPFLAGS="$(HOSTCFLAGS) -I$(LIBFDT_srcdir)" OBJDIR=$(obj) \ -- 2.16.2

2 2

[U-Boot] IMX6 NAND booting failure
by Rasheed, Abdul 18 May '18

18 May '18

Hi, I am working on VAR-SOM-MX6 SOC. I'm trying to boot a custom SPL from NAND. After programming NAND with custom SPL, system goes to serial downloader mode. I have taken the ROM code buffer log (also attached below). It shows that authentication fails. My boot security settings are OPEN, so even though authentication fails it should handover the control to SPL, which ROM code doesn't and system goes to serial downloader mode. I was able to attach JTAG and read the registers of core and it shows that LR is 0x000B0000. Which is exactly what it should be. Because it was expected to jump to entry point. 00902190 = 00010002 000200F0 00030000 00040000 009021A0 = 00050001 00060000 00070000 000700F0 009021B0 = 00080000 00000280 000800F0 00080000 009021C0 = 00000282 00080033 00090000 000A1E33 009021D0 = 00061FFF 000C0000 00000000 00000000 009021E0 = 00000000 00000000 00000000 00000000 009021F0 = 00000000 00000000 00000000 00000000 00902200 = 00000000 00000000 00000000 00000000 00902210 = 00000000 00000000 00000000 00000000 00902220 = 00000000 00000000 00000000 00000000 00902230 = 00000000 00000000 00000000 00000000 00902240 = 00000000 00000000 00000000 00000000 00902250 = 00000000 00000000 00000000 00000000 00902260 = 00000000 00000000 00000000 00000000 00902270 = 00000000 00000000 00000000 00000000 00902280 = 00000000 00000000 00000000 00000000 00902290 = 00000000 03040103 00000409 00030101 009022A0 = 06810040 00002200 0112008C 00000200 009022B0 = 15A24000 00010054 01000201 0200060A Regards, Abdul Rasheed

2 1

[U-Boot] [PATCH 0/3] Generic file system firmware loader DM
by tien.fong.chee＠intel.com 18 May '18

18 May '18

From: Tien Fong Chee <tien.fong.chee(a)intel.com> This patchset contains generic file system loader DM which is very close to Linux firmware loader but for U-Boot framework. Generic file system firmware loader can be used load whatever into target location, and then consumer driver would use it to program whatever, ie. the FPGA. This series is working on top of u-boot-socfpga.git - http://git.denx.de/u-boot-socfpga.git . Tien Fong Chee (3): doc: Add new doc for file system firmware loader driver model doc: dtbinding: Add file system firmware loader binding document common: Generic loader for file system doc/device-tree-bindings/misc/fs_loader.txt | 48 ++++++ doc/driver-model/fs_firmware_loader.txt | 100 +++++++++++ drivers/misc/Kconfig | 11 ++ drivers/misc/Makefile | 1 + drivers/misc/fs_loader.c | 240 +++++++++++++++++++++++++++ include/dm/uclass-id.h | 1 + include/fs_loader.h | 28 +++ 7 files changed, 429 insertions(+), 0 deletions(-) create mode 100644 doc/device-tree-bindings/misc/fs_loader.txt create mode 100644 doc/driver-model/fs_firmware_loader.txt create mode 100644 drivers/misc/fs_loader.c create mode 100644 include/fs_loader.h -- 1.7.7.4

3 7

[U-Boot] [PATCH v3 0/7] i.MX6DL: Add BTicino Mamoj board support
by Jagan Teki 18 May '18

18 May '18

This series add support for BTicino i.MX6DL Mamoj board. Changes for v3: - Use imx spl inbuilt functions for ddr config instead of register writes. - rebase to master Changes for v2: - Update Kconfig changes for CONFIG_FSL_ESDHC - Add HAB support Jagan Teki (7): i.MX6: board: Add BTicino i.MX6DL Mamoj initial support i.MX6DL: mamoj: Add I2C support i.MX6DL: mamoj: Add PFUZE100 support configs: imx6dl_mamoj: Enable fastboot and ums configs: imx6dl-mamoj: Add DFU support configs: imx6dl-mamoj: Add Falcon mode support configs: imx6dl-mamoj: Enable HAB arch/arm/dts/Makefile | 1 + arch/arm/dts/imx6dl-mamoj-u-boot.dtsi | 15 +++ arch/arm/dts/imx6dl-mamoj.dts | 225 ++++++++++++++++++++++++++++++++++ arch/arm/mach-imx/mx6/Kconfig | 32 +++++ board/bticino/mamoj/Kconfig | 12 ++ board/bticino/mamoj/MAINTAINERS | 10 ++ board/bticino/mamoj/Makefile | 8 ++ board/bticino/mamoj/README | 124 +++++++++++++++++++ board/bticino/mamoj/mamoj.c | 27 ++++ board/bticino/mamoj/spl.c | 172 ++++++++++++++++++++++++++ configs/imx6dl_mamoj_defconfig | 52 ++++++++ include/configs/imx6dl-mamoj.h | 102 +++++++++++++++ 12 files changed, 780 insertions(+) create mode 100644 arch/arm/dts/imx6dl-mamoj-u-boot.dtsi create mode 100644 arch/arm/dts/imx6dl-mamoj.dts create mode 100644 board/bticino/mamoj/Kconfig create mode 100644 board/bticino/mamoj/MAINTAINERS create mode 100644 board/bticino/mamoj/Makefile create mode 100644 board/bticino/mamoj/README create mode 100644 board/bticino/mamoj/mamoj.c create mode 100644 board/bticino/mamoj/spl.c create mode 100644 configs/imx6dl_mamoj_defconfig create mode 100644 include/configs/imx6dl-mamoj.h -- 2.14.3

3 9

[U-Boot] [PATCH v5 00/16] Add fastboot UDP support
by Alex Kiernan 18 May '18

18 May '18

This series merges the fastboot UDP support from AOSP into mainline U-Boot. Changes in UDP behaviour from the AOSP code, so it follows the existing USB behaviour: - 'boot' now follows the USB code and does 'bootm CONFIG_FASTBOOT_BUF_ADDR'. I've added 'fastboot_bootcmd' which if set overrides the boot command and allows the existing UDP behaviour to be preserved. - 'continue' in UDP now exits the fastboot server rather than executing 'run bootcmd' - 'reboot-bootloader' no longer writes 'reboot-bootloader' to CONFIG_FASTBOOT_BUF_ADDR as its marker for the subsequent boot. The code which is in AOSP common/android_bootloader.c expects this marker, but we have prior art in the USB code using the weak function fastboot_set_reboot_flag - 'getvar' in the UDP path now supports fetching 'fastboot.' prefixed variables (inherited from the USB path), these override the defaults I'll post the USB migration as a separate patch. Changes in v5: - don't depend on UDP_FUNCTION_FASTBOOT until it exists - squash in subsequent patch which updates defconfigs so we don't leave users of CONFIG_FASTBOOT without it enabled - fix build in drivers/fastboot when we have CONFIG_FASTBOOT without flash or erase and we've not yet added fb_common.c to the build - fix docbook formatting - rename CONFIG_FASTBOOT_FLASH_FILLBUF_SIZE to CONFIG_IMAGE_SPARSE_FILLBUF_SIZE and migrate it to Kconfig. - make fastboot_bytes_received/expected static and add function fastboot_get_bytes_remaining() - move fastboot_buf_addr/fastboot_buf_size/fastboot_progress_callback into fastboot-internal.h - delete redundant fb_ prefixes from statics Changes in v4: - add docbook comments - leave strcmp_l1() in USB fastboot as we don't need it in UDP path - add docbook comments - guard fb_getvar/fb_command with UDP_FUNCTION_FASTBOOT in Makefile - add docbook comments - remove parameter from fastboot_boot() since we always want fastboot_buf_addr (and if we're using fastboot_bootcmd then it's ignored) - split oem format into new patch Changes in v3: - move imply ANDROID_BOOT_IMAGE, CMD_FASTBOOT to FASTBOOT from USB_FUNCTION_FASTBOOT - add depend on USB_FUNCTION_FASTBOOT to FASTBOOT_USB_DEV - leave images-sparse.c in common to acommodate 2f83f21 - refactor for changes in master - Merge subsequent patch for formatting response strings into this one - allow NULL to fastboot_okay() when there's no message to send - guard FASTBOOT_GPT_NAME/FASTBOOT_MBR_NAME with EFI/DOS_PARTITION - use FASTBOOT as our guard in Kconfig not a list of USB || UDP - correct mis-translation from AOSP introduced when cleaning up for checkpatch - we should write when buffer is not NULL, rather than erasing, and erase when buffer is NULL - use CMD_RET_USAGE from do_fastboot - remove do_fastboot_udp from cmd/net.c and rewrite using net_loop() - rename timed_send_info to fastboot_send_info, rename fastboot_send_info to fastboot_udp_send_info - replace FASTBOOT_HEADER_SIZE with sizeof(struct fastboot_header) - move start time into timed_send_info() rather than passing it in - make calls to fastboot_udp_send_info a runtime dependency, not a compile time one - set ${filesize} to size of downloaded image - add progress meter from USB path during download - add support for 'oem format' command from the USB path - rename 'fastbootcmd' to 'fastboot_bootcmd' to make clear that this is the fastboot boot command - make getvar implementation table driven - add fastboot_buf_addr, fastboot_buf_size to override buffer address and size - return correct filesystem type in getvar partition-type on MMC - process "fastboot." prefixed env variables in getvar first so you can override the normal values (this also lets you set a fs type for NAND devices) - squash subsequent patches which change this code into this one: - If the fastboot flash/erase commands are disabled, remove that support so we still build correctly. - Add NAND support to fastboot UDP flash/erase commands - If we don't have a partition name passed, report it as not found. - Change the behaviour of the fastboot net code such that "reboot-bootloader" is no longer written to CONFIG_FASTBOOT_BUF_ADDR for use as a marker on reboot (the AOSP code in common/android-bootloader.c uses this marker - this code could be reinstated there if that gets merged). - Merge USB and UDP boot code. The USB implementation stays the same, but UDP no longer passes an fdt. We introduce a new environment variable 'fastboot_bootcmd' which if set overrides the hardcoded boot command, setting this then allows the UDP implementation to remain the same. If after running 'fastboot_bootcmd' the board has not booted, control is returned to U-Boot and the fastboot process ends. - Separate the fastboot protocol handling from the fastboot UDP code in preparation for reusing it in the USB code. Changes in v2: - ensure fastboot syntax is backward compatible - 'fastboot 0' means 'fastboot usb 0' Alex Kiernan (16): fastboot: Move fastboot to drivers/fastboot fastboot: Refactor fastboot_okay/fail to take response fastboot: Extract fastboot_okay/fail to fb_common.c fastboot: Correct dependencies in FASTBOOT_FLASH fastboot: Add missing newlines fastboot: Remove FIXME for CONFIG_FASTBOOT_...NAME fastboot: Fix parameter types in _fb_nand_write fastboot: Rename fb_set_reboot_flag to fastboot_set_reboot_flag fastboot: Extract common definitions from USB fastboot fastboot: Rename public fb_ functions to fastboot_ ti: fastboot: Move weak overrides to board files fs: Add fs_get_type_name to return current filesystem name fastboot: Migrate FASTBOOT_FLASH_NAND_TRIMFFS to Kconfig mmc: Separate "mmc swrite" from fastboot net: fastboot: Merge AOSP UDP fastboot fastboot: Add support for 'oem format' command arch/arm/Kconfig | 2 - arch/arm/mach-omap2/boot-common.c | 10 - arch/arm/mach-omap2/utils.c | 4 +- arch/arm/mach-rockchip/rk3128-board.c | 4 +- arch/arm/mach-rockchip/rk322x-board.c | 4 +- board/amazon/kc1/kc1.c | 2 +- board/lg/sniper/sniper.c | 2 +- board/ti/am57xx/board.c | 10 + board/ti/common/Kconfig | 1 - board/ti/dra7xx/evm.c | 10 + cmd/Kconfig | 22 +- cmd/fastboot.c | 91 ++++++- cmd/mmc.c | 14 +- common/Makefile | 14 - configs/am335x_boneblack_defconfig | 2 +- configs/am335x_boneblack_vboot_defconfig | 2 +- configs/am335x_evm_defconfig | 2 +- configs/am335x_evm_nor_defconfig | 2 +- configs/am335x_evm_norboot_defconfig | 2 +- configs/am335x_evm_spiboot_defconfig | 2 +- configs/am335x_evm_usbspl_defconfig | 2 +- configs/am57xx_evm_defconfig | 2 +- configs/am57xx_hs_evm_defconfig | 2 +- configs/bcm23550_w1d_defconfig | 2 +- configs/bcm28155_ap_defconfig | 2 +- configs/birdland_bav335a_defconfig | 2 +- configs/birdland_bav335b_defconfig | 2 +- configs/cgtqmx6eval_defconfig | 2 +- configs/dra7xx_evm_defconfig | 2 +- configs/dra7xx_hs_evm_defconfig | 2 +- configs/kc1_defconfig | 2 +- configs/mx6qsabrelite_defconfig | 2 +- configs/mx6sabresd_defconfig | 2 +- configs/nitrogen6dl2g_defconfig | 2 +- configs/nitrogen6dl_defconfig | 2 +- configs/nitrogen6q2g_defconfig | 2 +- configs/nitrogen6q_defconfig | 2 +- configs/nitrogen6s1g_defconfig | 2 +- configs/nitrogen6s_defconfig | 2 +- configs/omap3_beagle_defconfig | 2 +- configs/omap3_evm_defconfig | 2 +- configs/omap3_logic_defconfig | 2 +- configs/sniper_defconfig | 2 +- configs/stih410-b2260_defconfig | 2 +- configs/xilinx_zynqmp_zc1751_xm015_dc1_defconfig | 2 +- configs/xilinx_zynqmp_zc1751_xm016_dc2_defconfig | 2 +- configs/xilinx_zynqmp_zcu102_rev1_0_defconfig | 2 +- configs/xilinx_zynqmp_zcu102_revA_defconfig | 2 +- configs/xilinx_zynqmp_zcu102_revB_defconfig | 2 +- configs/xilinx_zynqmp_zcu106_revA_defconfig | 2 +- drivers/Kconfig | 2 + drivers/Makefile | 1 + {cmd => drivers}/fastboot/Kconfig | 59 ++-- drivers/fastboot/Makefile | 7 + drivers/fastboot/fb_command.c | 328 +++++++++++++++++++++++ drivers/fastboot/fb_common.c | 169 ++++++++++++ drivers/fastboot/fb_getvar.c | 230 ++++++++++++++++ {common => drivers/fastboot}/fb_mmc.c | 194 +++++++++----- {common => drivers/fastboot}/fb_nand.c | 48 ++-- drivers/usb/gadget/f_fastboot.c | 61 ++--- fs/fs.c | 13 + include/fastboot-internal.h | 36 +++ include/fastboot.h | 130 ++++++++- include/fb_mmc.h | 12 +- include/fb_nand.h | 14 +- include/fs.h | 10 + include/image-sparse.h | 4 +- include/net.h | 2 +- include/net/fastboot.h | 21 ++ lib/Kconfig | 11 + lib/Makefile | 1 + {common => lib}/image-sparse.c | 38 +-- net/Makefile | 1 + net/fastboot.c | 312 +++++++++++++++++++++ net/net.c | 7 + scripts/config_whitelist.txt | 2 - 76 files changed, 1704 insertions(+), 271 deletions(-) rename {cmd => drivers}/fastboot/Kconfig (79%) create mode 100644 drivers/fastboot/Makefile create mode 100644 drivers/fastboot/fb_command.c create mode 100644 drivers/fastboot/fb_common.c create mode 100644 drivers/fastboot/fb_getvar.c rename {common => drivers/fastboot}/fb_mmc.c (65%) rename {common => drivers/fastboot}/fb_nand.c (79%) create mode 100644 include/fastboot-internal.h create mode 100644 include/net/fastboot.h rename {common => lib}/image-sparse.c (88%) create mode 100644 net/fastboot.c -- 2.7.4

3 19

Re: [U-Boot] [PULL] Please pull u-boot-imx
by Stefano Babic 17 May '18

17 May '18

On 17/05/2018 18:33, Lukasz Majewski wrote: > Hi Stefano, Tom, > Tom was not in CC, added > On 17 May 2018 17:50, Stefano Babic <sbabic(a)denx.de> wrote: > > Hi Tom, > > please pull from u-boot-imx, thanks ! > > The following changes since commit > f2d0f5e7ab3b8a7b4bf6e2ac499b4867c701d52d: > > ARM: re-enable MVGBE for edminiv2 (2018-05-16 11:38:08 -0400) > > are available in the git repository at: > > git://www.denx.de/git/u-boot-imx.git master > > for you to fetch changes up to 2f5988533d5c447d7bda79b0d9719f84db9e1835: > > imx6: sabrelite: update defconfig to use distro defaults (2018-05-17 > 17:47:17 +0200) > > ---------------------------------------------------------------- > Guillaume GARDET (2): > imx6: Convert sabrelite and nitrogen6x boards to distro boot > support > imx6: sabrelite: update defconfig to use distro defaults > > Ian Ray (6): > board: ge: bx50v3: add winbond SPI NOR support > board: ge: bx50v3: rename detect_baseboard function > board: ge: bx50v3: fix display support for b{46}50v3 > board: ge: bx50v3: use VPD instead of compile-time checks > board: ge: bx50v3: configure video arguments using VPD > board: ge: bx50v3: remove redundant targets > > Lukasz Majewski (8): > dts: imx53: Add gpio and i2c nodes to imx53.dtsi file > dts: pinctrl: Provide IMX_PAD_SION definition for imx53 pinctrl > > > Two above patches are correct. > > pmic: fsl: Provide some more definitions for MC34708 PMIC > pmic: fsl: Define number of bytes sent at once by MC34708 PMIC > pmic: dm: Provide *trans_len() callback for pmic-uclass > pmic: dm: Rewrite pmic_reg_{read|write} and pmic_clrsetbits to > support transmissions larger than 1 byte > pmic: dm: Add support for MC34708 for PMIC DM > arm: imx53: Add support for imx53 boards from K+P > > > Stefano, Tom please drop above patches as they were superseded by v2 and > v3 (after discussion with Simon). I have just added the pmic patches due to the dependency in "arm: imx53: Add support for imx53 boards from K+P", and I have not seen any change request in them. I drop the series, Tom please wait, I will send a new PR after. > > IMHO v3 is eligible for pulling: > https://patchwork.ozlabs.org/patch/913670/ > Should they flow into Jaehoon's tree instead of u-boot-imx ? Best regards, Stefano > BR, > Łukasz Majewski > > Magnus Lilja (2): > mx31pdk: Convert CONFIG_MX31 flag to use Kconfig. > mx31: Convert MX31_HCLK_FREQ and MX31_CLK32 to Kconfig. > > Nandor Han (2): > board: ge: bx50v3: unify two switch statements > board: ge: bx50v3: detect the monitor type by reading VPD earlier > > Peter Robinson (4): > mx6 common: remove dangling comment > mx7: remove empty ifndef statement > mx6: Select CONFIG_MP with MX6_SMP > mx6: remove duplicated BOUNCE_BUFFER defines > > Sebastian Reichel (1): > ge: ppd: move CONFIG_ENV_IS_IN_MMC to defconfig > > arch/arm/Kconfig | 14 +++---- > arch/arm/dts/imx53-kp.dts | 135 > ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ > arch/arm/dts/imx53-pinfunc.h | 1 + > arch/arm/dts/imx53.dtsi | 101 > +++++++++++++++++++++++++++++++++++++++++++++++- > arch/arm/include/asm/arch-mx31/clock.h | 8 ---- > arch/arm/mach-imx/mx3/Kconfig | 34 > +++++++++++++++++ > arch/arm/mach-imx/mx5/Kconfig | 12 ++++++ > arch/arm/mach-imx/mx6/Kconfig | 15 ++------ > board/ge/bx50v3/Kconfig | 2 +- > board/ge/bx50v3/bx50v3.c | 71 > ++++++++++++++++++++++------------ > board/k+p/kp_imx53/Kconfig | 15 ++++++++ > board/k+p/kp_imx53/MAINTAINERS | 6 +++ > board/k+p/kp_imx53/Makefile | 8 ++++ > board/k+p/kp_imx53/kp_id_rev.c | 121 > ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ > board/k+p/kp_imx53/kp_id_rev.h | 28 > ++++++++++++++ > board/k+p/kp_imx53/kp_imx53.c | 212 > +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ > configs/ge_b650v3_defconfig | 43 > --------------------- > configs/ge_b850v3_defconfig | 43 > --------------------- > configs/{ge_b450v3_defconfig => ge_bx50v3_defconfig} | 4 +- > configs/kp_imx53_defconfig | 40 > +++++++++++++++++++ > configs/mx31pdk_defconfig | 3 +- > configs/mx53ppd_defconfig | 1 + > configs/mx6qsabrelite_defconfig | 15 +++----- > drivers/power/pmic/Kconfig | 7 ++++ > drivers/power/pmic/Makefile | 1 + > drivers/power/pmic/mc34708.c | 103 > +++++++++++++++++++++++++++++++++++++++++++++++++ > drivers/power/pmic/pmic-uclass.c | 48 > +++++++++++++++++------ > include/configs/advantech_dms-ba16.h | 1 - > include/configs/apalis_imx6.h | 1 - > include/configs/colibri_imx6.h | 1 - > include/configs/dh_imx6.h | 1 - > include/configs/ge_bx50v3.h | 17 +-------- > include/configs/kp_imx53.h | 113 > ++++++++++++++++++++++++++++++++++++++++++++++++++++++ > include/configs/kp_imx6q_tpc.h | 2 - > include/configs/mx31pdk.h | 2 - > include/configs/mx53ppd.h | 1 - > include/configs/mx6_common.h | 3 -- > include/configs/mx7_common.h | 3 -- > include/configs/nitrogen6x.h | 179 > +++++++++++++++++++++---------------------------------------------------------------- > include/fsl_pmic.h | 41 > ++++++++++++++++++++ > include/power/pmic.h | 2 + > 41 files changed, 1126 insertions(+), 332 deletions(-) > create mode 100644 arch/arm/dts/imx53-kp.dts > create mode 100644 arch/arm/mach-imx/mx3/Kconfig > create mode 100644 board/k+p/kp_imx53/Kconfig > create mode 100644 board/k+p/kp_imx53/MAINTAINERS > create mode 100644 board/k+p/kp_imx53/Makefile > create mode 100644 board/k+p/kp_imx53/kp_id_rev.c > create mode 100644 board/k+p/kp_imx53/kp_id_rev.h > create mode 100644 board/k+p/kp_imx53/kp_imx53.c > delete mode 100644 configs/ge_b650v3_defconfig > delete mode 100644 configs/ge_b850v3_defconfig > rename configs/{ge_b450v3_defconfig => ge_bx50v3_defconfig} (93%) > create mode 100644 configs/kp_imx53_defconfig > create mode 100644 drivers/power/pmic/mc34708.c > create mode 100644 include/configs/kp_imx53.h > > -- > ===================================================================== > 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 > ===================================================================== > _______________________________________________ > U-Boot mailing list > U-Boot(a)lists.denx.de > https://lists.denx.de/listinfo/u-boot > > -- ===================================================================== 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 =====================================================================

3 2

[U-Boot] Zynq: CONFIG_BOARD_RESET or reset_misc(), or ...?
by Leon Woestenberg 17 May '18

17 May '18

Hello all, for a Zynq (7-series) ARM based system I would like to implement a board-specific reset function. There are a few existing slightly different methods in place (see below). What is the preferred way and place? My current feeling is overriding reset_misc() in board.c, i.e. method #4 from the existings methods I found in U-Boot, see below. 1) There used to be a call-out from the CPU reset to the board_reset() if CONFIG_BOARD_RESET was defined non-zero, like this: arch/powerpc/cpu/ppc4xx/cpu.c: <...> void board_reset(void); <...> int do_reset (cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) { #if defined(CONFIG_BOARD_RESET) board_reset(); <...> This only existed for ppc4xx (which I think has been obsoleted now). 2) Blackfin seems to define a weak label "board_reset", and this (function) pointer is compared against non-NULL, called if non-NULL. arch/blackfin/cpu/reset.c:88: if (board_reset) arch/blackfin/cpu/reset.c:89: board_reset(); arch/blackfin/cpu/cpu.h:14:void board_reset(void) __attribute__((__weak__)); 3) PowerPC MPC85xx seems to define a weak label, and alias it to a __board_reset(); arch/powerpc/cpu/mpc85xx/cpu.c:33:__board_reset(void) arch/powerpc/cpu/mpc85xx/cpu.c:37:void board_reset(void) __attribute__((weak, alias("__board_reset"))); arch/powerpc/cpu/mpc85xx/cpu.c:315: board_reset(); /* * Default board reset function */ static void __board_reset(void) { /* Do nothing */ } void board_reset(void) __attribute__((weak, alias("__board_reset"))); 4) Similarly but a bit hidden for my "grep board_reset", is reset_misc() in arch/arm/lib/reset.c: #include <common.h> __weak void reset_misc(void) { } int do_reset(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) { puts ("resetting ...\n"); udelay (50000); /* wait 50 ms */ disable_interrupts(); reset_misc(); Thanks, Leon. -- Leon Woestenberg

1 0