diff options
| author | Tom Rini <trini@konsulko.com> | 2017-04-13 10:17:06 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2017-04-13 11:19:00 -0400 |
| commit | 1622559066d890f1b7622be0ede8a5d64de66ef3 (patch) | |
| tree | 3d7a01ff07bff410c6650eae19b704cd0419c254 /drivers | |
| parent | 0342e335ba887817ed401e77be324e064ea7031e (diff) | |
| parent | f479cec3b623778c26b23f66dc28cf33100ce089 (diff) | |
| download | u-boot-1622559066d890f1b7622be0ede8a5d64de66ef3.tar.gz | |
Merge branch 'master' of git://www.denx.de/git/u-boot-imx
Drop CONFIG_STACKSIZE from include/configs/imx6_logic.h
Signed-off-by: Tom Rini <trini@konsulko.com>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/net/phy/Kconfig | 13 | ||||
| -rw-r--r-- | drivers/video/mxsfb.c | 2 |
2 files changed, 14 insertions, 1 deletions
diff --git a/drivers/net/phy/Kconfig b/drivers/net/phy/Kconfig index e562a8ac1a7..aca3990aebf 100644 --- a/drivers/net/phy/Kconfig +++ b/drivers/net/phy/Kconfig @@ -15,6 +15,19 @@ if PHYLIB config MV88E61XX_SWITCH bool "Marvel MV88E61xx Ethernet switch PHY support." +if MV88E61XX_SWITCH + +config MV88E61XX_CPU_PORT + int "CPU Port" + +config MV88E61XX_PHY_PORTS + hex "Bitmask of PHY Ports" + +config MV88E61XX_FIXED_PORTS + hex "Bitmask of PHYless serdes Ports" + +endif # MV88E61XX_SWITCH + config PHYLIB_10G bool "Generic 10G PHY support" diff --git a/drivers/video/mxsfb.c b/drivers/video/mxsfb.c index 32ecbe2b099..20455ffb542 100644 --- a/drivers/video/mxsfb.c +++ b/drivers/video/mxsfb.c @@ -36,7 +36,7 @@ __weak void mxsfb_system_setup(void) } /* - * DENX M28EVK: + * ARIES M28EVK: * setenv videomode * video=ctfb:x:800,y:480,depth:18,mode:0,pclk:30066, * le:0,ri:256,up:0,lo:45,hs:1,vs:1,sync:100663296,vmode:0 |