January 2020 - U-Boot

[PATCH] Kconfig/zynq: Set default SPL_STACK_R_ADDR
by Olliver Schinagl 23 Jan '20

23 Jan '20

The zynq architecture depends on SPL_STACK_R_ADDR to be set, and thus it makes sense for the ARCH_ZYNQ to depend on SPL_STACK_R. Further more that address needs to have a sane default. So lets follow the OMAP2PLUS and set a default for the Zynq as well. Signed-off-by: Olliver Schinagl <oliver(a)schinagl.nl> --- arch/arm/Kconfig | 1 + common/spl/Kconfig | 1 + 2 files changed, 2 insertions(+) diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index a623ef5743..413b3e3a6e 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig @@ -1046,6 +1046,7 @@ config ARCH_ZYNQ select SPL_DM if SPL select SPL_OF_CONTROL if SPL select SPL_SEPARATE_BSS if SPL + select SPL_STACK_R if SPL select SUPPORT_SPL imply ARCH_EARLY_INIT_R imply BOARD_LATE_INIT diff --git a/common/spl/Kconfig b/common/spl/Kconfig index 76f39dc04f..cdebc62d0f 100644 --- a/common/spl/Kconfig +++ b/common/spl/Kconfig @@ -244,6 +244,7 @@ config SPL_STACK_R_ADDR depends on SPL_STACK_R hex "SDRAM location for SPL stack" default 0x82000000 if ARCH_OMAP2PLUS + default 0x200000 if ARCH_ZYNQ help Specify the address in SDRAM for the SPL stack. This will be set up before board_init_r() is called. -- 2.20.1

1 0

[PATCH] Kconfig/fpga_zynq: Depend on FPGA
by Olliver Schinagl 23 Jan '20

23 Jan '20

The zynq FPGA bits require the main FPGA bits to be enabled as we otherwise get the following compiler error: arch/arm/mach-zynq/cpu.c: In function 'arch_early_init_r': arch/arm/mach-zynq/cpu.c:118:37: error: 'const struct <anonymous>' has no member named 'fpga_size' fpga.size = zynq_fpga_descs[cpu_id].fpga_size; ^ Signed-off-by: Olliver Schinagl <oliver(a)schinagl.nl> --- drivers/fpga/Kconfig | 1 + 1 file changed, 1 insertion(+) diff --git a/drivers/fpga/Kconfig b/drivers/fpga/Kconfig index fe398a1d49..1d2df617d0 100644 --- a/drivers/fpga/Kconfig +++ b/drivers/fpga/Kconfig @@ -81,6 +81,7 @@ config FPGA_VIRTEX2 config FPGA_ZYNQPL bool "Enable Xilinx FPGA for Zynq" depends on ARCH_ZYNQ + select FPGA help Enable FPGA driver for loading bitstream in BIT and BIN format on Xilinx Zynq devices. -- 2.20.1

1 0

[PATCH v3 00/10] ClearFog Base static variant support
by Joel Johnson 23 Jan '20

23 Jan '20

This patch series adds support for ClearFog Base static configuration, as well as updating and fixing the ClearFog support for MMC and SPI booting. Stefan - I think everything is straight forward, with the only known unresolved question being handling of the duplicated Kconfig entries for the board-specific overrides. I've laid out the description in that particular commit, if you have guidance on a preferred approach I'm all ears. V2 changes: - updated against, and dependent on, https://patchwork.ozlabs.org/cover/1200324 V3 changes: - rebased against ClearFog runtime TLV EEPROM changes merged into mvebu/master Joel Johnson (10): arm: mvebu: fix SerDes table alignment arm: mvebu: solidrun: remove hardcoded DTS MAC address arm: mvebu: clearfog: initial ClearFog Base variant arm: mvebu: clearfog: Use Pro DT by default arm: mvebu: clearfog: Add SATA mode flags arm: mvebu: clearfog: Add option for 2.5 Gbps SFP arm: mvebu: clearfog: add SPI offsets arm: mvebu: enable working default boot support arm: mvebu: clearfog: move ENV params to Kconfig arm: mvebu: clearfog: reduce MMC boot assumptions .../arm/dts/armada-38x-solidrun-microsom.dtsi | 1 - arch/arm/mach-mvebu/Kconfig | 13 ++++ .../serdes/a38x/high_speed_env_spec.c | 6 +- board/solidrun/clearfog/Kconfig | 62 +++++++++++++++++++ board/solidrun/clearfog/clearfog.c | 26 +++++++- configs/clearfog_defconfig | 5 -- include/configs/clearfog.h | 1 - 7 files changed, 103 insertions(+), 11 deletions(-) create mode 100644 board/solidrun/clearfog/Kconfig -- 2.20.1

3 18

[PATCH] lx2160: Add support of emmc boot
by Meenakshi Aggarwal 23 Jan '20

23 Jan '20

Add support of "qixis_reset emmc" command for lx2160 Signed-off-by: Meenakshi Aggarwal <meenakshi.aggarwal(a)nxp.com> --- board/freescale/common/qixis.c | 6 ++++++ board/freescale/lx2160a/lx2160a.c | 2 ++ include/configs/lx2160aqds.h | 2 ++ include/configs/lx2160ardb.h | 2 ++ 4 files changed, 12 insertions(+) diff --git a/board/freescale/common/qixis.c b/board/freescale/common/qixis.c index 716c93b..1899fd5 100644 --- a/board/freescale/common/qixis.c +++ b/board/freescale/common/qixis.c @@ -1,6 +1,7 @@ // SPDX-License-Identifier: GPL-2.0+ /* * Copyright 2011 Freescale Semiconductor + * Copyright 2020 NXP * Author: Shengzhou Liu <Shengzhou.Liu(a)freescale.com> * * This file provides support for the QIXIS of some Freescale reference boards. @@ -287,8 +288,12 @@ static int qixis_reset_cmd(cmd_tbl_t *cmdtp, int flag, int argc, char * const ar #ifdef QIXIS_LBMAP_EMMC QIXIS_WRITE(rst_ctl, 0x30); QIXIS_WRITE(rcfg_ctl, 0); +#ifdef NON_EXTENDED_DUTCFG + QIXIS_WRITE(dutcfg[0], QIXIS_RCW_SRC_EMMC); +#else set_lbmap(QIXIS_LBMAP_EMMC); set_rcw_src(QIXIS_RCW_SRC_EMMC); +#endif QIXIS_WRITE(rcfg_ctl, QIXIS_RCFG_CTL_RECONFIG_IDLE); QIXIS_WRITE(rcfg_ctl, QIXIS_RCFG_CTL_RECONFIG_START); #else @@ -365,6 +370,7 @@ U_BOOT_CMD( "qixis watchdog <watchdog_period> - set the watchdog period\n" " period: 1s 2s 4s 8s 16s 32s 1min 2min 4min 8min\n" "qixis_reset dump - display the QIXIS registers\n" + "qixis_reset emmc - reset to emmc\n" "qixis_reset switch - display switch\n" ); #endif diff --git a/board/freescale/lx2160a/lx2160a.c b/board/freescale/lx2160a/lx2160a.c index dd3cd45..79abcd8 100644 --- a/board/freescale/lx2160a/lx2160a.c +++ b/board/freescale/lx2160a/lx2160a.c @@ -325,6 +325,8 @@ int checkboard(void) if (src == BOOT_SOURCE_SD_MMC) { puts("SD\n"); + } else if (src == BOOT_SOURCE_SD_MMC2) { + puts("eMMC\n"); } else { sw = QIXIS_READ(brdcfg[0]); sw = (sw >> QIXIS_XMAP_SHIFT) & QIXIS_XMAP_MASK; diff --git a/include/configs/lx2160aqds.h b/include/configs/lx2160aqds.h index f523b37..56a50d3 100644 --- a/include/configs/lx2160aqds.h +++ b/include/configs/lx2160aqds.h @@ -22,7 +22,9 @@ #define QIXIS_RCFG_CTL_WATCHDOG_ENBLE 0x08 #define QIXIS_LBMAP_MASK 0x0f #define QIXIS_LBMAP_SD +#define QIXIS_LBMAP_EMMC #define QIXIS_RCW_SRC_SD 0x08 +#define QIXIS_RCW_SRC_EMMC 0x09 #define NON_EXTENDED_DUTCFG #define QIXIS_SDID_MASK 0x07 #define QIXIS_ESDHC_NO_ADAPTER 0x7 diff --git a/include/configs/lx2160ardb.h b/include/configs/lx2160ardb.h index 6ff1c24..5b530f0 100644 --- a/include/configs/lx2160ardb.h +++ b/include/configs/lx2160ardb.h @@ -22,7 +22,9 @@ #define QIXIS_RCFG_CTL_WATCHDOG_ENBLE 0x08 #define QIXIS_LBMAP_MASK 0x0f #define QIXIS_LBMAP_SD +#define QIXIS_LBMAP_EMMC #define QIXIS_RCW_SRC_SD 0x08 +#define QIXIS_RCW_SRC_EMMC 0x09 #define NON_EXTENDED_DUTCFG /* VID */ -- 1.9.1

2 4

[PATCH] Kconfig/fpgad: Add dependencies
by Olliver Schinagl 23 Jan '20

23 Jan '20

Until the fpgad command is converted to driver model; it will depend on some drivers to implement said features. cmd/built-in.o: In function `do_fpga_md': cmd/fpgad.c:73: undefined reference to `fpga_get_reg' cmd/fpgad.c:85: undefined reference to `fpga_ptr' Signed-off-by: Olliver Schinagl <oliver(a)schinagl.nl> --- cmd/Kconfig | 1 + 1 file changed, 1 insertion(+) diff --git a/cmd/Kconfig b/cmd/Kconfig index 6e1efaaf85..0925236c0c 100644 --- a/cmd/Kconfig +++ b/cmd/Kconfig @@ -924,6 +924,7 @@ config CMD_FPGA_LOAD_SECURE config CMD_FPGAD bool "fpgad - dump FPGA registers" + depends on HRCON || STRIDER help (legacy, needs conversion to driver model) Provides a way to dump FPGA registers by calling the board-specific -- 2.20.1

1 0

[PATCH] mmc: check the return value of mmc_select_mode_and_width()
by Masahiro Yamada 23 Jan '20

23 Jan '20

Since commit 01298da31d92 ("mmc: Change mode when switching to a boot partition"), errors in mmc_select_mode_and_width() are ignored. The return value should be checked. Fixes: 01298da31d92 ("mmc: Change mode when switching to a boot partition") Signed-off-by: Masahiro Yamada <yamada.masahiro(a)socionext.com> --- drivers/mmc/mmc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/mmc/mmc.c b/drivers/mmc/mmc.c index d43983d4a648..b26e266c1c29 100644 --- a/drivers/mmc/mmc.c +++ b/drivers/mmc/mmc.c @@ -2575,7 +2575,7 @@ static int mmc_startup(struct mmc *mmc) err = mmc_get_capabilities(mmc); if (err) return err; - mmc_select_mode_and_width(mmc, mmc->card_caps); + err = mmc_select_mode_and_width(mmc, mmc->card_caps); } #endif if (err) -- 2.17.1

2 1

[RFC] Vocore2 MMC needs clock patches
by Mauro Condarelli 23 Jan '20

23 Jan '20

Hi Weijie, I attach my, apparently working, port to VoCore2 SoM. These patchsets are on top of Your 21 patch rewrite of MT7628 board, While the first patchset is relatively straightforward, but does not include MMC handling, to enable it I had to backport from Linux Kernel several pieces, essentially clock and interrupt handling. Those drivers appear written by You. I am unsure if this is really needed or if there is some other (perhaps cleaner) way to enable MMC. As said this seems to work for me, but I would like to contribute this board upstream, in the best possible way. Please let me know how I should proceed. Best Regards and Thanks in Advance

3 6

[PATCH] lx2160a: Add the serdes configurtion details for QDS
by Vikas Singh 23 Jan '20

23 Jan '20

Add 8_10_0 and 21_2_0 seredes protocol for QDS Add 10_12_3 seredes protocol for QDS Add the IOSLOT and the mezzanine card mapping against each serdes protocol. Signed-off-by: Vikas Singh <vikas.singh(a)nxp.com> --- board/freescale/lx2160a/eth_lx2160aqds.c | 84 +++++++++++++++++++++++++++++++- 1 file changed, 83 insertions(+), 1 deletion(-) diff --git a/board/freescale/lx2160a/eth_lx2160aqds.c b/board/freescale/lx2160a/eth_lx2160aqds.c index 55e8a42..741cca7 100644 --- a/board/freescale/lx2160a/eth_lx2160aqds.c +++ b/board/freescale/lx2160a/eth_lx2160aqds.c @@ -75,6 +75,29 @@ struct serdes_phy_config { * This table has limited serdes protocol entries. It can be expanded as per * requirement. */ +/***************************************************************** + | SERDES_1 PROTOCOL | IO_SLOT | CARD | + ***************************************************************** + | 3 | IO_SLOT_1 | M11-USXGMII | + | 7 | IO_SLOT_1 | M11-USXGMII | + | | IO_SLOT_2 | M4-PCIE-SGMII | + | 8 | IO_SLOT_1 | M12-XFI | + | 10 | IO_SLOT_1 | M11-USXGMII | + | | IO_SLOT_2 | M12-XFI | + | 13 | IO_SLOT_1 | M8-100G | + | | IO_SLOT_2 | M8-100G | + | 14 | IO_SLOT_1 | M8-100G | + | 15 | IO_SLOT_1 | M13-25G | + | 17 | IO_SLOT_1 | M13-25G | + | 19 | IO_SLOT_1 | M11-USXGMII | + | | IO_SLOT_2 | M7-40G | + | | IO_SLOT_6 | M13-25G | + | 20 | IO_SLOT_1 | M7-40G | + | | IO_SLOT_2 | M7-40G | + | 21 | IO_SLOT_1 | M13-25G | + | | IO_SLOT_2 | M13-25G | + ***************************************************************** + */ static const struct serdes_phy_config serdes1_phy_config[] = { {3, {{WRIOP1_DPMAC3, {AQ_PHY_ADDR1, -1}, EMI1, IO_SLOT_1}, @@ -101,6 +124,12 @@ static const struct serdes_phy_config serdes1_phy_config[] = { {WRIOP1_DPMAC10, {SGMII_CARD_PORT4_PHY_ADDR, -1}, EMI1, IO_SLOT_2} } }, {8, {} }, + {10, {{WRIOP1_DPMAC4, {AQ_PHY_ADDR2, -1}, + EMI1, IO_SLOT_1}, + {WRIOP1_DPMAC5, {AQ_PHY_ADDR3, -1}, + EMI1, IO_SLOT_1}, + {WRIOP1_DPMAC6, {AQ_PHY_ADDR4, -1}, + EMI1, IO_SLOT_1} } }, {13, {{WRIOP1_DPMAC1, {INPHI_PHY_ADDR1, INPHI_PHY_ADDR2, -1}, EMI1, IO_SLOT_1}, {WRIOP1_DPMAC2, {INPHI_PHY_ADDR1, INPHI_PHY_ADDR2, -1}, @@ -132,13 +161,49 @@ static const struct serdes_phy_config serdes1_phy_config[] = { {20, {{WRIOP1_DPMAC1, {CORTINA_PHY_ADDR1, -1}, EMI1, IO_SLOT_1}, {WRIOP1_DPMAC2, {CORTINA_PHY_ADDR1, -1}, - EMI1, IO_SLOT_2} } } + EMI1, IO_SLOT_2} } }, + {21, {{WRIOP1_DPMAC3, {INPHI_PHY_ADDR1, INPHI_PHY_ADDR2, -1}, + EMI1, IO_SLOT_1}, + {WRIOP1_DPMAC4, {INPHI_PHY_ADDR1, INPHI_PHY_ADDR2, -1}, + EMI1, IO_SLOT_1}, + {WRIOP1_DPMAC5, {INPHI_PHY_ADDR1, INPHI_PHY_ADDR2, -1}, + EMI1, IO_SLOT_1}, + {WRIOP1_DPMAC6, {INPHI_PHY_ADDR1, INPHI_PHY_ADDR2, -1}, + EMI1, IO_SLOT_1}, + {WRIOP1_DPMAC9, {INPHI_PHY_ADDR1, INPHI_PHY_ADDR2, -1}, + EMI1, IO_SLOT_2}, + {WRIOP1_DPMAC10, {INPHI_PHY_ADDR1, INPHI_PHY_ADDR2, -1}, + EMI1, IO_SLOT_2} } } }; +/***************************************************************** + | SERDES_2 PROTOCOL | IO_SLOT | CARD | + ***************************************************************** + | 2 | IO_SLOT_7 | M4-PCIE-SGMII | + | | IO_SLOT_8 | M4-PCIE-SGMII | + | 3 | IO_SLOT_7 | M4-PCIE-SGMII | + | | IO_SLOT_8 | M4-PCIE-SGMII | + | 5 | IO_SLOT_7 | M4-PCIE-SGMII | + | 10 | IO_SLOT_7 | M4-PCIE-SGMII | + | | IO_SLOT_8 | M4-PCIE-SGMII | + | 11 | IO_SLOT_7 | M4-PCIE-SGMII | + | | IO_SLOT_8 | M4-PCIE-SGMII | + | 12 | IO_SLOT_7 | M4-PCIE-SGMII | + | | IO_SLOT_8 | M4-PCIE-SGMII | + ***************************************************************** + */ static const struct serdes_phy_config serdes2_phy_config[] = { {2, {} }, {3, {} }, {5, {} }, + {10, {{WRIOP1_DPMAC11, {SGMII_CARD_PORT1_PHY_ADDR, -1}, + EMI1, IO_SLOT_7}, + {WRIOP1_DPMAC12, {SGMII_CARD_PORT2_PHY_ADDR, -1}, + EMI1, IO_SLOT_7}, + {WRIOP1_DPMAC17, {SGMII_CARD_PORT3_PHY_ADDR, -1}, + EMI1, IO_SLOT_7}, + {WRIOP1_DPMAC18, {SGMII_CARD_PORT4_PHY_ADDR, -1}, + EMI1, IO_SLOT_7} } }, {11, {{WRIOP1_DPMAC12, {SGMII_CARD_PORT2_PHY_ADDR, -1}, EMI1, IO_SLOT_7}, {WRIOP1_DPMAC17, {SGMII_CARD_PORT3_PHY_ADDR, -1}, @@ -151,8 +216,25 @@ static const struct serdes_phy_config serdes2_phy_config[] = { EMI1, IO_SLOT_8}, {WRIOP1_DPMAC14, {SGMII_CARD_PORT4_PHY_ADDR, -1}, EMI1, IO_SLOT_8} } }, + {12, {{WRIOP1_DPMAC11, {SGMII_CARD_PORT1_PHY_ADDR, -1}, + EMI1, IO_SLOT_7}, + {WRIOP1_DPMAC12, {SGMII_CARD_PORT2_PHY_ADDR, -1}, + EMI1, IO_SLOT_7}, + {WRIOP1_DPMAC17, {SGMII_CARD_PORT3_PHY_ADDR, -1}, + EMI1, IO_SLOT_7}, + {WRIOP1_DPMAC18, {SGMII_CARD_PORT4_PHY_ADDR, -1}, + EMI1, IO_SLOT_7} } } }; +/***************************************************************** + | SERDES_3 PROTOCOL | IO_SLOT | CARD | + ***************************************************************** + | 2 | IO_SLOT_5 | M4-PCIE-SGMII | + | | IO_SLOT_6 | M4-PCIE-SGMII | + | 3 | IO_SLOT_5 | M4-PCIE-SGMII | + | | IO_SLOT_6 | M4-PCIE-SGMII | + ***************************************************************** + */ static const struct serdes_phy_config serdes3_phy_config[] = { {2, {} }, {3, {} } -- 2.7.4

1 0

[U-Boot] [PATCH v2] spl: Move check for SPL_LIBCOMMON support to header
by Andrew F. Davis 23 Jan '20

23 Jan '20

Print statements in SPL depend on lib/common support, due to this many such print statements are ifdef'd. Instead of checking at each call site move the check to the common.h header and remove these inline checks. Signed-off-by: Andrew F. Davis <afd(a)ti.com> Reviewed-by: Simon Glass <sjg(a)chromium.org> --- common/common_fit.c | 2 -- common/spl/spl.c | 2 -- common/spl/spl_ext.c | 8 -------- common/spl/spl_fat.c | 6 ------ common/spl/spl_mmc.c | 18 ------------------ common/spl/spl_sata.c | 2 -- common/spl/spl_usb.c | 2 -- drivers/mmc/mmc-uclass.c | 2 -- drivers/mmc/mmc.c | 12 ------------ drivers/mmc/mmc_legacy.c | 2 -- include/stdio.h | 5 ++--- 11 files changed, 2 insertions(+), 59 deletions(-) diff --git a/common/common_fit.c b/common/common_fit.c index 41305d8aa6..a8a1fb8e5f 100644 --- a/common/common_fit.c +++ b/common/common_fit.c @@ -48,10 +48,8 @@ int fit_find_config_node(const void *fdt) node = fdt_next_subnode(fdt, node)) { name = fdt_getprop(fdt, node, "description", &len); if (!name) { -#ifdef CONFIG_SPL_LIBCOMMON_SUPPORT printf("%s: Missing FDT description in DTB\n", __func__); -#endif return -EINVAL; } diff --git a/common/spl/spl.c b/common/spl/spl.c index c1fce62b91..5b6f33c6b8 100644 --- a/common/spl/spl.c +++ b/common/spl/spl.c @@ -577,12 +577,10 @@ static int boot_from_devices(struct spl_image_info *spl_image, struct spl_image_loader *loader; loader = spl_ll_find_loader(spl_boot_list[i]); -#if defined(CONFIG_SPL_SERIAL_SUPPORT) && defined(CONFIG_SPL_LIBCOMMON_SUPPORT) if (loader) printf("Trying to boot from %s\n", loader->name); else puts(SPL_TPL_PROMPT "Unsupported Boot Device!\n"); -#endif if (loader && !spl_load_image(spl_image, loader)) { spl_image->boot_device = spl_boot_list[i]; return 0; diff --git a/common/spl/spl_ext.c b/common/spl/spl_ext.c index 2a6252229c..6d96901365 100644 --- a/common/spl/spl_ext.c +++ b/common/spl/spl_ext.c @@ -28,9 +28,7 @@ int spl_load_image_ext(struct spl_image_info *spl_image, err = ext4fs_mount(0); if (!err) { -#ifdef CONFIG_SPL_LIBCOMMON_SUPPORT printf("%s: ext4fs mount err - %d\n", __func__, err); -#endif goto end; } @@ -54,11 +52,9 @@ int spl_load_image_ext(struct spl_image_info *spl_image, err = ext4fs_read((char *)spl_image->load_addr, 0, filelen, &actlen); end: -#ifdef CONFIG_SPL_LIBCOMMON_SUPPORT if (err < 0) printf("%s: error reading image %s, err - %d\n", __func__, filename, err); -#endif return err < 0; } @@ -81,9 +77,7 @@ int spl_load_image_ext_os(struct spl_image_info *spl_image, err = ext4fs_mount(0); if (!err) { -#ifdef CONFIG_SPL_LIBCOMMON_SUPPORT printf("%s: ext4fs mount err - %d\n", __func__, err); -#endif return -1; } #if defined(CONFIG_SPL_ENV_SUPPORT) @@ -126,10 +120,8 @@ defaults: err = ext4fs_read((void *)CONFIG_SYS_SPL_ARGS_ADDR, 0, filelen, &actlen); if (err < 0) { -#ifdef CONFIG_SPL_LIBCOMMON_SUPPORT printf("%s: error reading image %s, err - %d\n", __func__, CONFIG_SPL_FS_LOAD_ARGS_NAME, err); -#endif return -1; } diff --git a/common/spl/spl_fat.c b/common/spl/spl_fat.c index aa371ab52c..bef2b30376 100644 --- a/common/spl/spl_fat.c +++ b/common/spl/spl_fat.c @@ -28,9 +28,7 @@ static int spl_register_fat_device(struct blk_desc *block_dev, int partition) err = fat_register_device(block_dev, partition); if (err) { -#ifdef CONFIG_SPL_LIBCOMMON_SUPPORT printf("%s: fat register err - %d\n", __func__, err); -#endif return err; } @@ -102,11 +100,9 @@ int spl_load_image_fat(struct spl_image_info *spl_image, } end: -#ifdef CONFIG_SPL_LIBCOMMON_SUPPORT if (err <= 0) printf("%s: error reading image %s, err - %d\n", __func__, filename, err); -#endif return (err <= 0); } @@ -152,10 +148,8 @@ defaults: err = file_fat_read(CONFIG_SPL_FS_LOAD_ARGS_NAME, (void *)CONFIG_SYS_SPL_ARGS_ADDR, 0); if (err <= 0) { -#ifdef CONFIG_SPL_LIBCOMMON_SUPPORT printf("%s: error reading image %s, err - %d\n", __func__, CONFIG_SPL_FS_LOAD_ARGS_NAME, err); -#endif return -1; } diff --git a/common/spl/spl_mmc.c b/common/spl/spl_mmc.c index 2ede096e61..3c89b2741e 100644 --- a/common/spl/spl_mmc.c +++ b/common/spl/spl_mmc.c @@ -95,9 +95,7 @@ int mmc_load_image_raw_sector(struct spl_image_info *spl_image, end: if (ret) { -#ifdef CONFIG_SPL_LIBCOMMON_SUPPORT puts("mmc_load_image_raw_sector: mmc block read error\n"); -#endif return -1; } @@ -114,9 +112,7 @@ static int spl_mmc_get_device_index(u32 boot_device) return 1; } -#ifdef CONFIG_SPL_LIBCOMMON_SUPPORT printf("spl: unsupported mmc boot device.\n"); -#endif return -ENODEV; } @@ -135,18 +131,14 @@ static int spl_mmc_find_device(struct mmc **mmcp, u32 boot_device) err = mmc_initialize(NULL); #endif /* DM_MMC */ if (err) { -#ifdef CONFIG_SPL_LIBCOMMON_SUPPORT printf("spl: could not initialize mmc. error: %d\n", err); -#endif return err; } *mmcp = find_mmc_device(mmc_dev); err = *mmcp ? 0 : -ENODEV; if (err) { -#ifdef CONFIG_SPL_LIBCOMMON_SUPPORT printf("spl: could not find mmc device %d. error: %d\n", mmc_dev, err); -#endif return err; } @@ -178,9 +170,7 @@ static int mmc_load_image_raw_partition(struct spl_image_info *spl_image, err = part_get_info(mmc_get_blk_desc(mmc), partition, &info); if (err) { -#ifdef CONFIG_SPL_LIBCOMMON_SUPPORT puts("spl: partition error\n"); -#endif return -1; } @@ -206,9 +196,7 @@ static int mmc_load_image_raw_os(struct spl_image_info *spl_image, CONFIG_SYS_MMCSD_RAW_MODE_ARGS_SECTORS, (void *) CONFIG_SYS_SPL_ARGS_ADDR); if (count != CONFIG_SYS_MMCSD_RAW_MODE_ARGS_SECTORS) { -#ifdef CONFIG_SPL_LIBCOMMON_SUPPORT puts("mmc_load_image_raw_os: mmc block read error\n"); -#endif return -1; } #endif /* CONFIG_SYS_MMCSD_RAW_MODE_ARGS_SECTOR */ @@ -336,9 +324,7 @@ int spl_mmc_load(struct spl_image_info *spl_image, err = mmc_init(mmc); if (err) { mmc = NULL; -#ifdef CONFIG_SPL_LIBCOMMON_SUPPORT printf("spl: mmc init failed with error: %d\n", err); -#endif return err; } } @@ -367,9 +353,7 @@ int spl_mmc_load(struct spl_image_info *spl_image, err = blk_dselect_hwpart(mmc_get_blk_desc(mmc), part); if (err) { -#ifdef CONFIG_SPL_LIBCOMMON_SUPPORT puts("spl: mmc partition switch failed\n"); -#endif return err; } /* Fall through */ @@ -404,10 +388,8 @@ int spl_mmc_load(struct spl_image_info *spl_image, return err; break; -#ifdef CONFIG_SPL_LIBCOMMON_SUPPORT default: puts("spl: mmc: wrong boot mode\n"); -#endif } return err; diff --git a/common/spl/spl_sata.c b/common/spl/spl_sata.c index e108af0576..216a738915 100644 --- a/common/spl/spl_sata.c +++ b/common/spl/spl_sata.c @@ -66,9 +66,7 @@ static int spl_sata_load_image(struct spl_image_info *spl_image, err = init_sata(CONFIG_SPL_SATA_BOOT_DEVICE); #endif if (err) { -#ifdef CONFIG_SPL_LIBCOMMON_SUPPORT printf("spl: sata init failed: err - %d\n", err); -#endif return err; } else { /* try to recognize storage devices immediately */ diff --git a/common/spl/spl_usb.c b/common/spl/spl_usb.c index e29d579b0d..0599ed6820 100644 --- a/common/spl/spl_usb.c +++ b/common/spl/spl_usb.c @@ -26,9 +26,7 @@ static int spl_usb_load_image(struct spl_image_info *spl_image, usb_stop(); err = usb_init(); if (err) { -#ifdef CONFIG_SPL_LIBCOMMON_SUPPORT printf("%s: usb init failed: err - %d\n", __func__, err); -#endif return err; } diff --git a/drivers/mmc/mmc-uclass.c b/drivers/mmc/mmc-uclass.c index c7a832ca90..1e6b7caa22 100644 --- a/drivers/mmc/mmc-uclass.c +++ b/drivers/mmc/mmc-uclass.c @@ -225,9 +225,7 @@ struct mmc *find_mmc_device(int dev_num) ret = blk_find_device(IF_TYPE_MMC, dev_num, &dev); if (ret) { -#if !defined(CONFIG_SPL_BUILD) || defined(CONFIG_SPL_LIBCOMMON_SUPPORT) printf("MMC Device %d not found\n", dev_num); -#endif return NULL; } diff --git a/drivers/mmc/mmc.c b/drivers/mmc/mmc.c index f683b52ead..dde299b3eb 100644 --- a/drivers/mmc/mmc.c +++ b/drivers/mmc/mmc.c @@ -250,9 +250,7 @@ int mmc_poll_for_busy(struct mmc *mmc, int timeout_ms) break; if (status & MMC_STATUS_MASK) { -#if !defined(CONFIG_SPL_BUILD) || defined(CONFIG_SPL_LIBCOMMON_SUPPORT) pr_err("Status Error: 0x%08x\n", status); -#endif return -ECOMM; } @@ -263,9 +261,7 @@ int mmc_poll_for_busy(struct mmc *mmc, int timeout_ms) } if (timeout_ms <= 0) { -#if !defined(CONFIG_SPL_BUILD) || defined(CONFIG_SPL_LIBCOMMON_SUPPORT) pr_err("Timeout waiting card ready\n"); -#endif return -ETIMEDOUT; } @@ -405,9 +401,7 @@ static int mmc_read_blocks(struct mmc *mmc, void *dst, lbaint_t start, cmd.cmdarg = 0; cmd.resp_type = MMC_RSP_R1b; if (mmc_send_cmd(mmc, &cmd, NULL)) { -#if !defined(CONFIG_SPL_BUILD) || defined(CONFIG_SPL_LIBCOMMON_SUPPORT) pr_err("mmc fail to send stop cmd\n"); -#endif return 0; } } @@ -445,10 +439,8 @@ ulong mmc_bread(struct blk_desc *block_dev, lbaint_t start, lbaint_t blkcnt, return 0; if ((start + blkcnt) > block_dev->lba) { -#if !defined(CONFIG_SPL_BUILD) || defined(CONFIG_SPL_LIBCOMMON_SUPPORT) pr_err("MMC: block number 0x" LBAF " exceeds max(0x" LBAF ")\n", start + blkcnt, block_dev->lba); -#endif return 0; } @@ -2811,9 +2803,7 @@ retry: err = mmc_send_op_cond(mmc); if (err) { -#if !defined(CONFIG_SPL_BUILD) || defined(CONFIG_SPL_LIBCOMMON_SUPPORT) pr_err("Card did not respond to voltage select!\n"); -#endif return -EOPNOTSUPP; } } @@ -2844,9 +2834,7 @@ int mmc_start_init(struct mmc *mmc) #endif if (no_card) { mmc->has_init = 0; -#if !defined(CONFIG_SPL_BUILD) || defined(CONFIG_SPL_LIBCOMMON_SUPPORT) pr_err("MMC: no card present\n"); -#endif return -ENOMEDIUM; } diff --git a/drivers/mmc/mmc_legacy.c b/drivers/mmc/mmc_legacy.c index b0f5cf58a2..7c09f7844b 100644 --- a/drivers/mmc/mmc_legacy.c +++ b/drivers/mmc/mmc_legacy.c @@ -46,9 +46,7 @@ struct mmc *find_mmc_device(int dev_num) return m; } -#if !defined(CONFIG_SPL_BUILD) || defined(CONFIG_SPL_LIBCOMMON_SUPPORT) printf("MMC Device %d not found\n", dev_num); -#endif return NULL; } diff --git a/include/stdio.h b/include/stdio.h index aedf374452..2d5d549fe3 100644 --- a/include/stdio.h +++ b/include/stdio.h @@ -10,9 +10,8 @@ int tstc(void); /* stdout */ #if !defined(CONFIG_SPL_BUILD) || \ - (defined(CONFIG_TPL_BUILD) && defined(CONFIG_TPL_SERIAL_SUPPORT)) || \ - (defined(CONFIG_SPL_BUILD) && !defined(CONFIG_TPL_BUILD) && \ - defined(CONFIG_SPL_SERIAL_SUPPORT)) + (defined(CONFIG_TPL_BUILD) && defined(CONFIG_TPL_SERIAL_SUPPORT) && defined(CONFIG_TPL_LIBCOMMON_SUPPORT)) || \ + (defined(CONFIG_SPL_BUILD) && defined(CONFIG_SPL_SERIAL_SUPPORT) && defined(CONFIG_SPL_LIBCOMMON_SUPPORT) && !defined(CONFIG_TPL_BUILD)) void putc(const char c); void puts(const char *s); int __printf(1, 2) printf(const char *fmt, ...); -- 2.17.1

3 2

[PATCH] Optionally: Set the serial# environment variable on the i.MX7.
by Mark Grosberg 22 Jan '20

22 Jan '20

Enabline this new option allows the kernel to obtain the unique ID of the CPU when not using ATAGS. Signed-off-by: Mark G <mark(a)novtech.com> --- arch/arm/include/asm/bootm.h | 2 +- arch/arm/mach-imx/mx7/Kconfig | 7 +++++++ arch/arm/mach-imx/mx7/soc.c | 15 ++++++++++++++- 3 files changed, 22 insertions(+), 2 deletions(-) diff --git a/arch/arm/include/asm/bootm.h b/arch/arm/include/asm/bootm.h index a2131ca07c..64ceb36ed8 100644 --- a/arch/arm/include/asm/bootm.h +++ b/arch/arm/include/asm/bootm.h @@ -39,7 +39,7 @@ extern void udc_disconnect(void); #endif struct tag_serialnr; -#ifdef CONFIG_SERIAL_TAG +#if defined(CONFIG_SERIAL_TAG) || defined(CONFIG_SET_SERIAL_ENV) #define BOOTM_ENABLE_SERIAL_TAG 1 void get_board_serial(struct tag_serialnr *serialnr); #else diff --git a/arch/arm/mach-imx/mx7/Kconfig b/arch/arm/mach-imx/mx7/Kconfig index 286d36589d..4cf14d43c0 100644 --- a/arch/arm/mach-imx/mx7/Kconfig +++ b/arch/arm/mach-imx/mx7/Kconfig @@ -71,6 +71,13 @@ config TARGET_COLIBRI_IMX7 endchoice +config SET_SERIAL_ENV + bool "Set serial number variable from the OCOTP" + help + Selecting this option will populate the serial# environment + variable with a unique identifier from the i.MX7 CPU. The + Linux kernel will use this as the serial number of the machine. + config SYS_SOC default "mx7" diff --git a/arch/arm/mach-imx/mx7/soc.c b/arch/arm/mach-imx/mx7/soc.c index 4aafeed188..208400a4a7 100644 --- a/arch/arm/mach-imx/mx7/soc.c +++ b/arch/arm/mach-imx/mx7/soc.c @@ -344,11 +344,24 @@ int arch_misc_init(void) sec_init(); #endif +#ifdef CONFIG_SET_SERIAL_ENV + { + struct tag_serialnr serialnr; + char serialbuf[sizeof(serialnr) * 2 + 8]; + + get_board_serial(&serialnr); + snprintf(serialbuf, sizeof(serialbuf), + "%08lx%08lx", + (ulong)serialnr.high, (ulong)serialnr.low); + env_set("serial#", serialbuf); + } +#endif + return 0; } #endif -#ifdef CONFIG_SERIAL_TAG +#if defined(CONFIG_SERIAL_TAG) || defined(CONFIG_SET_SERIAL_ENV) /* * OCOTP_TESTER * i.MX 7Solo Applications Processor Reference Manual, Rev. 0.1, 08/2016 -- 2.17.1

1 0