January 2021 - U-Boot

[PATCH] doc/sandbox: improve formatting of command line options
by Heinrich Schuchardt 23 Jan '21

23 Jan '21

Show the command line options in bold. Signed-off-by: Heinrich Schuchardt <xypron.glpk(a)gmx.de> --- doc/arch/sandbox.rst | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/doc/arch/sandbox.rst b/doc/arch/sandbox.rst index ee720c5a09..60ee1e0741 100644 --- a/doc/arch/sandbox.rst +++ b/doc/arch/sandbox.rst @@ -99,37 +99,37 @@ Command-line Options Various options are available, mostly for test purposes. Use -h to see available options. Some of these are described below: -* -t, --terminal <arg> - - The terminal is normally in what is called 'raw-with-sigs' mode. This means +-t, --terminal <arg> + The terminal is normally in what is called 'raw-with-sigs' mode. This means that you can use arrow keys for command editing and history, but if you press Ctrl-C, U-Boot will exit instead of handling this as a keypress. Other options are 'raw' (so Ctrl-C is handled within U-Boot) and 'cooked' (where the terminal is in cooked mode and cursor keys will not work, Ctrl-C will exit). -* -l - - Show the LCD emulation window. +-l + Show the LCD emulation window. -* -d <device_tree> - - A device tree binary file can be provided with -d. If you edit the source +-d <device_tree> + A device tree binary file can be provided with -d. If you edit the source (it is stored at arch/sandbox/dts/sandbox.dts) you must rebuild U-Boot to recreate the binary file. -* -D - - To use the default device tree, use -D. +-D + To use the default device tree, use -D. -* -T - - To use the test device tree, use -T. +-T + To use the test device tree, use -T. -* -c [<cmd>;]<cmd> - - To execute commands directly, use the -c option. You can specify a single +-c [<cmd>;]<cmd> + To execute commands directly, use the -c option. You can specify a single command, or multiple commands separated by a semicolon, as is normal in U-Boot. Be careful with quoting as the shell will normally process and swallow quotes. When -c is used, U-Boot exits after the command is complete, but you can force it to go to interactive mode instead with -i. -* -i - - Go to interactive mode after executing the commands specified by -c. +-i + Go to interactive mode after executing the commands specified by -c. Environment Variables --------------------- -- 2.29.2

2 2

[PATCH 1/5] tpm: cr50: Check for valid locality
by Simon Glass 23 Jan '21

23 Jan '21

When the Cr50 starts up it doesn't have a valid locality. The driver sets it to -1 to indicate that. Tracking this allows cr50_i2c_cleanup() to avoid releasing a locality that was not claimed. However the helper functions that generate the flags use a u8 type which cannot support -1, so they return a locality of 0xff. Fix this by updating the type. With this, 'tpm startup TPM2_SU_CLEAR' works as expected. Signed-off-by: Simon Glass <sjg(a)chromium.org> --- drivers/tpm/cr50_i2c.c | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/drivers/tpm/cr50_i2c.c b/drivers/tpm/cr50_i2c.c index ce61b72d222..f53924a8fcb 100644 --- a/drivers/tpm/cr50_i2c.c +++ b/drivers/tpm/cr50_i2c.c @@ -183,23 +183,31 @@ static int cr50_i2c_write(struct udevice *dev, u8 addr, const u8 *buffer, return cr50_i2c_wait_tpm_ready(dev); } -static inline u8 tpm_access(u8 locality) +static inline u8 tpm_access(int locality) { + if (locality == -1) + locality = 0; return 0x0 | (locality << 4); } -static inline u8 tpm_sts(u8 locality) +static inline u8 tpm_sts(int locality) { + if (locality == -1) + locality = 0; return 0x1 | (locality << 4); } -static inline u8 tpm_data_fifo(u8 locality) +static inline u8 tpm_data_fifo(int locality) { + if (locality == -1) + locality = 0; return 0x5 | (locality << 4); } -static inline u8 tpm_did_vid(u8 locality) +static inline u8 tpm_did_vid(int locality) { + if (locality == -1) + locality = 0; return 0x6 | (locality << 4); } -- 2.29.2.729.g45daf8777d-goog

1 9

[PATCH 00/10] binman: Various minor fixes and improvement
by Simon Glass 23 Jan '21

23 Jan '21

This series includes a number of minor fixes and improvements identified while trying out Chrome OS verified boot on it. These were not apparent without this real-world testing, but all are deficiencies in one way or another. Simon Glass (10): dtoc: binman: Drop Python 2 code patman: Correct lz4 compression parameters binman: Update the TODO list binman: Show the size when writing entries binman: Fix a few file comments binman: Support finding symbols in sub-sections binman: Support reading an image with entry args binman: Allow vblock to include devicetree blobs binman: Support alignment of files binman: Allow for skip_at_start when reading entries tools/binman/README | 3 +- tools/binman/control.py | 3 +- tools/binman/elf.py | 3 +- tools/binman/elf_test.py | 4 +- tools/binman/entry.py | 3 +- tools/binman/etype/blob.py | 4 + tools/binman/etype/files.py | 4 + tools/binman/etype/section.py | 66 +++++++++++-- tools/binman/etype/u_boot_spl_bss_pad.py | 1 - tools/binman/etype/u_boot_spl_nodtb.py | 2 +- tools/binman/etype/vblock.py | 15 ++- tools/binman/fmap_util.py | 4 +- tools/binman/ftest.py | 110 +++++++++++++++++++++- tools/binman/image.py | 62 ++++++++++-- tools/binman/state.py | 10 ++ tools/binman/test/084_files.dts | 2 +- tools/binman/test/187_symbols_sub.dts | 22 +++++ tools/binman/test/188_image_entryarg.dts | 21 +++++ tools/binman/test/189_vblock_content.dts | 31 ++++++ tools/binman/test/190_files_align.dts | 12 +++ tools/binman/test/191_read_image_skip.dts | 23 +++++ tools/dtoc/fdt.py | 15 ++- tools/dtoc/test_fdt.py | 6 ++ tools/patman/tools.py | 3 +- 24 files changed, 393 insertions(+), 36 deletions(-) create mode 100644 tools/binman/test/187_symbols_sub.dts create mode 100644 tools/binman/test/188_image_entryarg.dts create mode 100644 tools/binman/test/189_vblock_content.dts create mode 100644 tools/binman/test/190_files_align.dts create mode 100644 tools/binman/test/191_read_image_skip.dts -- 2.29.2.729.g45daf8777d-goog

1 20

[PATCH 00/25] binman: Support compression of sections
by Simon Glass 23 Jan '21

23 Jan '21

This series includes a number of improvements and refactors to support compressing entire sections. This is sometimes useful when a section contains a number of entries which are accessed as a whole and are best compressed together. Most of the effort here is clarifying what is in a section and what is added by its parent (i.e. padding). But the opportunity is taken to tidy up and somewhat simplify some of the section-handling code. Also some new tests are added to reduce the amount of undefined behaviour. This series is available at u-boot-dm/binman-working Simon Glass (25): binman: Give a sensible error if no command is given binman: Fix return from u-boot-ucode if there is no DT binman: Remove references to 'image' in entry_Section binman: Expand the error message for breaching a section binman: Move CompressData() into Entry base class binman: Use 'files-compress' to set compression for files binman: Update testPackExtra with more checks binman: Expand docs and test for padding binman: Expand docs and test for alignment binman: Move section-building code into a function binman: Refactor _BuildSectionData() binman: Move section padding to the parent binman: Make section padding consistent with other entries binman: Store the original data before compression binman: Set section contents in GetData() binman: Avoid reporting image-pos with compression binman: Drop Entry.CheckOffset() binman: Move sort and expand to the main Pack() function binman: Drop the Entry.CheckSize() method binman: Call CheckSize() from the section's Pack() method binman: Drop CheckEntries() binman: Update CheckEntries() for compressed sections binman: Use the actual contents in CheckSize() binman: Support compression of sections binman: Avoid calculated section data repeatedly tools/binman/README | 72 ++-- tools/binman/README.entries | 15 +- tools/binman/cmdline.py | 1 + tools/binman/control.py | 4 +- tools/binman/entry.py | 65 +++- tools/binman/etype/blob.py | 7 - tools/binman/etype/cbfs.py | 6 +- tools/binman/etype/files.py | 7 +- tools/binman/etype/section.py | 167 +++++++-- tools/binman/etype/u_boot_ucode.py | 1 + tools/binman/ftest.py | 347 +++++++++++++++++- tools/binman/image.py | 2 +- tools/binman/test/009_pack_extra.dts | 2 +- tools/binman/test/085_files_compress.dts | 2 +- tools/binman/test/177_section_pad.dts | 27 ++ tools/binman/test/178_section_align.dts | 34 ++ tools/binman/test/179_compress_image.dts | 14 + tools/binman/test/180_compress_image_less.dts | 14 + .../binman/test/181_compress_section_size.dts | 17 + tools/binman/test/182_compress_section.dts | 16 + tools/binman/test/183_compress_extra.dts | 37 ++ 21 files changed, 753 insertions(+), 104 deletions(-) create mode 100644 tools/binman/test/177_section_pad.dts create mode 100644 tools/binman/test/178_section_align.dts create mode 100644 tools/binman/test/179_compress_image.dts create mode 100644 tools/binman/test/180_compress_image_less.dts create mode 100644 tools/binman/test/181_compress_section_size.dts create mode 100644 tools/binman/test/182_compress_section.dts create mode 100644 tools/binman/test/183_compress_extra.dts -- 2.29.0.rc1.297.gfa9743e501-goog

2 37

[PATCH 1/2] this: patman: Update documentation to match new usage
by Simon Glass 23 Jan '21

23 Jan '21

With the subcommands some of the documentation examples are no-longer correct. Fix all of them, so it is consistent. Signed-off-by: Simon Glass <sjg(a)chromium.org> --- tools/patman/README | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/tools/patman/README b/tools/patman/README index 6b806632f8c..53f55ce95d4 100644 --- a/tools/patman/README +++ b/tools/patman/README @@ -136,17 +136,17 @@ How to run it First do a dry run: -$ ./tools/patman/patman -n +$ ./tools/patman/patman send -n If it can't detect the upstream branch, try telling it how many patches there are in your series: -$ ./tools/patman/patman -n -c5 +$ ./tools/patman/patman -c5 send -n This will create patch files in your current directory and tell you who it is thinking of sending them to. Take a look at the patch files. -$ ./tools/patman/patman -n -c5 -s1 +$ ./tools/patman/patman -c5 -s1 send -n Similar to the above, but skip the first commit and take the next 5. This is useful if your top commit is for setting up testing. @@ -433,12 +433,12 @@ but that you don't want to submit because there is an existing patch for it on the list. So you can tell patman to create and check some patches (skipping the first patch) with: - patman -s1 -n + patman -s1 send -n If you want to do all of them including the work-in-progress one, then (if you are tracking an upstream branch): - patman -n + patman send -n Let's say that patman reports an error in the second patch. Then: @@ -450,7 +450,7 @@ Let's say that patman reports an error in the second patch. Then: Now you have an updated patch series. To check it: - patman -s1 -n + patman -s1 send -n Let's say it is now clean and you want to send it. Now you need to set up the destination. So amend the top commit with: @@ -485,7 +485,7 @@ mmc and sparc, and the last one to sandbox. Now to send the patches, take off the -n flag: - patman -s1 + patman -s1 send The patches will be created, shown in your editor, and then sent along with the cover letter. Note that patman's tags are automatically removed so that -- 2.29.2.729.g45daf8777d-goog

2 3

[PATCH] ARM: imx6: dh-imx6: Move bootcounter to SNVS_LPGDR
by Marek Vasut 23 Jan '21

23 Jan '21

Move the bootcounter to SVNS_LPGDR to free up OCRAM for usage by the VPU. Signed-off-by: Marek Vasut <marex(a)denx.de> Cc: Stefano Babic <sbabic(a)denx.de> --- configs/dh_imx6_defconfig | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/configs/dh_imx6_defconfig b/configs/dh_imx6_defconfig index 0d1f0cfeac1..0a667fbae97 100644 --- a/configs/dh_imx6_defconfig +++ b/configs/dh_imx6_defconfig @@ -18,8 +18,10 @@ CONFIG_DM_GPIO=y CONFIG_SPL_TEXT_BASE=0x00908000 CONFIG_SPL_MMC_SUPPORT=y CONFIG_SPL_SERIAL_SUPPORT=y -CONFIG_SYS_BOOTCOUNT_ADDR=0x00900000 +CONFIG_BOOTCOUNT_BOOTLIMIT=3 +CONFIG_SYS_BOOTCOUNT_ADDR=0x020CC068 CONFIG_SPL=y +CONFIG_SYS_BOOTCOUNT_SINGLEWORD=y CONFIG_ENV_OFFSET_REDUND=0x110000 CONFIG_SPL_SPI_FLASH_SUPPORT=y CONFIG_SPL_SPI_SUPPORT=y @@ -47,6 +49,7 @@ CONFIG_CMD_SATA=y CONFIG_CMD_USB=y CONFIG_CMD_USB_MASS_STORAGE=y CONFIG_CMD_WDT=y +CONFIG_CMD_BOOTCOUNT=y CONFIG_CMD_CACHE=y CONFIG_CMD_TIME=y CONFIG_CMD_EXT4_WRITE=y -- 2.29.2

2 1

[PATCH v3] imx8mq: configs: add support for distro boot commands
by Alice Guo (OSS) 23 Jan '21

23 Jan '21

From: Alice Guo <alice.guo(a)nxp.com> Supported boot device types in iMX8MQ: MMC, DHCP. CONFIG_DISTRO_DEFAULTS is added for enabling the DISTRO_DEFAULTS option. CONFIG_BOOTCOMMAND which is defined in include/configs/imx8mq_evk.h is deleted because "run distro_bootcmd" is required to be the default boot mode. scriptaddr is the location in RAM where boot.scr.uimg/boot.scr will be loaded to prior to execution. kernel_addr_r is the location in RAM where the kernel will be loaded to. Delete unnecessary environment variables because "run distro_bootcmd" is set to be the default boot mode. Signed-off-by: Alice Guo <alice.guo(a)nxp.com> --- Changes for v3: - enable the DISTRO_DEFAULTS option by adding CONFIG_DISTRO_DEFAULTS=y - modify commit log Changes for v2: - re-add boot_fdt, initrd_addr and bootm_size which may need to be used configs/imx8mq_evk_defconfig | 1 + include/configs/imx8mq_evk.h | 75 ++++++------------------------------ 2 files changed, 13 insertions(+), 63 deletions(-) diff --git a/configs/imx8mq_evk_defconfig b/configs/imx8mq_evk_defconfig index de91a76d41..424301bf4d 100644 --- a/configs/imx8mq_evk_defconfig +++ b/configs/imx8mq_evk_defconfig @@ -36,6 +36,7 @@ CONFIG_CMD_EXT2=y CONFIG_CMD_EXT4=y CONFIG_CMD_EXT4_WRITE=y CONFIG_CMD_FAT=y +CONFIG_DISTRO_DEFAULTS=y CONFIG_OF_CONTROL=y CONFIG_ENV_OVERWRITE=y CONFIG_ENV_IS_IN_MMC=y diff --git a/include/configs/imx8mq_evk.h b/include/configs/imx8mq_evk.h index 96bfff749c..1861ebad18 100644 --- a/include/configs/imx8mq_evk.h +++ b/include/configs/imx8mq_evk.h @@ -74,20 +74,20 @@ #define IMX_FEC_BASE 0x30BE0000 #endif -#define CONFIG_MFG_ENV_SETTINGS \ - "mfgtool_args=setenv bootargs console=${console},${baudrate} " \ - "rdinit=/linuxrc " \ - "g_mass_storage.stall=0 g_mass_storage.removable=1 " \ - "g_mass_storage.idVendor=0x066F g_mass_storage.idProduct=0x37FF "\ - "g_mass_storage.iSerialNumber=\"\" "\ - "clk_ignore_unused "\ - "\0" \ - "initrd_addr=0x43800000\0" \ - "bootcmd_mfg=run mfgtool_args;booti ${loadaddr} ${initrd_addr} ${fdt_addr};\0" \ +#ifndef CONFIG_SPL_BUILD +#define BOOT_TARGET_DEVICES(func) \ + func(MMC, mmc, 0) \ + func(MMC, mmc, 1) \ + func(DHCP, dhcp, na) + +#include <config_distro_bootcmd.h> +#endif + /* Initial environment variables */ #define CONFIG_EXTRA_ENV_SETTINGS \ - CONFIG_MFG_ENV_SETTINGS \ - "script=boot.scr\0" \ + BOOTENV \ + "scriptaddr=0x43500000\0" \ + "kernel_addr_r=0x40880000\0" \ "image=Image\0" \ "console=ttymxc0,115200\0" \ "fdt_addr=0x43000000\0" \ @@ -95,59 +95,8 @@ "fdt_file=imx8mq-evk.dtb\0" \ "initrd_addr=0x43800000\0" \ "bootm_size=0x10000000\0" \ - "mmcdev="__stringify(CONFIG_SYS_MMC_ENV_DEV)"\0" \ "mmcpart=" __stringify(CONFIG_SYS_MMC_IMG_LOAD_PART) "\0" \ "mmcroot=" CONFIG_MMCROOT " rootwait rw\0" \ - "mmcautodetect=yes\0" \ - "mmcargs=setenv bootargs console=${console} root=${mmcroot}\0 " \ - "loadbootscript=fatload mmc ${mmcdev}:${mmcpart} ${loadaddr} ${script};\0" \ - "bootscript=echo Running bootscript from mmc ...; " \ - "source\0" \ - "loadimage=fatload mmc ${mmcdev}:${mmcpart} ${loadaddr} ${image}\0" \ - "loadfdt=fatload mmc ${mmcdev}:${mmcpart} ${fdt_addr} ${fdt_file}\0" \ - "mmcboot=echo Booting from mmc ...; " \ - "run mmcargs; " \ - "if test ${boot_fdt} = yes || test ${boot_fdt} = try; then " \ - "if run loadfdt; then " \ - "booti ${loadaddr} - ${fdt_addr}; " \ - "else " \ - "echo WARN: Cannot load the DT; " \ - "fi; " \ - "else " \ - "echo wait for boot; " \ - "fi;\0" \ - "netargs=setenv bootargs console=${console} " \ - "root=/dev/nfs " \ - "ip=dhcp nfsroot=${serverip}:${nfsroot},v3,tcp\0" \ - "netboot=echo Booting from net ...; " \ - "run netargs; " \ - "if test ${ip_dyn} = yes; then " \ - "setenv get_cmd dhcp; " \ - "else " \ - "setenv get_cmd tftp; " \ - "fi; " \ - "${get_cmd} ${loadaddr} ${image}; " \ - "if test ${boot_fdt} = yes || test ${boot_fdt} = try; then " \ - "if ${get_cmd} ${fdt_addr} ${fdt_file}; then " \ - "booti ${loadaddr} - ${fdt_addr}; " \ - "else " \ - "echo WARN: Cannot load the DT; " \ - "fi; " \ - "else " \ - "booti; " \ - "fi;\0" - -#define CONFIG_BOOTCOMMAND \ - "mmc dev ${mmcdev}; if mmc rescan; then " \ - "if run loadbootscript; then " \ - "run bootscript; " \ - "else " \ - "if run loadimage; then " \ - "run mmcboot; " \ - "else run netboot; " \ - "fi; " \ - "fi; " \ - "else booti ${loadaddr} - ${fdt_addr}; fi" /* Link Definitions */ #define CONFIG_LOADADDR 0x40480000 -- 2.17.1

2 1

[PATCH 1/3] clk: imx: Add ECSPI to iMX8MN
by Marek Vasut 23 Jan '21

23 Jan '21

Add ECSPI clock entries to iMX8MN clock driver. Only make those entries available in case SPI support in U-Boot is enabled at all to conserve space, esp. in SPL. Signed-off-by: Marek Vasut <marex(a)denx.de> Cc: Peng Fan <peng.fan(a)nxp.com> Cc: Stefano Babic <sbabic(a)denx.de> --- drivers/clk/imx/clk-imx8mn.c | 29 +++++++++++++++++++++++++++++ 1 file changed, 29 insertions(+) diff --git a/drivers/clk/imx/clk-imx8mn.c b/drivers/clk/imx/clk-imx8mn.c index e29d902544c..e398d7de02a 100644 --- a/drivers/clk/imx/clk-imx8mn.c +++ b/drivers/clk/imx/clk-imx8mn.c @@ -105,6 +105,20 @@ static const char *imx8mn_usdhc1_sels[] = {"clock-osc-24m", "sys_pll1_400m", "sy static const char *imx8mn_usdhc2_sels[] = {"clock-osc-24m", "sys_pll1_400m", "sys_pll1_800m", "sys_pll2_500m", "sys_pll3_out", "sys_pll1_266m", "audio_pll2_out", "sys_pll1_100m", }; +#if CONFIG_IS_ENABLED(DM_SPI) +static const char *imx8mn_ecspi1_sels[] = {"osc_24m", "sys_pll2_200m", "sys_pll1_40m", + "sys_pll1_160m", "sys_pll1_800m", "sys_pll3_out", + "sys_pll2_250m", "audio_pll2_out", }; + +static const char *imx8mn_ecspi2_sels[] = {"osc_24m", "sys_pll2_200m", "sys_pll1_40m", + "sys_pll1_160m", "sys_pll1_800m", "sys_pll3_out", + "sys_pll2_250m", "audio_pll2_out", }; + +static const char *imx8mn_ecspi3_sels[] = {"osc_24m", "sys_pll2_200m", "sys_pll1_40m", + "sys_pll1_160m", "sys_pll1_800m", "sys_pll3_out", + "sys_pll2_250m", "audio_pll2_out", }; +#endif + static const char *imx8mn_i2c1_sels[] = {"clock-osc-24m", "sys_pll1_160m", "sys_pll2_50m", "sys_pll3_out", "audio_pll1_out", "video_pll1_out", "audio_pll2_out", "sys_pll1_133m", }; @@ -440,6 +454,21 @@ static int imx8mn_clk_probe(struct udevice *dev) base + 0x40a0, 0)); #endif +#if CONFIG_IS_ENABLED(DM_SPI) + clk_dm(IMX8MN_CLK_ECSPI1, + imx8m_clk_composite("ecspi1", imx8mn_ecspi1_sels, base + 0xb280)); + clk_dm(IMX8MN_CLK_ECSPI2, + imx8m_clk_composite("ecspi2", imx8mn_ecspi2_sels, base + 0xb300)); + clk_dm(IMX8MN_CLK_ECSPI3, + imx8m_clk_composite("ecspi3", imx8mn_ecspi3_sels, base + 0xc180)); + clk_dm(IMX8MN_CLK_ECSPI1_ROOT, + imx_clk_gate4("ecspi1_root_clk", "ecspi1", base + 0x4070, 0)); + clk_dm(IMX8MN_CLK_ECSPI2_ROOT, + imx_clk_gate4("ecspi2_root_clk", "ecspi2", base + 0x4080, 0)); + clk_dm(IMX8MN_CLK_ECSPI3_ROOT, + imx_clk_gate4("ecspi3_root_clk", "ecspi3", base + 0x4090, 0)); +#endif + return 0; } -- 2.29.2

3 6

[PATCH] mx6ul(l)evk: Enable DM_ETH_PHY
by Sean Anderson 23 Jan '21

23 Jan '21

This fixes eth0 not initializing properly. Both eth0 and eth1 use the MDIO interface on eth1 to access their PHYs. However, without DM_ETH_PHY, eth0 still tries to use its own MDIO interface to access its phy. Before this patch, a boot log might contain lines like Net: Warning: ethernet@20b4000 using MAC address from ROM eth1: ethernet@20b4000 [PRIME]Could not get PHY for FEC0: addr 2 After this patch they now look like Net: Warning: ethernet@20b4000 using MAC address from ROM eth1: ethernet@20b4000 [PRIME]Get shared mii bus on ethernet@2188000 Warning: ethernet@2188000 using MAC address from ROM , eth0: ethernet@2188000 As an alternative to DM_ETH_PHY, FEC_MXC_SHARE_MDIO could also have been used to achieve the same effect. Signed-off-by: Sean Anderson <sean.anderson(a)seco.com> --- configs/mx6ul_14x14_evk_defconfig | 1 + configs/mx6ul_9x9_evk_defconfig | 1 + configs/mx6ull_14x14_evk_defconfig | 1 + configs/mx6ull_14x14_evk_plugin_defconfig | 1 + 4 files changed, 4 insertions(+) diff --git a/configs/mx6ul_14x14_evk_defconfig b/configs/mx6ul_14x14_evk_defconfig index f0a155aff3..5c3440f930 100644 --- a/configs/mx6ul_14x14_evk_defconfig +++ b/configs/mx6ul_14x14_evk_defconfig @@ -68,6 +68,7 @@ CONFIG_PHYLIB=y CONFIG_PHY_MICREL=y CONFIG_PHY_MICREL_KSZ8XXX=y CONFIG_DM_ETH=y +CONFIG_DM_ETH_PHY=y CONFIG_FEC_MXC=y CONFIG_MII=y CONFIG_PINCTRL=y diff --git a/configs/mx6ul_9x9_evk_defconfig b/configs/mx6ul_9x9_evk_defconfig index 40bb371a69..86027d2d49 100644 --- a/configs/mx6ul_9x9_evk_defconfig +++ b/configs/mx6ul_9x9_evk_defconfig @@ -61,6 +61,7 @@ CONFIG_PHYLIB=y CONFIG_PHY_MICREL=y CONFIG_PHY_MICREL_KSZ8XXX=y CONFIG_DM_ETH=y +CONFIG_DM_ETH_PHY=y CONFIG_MII=y CONFIG_PINCTRL=y CONFIG_PINCTRL_IMX6=y diff --git a/configs/mx6ull_14x14_evk_defconfig b/configs/mx6ull_14x14_evk_defconfig index 4fdbb915d4..fd33e0a4ef 100644 --- a/configs/mx6ull_14x14_evk_defconfig +++ b/configs/mx6ull_14x14_evk_defconfig @@ -47,6 +47,7 @@ CONFIG_PHYLIB=y CONFIG_PHY_MICREL=y CONFIG_PHY_MICREL_KSZ8XXX=y CONFIG_DM_ETH=y +CONFIG_DM_ETH_PHY=y CONFIG_FEC_MXC=y CONFIG_MII=y CONFIG_PINCTRL=y diff --git a/configs/mx6ull_14x14_evk_plugin_defconfig b/configs/mx6ull_14x14_evk_plugin_defconfig index f8f863411e..f3f3fac9c1 100644 --- a/configs/mx6ull_14x14_evk_plugin_defconfig +++ b/configs/mx6ull_14x14_evk_plugin_defconfig @@ -48,6 +48,7 @@ CONFIG_PHYLIB=y CONFIG_PHY_MICREL=y CONFIG_PHY_MICREL_KSZ8XXX=y CONFIG_DM_ETH=y +CONFIG_DM_ETH_PHY=y CONFIG_FEC_MXC=y CONFIG_MII=y CONFIG_PINCTRL=y -- 2.25.1

3 2

[PATCH] arm: dart6ul: fix ddr size macro
by ferlandm＠amotus.ca 23 Jan '21

23 Jan '21

From: Marc Ferland <ferlandm(a)amotus.ca> The previous macro was off by one bit and so we were getting a ddr size which was twice the real size. This commit refactors the macro so it returns the right size in _bytes_ and modifies the printf call so the size is still printed in MiB. Signed-off-by: Marc Ferland <ferlandm(a)amotus.ca> --- board/variscite/dart_6ul/dart_6ul.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/board/variscite/dart_6ul/dart_6ul.c b/board/variscite/dart_6ul/dart_6ul.c index 360be758bb..12e222e96e 100644 --- a/board/variscite/dart_6ul/dart_6ul.c +++ b/board/variscite/dart_6ul/dart_6ul.c @@ -250,7 +250,7 @@ struct dart6ul_info { #define DART6UL_INFO_STORAGE_GET(n) ((n) & 0x3) #define DART6UL_INFO_WIFI_GET(n) ((n) >> 2 & 0x1) #define DART6UL_INFO_REV_GET(n) ((n) >> 3 & 0x3) -#define DART6UL_DDRSIZE_IN_MIB(n) ((n) << 8) +#define DART6UL_DDRSIZE(n) ((n) * SZ_128M) #define DART6UL_INFO_MAGIC 0x32524156 static const char *som_info_storage_to_str(u8 som_info) @@ -323,7 +323,7 @@ int checkboard(void) info->date, som_info_storage_to_str(info->som_info), DART6UL_INFO_WIFI_GET(info->som_info) ? "yes" : "no", - DART6UL_DDRSIZE_IN_MIB(info->ddr_size), + DART6UL_DDRSIZE(info->ddr_size) / SZ_1M, som_info_rev_to_str(info->som_info)); free(info); -- 2.25.1

2 1