2018.05 RC1
This commit is contained in:
parent
ffcc253f44
commit
e6c2070280
|
@ -1,164 +0,0 @@
|
|||
From patchwork Wed Feb 14 23:02:15 2018
|
||||
Content-Type: text/plain; charset="utf-8"
|
||||
MIME-Version: 1.0
|
||||
Content-Transfer-Encoding: 7bit
|
||||
Subject: [U-Boot,
|
||||
1/2] net: phy: Add PHY_RTL8211E_PINE64_GIGABIT_FIX for realtek phys
|
||||
X-Patchwork-Submitter: Kyle Evans <kevans@freebsd.org>
|
||||
X-Patchwork-Id: 873752
|
||||
Message-Id: <20180214230216.2001-2-kevans@FreeBSD.org>
|
||||
To: andre.przywara@arm.com, joe.hershberger@ni.com,
|
||||
philipp.tomsich@theobroma-systems.com, alex.g@adaptrum.com,
|
||||
hannes.schmelzer@br-automation.com, sbabic@denx.de,
|
||||
jagan@amarulasolutions.com, narmstrong@baylibre.com,
|
||||
tharvey@gateworks.com,
|
||||
york.sun@nxp.com, madalin.bucur@nxp.com, u-boot@lists.denx.de
|
||||
Date: Wed, 14 Feb 2018 17:02:15 -0600
|
||||
From: kevans@FreeBSD.org
|
||||
List-Id: U-Boot discussion <u-boot.lists.denx.de>
|
||||
|
||||
Setting PHY_RTL8211E_PINE64_GIGABIT_FIX forces internal rx/tx delays off
|
||||
on the PHY, as well as flipping some magical undocumented bits. The
|
||||
magic number comes from the Pine64 engineering team, presumably as a
|
||||
proxy from Realtek. This configuration fixes the throughput on some
|
||||
Pine64 models. Packet loss of up to 60-70% has been observed without
|
||||
this.
|
||||
|
||||
Signed-off-by: Kyle Evans <kevans@FreeBSD.org>
|
||||
---
|
||||
drivers/net/phy/Kconfig | 10 ++++++++++
|
||||
drivers/net/phy/realtek.c | 34 ++++++++++++++++++++++++++++++++++
|
||||
2 files changed, 44 insertions(+)
|
||||
|
||||
diff --git a/drivers/net/phy/Kconfig b/drivers/net/phy/Kconfig
|
||||
index e32f1eb1c0..ad648a889d 100644
|
||||
--- a/drivers/net/phy/Kconfig
|
||||
+++ b/drivers/net/phy/Kconfig
|
||||
@@ -114,6 +114,16 @@ config PHY_NATSEMI
|
||||
config PHY_REALTEK
|
||||
bool "Realtek Ethernet PHYs support"
|
||||
|
||||
+config RTL8211E_PINE64_GIGABIT_FIX
|
||||
+ bool "Fix gigabit throughput on some Pine64+ models"
|
||||
+ depends on PHY_REALTEK
|
||||
+ help
|
||||
+ Configure the Realtek RTL8211E found on some Pine64+ models differently to
|
||||
+ fix throughput on Gigabit links, turning off all internal delays in the
|
||||
+ process. The settings that this touches are not documented in the CONFREG
|
||||
+ section of the RTL8211E datasheet, but come from Realtek by way of the
|
||||
+ Pine64 engineering team.
|
||||
+
|
||||
config RTL8211X_PHY_FORCE_MASTER
|
||||
bool "Ethernet PHY RTL8211x: force 1000BASE-T master mode"
|
||||
depends on PHY_REALTEK
|
||||
diff --git a/drivers/net/phy/realtek.c b/drivers/net/phy/realtek.c
|
||||
index 6d917f86f4..d5c2a46c67 100644
|
||||
--- a/drivers/net/phy/realtek.c
|
||||
+++ b/drivers/net/phy/realtek.c
|
||||
@@ -13,6 +13,7 @@
|
||||
#include <phy.h>
|
||||
|
||||
#define PHY_RTL8211x_FORCE_MASTER BIT(1)
|
||||
+#define PHY_RTL8211E_PINE64_GIGABIT_FIX BIT(2)
|
||||
|
||||
#define PHY_AUTONEGOTIATE_TIMEOUT 5000
|
||||
|
||||
@@ -47,6 +48,13 @@
|
||||
#define MIIM_RTL8211F_PHYSTAT_SPDDONE 0x0800
|
||||
#define MIIM_RTL8211F_PHYSTAT_LINK 0x0004
|
||||
|
||||
+#define MIIM_RTL8211E_CONFREG 0x1c
|
||||
+#define MIIM_RTL8211E_CONFREG_TXD 0x0002
|
||||
+#define MIIM_RTL8211E_CONFREG_RXD 0x0004
|
||||
+#define MIIM_RTL8211E_CONFREG_MAGIC 0xb400 /* Undocumented */
|
||||
+
|
||||
+#define MIIM_RTL8211E_EXT_PAGE_SELECT 0x1e
|
||||
+
|
||||
#define MIIM_RTL8211F_PAGE_SELECT 0x1f
|
||||
#define MIIM_RTL8211F_TX_DELAY 0x100
|
||||
#define MIIM_RTL8211F_LCR 0x10
|
||||
@@ -60,6 +68,15 @@ static int rtl8211b_probe(struct phy_device *phydev)
|
||||
return 0;
|
||||
}
|
||||
|
||||
+static int rtl8211e_probe(struct phy_device *phydev)
|
||||
+{
|
||||
+#ifdef CONFIG_RTL8211E_PINE64_GIGABIT_FIX
|
||||
+ phydev->flags |= PHY_RTL8211E_PINE64_GIGABIT_FIX;
|
||||
+#endif
|
||||
+
|
||||
+ return 0;
|
||||
+}
|
||||
+
|
||||
/* RealTek RTL8211x */
|
||||
static int rtl8211x_config(struct phy_device *phydev)
|
||||
{
|
||||
@@ -81,6 +98,22 @@ static int rtl8211x_config(struct phy_device *phydev)
|
||||
reg |= MIIM_RTL8211x_CTRL1000T_MASTER;
|
||||
phy_write(phydev, MDIO_DEVAD_NONE, MII_CTRL1000, reg);
|
||||
}
|
||||
+ if (phydev->flags & PHY_RTL8211E_PINE64_GIGABIT_FIX) {
|
||||
+ unsigned int reg;
|
||||
+
|
||||
+ phy_write(phydev, MDIO_DEVAD_NONE, MIIM_RTL8211F_PAGE_SELECT,
|
||||
+ 7);
|
||||
+ phy_write(phydev, MDIO_DEVAD_NONE,
|
||||
+ MIIM_RTL8211E_EXT_PAGE_SELECT, 0xa4);
|
||||
+ reg = phy_read(phydev, MDIO_DEVAD_NONE, MIIM_RTL8211E_CONFREG);
|
||||
+ /* Ensure both internal delays are turned off */
|
||||
+ reg &= ~(MIIM_RTL8211E_CONFREG_TXD | MIIM_RTL8211E_CONFREG_RXD);
|
||||
+ /* Flip the magic undocumented bits */
|
||||
+ reg |= MIIM_RTL8211E_CONFREG_MAGIC;
|
||||
+ phy_write(phydev, MDIO_DEVAD_NONE, MIIM_RTL8211E_CONFREG, reg);
|
||||
+ phy_write(phydev, MDIO_DEVAD_NONE, MIIM_RTL8211F_PAGE_SELECT,
|
||||
+ 0);
|
||||
+ }
|
||||
/* read interrupt status just to clear it */
|
||||
phy_read(phydev, MDIO_DEVAD_NONE, MIIM_RTL8211x_PHY_INER);
|
||||
|
||||
@@ -279,6 +312,7 @@ static struct phy_driver RTL8211E_driver = {
|
||||
.uid = 0x1cc915,
|
||||
.mask = 0xffffff,
|
||||
.features = PHY_GBIT_FEATURES,
|
||||
+ .probe = &rtl8211e_probe,
|
||||
.config = &rtl8211x_config,
|
||||
.startup = &rtl8211e_startup,
|
||||
.shutdown = &genphy_shutdown,
|
||||
|
||||
From patchwork Wed Feb 14 23:02:16 2018
|
||||
Content-Type: text/plain; charset="utf-8"
|
||||
MIME-Version: 1.0
|
||||
Content-Transfer-Encoding: 7bit
|
||||
Subject: [U-Boot,
|
||||
2/2] Configs: Use the newly added PHY_RTL8211E_PINE64_GIGABIT_FIX
|
||||
X-Patchwork-Submitter: Kyle Evans <kevans@freebsd.org>
|
||||
X-Patchwork-Id: 873751
|
||||
Message-Id: <20180214230216.2001-3-kevans@FreeBSD.org>
|
||||
To: andre.przywara@arm.com, joe.hershberger@ni.com,
|
||||
philipp.tomsich@theobroma-systems.com, alex.g@adaptrum.com,
|
||||
hannes.schmelzer@br-automation.com, sbabic@denx.de,
|
||||
jagan@amarulasolutions.com, narmstrong@baylibre.com,
|
||||
tharvey@gateworks.com,
|
||||
york.sun@nxp.com, madalin.bucur@nxp.com, u-boot@lists.denx.de
|
||||
Date: Wed, 14 Feb 2018 17:02:16 -0600
|
||||
From: kevans@FreeBSD.org
|
||||
List-Id: U-Boot discussion <u-boot.lists.denx.de>
|
||||
|
||||
The Pine64+ uses a generic PHY driver, so flip it over to using the Realtek PHY
|
||||
driver to actually apply the RTL8211e fix.
|
||||
|
||||
Signed-off-by: Kyle Evans <kevans@FreeBSD.org>
|
||||
---
|
||||
configs/pine64_plus_defconfig | 2 ++
|
||||
1 file changed, 2 insertions(+)
|
||||
|
||||
diff --git a/configs/pine64_plus_defconfig b/configs/pine64_plus_defconfig
|
||||
index 01ed23844b..149311f2c4 100644
|
||||
--- a/configs/pine64_plus_defconfig
|
||||
+++ b/configs/pine64_plus_defconfig
|
||||
@@ -14,3 +14,5 @@ CONFIG_OF_LIST="sun50i-a64-pine64 sun50i-a64-pine64-plus"
|
||||
CONFIG_SUN8I_EMAC=y
|
||||
CONFIG_USB_EHCI_HCD=y
|
||||
CONFIG_SYS_USB_EVENT_POLL_VIA_INT_QUEUE=y
|
||||
+CONFIG_PHY_REALTEK=y
|
||||
+CONFIG_RTL8211E_PINE64_GIGABIT_FIX=y
|
|
@ -1,115 +0,0 @@
|
|||
From patchwork Sat Mar 17 05:15:48 2018
|
||||
Content-Type: text/plain; charset="utf-8"
|
||||
MIME-Version: 1.0
|
||||
Content-Transfer-Encoding: 7bit
|
||||
Subject: [U-Boot] mmc: use core clock frequency in bcm2835 sdhost
|
||||
X-Patchwork-Submitter: Jonathan Gray <jsg@jsg.id.au>
|
||||
X-Patchwork-Id: 887255
|
||||
Message-Id: <20180317051548.42856-1-jsg@jsg.id.au>
|
||||
To: u-boot@lists.denx.de
|
||||
Cc: Alexander Graf <agraf@suse.de>
|
||||
Date: Sat, 17 Mar 2018 16:15:48 +1100
|
||||
From: Jonathan Gray <jsg@jsg.id.au>
|
||||
List-Id: U-Boot discussion <u-boot.lists.denx.de>
|
||||
|
||||
In raspberrypi-firmware 7fdcd00e00a42a1c91e8bd6f5eb8352fe9358557 and
|
||||
later start.elf now sets the EMMC clock to 200 MHz.
|
||||
|
||||
According to Phil Elwell in
|
||||
https://github.com/raspberrypi/firmware/issues/953
|
||||
the SDHost controller shares the core/VPU clock and doesn't use
|
||||
the EMMC clock.
|
||||
|
||||
Use the core clock id when determining the frequency to allow
|
||||
U-Boot to work with recent versions of raspberrypi-firmware.
|
||||
Otherwise U-Boot hangs at:
|
||||
|
||||
U-Boot 2018.03 (Mar 14 2018 - 20:36:00 +1100)
|
||||
|
||||
DRAM: 948 MiB
|
||||
RPI 3 Model B (0xa02082)
|
||||
MMC: mmc@7e202000: 0, sdhci@7e300000: 1
|
||||
Loading Environment from FAT...
|
||||
|
||||
Signed-off-by: Jonathan Gray <jsg@jsg.id.au>
|
||||
Cc: Alexander Graf <agraf@suse.de>
|
||||
Cc: Peter Robinson <pbrobinson@gmail.com>
|
||||
---
|
||||
arch/arm/mach-bcm283x/include/mach/msg.h | 3 ++-
|
||||
arch/arm/mach-bcm283x/msg.c | 4 ++--
|
||||
drivers/mmc/bcm2835_sdhci.c | 2 +-
|
||||
drivers/mmc/bcm2835_sdhost.c | 3 ++-
|
||||
4 files changed, 7 insertions(+), 5 deletions(-)
|
||||
|
||||
diff --git a/arch/arm/mach-bcm283x/include/mach/msg.h b/arch/arm/mach-bcm283x/include/mach/msg.h
|
||||
index 478b1f1c50..d055480ba1 100644
|
||||
--- a/arch/arm/mach-bcm283x/include/mach/msg.h
|
||||
+++ b/arch/arm/mach-bcm283x/include/mach/msg.h
|
||||
@@ -18,9 +18,10 @@ int bcm2835_power_on_module(u32 module);
|
||||
/**
|
||||
* bcm2835_get_mmc_clock() - get the frequency of the MMC clock
|
||||
*
|
||||
+ * @clock_id: ID of clock to get frequency for
|
||||
* @return clock frequency, or -ve on error
|
||||
*/
|
||||
-int bcm2835_get_mmc_clock(void);
|
||||
+int bcm2835_get_mmc_clock(u32 clock_id);
|
||||
|
||||
/**
|
||||
* bcm2835_get_video_size() - get the current display size
|
||||
diff --git a/arch/arm/mach-bcm283x/msg.c b/arch/arm/mach-bcm283x/msg.c
|
||||
index 92e93ad9e5..ad29f3be09 100644
|
||||
--- a/arch/arm/mach-bcm283x/msg.c
|
||||
+++ b/arch/arm/mach-bcm283x/msg.c
|
||||
@@ -65,7 +65,7 @@ int bcm2835_power_on_module(u32 module)
|
||||
return 0;
|
||||
}
|
||||
|
||||
-int bcm2835_get_mmc_clock(void)
|
||||
+int bcm2835_get_mmc_clock(u32 clock_id)
|
||||
{
|
||||
ALLOC_CACHE_ALIGN_BUFFER(struct msg_get_clock_rate, msg_clk, 1);
|
||||
int ret;
|
||||
@@ -76,7 +76,7 @@ int bcm2835_get_mmc_clock(void)
|
||||
|
||||
BCM2835_MBOX_INIT_HDR(msg_clk);
|
||||
BCM2835_MBOX_INIT_TAG(&msg_clk->get_clock_rate, GET_CLOCK_RATE);
|
||||
- msg_clk->get_clock_rate.body.req.clock_id = BCM2835_MBOX_CLOCK_ID_EMMC;
|
||||
+ msg_clk->get_clock_rate.body.req.clock_id = clock_id;
|
||||
|
||||
ret = bcm2835_mbox_call_prop(BCM2835_MBOX_PROP_CHAN, &msg_clk->hdr);
|
||||
if (ret) {
|
||||
diff --git a/drivers/mmc/bcm2835_sdhci.c b/drivers/mmc/bcm2835_sdhci.c
|
||||
index 3157354d2a..08bddd410e 100644
|
||||
--- a/drivers/mmc/bcm2835_sdhci.c
|
||||
+++ b/drivers/mmc/bcm2835_sdhci.c
|
||||
@@ -183,7 +183,7 @@ static int bcm2835_sdhci_probe(struct udevice *dev)
|
||||
if (base == FDT_ADDR_T_NONE)
|
||||
return -EINVAL;
|
||||
|
||||
- ret = bcm2835_get_mmc_clock();
|
||||
+ ret = bcm2835_get_mmc_clock(BCM2835_MBOX_CLOCK_ID_EMMC);
|
||||
if (ret < 0) {
|
||||
debug("%s: Failed to set MMC clock (err=%d)\n", __func__, ret);
|
||||
return ret;
|
||||
diff --git a/drivers/mmc/bcm2835_sdhost.c b/drivers/mmc/bcm2835_sdhost.c
|
||||
index 1bf52a3019..bccd182e50 100644
|
||||
--- a/drivers/mmc/bcm2835_sdhost.c
|
||||
+++ b/drivers/mmc/bcm2835_sdhost.c
|
||||
@@ -35,6 +35,7 @@
|
||||
#include <dm.h>
|
||||
#include <mmc.h>
|
||||
#include <asm/arch/msg.h>
|
||||
+#include <asm/arch/mbox.h>
|
||||
#include <asm/unaligned.h>
|
||||
#include <linux/compat.h>
|
||||
#include <linux/io.h>
|
||||
@@ -941,7 +942,7 @@ static int bcm2835_probe(struct udevice *dev)
|
||||
if (!host->ioaddr)
|
||||
return -ENOMEM;
|
||||
|
||||
- host->max_clk = bcm2835_get_mmc_clock();
|
||||
+ host->max_clk = bcm2835_get_mmc_clock(BCM2835_MBOX_CLOCK_ID_CORE);
|
||||
|
||||
bcm2835_add_host(host);
|
||||
|
|
@ -1,48 +0,0 @@
|
|||
From patchwork Thu Mar 15 14:07:09 2018
|
||||
Content-Type: text/plain; charset="utf-8"
|
||||
MIME-Version: 1.0
|
||||
Content-Transfer-Encoding: 7bit
|
||||
Subject: [U-Boot] net: Only access network devices after init
|
||||
X-Patchwork-Submitter: Alexander Graf <agraf@suse.de>
|
||||
X-Patchwork-Id: 886255
|
||||
Message-Id: <20180315140709.10346-1-agraf@suse.de>
|
||||
To: u-boot@lists.denx.de
|
||||
Cc: Joe Hershberger <joe.hershberger@ni.com>
|
||||
Date: Thu, 15 Mar 2018 15:07:09 +0100
|
||||
From: Alexander Graf <agraf@suse.de>
|
||||
List-Id: U-Boot discussion <u-boot.lists.denx.de>
|
||||
|
||||
In the efi_loader main loop we call eth_rx() occasionally. This rx function
|
||||
might end up calling into devices that haven't been initialized yet,
|
||||
potentially resulting in a lot of transfer timeouts.
|
||||
|
||||
Instead, let's make sure the ethernet device is actually initialized before
|
||||
reading from or writing to it.
|
||||
|
||||
Signed-off-by: Alexander Graf <agraf@suse.de>
|
||||
---
|
||||
net/eth-uclass.c | 4 ++--
|
||||
1 file changed, 2 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/net/eth-uclass.c b/net/eth-uclass.c
|
||||
index d30b04ba86..240b596534 100644
|
||||
--- a/net/eth-uclass.c
|
||||
+++ b/net/eth-uclass.c
|
||||
@@ -336,7 +336,7 @@ int eth_send(void *packet, int length)
|
||||
if (!current)
|
||||
return -ENODEV;
|
||||
|
||||
- if (!device_active(current))
|
||||
+ if (!eth_is_active(current))
|
||||
return -EINVAL;
|
||||
|
||||
ret = eth_get_ops(current)->send(current, packet, length);
|
||||
@@ -359,7 +359,7 @@ int eth_rx(void)
|
||||
if (!current)
|
||||
return -ENODEV;
|
||||
|
||||
- if (!device_active(current))
|
||||
+ if (!eth_is_active(current))
|
||||
return -EINVAL;
|
||||
|
||||
/* Process up to 32 packets at one time */
|
|
@ -1,138 +0,0 @@
|
|||
From patchwork Thu Mar 15 14:10:20 2018
|
||||
Content-Type: text/plain; charset="utf-8"
|
||||
MIME-Version: 1.0
|
||||
Content-Transfer-Encoding: 7bit
|
||||
Subject: [U-Boot] lan7xxx: Require phylib
|
||||
X-Patchwork-Submitter: Alexander Graf <agraf@suse.de>
|
||||
X-Patchwork-Id: 886258
|
||||
Message-Id: <20180315141020.11581-1-agraf@suse.de>
|
||||
To: u-boot@lists.denx.de
|
||||
Cc: Joe Hershberger <joe.hershberger@ni.com>
|
||||
Date: Thu, 15 Mar 2018 15:10:20 +0100
|
||||
From: Alexander Graf <agraf@suse.de>
|
||||
List-Id: U-Boot discussion <u-boot.lists.denx.de>
|
||||
|
||||
The lan75xx and lan78xx drivers need to drive their phy via the generic
|
||||
phylib framework. Let's reflect that dependency in Kconfig, so that we
|
||||
don't get build errors when phylib does not get selected.
|
||||
|
||||
Signed-off-by: Alexander Graf <agraf@suse.de>
|
||||
---
|
||||
drivers/usb/eth/Kconfig | 2 ++
|
||||
1 file changed, 2 insertions(+)
|
||||
|
||||
diff --git a/drivers/usb/eth/Kconfig b/drivers/usb/eth/Kconfig
|
||||
index 496a6d1933..2f6bfa8e71 100644
|
||||
--- a/drivers/usb/eth/Kconfig
|
||||
+++ b/drivers/usb/eth/Kconfig
|
||||
@@ -23,6 +23,7 @@ config USB_ETHER_ASIX88179
|
||||
config USB_ETHER_LAN75XX
|
||||
bool "Microchip LAN75XX support"
|
||||
depends on USB_HOST_ETHER
|
||||
+ depends on PHYLIB
|
||||
---help---
|
||||
Say Y here if you would like to support Microchip LAN75XX Hi-Speed
|
||||
USB 2.0 to 10/100/1000 Gigabit Ethernet controller.
|
||||
@@ -32,6 +33,7 @@ config USB_ETHER_LAN75XX
|
||||
config USB_ETHER_LAN78XX
|
||||
bool "Microchip LAN78XX support"
|
||||
depends on USB_HOST_ETHER
|
||||
+ depends on PHYLIB
|
||||
---help---
|
||||
Say Y here if you would like to support Microchip LAN78XX USB 3.1
|
||||
Gen 1 to 10/100/1000 Gigabit Ethernet controller.
|
||||
From patchwork Thu Mar 15 14:05:36 2018
|
||||
Content-Type: text/plain; charset="utf-8"
|
||||
MIME-Version: 1.0
|
||||
Content-Transfer-Encoding: 7bit
|
||||
Subject: [U-Boot,1/2] rpi3: Enable lan78xx driver
|
||||
X-Patchwork-Submitter: Alexander Graf <agraf@suse.de>
|
||||
X-Patchwork-Id: 886254
|
||||
Message-Id: <20180315140537.9818-1-agraf@suse.de>
|
||||
To: u-boot@lists.denx.de
|
||||
Date: Thu, 15 Mar 2018 15:05:36 +0100
|
||||
From: Alexander Graf <agraf@suse.de>
|
||||
List-Id: U-Boot discussion <u-boot.lists.denx.de>
|
||||
|
||||
The new Raspberry Pi B 3+ has a lan78xx device attached to it. Let's add
|
||||
driver support in U-Boot for it.
|
||||
|
||||
Signed-off-by: Alexander Graf <agraf@suse.de>
|
||||
---
|
||||
configs/rpi_3_defconfig | 2 ++
|
||||
1 file changed, 2 insertions(+)
|
||||
|
||||
diff --git a/configs/rpi_3_defconfig b/configs/rpi_3_defconfig
|
||||
index 0f3a54ec9a..810b60344f 100644
|
||||
--- a/configs/rpi_3_defconfig
|
||||
+++ b/configs/rpi_3_defconfig
|
||||
@@ -36,3 +36,5 @@ CONFIG_SYS_WHITE_ON_BLACK=y
|
||||
CONFIG_CONSOLE_SCROLL_LINES=10
|
||||
CONFIG_PHYS_TO_BUS=y
|
||||
CONFIG_OF_LIBFDT_OVERLAY=y
|
||||
+CONFIG_PHYLIB=y
|
||||
+CONFIG_USB_ETHER_LAN78XX=y
|
||||
|
||||
From patchwork Thu Mar 15 14:05:37 2018
|
||||
Content-Type: text/plain; charset="utf-8"
|
||||
MIME-Version: 1.0
|
||||
Content-Transfer-Encoding: 7bit
|
||||
Subject: [U-Boot,2/2] rpi: Add identifier for the new RPi3 B+
|
||||
X-Patchwork-Submitter: Alexander Graf <agraf@suse.de>
|
||||
X-Patchwork-Id: 886253
|
||||
Message-Id: <20180315140537.9818-2-agraf@suse.de>
|
||||
To: u-boot@lists.denx.de
|
||||
Date: Thu, 15 Mar 2018 15:05:37 +0100
|
||||
From: Alexander Graf <agraf@suse.de>
|
||||
List-Id: U-Boot discussion <u-boot.lists.denx.de>
|
||||
|
||||
The Raspberr Pi Foundation released a new RPi3 version which we want
|
||||
to detect as well, so we can enable ethernet on it and know the correct
|
||||
device tree file name.
|
||||
|
||||
Add an identifier for it.
|
||||
|
||||
Signed-off-by: Alexander Graf <agraf@suse.de>
|
||||
---
|
||||
board/raspberrypi/rpi/rpi.c | 5 +++++
|
||||
1 file changed, 5 insertions(+)
|
||||
|
||||
diff --git a/board/raspberrypi/rpi/rpi.c b/board/raspberrypi/rpi/rpi.c
|
||||
index 177f4af265..279a9c3cda 100644
|
||||
--- a/board/raspberrypi/rpi/rpi.c
|
||||
+++ b/board/raspberrypi/rpi/rpi.c
|
||||
@@ -111,6 +111,11 @@ static const struct rpi_model rpi_models_new_scheme[] = {
|
||||
DTB_DIR "bcm2835-rpi-zero-w.dtb",
|
||||
false,
|
||||
},
|
||||
+ [0xD] = {
|
||||
+ "3 Model B+",
|
||||
+ DTB_DIR "bcm2837-rpi-3-b-plus.dtb",
|
||||
+ true,
|
||||
+ },
|
||||
};
|
||||
|
||||
static const struct rpi_model rpi_models_old_scheme[] = {
|
||||
From 2ce61c377f5cb1175f3fd0ad05857d4f56ce3966 Mon Sep 17 00:00:00 2001
|
||||
From: Peter Robinson <pbrobinson@gmail.com>
|
||||
Date: Fri, 16 Mar 2018 02:24:41 +0000
|
||||
Subject: [PATCH] Raspberry Pi B 3+ has a lan78xx device
|
||||
|
||||
Signed-off-by: Peter Robinson <pbrobinson@gmail.com>
|
||||
---
|
||||
configs/rpi_3_32b_defconfig | 2 ++
|
||||
1 file changed, 2 insertions(+)
|
||||
|
||||
diff --git a/configs/rpi_3_32b_defconfig b/configs/rpi_3_32b_defconfig
|
||||
index 317fc28f71..4e59c14fdf 100644
|
||||
--- a/configs/rpi_3_32b_defconfig
|
||||
+++ b/configs/rpi_3_32b_defconfig
|
||||
@@ -36,3 +36,5 @@ CONFIG_SYS_WHITE_ON_BLACK=y
|
||||
CONFIG_CONSOLE_SCROLL_LINES=10
|
||||
CONFIG_PHYS_TO_BUS=y
|
||||
CONFIG_OF_LIBFDT_OVERLAY=y
|
||||
+CONFIG_PHYLIB=y
|
||||
+CONFIG_USB_ETHER_LAN78XX=y
|
||||
--
|
||||
2.16.2
|
||||
|
|
@ -1,53 +0,0 @@
|
|||
From patchwork Thu Apr 5 09:37:52 2018
|
||||
Content-Type: text/plain; charset="utf-8"
|
||||
MIME-Version: 1.0
|
||||
Content-Transfer-Encoding: 7bit
|
||||
Subject: [U-Boot] rpi: Allow to boot without serial
|
||||
X-Patchwork-Submitter: Alexander Graf <agraf@suse.de>
|
||||
X-Patchwork-Id: 895325
|
||||
X-Patchwork-Delegate: agraf@suse.de
|
||||
Message-Id: <20180405093752.32985-1-agraf@suse.de>
|
||||
To: u-boot@lists.denx.de
|
||||
Date: Thu, 5 Apr 2018 11:37:52 +0200
|
||||
From: Alexander Graf <agraf@suse.de>
|
||||
List-Id: U-Boot discussion <u-boot.lists.denx.de>
|
||||
|
||||
When we enable CONFIG_OF_BOARD on Raspberry Pis, we may end up without
|
||||
serial console support in early boot. Hence we need to make the serial
|
||||
port optional, otherwise we will never get to the point where serial
|
||||
would be probed.
|
||||
|
||||
Signed-off-by: Alexander Graf <agraf@suse.de>
|
||||
---
|
||||
configs/rpi_0_w_defconfig | 1 +
|
||||
configs/rpi_2_defconfig | 1 +
|
||||
configs/rpi_defconfig | 1 +
|
||||
3 files changed, 3 insertions(+)
|
||||
|
||||
diff --git a/configs/rpi_0_w_defconfig b/configs/rpi_0_w_defconfig
|
||||
index 04717d5e50..6e02cf34e9 100644
|
||||
--- a/configs/rpi_0_w_defconfig
|
||||
+++ b/configs/rpi_0_w_defconfig
|
||||
@@ -34,3 +34,4 @@ CONFIG_SYS_WHITE_ON_BLACK=y
|
||||
CONFIG_CONSOLE_SCROLL_LINES=10
|
||||
CONFIG_PHYS_TO_BUS=y
|
||||
CONFIG_OF_LIBFDT_OVERLAY=y
|
||||
+# CONFIG_REQUIRE_SERIAL_CONSOLE is not set
|
||||
diff --git a/configs/rpi_2_defconfig b/configs/rpi_2_defconfig
|
||||
index f8203c9d47..dd3c60cc93 100644
|
||||
--- a/configs/rpi_2_defconfig
|
||||
+++ b/configs/rpi_2_defconfig
|
||||
@@ -34,3 +34,4 @@ CONFIG_SYS_WHITE_ON_BLACK=y
|
||||
CONFIG_CONSOLE_SCROLL_LINES=10
|
||||
CONFIG_PHYS_TO_BUS=y
|
||||
CONFIG_OF_LIBFDT_OVERLAY=y
|
||||
+# CONFIG_REQUIRE_SERIAL_CONSOLE is not set
|
||||
diff --git a/configs/rpi_defconfig b/configs/rpi_defconfig
|
||||
index d13d3d3e2e..2c0412d8ea 100644
|
||||
--- a/configs/rpi_defconfig
|
||||
+++ b/configs/rpi_defconfig
|
||||
@@ -34,3 +34,4 @@ CONFIG_SYS_WHITE_ON_BLACK=y
|
||||
CONFIG_CONSOLE_SCROLL_LINES=10
|
||||
CONFIG_PHYS_TO_BUS=y
|
||||
CONFIG_OF_LIBFDT_OVERLAY=y
|
||||
+# CONFIG_REQUIRE_SERIAL_CONSOLE is not set
|
2
sources
2
sources
|
@ -1 +1 @@
|
|||
SHA512 (u-boot-2018.03.tar.bz2) = adcf2446f33173bde48abd882e99e44b28f0ce88db803085def0160bbe3808d23ac383c57a6c9b0f2b724dd62d4b4bb18e44ec101d53928eafe889fc7b0547c7
|
||||
SHA512 (u-boot-2018.05-rc1.tar.bz2) = c765ffccc82a90f216155407a4d409df7d4fd19c588e5d2224dabb1723091b62048b7df64671654adaee765b2536fc5a0f80f6490cffca9d201c523d54484513
|
||||
|
|
|
@ -1,8 +1,8 @@
|
|||
#global candidate rc4
|
||||
%global candidate rc1
|
||||
|
||||
Name: uboot-tools
|
||||
Version: 2018.03
|
||||
Release: 4%{?candidate:.%{candidate}}%{?dist}
|
||||
Version: 2018.05
|
||||
Release: 0.1%{?candidate:.%{candidate}}%{?dist}
|
||||
Summary: U-Boot utilities
|
||||
License: GPLv2+ BSD LGPL-2.1+ LGPL-2.0+
|
||||
URL: http://www.denx.de/wiki/U-Boot
|
||||
|
@ -20,19 +20,14 @@ Patch1: uefi-use-Fedora-specific-path-name.patch
|
|||
# general fixes
|
||||
Patch2: uefi-distro-load-FDT-from-any-partition-on-boot-device.patch
|
||||
Patch3: usb-kbd-fixes.patch
|
||||
Patch4: Add-fix-for-Pine64-gigabit-throughput-issues.patch
|
||||
Patch5: rk33xx-make_fit_atf-fix.patch
|
||||
Patch6: rk33xx-enable-make-itb.patch
|
||||
Patch7: net-Only-access-network-devices-after-init.patch
|
||||
Patch4: rk33xx-make_fit_atf-fix.patch
|
||||
Patch5: rk33xx-enable-make-itb.patch
|
||||
|
||||
# Board fixes and enablement
|
||||
Patch10: dragonboard-fixes.patch
|
||||
Patch11: BeagleBoard.org-PocketBeagle.patch
|
||||
Patch12: mx6cuboxi-add-support-for-detecting-Revision-1.5-SoM.patch
|
||||
Patch13: rpi-3-plus-support.patch
|
||||
Patch14: rpi-Allow-to-boot-without-serial.patch
|
||||
Patch15: rpi-Enable-using-the-DT-provided-by-the-Raspberry-Pi.patch
|
||||
Patch16: mmc-use-core-clock-frequency-in-bcm2835-sdhost.patch
|
||||
Patch13: rpi-Enable-using-the-DT-provided-by-the-Raspberry-Pi.patch
|
||||
Patch19: mmc-mv_sdhci-zero-out-sdhci_host-structure.patch
|
||||
Patch20: mvneta-support-setting-hardware-address.patch
|
||||
Patch21: sunxi-improve-throughput-in-the-sunxi_mmc-driver.patch
|
||||
|
@ -296,6 +291,9 @@ cp -p board/warp7/README builds/docs/README.warp7
|
|||
%endif
|
||||
|
||||
%changelog
|
||||
* Sun Apr 8 2018 Peter Robinson <pbrobinson@fedoraproject.org> 2018.05-0.1
|
||||
- 2018.05 RC1
|
||||
|
||||
* Fri Apr 6 2018 Peter Robinson <pbrobinson@fedoraproject.org> 2018.03-4
|
||||
- Improvements for Raspberry Pi, AllWinner MMC perf, mvebu devices
|
||||
|
||||
|
|
Loading…
Reference in New Issue