February 2018 - U-Boot

[U-Boot] [RFC PATCH] net: gem: Add support for more PHYs on MDIO bus
by Michal Simek 04 Apr '18

04 Apr '18

Find out MDIO bus and enable MDIO access to it if this is done via different controller. Signed-off-by: Michal Simek <michal.simek(a)xilinx.com> --- Hi Joe, this is the code I have hacked a year ago for ZynqMP where we can have configuration that 4 gems are enabled but they share the same MDIO bus which can be assigned to only gem. Normally recommendation is that you should assign it to IP which is required for boot and this is suitable I would say for almost everybody. But for testing purpose it will be good to support sharing mdio bus between others IPs. This hack is "enabling" this for others gem but not across different ethernet drivers. And my question is if there is any solution which can be used now for handling it. Or even this should work even now but we do something wrong. I am refreshing this topic based on communication with Tomasz Gorochowik when he wanted to separate mdio part but it is not compatible with solution used in Linux which is pattern we should follow. Note: I tested it only on zcu102 with the standard configuration but Tomasz confirmed that this is still working with shared mdio bus. Thanks, Michal --- drivers/net/zynq_gem.c | 37 ++++++++++++++++++++++++++++++------- 1 file changed, 30 insertions(+), 7 deletions(-) diff --git a/drivers/net/zynq_gem.c b/drivers/net/zynq_gem.c index 2cc49bca922a..33245ec36e67 100644 --- a/drivers/net/zynq_gem.c +++ b/drivers/net/zynq_gem.c @@ -177,6 +177,7 @@ struct zynq_gem_priv { int phyaddr; int init; struct zynq_gem_regs *iobase; + struct zynq_gem_regs *mdiobase; phy_interface_t interface; struct phy_device *phydev; int phy_of_handle; @@ -189,7 +190,7 @@ static u32 phy_setup_op(struct zynq_gem_priv *priv, u32 phy_addr, u32 regnum, u32 op, u16 *data) { u32 mgtcr; - struct zynq_gem_regs *regs = priv->iobase; + struct zynq_gem_regs *regs = priv->mdiobase; int err; err = wait_for_bit_le32(&regs->nwsr, ZYNQ_GEM_NWSR_MDIOIDLE_MASK, @@ -314,7 +315,7 @@ static int zynq_phy_init(struct udevice *dev) { int ret; struct zynq_gem_priv *priv = dev_get_priv(dev); - struct zynq_gem_regs *regs = priv->iobase; + struct zynq_gem_regs *regs_mdio = priv->mdiobase; const u32 supported = SUPPORTED_10baseT_Half | SUPPORTED_10baseT_Full | SUPPORTED_100baseT_Half | @@ -323,7 +324,7 @@ static int zynq_phy_init(struct udevice *dev) SUPPORTED_1000baseT_Full; /* Enable only MDIO bus */ - writel(ZYNQ_GEM_NWCTRL_MDEN_MASK, &regs->nwctrl); + writel(ZYNQ_GEM_NWCTRL_MDEN_MASK, &regs_mdio->nwctrl); if (priv->interface != PHY_INTERFACE_MODE_SGMII) { ret = phy_detection(dev); @@ -355,6 +356,7 @@ static int zynq_gem_init(struct udevice *dev) unsigned long clk_rate = 0; struct zynq_gem_priv *priv = dev_get_priv(dev); struct zynq_gem_regs *regs = priv->iobase; + struct zynq_gem_regs *regs_mdio = priv->mdiobase; struct emac_bd *dummy_tx_bd = &priv->tx_bd[TX_FREE_DESC]; struct emac_bd *dummy_rx_bd = &priv->tx_bd[TX_FREE_DESC + 2]; @@ -397,7 +399,7 @@ static int zynq_gem_init(struct udevice *dev) writel(ZYNQ_GEM_DMACR_INIT, &regs->dmacr); /* Setup for Network Control register, MDIO, Rx and Tx enable */ - setbits_le32(&regs->nwctrl, ZYNQ_GEM_NWCTRL_MDEN_MASK); + setbits_le32(&regs_mdio->nwctrl, ZYNQ_GEM_NWCTRL_MDEN_MASK); /* Disable the second priority queue */ dummy_tx_bd->addr = 0; @@ -623,6 +625,7 @@ static int zynq_gem_probe(struct udevice *dev) void *bd_space; struct zynq_gem_priv *priv = dev_get_priv(dev); int ret; + char name[MDIO_NAME_LEN]; /* Align rxbuffers to ARCH_DMA_MINALIGN */ priv->rxbuffers = memalign(ARCH_DMA_MINALIGN, RX_BUF * PKTSIZE_ALIGN); @@ -648,6 +651,9 @@ static int zynq_gem_probe(struct udevice *dev) priv->bus->write = zynq_gem_miiphy_write; priv->bus->priv = priv; + snprintf(name, MDIO_NAME_LEN, "gem%lx", (ulong)priv->iobase); + strncpy(priv->bus->name, name, MDIO_NAME_LEN); + ret = mdio_register_seq(priv->bus, dev->seq); if (ret) return ret; @@ -682,6 +688,8 @@ static int zynq_gem_ofdata_to_platdata(struct udevice *dev) struct zynq_gem_priv *priv = dev_get_priv(dev); int node = dev_of_offset(dev); const char *phy_mode; + fdt_addr_t addr; + int parent; pdata->iobase = (phys_addr_t)devfdt_get_addr(dev); priv->iobase = (struct zynq_gem_regs *)pdata->iobase; @@ -690,10 +698,24 @@ static int zynq_gem_ofdata_to_platdata(struct udevice *dev) priv->phy_of_handle = fdtdec_lookup_phandle(gd->fdt_blob, node, "phy-handle"); - if (priv->phy_of_handle > 0) + if (priv->phy_of_handle > 0) { priv->phyaddr = fdtdec_get_int(gd->fdt_blob, priv->phy_of_handle, "reg", -1); + parent = fdt_parent_offset(gd->fdt_blob, priv->phy_of_handle); + addr = fdtdec_get_addr(gd->fdt_blob, parent, "reg"); + + if (addr == FDT_ADDR_T_NONE) { + printf("MDIO bus not found %x %x, %x\n", + node, priv->phy_of_handle, parent); + return -ENODEV; + } + + priv->mdiobase = (struct zynq_gem_regs *)addr; + } else { + priv->mdiobase = priv->iobase; + } + phy_mode = fdt_getprop(gd->fdt_blob, node, "phy-mode", NULL); if (phy_mode) pdata->phy_interface = phy_get_interface_by_name(phy_mode); @@ -706,8 +728,9 @@ static int zynq_gem_ofdata_to_platdata(struct udevice *dev) priv->int_pcs = fdtdec_get_bool(gd->fdt_blob, node, "is-internal-pcspma"); - printf("ZYNQ GEM: %lx, phyaddr %x, interface %s\n", (ulong)priv->iobase, - priv->phyaddr, phy_string_for_interface(priv->interface)); + printf("ZYNQ GEM: %lx, mdio bus %lx, phyaddr %d, interface %s\n", + (ulong)priv->iobase, (ulong)priv->mdiobase, priv->phyaddr, + phy_string_for_interface(priv->interface)); return 0; } -- 1.9.1

4 6

[U-Boot] [PATCH 1/3] dm: Add migration plan for CONFIG_BLK
by Simon Glass 03 Apr '18

03 Apr '18

The CONFIG_BLK conversion involves quite invasive changes in the U-Boot code, with #ifdefs and different code paths. We should try to move over to this soon so we can drop the old code. Set a deadline of 9 months for this work, rounded up to the next release. Signed-off-by: Simon Glass <sjg(a)chromium.org> --- doc/driver-model/MIGRATION.txt | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) create mode 100644 doc/driver-model/MIGRATION.txt diff --git a/doc/driver-model/MIGRATION.txt b/doc/driver-model/MIGRATION.txt new file mode 100644 index 0000000000..d2fe027249 --- /dev/null +++ b/doc/driver-model/MIGRATION.txt @@ -0,0 +1,20 @@ +Migration Schedule +==================== + +U-Boot has been migrating to a new driver model since its introduction in +2014. This file describes the schedule for deprecation of pre-driver-model +features. + + +CONFIG_BLK +---------- + +Status: In progress +Deadline: 2018.05 + +Maintainers should submit patches for enabling CONFIG_BLK on all boards in +time for inclusion in the 2018.05 release. Boards not converted by this +time may be removed in a subsequent release. + +Note that this implies use of driver model for all block devices (e.g. +MMC, USB, SCSI, SATA). -- 2.14.0.rc1.383.gd1ce394fe2-goog

10 24

[U-Boot] Please pull u-boot-dm
by Simon Glass 03 Apr '18

03 Apr '18

Hi Tom, Here are some additions to logging and 64-bit sandbox support. The following changes since commit ab12aa24e619b5e81cbde7de88c6d9a19f04313b: ARM: socfpga: Convert callers of cm_write_with_phase for wait_for_bit_le32 (2018-01-26 13:08:03 -0500) are available in the Git repository at: git://git.denx.de/u-boot-dm.git for you to fetch changes up to 4e94617bf911595efcecf52d6c9f323744a81cda: log: add category LOGC_EFI (2018-01-26 12:20:55 -0700) ---------------------------------------------------------------- Heinrich Schuchardt (1): log: add category LOGC_EFI Mario Six (1): sandbox: Add 64-bit sandbox Simon Glass (9): dm: core: Add a function to look up a uclass by name log: Add functions to convert IDs to/from names log: Add control over log formatting log: Update log_console to honour the log format log: Add a command to control the log output format log: Add a command to output a log record log: Add tests for the new log features log: Add documentation for commands and formatting log: Add a way to log error-return values arch/sandbox/Kconfig | 16 ++- arch/sandbox/cpu/cpu.c | 2 +- arch/sandbox/dts/Makefile | 4 + arch/sandbox/dts/sandbox64.dts | 317 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++ arch/sandbox/include/asm/io.h | 6 ++ arch/sandbox/include/asm/types.h | 17 +++- board/sandbox/README.sandbox | 7 +- cmd/demo.c | 6 +- cmd/log.c | 82 +++++++++++++++ common/Kconfig | 13 +++ common/log.c | 69 +++++++++++++ common/log_console.c | 27 ++++- configs/sandbox64_defconfig | 200 ++++++++++++++++++++++++++++++++++++ configs/sandbox_defconfig | 1 + doc/README.log | 36 +++++++ drivers/core/uclass.c | 14 +++ drivers/demo/demo-simple.c | 2 +- include/asm-generic/global_data.h | 1 + include/dm/uclass.h | 8 ++ include/log.h | 65 +++++++++++- test/dm/core.c | 9 ++ test/py/tests/test_log.py | 32 +++++- 22 files changed, 912 insertions(+), 22 deletions(-) create mode 100644 arch/sandbox/dts/sandbox64.dts create mode 100644 configs/sandbox64_defconfig Regards, Simon

2 5

[U-Boot] [PATCH] tools: buildman: prevent trying to use the working directory as build dorectory
by Lothar Waßmann 02 Apr '18

02 Apr '18

When the U-Boot base directory happens to have the same name as the branch that buildman is directed to use via the '-b' option and no output directory is specified with '-o', buildman happily starts removing the whole U-Boot sources eventually only stopped with the error message: OSError: [Errno 20] Not a directory: '../<branch-name>/boards.cfg Add a check to the builderthread.Mkdir function to verify that the path it tries to create does not match the current working directory. Signed-off-by: Lothar Waßmann <LW(a)KARO-electronics.de> --- tools/buildman/builderthread.py | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/tools/buildman/builderthread.py b/tools/buildman/builderthread.py index acaf500..3549029 100644 --- a/tools/buildman/builderthread.py +++ b/tools/buildman/builderthread.py @@ -7,6 +7,7 @@ import errno import glob import os import shutil +import sys import threading import command @@ -27,6 +28,9 @@ def Mkdir(dirname, parents = False): os.mkdir(dirname) except OSError as err: if err.errno == errno.EEXIST: + if os.path.realpath('.') == os.path.realpath(dirname): + print "Cannot create the current working directory '%s'!" % dirname + sys.exit(1) pass else: raise -- 2.1.4

2 3

[U-Boot] [PATCH v3 00/14] log: Add a new logging feature
by Simon Glass 02 Apr '18

02 Apr '18

U-Boot currently has fairly rudimentary logging features. A basic printf() provides console output and debug() provides debug output which is activated if DEBUG is defined in the file containing the debug() statements. It would be useful to have a few more features: - control of debug output at runtime, so problems can potentially be debugged without recompiling U-Boot - control of which subsystems output debug information, so that (for example) it is possible to enable debugging for MMC or SATA at runtime - indication of severity with each message, so that the user can control whether just errors are displayed, warnings, or all debug messages - sending logging information to different destinations, such as console, memory, linux, etc, At present U-Boot has a logbuffer feature which records output in a memory buffer for later display or storage. This is useful but is not at present enabled for any board. This series introduced a new logging system which supports: - various log levels from panic to debug - log categories including all uclasses and a few others - log drivers to which all log records can be sent - log filters which control which log records make it to which drivers Enabling logging with the default options does not add much to code size. By default the maximum recorded log level is LOGL_INFO, meaning that debug messages (and above) are discarded a build-time. Increasing this level provides more run-time flexibility to enable/disable logging at the cost of increased code size. This feature is by no means finished. The README provides a long list of features and clean-ups that could be done. But hopefully this is a starting point for improving this important area in U-Boot. The series is available at u-boot-dm/log-working Changes in v3: - Rebase to master Changes in v2: - Add a comment as to why CONFIG_LOG_MAX_LEVEL is not defined - Change log levels to match new header - Change sandbox log level to 6 - Drop MAINTAINERS entries for files not added by this patch - Drop the special log() functions from the README - Drop the use of 'continue' in the macro - Fix LOG_SPL_MAX_LEVEL typo (should be SPL_LOG_MAX_LEVEL) - Fix function called when test command is selected - Fix help output for 'log test' - Fix up bad use of #if CONFIG_VAL() - use #ifdef instead - Line up log levels with Linux - Only execute log tests if CONFIG_LOG is enabled - Rename LOGL_WARN to LOGL_WARNING - Split pre-console address change into a separate patch - Update commit message to explain that this is not just for serial output Simon Glass (14): Revert "sandbox: remove os_putc() and os_puts()" sandbox: Adjust pre-console address to avoid conflict Revert "sandbox: Drop special case console code for sandbox" Move debug and logging support to a separate header mtdparts: Correct use of debug() Drop the log buffer log: Add an implemention of logging log: Add a console driver log: Add a 'log level' command log: Add a test command log: Plumb logging into the init sequence log: sandbox: Enable logging log: test: Add a pytest for logging log: Add documentation MAINTAINERS | 9 ++ arch/sandbox/cpu/os.c | 11 ++ cmd/Kconfig | 8 + cmd/Makefile | 2 +- cmd/log.c | 326 +++++--------------------------------- cmd/mtdparts.c | 3 - common/Kconfig | 86 ++++++++++ common/Makefile | 2 + common/board_f.c | 23 +-- common/board_r.c | 27 +--- common/console.c | 7 + common/image.c | 9 -- common/log.c | 245 ++++++++++++++++++++++++++++ common/log_console.c | 23 +++ common/stdio.c | 6 - configs/sandbox_defconfig | 5 +- doc/README.log | 214 +++++++++++++++++++++++++ include/asm-generic/global_data.h | 8 +- include/common.h | 46 +----- include/log.h | 297 ++++++++++++++++++++++++++++++++++ include/logbuff.h | 49 ------ include/os.h | 20 +++ include/post.h | 4 +- post/post.c | 9 -- post/tests.c | 4 - scripts/config_whitelist.txt | 1 - test/Makefile | 1 + test/log/Makefile | 7 + test/log/log_test.c | 203 ++++++++++++++++++++++++ test/py/tests/test_log.py | 101 ++++++++++++ 30 files changed, 1294 insertions(+), 462 deletions(-) create mode 100644 common/log.c create mode 100644 common/log_console.c create mode 100644 doc/README.log create mode 100644 include/log.h delete mode 100644 include/logbuff.h create mode 100644 test/log/Makefile create mode 100644 test/log/log_test.c create mode 100644 test/py/tests/test_log.py -- 2.15.0.448.gf294e3d99a-goog

3 28

[U-Boot] [PATCH 1/3] cmd: cbfs: fix reading the end_of_rom pointer for 64bit archs
by Andre Heider 01 Apr '18

01 Apr '18

The cast breaks the pointer on 64bit archs, so lets get rid of it. Signed-off-by: Andre Heider <a.heider(a)gmail.com> --- cmd/cbfs.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cmd/cbfs.c b/cmd/cbfs.c index 799ba01fcc..736f8c4527 100644 --- a/cmd/cbfs.c +++ b/cmd/cbfs.c @@ -22,7 +22,7 @@ static int do_cbfs_init(cmd_tbl_t *cmdtp, int flag, int argc, return 0; } if (argc == 2) { - end_of_rom = (int)simple_strtoul(argv[1], &ep, 16); + end_of_rom = simple_strtoul(argv[1], &ep, 16); if (*ep) { puts("\n** Invalid end of ROM **\n"); return 1; -- 2.16.1

3 9

[U-Boot] [PATCH v2 1/2] core: add uclass_get_device_by_phandle_id() api
by Kever Yang 01 Apr '18

01 Apr '18

Add api for who can not get phandle from a device property. Signed-off-by: Kever Yang <kever.yang(a)rock-chips.com> --- Changes in v2: - use uint instead of int for phandle - address comment from Philipp drivers/core/uclass.c | 26 ++++++++++++++++++++++++++ include/dm/uclass.h | 16 ++++++++++++++++ 2 files changed, 42 insertions(+) diff --git a/drivers/core/uclass.c b/drivers/core/uclass.c index f5e4067..274b833 100644 --- a/drivers/core/uclass.c +++ b/drivers/core/uclass.c @@ -443,6 +443,32 @@ int uclass_get_device_by_ofnode(enum uclass_id id, ofnode node, } #if CONFIG_IS_ENABLED(OF_CONTROL) +int uclass_get_device_by_phandle_id(enum uclass_id id, uint phandle_id, + struct udevice **devp) +{ + struct udevice *dev; + struct uclass *uc; + int ret; + + *devp = NULL; + ret = uclass_get(id, &uc); + if (ret) + return ret; + + list_for_each_entry(dev, &uc->dev_head, uclass_node) { + uint phandle; + + phandle = dev_read_phandle(dev); + + if (phandle == phandle_id) { + *devp = dev; + return uclass_get_device_tail(dev, ret, devp); + } + } + + return -ENODEV; +} + int uclass_get_device_by_phandle(enum uclass_id id, struct udevice *parent, const char *name, struct udevice **devp) { diff --git a/include/dm/uclass.h b/include/dm/uclass.h index 1818849..63cb6e9 100644 --- a/include/dm/uclass.h +++ b/include/dm/uclass.h @@ -203,6 +203,22 @@ int uclass_get_device_by_ofnode(enum uclass_id id, ofnode node, struct udevice **devp); /** + * uclass_get_device_by_phandle_id() - Get a uclass device by phandle id + * + * This searches the devices in the uclass for one with the given phandle id. + * + * The device is probed to activate it ready for use. + * + * @id: uclass ID to look up + * @phandle_id: the phandle id to look up + * @devp: Returns pointer to device (there is only one for each node) + * @return 0 if OK, -ENODEV if there is no device match the phandle, other + * -ve on error + */ +int uclass_get_device_by_phandle_id(enum uclass_id id, uint phandle_id, + struct udevice **devp); + +/** * uclass_get_device_by_phandle() - Get a uclass device by phandle * * This searches the devices in the uclass for one with the given phandle. -- 1.9.1

4 10

[U-Boot] [PATCH] core: do not fail in device_probe() when clk set default fail
by Kever Yang 31 Mar '18

31 Mar '18

Assigned clocks are widely used in kernel, but not in U-Boot yet, many U-Boot clock driver do not have the API while dts port from kernel have "assigned-clocks" node. Just give a warning now instead of a device probe fail. Signed-off-by: Kever Yang <kever.yang(a)rock-chips.com> --- drivers/core/device.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/core/device.c b/drivers/core/device.c index 9d58f44..71872e9 100644 --- a/drivers/core/device.c +++ b/drivers/core/device.c @@ -407,7 +407,7 @@ int device_probe(struct udevice *dev) /* Process 'assigned-{clocks/clock-parents/clock-rates}' properties */ ret = clk_set_defaults(dev); if (ret) - goto fail; + debug("%s clk_set_defaults failed %d\n", ret); if (drv->probe) { ret = drv->probe(dev); -- 1.9.1

3 3

[U-Boot] [PATCH 0/4] Meson clock driver
by Beniamino Galvani 31 Mar '18

31 Mar '18

Hi, this is a basic clock driver for u-boot that supports enabling/disabling clock gates and getting their frequency. With this, some hardcoded initializations can be removed from the board code, and drivers can use the information from device tree to initialize clocks. Beniamino Galvani (4): ARM: dts: update gxbb-clkc.h from Linux 4.14 ARM: meson: add clock measurement function clk: add Amlogic meson clock driver meson: use the clock driver arch/arm/include/asm/arch-meson/clock.h | 34 ++++++ arch/arm/include/asm/arch-meson/gxbb.h | 10 -- arch/arm/include/asm/arch-meson/i2c.h | 11 -- arch/arm/mach-meson/Kconfig | 2 + arch/arm/mach-meson/Makefile | 2 +- arch/arm/mach-meson/clock.c | 45 ++++++++ board/amlogic/odroid-c2/odroid-c2.c | 4 +- board/amlogic/p212/p212.c | 3 +- drivers/clk/Makefile | 1 + drivers/clk/clk_meson.c | 196 ++++++++++++++++++++++++++++++++ drivers/i2c/meson_i2c.c | 20 +++- include/dt-bindings/clock/gxbb-clkc.h | 75 ++++++++++++ 12 files changed, 373 insertions(+), 30 deletions(-) create mode 100644 arch/arm/include/asm/arch-meson/clock.h delete mode 100644 arch/arm/include/asm/arch-meson/i2c.h create mode 100644 arch/arm/mach-meson/clock.c create mode 100644 drivers/clk/clk_meson.c -- 2.14.3

5 21

[U-Boot] [PATCH v2 1/3] Move CONFIG_PHY_ADDR to Kconfig
by Stefan Mavrodiev 30 Mar '18

30 Mar '18

CONFIG_PHY_ADDR is used for old-style configuration. This makes impossible changing the PHY address, if multiple boards share a same config header file (for example include/configs/sunxi-common.h). Moving this to Kconfig helps overcoming this issue. It's defined as entry inside PHYLIB section. After the implemention, moveconfig was run. The issues are: - edb9315a - CONFIG_PHYLIB is not enabled. Entry is deleted. - ds414 - CONFIG_PHYLIB is in incompatible format: { 0x1, 0x0 }. This entry is also deleted. - devkit3250 - The PHY_ADDR is in hex format (0x1F). Manually CONFIG_PHY_ADDR=31 is added in the defconfig. After the changes the suspicious defconfigs passes building. Signed-off-by: Stefan Mavrodiev <stefan(a)olimex.com> Acked-by: Maxime Ripard <maxime.ripard(a)free-electrons.com> --- Changes for v2: - Replaced CONFIG_SUNXI_PHY_ADDR with a common one CONFIG_PHY_ADDR, using moveconfig. README | 4 ---- configs/devkit3250_defconfig | 1 + configs/khadas-vim_defconfig | 1 + configs/libretech-cc_defconfig | 1 + configs/p212_defconfig | 1 + drivers/net/phy/Kconfig | 7 +++++++ include/configs/am335x_shc.h | 1 - include/configs/baltos.h | 1 - include/configs/devkit3250.h | 1 - include/configs/ds414.h | 1 - include/configs/edb93xx.h | 1 - include/configs/khadas-vim.h | 2 -- include/configs/libretech-cc.h | 2 -- include/configs/p212.h | 2 -- include/configs/pepper.h | 1 - include/configs/sunxi-common.h | 2 -- include/configs/work_92105.h | 1 - include/configs/x600.h | 1 - scripts/config_whitelist.txt | 1 - 19 files changed, 11 insertions(+), 21 deletions(-) diff --git a/README b/README index b53ea7d..499184d 100644 --- a/README +++ b/README @@ -1436,10 +1436,6 @@ The following options need to be configured: be at least 4MB. - MII/PHY support: - CONFIG_PHY_ADDR - - The address of PHY on MII bus. - CONFIG_PHY_CLOCK_FREQ (ppc4xx) The clock frequency of the MII bus diff --git a/configs/devkit3250_defconfig b/configs/devkit3250_defconfig index 2ad08ae..930b631 100644 --- a/configs/devkit3250_defconfig +++ b/configs/devkit3250_defconfig @@ -36,6 +36,7 @@ CONFIG_MTD_NOR_FLASH=y CONFIG_NAND=y CONFIG_SPL_NAND_SIMPLE=y CONFIG_PHYLIB=y +CONFIG_PHY_ADDR=31 CONFIG_DM_SERIAL=y CONFIG_SYS_NS16550=y CONFIG_USB=y diff --git a/configs/khadas-vim_defconfig b/configs/khadas-vim_defconfig index 4ceab90..e9a96d3 100644 --- a/configs/khadas-vim_defconfig +++ b/configs/khadas-vim_defconfig @@ -20,6 +20,7 @@ CONFIG_NET_RANDOM_ETHADDR=y CONFIG_DM_GPIO=y CONFIG_DM_MMC=y CONFIG_MMC_MESON_GX=y +CONFIG_PHY_ADDR=8 CONFIG_PHY_MESON_GXL=y CONFIG_DM_ETH=y CONFIG_ETH_DESIGNWARE=y diff --git a/configs/libretech-cc_defconfig b/configs/libretech-cc_defconfig index 3bccff1..86852b1 100644 --- a/configs/libretech-cc_defconfig +++ b/configs/libretech-cc_defconfig @@ -20,6 +20,7 @@ CONFIG_NET_RANDOM_ETHADDR=y CONFIG_DM_GPIO=y CONFIG_DM_MMC=y CONFIG_MMC_MESON_GX=y +CONFIG_PHY_ADDR=8 CONFIG_PHY_MESON_GXL=y CONFIG_DM_ETH=y CONFIG_ETH_DESIGNWARE=y diff --git a/configs/p212_defconfig b/configs/p212_defconfig index cb9be4a..9466238 100644 --- a/configs/p212_defconfig +++ b/configs/p212_defconfig @@ -20,6 +20,7 @@ CONFIG_NET_RANDOM_ETHADDR=y CONFIG_DM_GPIO=y CONFIG_DM_MMC=y CONFIG_MMC_MESON_GX=y +CONFIG_PHY_ADDR=8 CONFIG_PHY_MESON_GXL=y CONFIG_DM_ETH=y CONFIG_ETH_DESIGNWARE=y diff --git a/drivers/net/phy/Kconfig b/drivers/net/phy/Kconfig index 95b7534..c934aed 100644 --- a/drivers/net/phy/Kconfig +++ b/drivers/net/phy/Kconfig @@ -12,6 +12,13 @@ menuconfig PHYLIB if PHYLIB +config PHY_ADDR + int "PHY address" + default 1 if ARCH_SUNXI + default 0 + help + The address of PHY on MII bus. Usually in range of 0 to 31. + config B53_SWITCH bool "Broadcom BCM53xx (RoboSwitch) Ethernet switch PHY support." help diff --git a/include/configs/am335x_shc.h b/include/configs/am335x_shc.h index e2d329a..2b705fc 100644 --- a/include/configs/am335x_shc.h +++ b/include/configs/am335x_shc.h @@ -264,7 +264,6 @@ #define CONFIG_BOOTP_GATEWAY #define CONFIG_BOOTP_SUBNETMASK #define CONFIG_NET_RETRY_COUNT 10 -#define CONFIG_PHY_ADDR 0 #define CONFIG_PHY_SMSC /* I2C configuration */ diff --git a/include/configs/baltos.h b/include/configs/baltos.h index 75dd0c5..31ae20c 100644 --- a/include/configs/baltos.h +++ b/include/configs/baltos.h @@ -285,7 +285,6 @@ #endif /* Network. */ -#define CONFIG_PHY_ADDR 0 #define CONFIG_PHY_SMSC #define CONFIG_MII #define CONFIG_PHY_ATHEROS diff --git a/include/configs/devkit3250.h b/include/configs/devkit3250.h index 526a81a..b66b90e 100644 --- a/include/configs/devkit3250.h +++ b/include/configs/devkit3250.h @@ -73,7 +73,6 @@ #define CONFIG_RMII #define CONFIG_PHY_SMSC #define CONFIG_LPC32XX_ETH -#define CONFIG_PHY_ADDR 0x1F #define CONFIG_SYS_FAULT_ECHO_LINK_DOWN /* diff --git a/include/configs/ds414.h b/include/configs/ds414.h index c840c93..03e96df 100644 --- a/include/configs/ds414.h +++ b/include/configs/ds414.h @@ -41,7 +41,6 @@ #define CONFIG_ENV_SECT_SIZE (64 << 10) /* 64KiB sectors */ #define CONFIG_PHY_MARVELL /* there is a marvell phy */ -#define CONFIG_PHY_ADDR { 0x1, 0x0 } #define CONFIG_SYS_NETA_INTERFACE_TYPE PHY_INTERFACE_MODE_RGMII #define CONFIG_SYS_ALT_MEMTEST diff --git a/include/configs/edb93xx.h b/include/configs/edb93xx.h index fcad7c4..03a1eff 100644 --- a/include/configs/edb93xx.h +++ b/include/configs/edb93xx.h @@ -97,7 +97,6 @@ #define CONFIG_DRIVER_EP93XX_MAC #define CONFIG_MII_SUPPRESS_PREAMBLE #define CONFIG_MII -#define CONFIG_PHY_ADDR 1 #undef CONFIG_NETCONSOLE /* SDRAM configuration */ diff --git a/include/configs/khadas-vim.h b/include/configs/khadas-vim.h index 9d99bc5..f44b388 100644 --- a/include/configs/khadas-vim.h +++ b/include/configs/khadas-vim.h @@ -12,8 +12,6 @@ #define CONFIG_MISC_INIT_R -#define CONFIG_PHY_ADDR 8 - #define MESON_FDTFILE_SETTING "fdtfile=amlogic/meson-gxl-s905x-khadas-vim.dtb\0" #include <configs/meson-gxbb-common.h> diff --git a/include/configs/libretech-cc.h b/include/configs/libretech-cc.h index ffaca26..08dfb30 100644 --- a/include/configs/libretech-cc.h +++ b/include/configs/libretech-cc.h @@ -12,8 +12,6 @@ #define CONFIG_MISC_INIT_R -#define CONFIG_PHY_ADDR 8 - #define MESON_FDTFILE_SETTING "fdtfile=amlogic/meson-gxl-s905x-libretech-cc.dtb\0" #include <configs/meson-gxbb-common.h> diff --git a/include/configs/p212.h b/include/configs/p212.h index 793b556..0477384 100644 --- a/include/configs/p212.h +++ b/include/configs/p212.h @@ -12,8 +12,6 @@ #define CONFIG_MISC_INIT_R -#define CONFIG_PHY_ADDR 8 - /* Serial setup */ #define CONFIG_CONS_INDEX 0 diff --git a/include/configs/pepper.h b/include/configs/pepper.h index 7ef2529..960afa0 100644 --- a/include/configs/pepper.h +++ b/include/configs/pepper.h @@ -77,7 +77,6 @@ #define CONFIG_SYS_NS16550_COM1 0x44e09000 /* Ethernet support */ -#define CONFIG_PHY_ADDR 0 #define CONFIG_PHY_RESET_DELAY 1000 /* SPL */ diff --git a/include/configs/sunxi-common.h b/include/configs/sunxi-common.h index 9b3944a..e252e7fb 100644 --- a/include/configs/sunxi-common.h +++ b/include/configs/sunxi-common.h @@ -296,12 +296,10 @@ extern int soft_i2c_gpio_scl; /* Ethernet support */ #ifdef CONFIG_SUN4I_EMAC -#define CONFIG_PHY_ADDR 1 #define CONFIG_MII /* MII PHY management */ #endif #ifdef CONFIG_SUN7I_GMAC -#define CONFIG_PHY_ADDR 1 #define CONFIG_MII /* MII PHY management */ #define CONFIG_PHY_REALTEK #endif diff --git a/include/configs/work_92105.h b/include/configs/work_92105.h index 7faab4e..c0a9833 100644 --- a/include/configs/work_92105.h +++ b/include/configs/work_92105.h @@ -57,7 +57,6 @@ #define CONFIG_PHY_SMSC #define CONFIG_LPC32XX_ETH -#define CONFIG_PHY_ADDR 0 #define CONFIG_SYS_FAULT_ECHO_LINK_DOWN /* FIXME: remove "Waiting for PHY auto negotiation to complete..." message */ diff --git a/include/configs/x600.h b/include/configs/x600.h index 66a8e88..ea9500a 100644 --- a/include/configs/x600.h +++ b/include/configs/x600.h @@ -71,7 +71,6 @@ /* Ethernet config options */ #define CONFIG_MII #define CONFIG_PHY_RESET_DELAY 10000 /* in usec */ -#define CONFIG_PHY_ADDR 0 /* PHY address */ #define CONFIG_SPEAR_GPIO diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt index ef83c00..c94e6ce 100644 --- a/scripts/config_whitelist.txt +++ b/scripts/config_whitelist.txt @@ -1593,7 +1593,6 @@ CONFIG_PERIF2_FREQ CONFIG_PERIF3_FREQ CONFIG_PERIF4_FREQ CONFIG_PHYSMEM -CONFIG_PHY_ADDR CONFIG_PHY_BASE_ADR CONFIG_PHY_BCM5421S CONFIG_PHY_ET1011C_TX_CLK_FIX -- 2.7.4

7 12