January 2016 - U-Boot

[U-Boot] [PATCH 00/19] video: Introduce support for anti-aliased outline fonts
by Simon Glass 30 Jan '16

30 Jan '16

The existing 8x16 font is adequate for most purposes. It is small and fast. However for boot screens where information must be presented to the user, the console font is not ideal. Common requirements are larger and better-looking fonts. In many systems U-Boot is 'behind the scenes' and does not display user-facing data. For those situations where this is not the case, we need to present firmware screens with visually attractive menus. This series adds a console driver which uses TrueType fonts built into U-Boot. It can render them at any size. This can be used in scripts to place text as needed on the display. This driver is not really designed to operate with the command line. Much of U-Boot expects a fixed-width font. But to keep things working correctly, rudimentary support for the console is provided. The main missing feature is support for command-line editing. The TrueType implementation is STB, a fairly light-weight TrueType-rendering implementation from http://nothings.org/. This integrates fairly easily with U-Boot. The driver is tested on sandbox and a few ARM hardware devices. It should be possible to use it on any hardware. The main new dependency is floating point which is available on many modern systems. Care is taken to ensure this dependency is isolated to this one driver. Simon Glass (19): video: Add stb TrueType font renderer Makefile: Add rules to build in .ttf files video kconfig console_normal video: Use fractional units for X coordinates video: Handle the 'bell' character video: Provide a left margin for the text console video: Provide a signal when a new console line is started video: Provide a backspace method video: Add a console driver that uses TrueType fonts video: Add the Nimbus sans font video: Add the AnkaCoder mono-spaced font video: Add the Rufscript handwriting font video: Add the Cantoraone decorative font License: Add the Open Font License video: Allow selection of the driver and font size video: sandbox: Allow selection of font size and console name video: sandbox: Enable truetype fonts for sandbox video: test: Add console tests for truetype video: Correct 'tor' typo in comment Licenses/OFL.txt | 97 + Licenses/README | 1 + configs/sandbox_defconfig | 4 +- drivers/video/Kconfig | 36 +- drivers/video/Makefile | 6 +- drivers/video/console_normal.c | 24 +- drivers/video/console_rotate.c | 66 +- drivers/video/console_truetype.c | 550 +++++ drivers/video/fonts/Kconfig | 51 + drivers/video/fonts/Makefile | 11 + drivers/video/fonts/ankacoder_c75_r.ttf | Bin 0 -> 65596 bytes drivers/video/fonts/cantoraone_regular.ttf | Bin 0 -> 163116 bytes drivers/video/fonts/nimbus_sans_l_regular.ttf | Bin 0 -> 61660 bytes drivers/video/fonts/rufscript010.ttf | Bin 0 -> 23080 bytes drivers/video/sandbox_sdl.c | 2 + drivers/video/stb_truetype.h | 3240 +++++++++++++++++++++++++ drivers/video/vidconsole-uclass.c | 84 +- drivers/video/video-uclass.c | 29 +- include/dm/test.h | 2 + include/video.h | 7 +- include/video_console.h | 70 +- scripts/Makefile.lib | 21 + test/dm/video.c | 90 +- 23 files changed, 4326 insertions(+), 65 deletions(-) create mode 100644 Licenses/OFL.txt create mode 100644 drivers/video/console_truetype.c create mode 100644 drivers/video/fonts/Kconfig create mode 100644 drivers/video/fonts/Makefile create mode 100644 drivers/video/fonts/ankacoder_c75_r.ttf create mode 100644 drivers/video/fonts/cantoraone_regular.ttf create mode 100644 drivers/video/fonts/nimbus_sans_l_regular.ttf create mode 100644 drivers/video/fonts/rufscript010.ttf create mode 100644 drivers/video/stb_truetype.h -- 2.6.0.rc2.230.g3dd15c0

4 32

[U-Boot] [PATCH] clk: Correct compilation when OF_CONTROL is not set
by Simon Glass 30 Jan '16

30 Jan '16

At present clk.h does not build without OF_CONTROL, but it is clearly intended to. Fix it. Signed-off-by: Simon Glass <sjg(a)chromium.org> --- include/clk.h | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/include/clk.h b/include/clk.h index 05c5a79..e6ab934 100644 --- a/include/clk.h +++ b/include/clk.h @@ -8,6 +8,7 @@ #ifndef _CLK_H_ #define _CLK_H_ +#include <errno.h> #include <linux/types.h> struct udevice; @@ -153,7 +154,7 @@ int fdt_clk_get(const void *fdt, int nodeoffset, int index, struct udevice **dev); #else static inline int fdt_clk_get(const void *fdt, int nodeoffset, int index, - struct udevice **dev); + struct udevice **dev) { return -ENOSYS; } -- 2.7.0.rc3.207.g0ac5344

2 2

[U-Boot] Please pull u-boot-dm
by Simon Glass 30 Jan '16

30 Jan '16

Hi Tom, This includes new TPM support and Stephen's work on the Python test framework. The following changes since commit 3faf2216d9649e2a22e6728194e9797cb46db933: Merge branch 'master' of git://git.denx.de/u-boot-tegra (2016-01-28 15:17:11 -0500) are available in the git repository at: git://git.denx.de/u-boot-dm.git for you to fetch changes up to 26db3a617b38cc1bed1ce100381d2c4ccbb55e42: test/py: dfu: allow boardenv to specify test sizes (2016-01-28 21:01:24 -0700) ---------------------------------------------------------------- Christophe Ricard (5): tpm: Fix fault in case CONFIG_DM_TPM is set without any TPM tpm: tpm_tis_lpc: fix typo tpm: Rename tpm_tis_infineon.h to tpm_tis.h and move infineon specific stuff in tpm_infineon.c tpm: st33zp24: Add tpm st33zp24 support with i2c tpm: st33zp24: Add tpm st33zp24 spi support Simon Glass (1): dm: Remove device_probe_child() Stephen Warren (30): test/py: fix timeout to be absolute test/py: move U-Boot respawn trigger to the test core test/py: drain console log at the end of any failed test test/py: log when tests send CTRL-C test/py: optionally ignore errors from shell commands test/py: add various utility code test/py: ums: add filesystem-based testing test/py: add DFU test test/py: move find_ram_base() into u_boot_utils test/py: add a networking test test/py: make crash detection more robust ARM: tegra: shut down USB device controller at boot test/py: dfu: error out if USB device already exists Implement "pci enum" command for CONFIG_DM_PCI distro bootcmd: make net boot only optionally start USB distro bootcmd: enumerate PCI before network operations test/py: make net test aware of USB and PCI enumeration test/py: use " for docstrings test/py: Quote consistency test/py: Provide custom IDs when parametrizing tests test/dm: clear unit test failure count each run test/py: fix spawn.expect multiple match handling test.py: calculate bad patterns on change only test/py: check for bad patterns everywhere we wait test/py: detect another "bad pattern" in console output test/py: correctly log xfail/xpass tests test/py: pass test DTB to sandbox test/py: run sandbox in source directory test/py: fix a couple typos in comments test/py: dfu: allow boardenv to specify test sizes README | 11 ++ arch/arm/mach-tegra/Kconfig | 13 ++ arch/arm/mach-tegra/board2.c | 10 +- cmd/pci.c | 18 +- cmd/tpm.c | 2 +- doc/README.distro | 15 ++ drivers/core/device.c | 9 +- drivers/pci/pci-uclass.c | 15 ++ drivers/tpm/Kconfig | 20 +- drivers/tpm/Makefile | 2 + drivers/tpm/{tpm_tis_infineon.h => tpm_tis.h} | 17 +- drivers/tpm/tpm_tis_infineon.c | 17 +- drivers/tpm/tpm_tis_st33zp24_i2c.c | 543 ++++++++++++++++++++++++++++++++++++++++++++++++++++++ drivers/tpm/tpm_tis_st33zp24_spi.c | 672 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ include/config_distro_bootcmd.h | 23 ++- include/dm/device-internal.h | 13 -- lib/tpm.c | 2 +- test/dfu/README | 44 ----- test/dfu/dfu_gadget_test.sh | 108 ----------- test/dfu/dfu_gadget_test_init.sh | 45 ----- test/dm/test-main.c | 2 + test/py/conftest.py | 118 +++++++----- test/py/multiplexed_log.css | 8 + test/py/multiplexed_log.py | 228 +++++++++++++---------- test/py/test.py | 8 +- test/py/tests/test_000_version.py | 2 +- test/py/tests/test_dfu.py | 279 ++++++++++++++++++++++++++++ test/py/tests/test_env.py | 66 +++---- test/py/tests/test_help.py | 2 +- test/py/tests/test_hush_if_test.py | 10 +- test/py/tests/test_md.py | 13 +- test/py/tests/test_net.py | 155 ++++++++++++++++ test/py/tests/test_sandbox_exit.py | 6 +- test/py/tests/test_shell_basics.py | 12 +- test/py/tests/test_sleep.py | 8 +- test/py/tests/test_ums.py | 243 +++++++++++++++++++----- test/py/tests/test_unknown_cmd.py | 4 +- test/py/u_boot_console_base.py | 226 +++++++++++++---------- test/py/u_boot_console_exec_attach.py | 12 +- test/py/u_boot_console_sandbox.py | 28 +-- test/py/u_boot_spawn.py | 47 +++-- test/py/u_boot_utils.py | 209 +++++++++++++++++++++ test/ums/README | 30 --- test/ums/ums_gadget_test.sh | 183 ------------------ 44 files changed, 2630 insertions(+), 868 deletions(-) rename drivers/tpm/{tpm_tis_infineon.h => tpm_tis.h} (86%) create mode 100644 drivers/tpm/tpm_tis_st33zp24_i2c.c create mode 100644 drivers/tpm/tpm_tis_st33zp24_spi.c delete mode 100644 test/dfu/README delete mode 100755 test/dfu/dfu_gadget_test.sh delete mode 100755 test/dfu/dfu_gadget_test_init.sh create mode 100644 test/py/tests/test_dfu.py create mode 100644 test/py/tests/test_net.py create mode 100644 test/py/u_boot_utils.py delete mode 100644 test/ums/README delete mode 100755 test/ums/ums_gadget_test.sh Regards, Simon

2 1

[U-Boot] [PATCH v2] net: Add bootfile in DHCP Request
by amessier.tyco＠gmail.com 29 Jan '16

29 Jan '16

From: Alexandre Messier <amessier(a)tycoint.com> Add the bootfile name in the DHCP Request packet, in addition to it already being sent in the DHCP Discover. This is needed by some DHCP servers so that the bootfile name is properly returned by the server to the client in the DHCP Ack, as expected by U-Boot. Signed-off-by: Alexandre Messier <amessier(a)tycoint.com> --- Changes since v1: - Addressed Joe Hershberger's comment: Removed the config option, always send the bootfile name. - Removed from patch series. v1 was in a series, but now the patch stands alone. v1 can be found here: Patchwork: https://patchwork.ozlabs.org/patch/571775/ Mailing list: http://lists.denx.de/pipermail/u-boot/2016-January/242839.html net/bootp.c | 1 + 1 file changed, 1 insertion(+) diff --git a/net/bootp.c b/net/bootp.c index 8aeddb0..036d9ff 100644 --- a/net/bootp.c +++ b/net/bootp.c @@ -949,6 +949,7 @@ static void dhcp_send_request_packet(struct bootp_hdr *bp_offer) net_write_ip(&bp->bp_giaddr, zero_ip); memcpy(bp->bp_chaddr, net_ethaddr, 6); + copy_filename(bp->bp_file, net_boot_file_name, sizeof(bp->bp_file)); /* * ID is the id of the OFFER packet -- 2.7.0

2 1

[U-Boot] [PATCH 2/2][v2] net: phy: implements probe for Cortina phy
by shh.xie＠gmail.com 29 Jan '16

29 Jan '16

From: Shaohui Xie <Shaohui.Xie(a)nxp.com> Cortina phy cannot support soft reset, this commit implements probe for Cortina PHY to tell phylib to skip phy soft reset by setting PHY_FLAG_BROKEN_RESET in flags. Signed-off-by: Shaohui Xie <Shaohui.Xie(a)nxp.com> Acked-by: Joe Hershberger <joe.hershberger(a)ni.com> --- changes in v2: 1. use PHY_FLAG_BROKEN_RESET instead of PHY_BROKEN_RESET drivers/net/phy/cortina.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/drivers/net/phy/cortina.c b/drivers/net/phy/cortina.c index 3a2b3bb..ba1157f 100644 --- a/drivers/net/phy/cortina.c +++ b/drivers/net/phy/cortina.c @@ -256,6 +256,12 @@ int cs4340_config(struct phy_device *phydev) return 0; } +int cs4340_probe(struct phy_device *phydev) +{ + phydev->flags = PHY_FLAG_BROKEN_RESET; + return 0; +} + int cs4340_startup(struct phy_device *phydev) { phydev->link = 1; @@ -275,6 +281,7 @@ struct phy_driver cs4340_driver = { MDIO_DEVS_PHYXS | MDIO_DEVS_AN | MDIO_DEVS_VEND1 | MDIO_DEVS_VEND2), .config = &cs4340_config, + .probe = &cs4340_probe, .startup = &cs4340_startup, .shutdown = &gen10g_shutdown, }; -- 2.1.0.27.g96db324

2 1

[U-Boot] [PATCH 1/2][v2] net: phy: introduce a quirk PHY_FLAG_BROKEN_RESET
by shh.xie＠gmail.com 29 Jan '16

29 Jan '16

From: Shaohui Xie <Shaohui.Xie(a)nxp.com> Current driver always performs a phy soft reset when connecting the phy device, but soft reset is not always supported by a phy device, so introduce a quirk PHY_FLAG_BROKEN_RESET to let such a phy device to skip soft reset. This commit uses 'flags' of phy device structure to store the quirk. Signed-off-by: Shaohui Xie <Shaohui.Xie(a)nxp.com> --- changes in v2: 1. use PHY_FLAG_BROKEN_RESET instead of PHY_BROKEN_RESET 2. use '&' to check the phydev->flags instead of '==' drivers/net/phy/phy.c | 3 +++ include/phy.h | 2 ++ 2 files changed, 5 insertions(+) diff --git a/drivers/net/phy/phy.c b/drivers/net/phy/phy.c index 9bf231c..9126d5d 100644 --- a/drivers/net/phy/phy.c +++ b/drivers/net/phy/phy.c @@ -741,6 +741,9 @@ int phy_reset(struct phy_device *phydev) int timeout = 500; int devad = MDIO_DEVAD_NONE; + if (phydev->flags & PHY_FLAG_BROKEN_RESET) + return 0; + #ifdef CONFIG_PHYLIB_10G /* If it's 10G, we need to issue reset through one of the MMDs */ if (is_10g_interface(phydev->interface)) { diff --git a/include/phy.h b/include/phy.h index e030c9f..09bbe48 100644 --- a/include/phy.h +++ b/include/phy.h @@ -17,6 +17,8 @@ #define PHY_MAX_ADDR 32 +#define PHY_FLAG_BROKEN_RESET (1 << 0) /* soft reset not supported */ + #define PHY_DEFAULT_FEATURES (SUPPORTED_Autoneg | \ SUPPORTED_TP | \ SUPPORTED_MII) -- 2.1.0.27.g96db324

3 2

[U-Boot] [PATCH] net: phy: Use 'autoneg' flag from phydev
by amessier.tyco＠gmail.com 29 Jan '16

29 Jan '16

From: Alexandre Messier <amessier(a)tycoint.com> Use the 'autoneg' flag available in phydev when checking if autoneg is in use. The previous implementation was checking directly in the PHY if autoneg was supported. Some PHYs will report that autoneg is supported, even when it is disabled. Thus it is not possible to use that bit to determine if autoneg is currently in use or not. Signed-off-by: Alexandre Messier <amessier(a)tycoint.com> --- drivers/net/phy/phy.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/drivers/net/phy/phy.c b/drivers/net/phy/phy.c index 1d8eed5..10a7b30 100644 --- a/drivers/net/phy/phy.c +++ b/drivers/net/phy/phy.c @@ -223,7 +223,8 @@ int genphy_update_link(struct phy_device *phydev) if (phydev->link && mii_reg & BMSR_LSTATUS) return 0; - if ((mii_reg & BMSR_ANEGCAPABLE) && !(mii_reg & BMSR_ANEGCOMPLETE)) { + if ((phydev->autoneg == AUTONEG_ENABLE) && + !(mii_reg & BMSR_ANEGCOMPLETE)) { int i = 0; printf("%s Waiting for PHY auto negotiation to complete", @@ -279,7 +280,7 @@ int genphy_parse_link(struct phy_device *phydev) int mii_reg = phy_read(phydev, MDIO_DEVAD_NONE, MII_BMSR); /* We're using autonegotiation */ - if (phydev->supported & SUPPORTED_Autoneg) { + if (phydev->autoneg == AUTONEG_ENABLE) { u32 lpa = 0; int gblpa = 0; u32 estatus = 0; -- 1.8.3.1

3 2

[U-Boot] [PATCH] net: phy: Set ANRESTART in setup_forced
by amessier.tyco＠gmail.com 29 Jan '16

29 Jan '16

From: Alexandre Messier <amessier(a)tycoint.com> When configuring a PHY in fixed (forced) link mode, in order for the changes to be applied, either one of these conditions must be triggered: 1- PHY is reset 2- Autoneg is restarted 3- PHY transitions from power-down to power-up Neither of these is currently done, so effectively the fixed link configuration is not applied in the PHY. Fix this by setting the Autoneg restart bit. Signed-off-by: Alexandre Messier <amessier(a)tycoint.com> --- drivers/net/phy/phy.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/net/phy/phy.c b/drivers/net/phy/phy.c index a6023f1..1d8eed5 100644 --- a/drivers/net/phy/phy.c +++ b/drivers/net/phy/phy.c @@ -116,7 +116,7 @@ static int genphy_config_advert(struct phy_device *phydev) static int genphy_setup_forced(struct phy_device *phydev) { int err; - int ctl = 0; + int ctl = BMCR_ANRESTART; phydev->pause = phydev->asym_pause = 0; -- 1.8.3.1

3 2

[U-Boot] [PATCH] net: phy: micrel: Disable B_CAST on config
by amessier.tyco＠gmail.com 29 Jan '16

29 Jan '16

From: Alexandre Messier <amessier(a)tycoint.com> Micrel PHYs KSZ8021/31 and KSZ8081 have a feature where MDIO address 0 is considered as a broadcast address; the PHY will respond even if it is not its configured (pinstrapped) address. This feature is enabled by default. The Linux kernel disables that feature at initialisation, but not before it probes the MDIO bus. This causes an issue, because a PHY at address 3 will be discovered at addresses 0 and 3, but will then only respond at address 3. Because Linux attaches the first PHY it discovers on 'eth0', it will attach the PHY from address 0, which will never answer again. Fix the issue by disabling the broadcast feature in U-Boot, before Linux is started. Signed-off-by: Alexandre Messier <amessier(a)tycoint.com> --- drivers/net/phy/micrel.c | 22 ++++++++++++++++++++-- 1 file changed, 20 insertions(+), 2 deletions(-) diff --git a/drivers/net/phy/micrel.c b/drivers/net/phy/micrel.c index cbec928..2458254 100644 --- a/drivers/net/phy/micrel.c +++ b/drivers/net/phy/micrel.c @@ -22,12 +22,30 @@ static struct phy_driver KSZ804_driver = { .shutdown = &genphy_shutdown, }; +#define MII_KSZPHY_OMSO 0x16 +#define KSZPHY_OMSO_B_CAST_OFF (1 << 9) + +static int ksz_genconfig_bcastoff(struct phy_device *phydev) +{ + int ret; + + ret = phy_read(phydev, MDIO_DEVAD_NONE, MII_KSZPHY_OMSO); + if (ret < 0) + return ret; + + ret = phy_write(phydev, MDIO_DEVAD_NONE, MII_KSZPHY_OMSO, ret | KSZPHY_OMSO_B_CAST_OFF); + if (ret < 0) + return ret; + + return genphy_config(phydev); +} + static struct phy_driver KSZ8031_driver = { .name = "Micrel KSZ8021/KSZ8031", .uid = 0x221550, .mask = 0xfffff0, .features = PHY_BASIC_FEATURES, - .config = &genphy_config, + .config = &ksz_genconfig_bcastoff, .startup = &genphy_startup, .shutdown = &genphy_shutdown, }; @@ -37,7 +55,7 @@ static struct phy_driver KSZ8081_driver = { .uid = 0x221560, .mask = 0xfffff0, .features = PHY_BASIC_FEATURES, - .config = &genphy_config, + .config = &ksz_genconfig_bcastoff, .startup = &genphy_startup, .shutdown = &genphy_shutdown, }; -- 1.8.3.1

3 2

[U-Boot] [PATCH v2 0/7] net: add support for phy speed limitation
by Alexey Brodkin 29 Jan '16

29 Jan '16

In some cases Ethernet PHY and network itself might support speeds which are not supported by Ethernet controller (MAC). To support that kind of situation it is required to force limit PHY so it is not configured for unsupported mode or even if PHY autonegotiated too high speed it will be reconfigured for slower mode. Note this series is v2 because v1 patches were sent separately not being aranged in series. And now I'm putting all patches in one series and marking it v2 even though no changes were done in patches itself. Alexey Brodkin (4): drivers/net/phy: introduce phy_set_supported() include/net.h: add max_speed member in struct eth_pdata net/designware: do explicit port selection for 1Gb mode net/designware: add support of max-speed device tree property Florian Fainelli (2): net: phy: ensure Gigabit features are masked off if requested net: phy: breakdown PHY_*_FEATURES defines Sascha Hauer (1): net: phy: genphy: Allow overwriting features drivers/net/designware.c | 16 +++++++++- drivers/net/designware.h | 1 + drivers/net/phy/phy.c | 77 ++++++++++++++++++++++++++++++++++-------------- include/net.h | 2 ++ include/phy.h | 23 ++++++++++----- 5 files changed, 89 insertions(+), 30 deletions(-) -- 2.4.3

3 25