Merge remote-tracking branch 'up/master' into master-riscv64
Signed-off-by: David Abdurachmanov <david.abdurachmanov@gmail.com>
This commit is contained in:
commit
f0e754c7e3
|
@ -9,6 +9,18 @@ KERNEL_VERSION="$2"
|
|||
#BOOT_DIR_ABS="$3"
|
||||
#KERNEL_IMAGE="$4"
|
||||
|
||||
[ -f /etc/u-boot.conf ] && source /etc/u-boot.conf || true
|
||||
[ -z "$FIRMWAREDT" ] || FirmwareDT=$FIRMWAREDT
|
||||
|
||||
if [[ $FirmwareDT == "True" ]]
|
||||
then
|
||||
# if we want to use firmware DT we remove symlink to current kernel DT
|
||||
if [ -h /boot/dtb ]; then
|
||||
rm -f /boot/dtb
|
||||
fi
|
||||
exit 0
|
||||
fi
|
||||
|
||||
# Setup a /boot/dtb -> /boot/dtb-$newest_kernel_version symlink so that
|
||||
# u-boot can find the correct dtb to load.
|
||||
#
|
||||
|
|
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
|
@ -0,0 +1,162 @@
|
|||
From 1e93c98419e6a1ea62ef697ed915617024eb6da0 Mon Sep 17 00:00:00 2001
|
||||
From: Peter Robinson <pbrobinson@gmail.com>
|
||||
Date: Thu, 18 Apr 2019 14:03:33 +0100
|
||||
Subject: [PATCH] arm: tegra: defaine fdtfile for all devices
|
||||
|
||||
Signed-off-by: Peter Robinson <pbrobinson@gmail.com>
|
||||
---
|
||||
include/configs/tegra-common.h | 6 ++++++
|
||||
include/configs/tegra114-common.h | 1 +
|
||||
include/configs/tegra124-common.h | 1 +
|
||||
include/configs/tegra186-common.h | 1 +
|
||||
include/configs/tegra20-common.h | 1 +
|
||||
include/configs/tegra210-common.h | 1 +
|
||||
include/configs/tegra30-common.h | 1 +
|
||||
7 files changed, 12 insertions(+)
|
||||
|
||||
diff --git a/include/configs/tegra-common.h b/include/configs/tegra-common.h
|
||||
index 84f671d00c..c3e16d8cfc 100644
|
||||
--- a/include/configs/tegra-common.h
|
||||
+++ b/include/configs/tegra-common.h
|
||||
@@ -56,6 +56,12 @@
|
||||
#define CONFIG_SYS_MEMTEST_START (NV_PA_SDRC_CS0 + 0x600000)
|
||||
#define CONFIG_SYS_MEMTEST_END (CONFIG_SYS_MEMTEST_START + 0x100000)
|
||||
|
||||
+#ifdef CONFIG_ARM64
|
||||
+#define FDTFILE "nvidia/" CONFIG_DEFAULT_DEVICE_TREE ".dtb"
|
||||
+#else
|
||||
+#define FDTFILE CONFIG_DEFAULT_DEVICE_TREE ".dtb"
|
||||
+#endif
|
||||
+
|
||||
/*-----------------------------------------------------------------------
|
||||
* Physical Memory Map
|
||||
*/
|
||||
diff --git a/include/configs/tegra114-common.h b/include/configs/tegra114-common.h
|
||||
index 1aa4412645..0c44a7673b 100644
|
||||
--- a/include/configs/tegra114-common.h
|
||||
+++ b/include/configs/tegra114-common.h
|
||||
@@ -50,6 +50,7 @@
|
||||
"scriptaddr=0x90000000\0" \
|
||||
"pxefile_addr_r=0x90100000\0" \
|
||||
"kernel_addr_r=" __stringify(CONFIG_LOADADDR) "\0" \
|
||||
+ "fdtfile=" FDTFILE "\0" \
|
||||
"fdt_addr_r=0x83000000\0" \
|
||||
"ramdisk_addr_r=0x83100000\0"
|
||||
|
||||
diff --git a/include/configs/tegra124-common.h b/include/configs/tegra124-common.h
|
||||
index 3530684164..29da06c8f7 100644
|
||||
--- a/include/configs/tegra124-common.h
|
||||
+++ b/include/configs/tegra124-common.h
|
||||
@@ -52,6 +52,7 @@
|
||||
"scriptaddr=0x90000000\0" \
|
||||
"pxefile_addr_r=0x90100000\0" \
|
||||
"kernel_addr_r=" __stringify(CONFIG_LOADADDR) "\0" \
|
||||
+ "fdtfile=" FDTFILE "\0" \
|
||||
"fdt_addr_r=0x83000000\0" \
|
||||
"ramdisk_addr_r=0x83100000\0"
|
||||
|
||||
diff --git a/include/configs/tegra186-common.h b/include/configs/tegra186-common.h
|
||||
index b4936cc731..5c3ad35c76 100644
|
||||
--- a/include/configs/tegra186-common.h
|
||||
+++ b/include/configs/tegra186-common.h
|
||||
@@ -49,6 +49,7 @@
|
||||
"scriptaddr=0x90000000\0" \
|
||||
"pxefile_addr_r=0x90100000\0" \
|
||||
"kernel_addr_r=" __stringify(CONFIG_LOADADDR) "\0" \
|
||||
+ "fdtfile=" FDTFILE "\0" \
|
||||
"fdt_addr_r=0x82000000\0" \
|
||||
"ramdisk_addr_r=0x82100000\0"
|
||||
|
||||
diff --git a/include/configs/tegra20-common.h b/include/configs/tegra20-common.h
|
||||
index e58477e289..73c94d993b 100644
|
||||
--- a/include/configs/tegra20-common.h
|
||||
+++ b/include/configs/tegra20-common.h
|
||||
@@ -51,6 +51,7 @@
|
||||
"scriptaddr=0x10000000\0" \
|
||||
"pxefile_addr_r=0x10100000\0" \
|
||||
"kernel_addr_r=" __stringify(CONFIG_LOADADDR) "\0" \
|
||||
+ "fdtfile=" FDTFILE "\0" \
|
||||
"fdt_addr_r=0x03000000\0" \
|
||||
"ramdisk_addr_r=0x03100000\0"
|
||||
|
||||
diff --git a/include/configs/tegra210-common.h b/include/configs/tegra210-common.h
|
||||
index 1c533118ad..69e446ed58 100644
|
||||
--- a/include/configs/tegra210-common.h
|
||||
+++ b/include/configs/tegra210-common.h
|
||||
@@ -46,6 +46,7 @@
|
||||
"scriptaddr=0x90000000\0" \
|
||||
"pxefile_addr_r=0x90100000\0" \
|
||||
"kernel_addr_r=" __stringify(CONFIG_LOADADDR) "\0" \
|
||||
+ "fdtfile=" FDTFILE "\0" \
|
||||
"fdt_addr_r=0x82000000\0" \
|
||||
"ramdisk_addr_r=0x82100000\0"
|
||||
|
||||
diff --git a/include/configs/tegra30-common.h b/include/configs/tegra30-common.h
|
||||
index 2d8948d9d9..27696009cd 100644
|
||||
--- a/include/configs/tegra30-common.h
|
||||
+++ b/include/configs/tegra30-common.h
|
||||
@@ -47,6 +47,7 @@
|
||||
"scriptaddr=0x90000000\0" \
|
||||
"pxefile_addr_r=0x90100000\0" \
|
||||
"kernel_addr_r=" __stringify(CONFIG_LOADADDR) "\0" \
|
||||
+ "fdtfile=" FDTFILE "\0" \
|
||||
"fdt_addr_r=0x83000000\0" \
|
||||
"ramdisk_addr_r=0x83100000\0"
|
||||
|
||||
--
|
||||
2.21.0
|
||||
From 267dc15aa8f247362b04387d6a1ab01d94d41aef Mon Sep 17 00:00:00 2001
|
||||
From: Peter Robinson <pbrobinson@gmail.com>
|
||||
Date: Thu, 18 Apr 2019 15:44:59 +0100
|
||||
Subject: [PATCH] add BOOTENV_EFI_SET_FDTFILE_FALLBACK for tegra186 because tx2
|
||||
variants
|
||||
|
||||
Signed-off-by: Peter Robinson <pbrobinson@gmail.com>
|
||||
---
|
||||
include/config_distro_bootcmd.h | 2 ++
|
||||
include/configs/tegra186-common.h | 7 ++++++-
|
||||
2 files changed, 8 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/include/config_distro_bootcmd.h b/include/config_distro_bootcmd.h
|
||||
index 4993303f4d..cd317bb457 100644
|
||||
--- a/include/config_distro_bootcmd.h
|
||||
+++ b/include/config_distro_bootcmd.h
|
||||
@@ -118,8 +118,10 @@
|
||||
"setenv efi_fdtfile ${soc}-${board}${boardver}.dtb; " \
|
||||
"fi; "
|
||||
#else
|
||||
+#ifndef BOOTENV_EFI_SET_FDTFILE_FALLBACK
|
||||
#define BOOTENV_EFI_SET_FDTFILE_FALLBACK
|
||||
#endif
|
||||
+#endif
|
||||
|
||||
|
||||
#define BOOTENV_SHARED_EFI \
|
||||
diff --git a/include/configs/tegra186-common.h b/include/configs/tegra186-common.h
|
||||
index 5c3ad35c76..d5f21e0907 100644
|
||||
--- a/include/configs/tegra186-common.h
|
||||
+++ b/include/configs/tegra186-common.h
|
||||
@@ -20,6 +20,12 @@
|
||||
/* Generic Interrupt Controller */
|
||||
#define CONFIG_GICV2
|
||||
|
||||
+#undef FDTFILE
|
||||
+#define BOOTENV_EFI_SET_FDTFILE_FALLBACK \
|
||||
+ "if test -z \"${fdtfile}\" -a -n \"${soc}\"; then " \
|
||||
+ "setenv efi_fdtfile ${vendor}/${soc}-${board}${boardver}.dtb; " \
|
||||
+ "fi; "
|
||||
+
|
||||
/*
|
||||
* Memory layout for where various images get loaded by boot scripts:
|
||||
*
|
||||
@@ -49,7 +55,6 @@
|
||||
"scriptaddr=0x90000000\0" \
|
||||
"pxefile_addr_r=0x90100000\0" \
|
||||
"kernel_addr_r=" __stringify(CONFIG_LOADADDR) "\0" \
|
||||
- "fdtfile=" FDTFILE "\0" \
|
||||
"fdt_addr_r=0x82000000\0" \
|
||||
"ramdisk_addr_r=0x82100000\0"
|
||||
|
||||
--
|
||||
2.21.0
|
||||
|
|
@ -1,16 +1,15 @@
|
|||
From patchwork Fri Mar 8 19:51:25 2019
|
||||
From patchwork Tue Apr 16 16:24:16 2019
|
||||
Content-Type: text/plain; charset="utf-8"
|
||||
MIME-Version: 1.0
|
||||
Content-Transfer-Encoding: 7bit
|
||||
Subject: [U-Boot,
|
||||
1/3] net: eth-uclass: Write MAC address to hardware after probe
|
||||
Subject: [U-Boot, v2,
|
||||
1/2] net: eth-uclass: Write MAC address to hardware after probe
|
||||
X-Patchwork-Submitter: Thierry Reding <thierry.reding@gmail.com>
|
||||
X-Patchwork-Id: 1053669
|
||||
Message-Id: <20190308195127.32711-1-thierry.reding@gmail.com>
|
||||
To: Joe Hershberger <joe.hershberger@ni.com>
|
||||
Cc: u-boot@lists.denx.de, Stephen Warren <swarren@nvidia.com>,
|
||||
Tom Warren <twarren@nvidia.com>
|
||||
Date: Fri, 8 Mar 2019 20:51:25 +0100
|
||||
X-Patchwork-Id: 1086417
|
||||
Message-Id: <20190416162417.25799-1-thierry.reding@gmail.com>
|
||||
To: Simon Glass <sjg@chromium.org>, Joe Hershberger <joe.hershberger@ni.com>
|
||||
Cc: u-boot@lists.denx.de
|
||||
Date: Tue, 16 Apr 2019 18:24:16 +0200
|
||||
From: Thierry Reding <thierry.reding@gmail.com>
|
||||
List-Id: U-Boot discussion <u-boot.lists.denx.de>
|
||||
|
||||
|
@ -44,104 +43,155 @@ index 2ef20df19203..4225aabf1fa1 100644
|
|||
}
|
||||
|
||||
|
||||
From patchwork Fri Mar 8 19:51:26 2019
|
||||
From patchwork Tue Apr 16 16:24:17 2019
|
||||
Content-Type: text/plain; charset="utf-8"
|
||||
MIME-Version: 1.0
|
||||
Content-Transfer-Encoding: 7bit
|
||||
Subject: [U-Boot,2/3] net: rtl8169: Implement ->hwaddr_write() callback
|
||||
Subject: [U-Boot,v2,2/2] net: eth-uclass: Support device tree MAC addresses
|
||||
X-Patchwork-Submitter: Thierry Reding <thierry.reding@gmail.com>
|
||||
X-Patchwork-Id: 1053670
|
||||
Message-Id: <20190308195127.32711-2-thierry.reding@gmail.com>
|
||||
To: Joe Hershberger <joe.hershberger@ni.com>
|
||||
Cc: u-boot@lists.denx.de, Stephen Warren <swarren@nvidia.com>,
|
||||
Tom Warren <twarren@nvidia.com>
|
||||
Date: Fri, 8 Mar 2019 20:51:26 +0100
|
||||
X-Patchwork-Id: 1086418
|
||||
Message-Id: <20190416162417.25799-2-thierry.reding@gmail.com>
|
||||
To: Simon Glass <sjg@chromium.org>, Joe Hershberger <joe.hershberger@ni.com>
|
||||
Cc: u-boot@lists.denx.de
|
||||
Date: Tue, 16 Apr 2019 18:24:17 +0200
|
||||
From: Thierry Reding <thierry.reding@gmail.com>
|
||||
List-Id: U-Boot discussion <u-boot.lists.denx.de>
|
||||
|
||||
From: Thierry Reding <treding@nvidia.com>
|
||||
|
||||
Implement this callback that allows the MAC address to be set for the
|
||||
Ethernet card. This is necessary in order for the device to be able to
|
||||
receive packets for the MAC address that U-Boot advertises.
|
||||
Add the standard Ethernet device tree bindings (imported from v5.0 of
|
||||
the Linux kernel) and implement support for reading the MAC address for
|
||||
Ethernet devices in the Ethernet uclass. If the "mac-address" property
|
||||
exists, the MAC address will be parsed from that. If that property does
|
||||
not exist, the "local-mac-address" property will be tried as fallback.
|
||||
|
||||
MAC addresses from device tree take precedence over the ones stored in
|
||||
a network interface card's ROM.
|
||||
|
||||
Acked-by: Joe Hershberger <joe.hershberger@ni.com>
|
||||
Signed-off-by: Thierry Reding <treding@nvidia.com>
|
||||
---
|
||||
drivers/net/rtl8169.c | 18 ++++++++++++++++++
|
||||
1 file changed, 18 insertions(+)
|
||||
Changes in v2:
|
||||
- use dev_read_u8_array_ptr()
|
||||
|
||||
diff --git a/drivers/net/rtl8169.c b/drivers/net/rtl8169.c
|
||||
index a78f3d233f1a..27e27b34176b 100644
|
||||
--- a/drivers/net/rtl8169.c
|
||||
+++ b/drivers/net/rtl8169.c
|
||||
@@ -941,6 +941,23 @@ static void rtl_halt(struct eth_device *dev)
|
||||
.../devicetree/bindings/net/ethernet.txt | 66 +++++++++++++++++++
|
||||
net/eth-uclass.c | 26 +++++++-
|
||||
2 files changed, 89 insertions(+), 3 deletions(-)
|
||||
create mode 100644 Documentation/devicetree/bindings/net/ethernet.txt
|
||||
|
||||
diff --git a/Documentation/devicetree/bindings/net/ethernet.txt b/Documentation/devicetree/bindings/net/ethernet.txt
|
||||
new file mode 100644
|
||||
index 000000000000..cfc376bc977a
|
||||
--- /dev/null
|
||||
+++ b/Documentation/devicetree/bindings/net/ethernet.txt
|
||||
@@ -0,0 +1,66 @@
|
||||
+The following properties are common to the Ethernet controllers:
|
||||
+
|
||||
+NOTE: All 'phy*' properties documented below are Ethernet specific. For the
|
||||
+generic PHY 'phys' property, see
|
||||
+Documentation/devicetree/bindings/phy/phy-bindings.txt.
|
||||
+
|
||||
+- local-mac-address: array of 6 bytes, specifies the MAC address that was
|
||||
+ assigned to the network device;
|
||||
+- mac-address: array of 6 bytes, specifies the MAC address that was last used by
|
||||
+ the boot program; should be used in cases where the MAC address assigned to
|
||||
+ the device by the boot program is different from the "local-mac-address"
|
||||
+ property;
|
||||
+- nvmem-cells: phandle, reference to an nvmem node for the MAC address;
|
||||
+- nvmem-cell-names: string, should be "mac-address" if nvmem is to be used;
|
||||
+- max-speed: number, specifies maximum speed in Mbit/s supported by the device;
|
||||
+- max-frame-size: number, maximum transfer unit (IEEE defined MTU), rather than
|
||||
+ the maximum frame size (there's contradiction in the Devicetree
|
||||
+ Specification).
|
||||
+- phy-mode: string, operation mode of the PHY interface. This is now a de-facto
|
||||
+ standard property; supported values are:
|
||||
+ * "internal"
|
||||
+ * "mii"
|
||||
+ * "gmii"
|
||||
+ * "sgmii"
|
||||
+ * "qsgmii"
|
||||
+ * "tbi"
|
||||
+ * "rev-mii"
|
||||
+ * "rmii"
|
||||
+ * "rgmii" (RX and TX delays are added by the MAC when required)
|
||||
+ * "rgmii-id" (RGMII with internal RX and TX delays provided by the PHY, the
|
||||
+ MAC should not add the RX or TX delays in this case)
|
||||
+ * "rgmii-rxid" (RGMII with internal RX delay provided by the PHY, the MAC
|
||||
+ should not add an RX delay in this case)
|
||||
+ * "rgmii-txid" (RGMII with internal TX delay provided by the PHY, the MAC
|
||||
+ should not add an TX delay in this case)
|
||||
+ * "rtbi"
|
||||
+ * "smii"
|
||||
+ * "xgmii"
|
||||
+ * "trgmii"
|
||||
+ * "2000base-x",
|
||||
+ * "2500base-x",
|
||||
+ * "rxaui"
|
||||
+ * "xaui"
|
||||
+ * "10gbase-kr" (10GBASE-KR, XFI, SFI)
|
||||
+- phy-connection-type: the same as "phy-mode" property but described in the
|
||||
+ Devicetree Specification;
|
||||
+- phy-handle: phandle, specifies a reference to a node representing a PHY
|
||||
+ device; this property is described in the Devicetree Specification and so
|
||||
+ preferred;
|
||||
+- phy: the same as "phy-handle" property, not recommended for new bindings.
|
||||
+- phy-device: the same as "phy-handle" property, not recommended for new
|
||||
+ bindings.
|
||||
+- rx-fifo-depth: the size of the controller's receive fifo in bytes. This
|
||||
+ is used for components that can have configurable receive fifo sizes,
|
||||
+ and is useful for determining certain configuration settings such as
|
||||
+ flow control thresholds.
|
||||
+- tx-fifo-depth: the size of the controller's transmit fifo in bytes. This
|
||||
+ is used for components that can have configurable fifo sizes.
|
||||
+- managed: string, specifies the PHY management type. Supported values are:
|
||||
+ "auto", "in-band-status". "auto" is the default, it usess MDIO for
|
||||
+ management if fixed-link is not specified.
|
||||
+
|
||||
+Child nodes of the Ethernet controller are typically the individual PHY devices
|
||||
+connected via the MDIO bus (sometimes the MDIO bus controller is separate).
|
||||
+They are described in the phy.txt file in this same directory.
|
||||
+For non-MDIO PHY management see fixed-link.txt.
|
||||
diff --git a/net/eth-uclass.c b/net/eth-uclass.c
|
||||
index 4225aabf1fa1..c6d5ec013bd8 100644
|
||||
--- a/net/eth-uclass.c
|
||||
+++ b/net/eth-uclass.c
|
||||
@@ -455,6 +455,23 @@ static int eth_pre_unbind(struct udevice *dev)
|
||||
return 0;
|
||||
}
|
||||
#endif
|
||||
|
||||
+#ifdef CONFIG_DM_ETH
|
||||
+static int rtl8169_write_hwaddr(struct udevice *dev)
|
||||
+static bool eth_dev_get_mac_address(struct udevice *dev, u8 mac[ARP_HLEN])
|
||||
+{
|
||||
+ struct eth_pdata *plat = dev_get_platdata(dev);
|
||||
+ unsigned int i;
|
||||
+ const uint8_t *p;
|
||||
+
|
||||
+ RTL_W8(Cfg9346, Cfg9346_Unlock);
|
||||
+ p = dev_read_u8_array_ptr(dev, "mac-address", ARP_HLEN);
|
||||
+ if (!p)
|
||||
+ p = dev_read_u8_array_ptr(dev, "local-mac-address", ARP_HLEN);
|
||||
+
|
||||
+ for (i = 0; i < MAC_ADDR_LEN; i++)
|
||||
+ RTL_W8(MAC0 + i, plat->enetaddr[i]);
|
||||
+
|
||||
+ RTL_W8(Cfg9346, Cfg9346_Lock);
|
||||
+
|
||||
+ return 0;
|
||||
+ if (!p) {
|
||||
+ memset(mac, 0, ARP_HLEN);
|
||||
+ return false;
|
||||
+ }
|
||||
+#endif
|
||||
+
|
||||
/**************************************************************************
|
||||
INIT - Look for an adapter, this routine's visible to the outside
|
||||
***************************************************************************/
|
||||
@@ -1195,6 +1212,7 @@ static const struct eth_ops rtl8169_eth_ops = {
|
||||
.send = rtl8169_eth_send,
|
||||
.recv = rtl8169_eth_recv,
|
||||
.stop = rtl8169_eth_stop,
|
||||
+ .write_hwaddr = rtl8169_write_hwaddr,
|
||||
};
|
||||
+ memcpy(mac, p, ARP_HLEN);
|
||||
+ return true;
|
||||
+}
|
||||
+
|
||||
static int eth_post_probe(struct udevice *dev)
|
||||
{
|
||||
struct eth_device_priv *priv = dev->uclass_priv;
|
||||
@@ -489,9 +506,12 @@ static int eth_post_probe(struct udevice *dev)
|
||||
|
||||
static const struct udevice_id rtl8169_eth_ids[] = {
|
||||
priv->state = ETH_STATE_INIT;
|
||||
|
||||
From patchwork Fri Mar 8 19:51:27 2019
|
||||
Content-Type: text/plain; charset="utf-8"
|
||||
MIME-Version: 1.0
|
||||
Content-Transfer-Encoding: 7bit
|
||||
Subject: [U-Boot,3/3] net: rtl8169: Support RTL-8168h/8111h
|
||||
X-Patchwork-Submitter: Thierry Reding <thierry.reding@gmail.com>
|
||||
X-Patchwork-Id: 1053671
|
||||
Message-Id: <20190308195127.32711-3-thierry.reding@gmail.com>
|
||||
To: Joe Hershberger <joe.hershberger@ni.com>
|
||||
Cc: u-boot@lists.denx.de, Stephen Warren <swarren@nvidia.com>,
|
||||
Tom Warren <twarren@nvidia.com>
|
||||
Date: Fri, 8 Mar 2019 20:51:27 +0100
|
||||
From: Thierry Reding <thierry.reding@gmail.com>
|
||||
List-Id: U-Boot discussion <u-boot.lists.denx.de>
|
||||
- /* Check if the device has a MAC address in ROM */
|
||||
- if (eth_get_ops(dev)->read_rom_hwaddr)
|
||||
- eth_get_ops(dev)->read_rom_hwaddr(dev);
|
||||
+ /* Check if the device has a MAC address in device tree */
|
||||
+ if (!eth_dev_get_mac_address(dev, pdata->enetaddr)) {
|
||||
+ /* Check if the device has a MAC address in ROM */
|
||||
+ if (eth_get_ops(dev)->read_rom_hwaddr)
|
||||
+ eth_get_ops(dev)->read_rom_hwaddr(dev);
|
||||
+ }
|
||||
|
||||
From: Thierry Reding <treding@nvidia.com>
|
||||
|
||||
This version of the RTL-8168 is present on some development boards and
|
||||
is compatible with this driver. Add support for identifying this version
|
||||
of the chip so that U-Boot won't complain about it being unknown.
|
||||
|
||||
Signed-off-by: Thierry Reding <treding@nvidia.com>
|
||||
---
|
||||
drivers/net/rtl8169.c | 1 +
|
||||
1 file changed, 1 insertion(+)
|
||||
|
||||
diff --git a/drivers/net/rtl8169.c b/drivers/net/rtl8169.c
|
||||
index 27e27b34176b..bc052e72564b 100644
|
||||
--- a/drivers/net/rtl8169.c
|
||||
+++ b/drivers/net/rtl8169.c
|
||||
@@ -257,6 +257,7 @@ static struct {
|
||||
{"RTL-8168/8111g", 0x4c, 0xff7e1880,},
|
||||
{"RTL-8101e", 0x34, 0xff7e1880,},
|
||||
{"RTL-8100e", 0x32, 0xff7e1880,},
|
||||
+ {"RTL-8168h/8111h", 0x54, 0xff7e1880,},
|
||||
};
|
||||
|
||||
enum _DescStatusBit {
|
||||
eth_env_get_enetaddr_by_index("eth", dev->seq, env_enetaddr);
|
||||
if (!is_zero_ethaddr(env_enetaddr)) {
|
||||
|
|
|
@ -0,0 +1,102 @@
|
|||
From patchwork Tue Apr 16 16:20:29 2019
|
||||
Content-Type: text/plain; charset="utf-8"
|
||||
MIME-Version: 1.0
|
||||
Content-Transfer-Encoding: 7bit
|
||||
Subject: [U-Boot, RESEND,
|
||||
1/2] net: rtl8169: Implement ->hwaddr_write() callback
|
||||
X-Patchwork-Submitter: Thierry Reding <thierry.reding@gmail.com>
|
||||
X-Patchwork-Id: 1086411
|
||||
Message-Id: <20190416162030.13590-1-thierry.reding@gmail.com>
|
||||
To: Joe Hershberger <joe.hershberger@ni.com>
|
||||
Cc: u-boot@lists.denx.de
|
||||
Date: Tue, 16 Apr 2019 18:20:29 +0200
|
||||
From: Thierry Reding <thierry.reding@gmail.com>
|
||||
List-Id: U-Boot discussion <u-boot.lists.denx.de>
|
||||
|
||||
From: Thierry Reding <treding@nvidia.com>
|
||||
|
||||
Implement this callback that allows the MAC address to be set for the
|
||||
Ethernet card. This is necessary in order for the device to be able to
|
||||
receive packets for the MAC address that U-Boot advertises.
|
||||
|
||||
Signed-off-by: Thierry Reding <treding@nvidia.com>
|
||||
Acked-by: Joe Hershberger <joe.hershberger@ni.com>
|
||||
---
|
||||
drivers/net/rtl8169.c | 18 ++++++++++++++++++
|
||||
1 file changed, 18 insertions(+)
|
||||
|
||||
diff --git a/drivers/net/rtl8169.c b/drivers/net/rtl8169.c
|
||||
index a78f3d233f1a..27e27b34176b 100644
|
||||
--- a/drivers/net/rtl8169.c
|
||||
+++ b/drivers/net/rtl8169.c
|
||||
@@ -941,6 +941,23 @@ static void rtl_halt(struct eth_device *dev)
|
||||
}
|
||||
#endif
|
||||
|
||||
+#ifdef CONFIG_DM_ETH
|
||||
+static int rtl8169_write_hwaddr(struct udevice *dev)
|
||||
+{
|
||||
+ struct eth_pdata *plat = dev_get_platdata(dev);
|
||||
+ unsigned int i;
|
||||
+
|
||||
+ RTL_W8(Cfg9346, Cfg9346_Unlock);
|
||||
+
|
||||
+ for (i = 0; i < MAC_ADDR_LEN; i++)
|
||||
+ RTL_W8(MAC0 + i, plat->enetaddr[i]);
|
||||
+
|
||||
+ RTL_W8(Cfg9346, Cfg9346_Lock);
|
||||
+
|
||||
+ return 0;
|
||||
+}
|
||||
+#endif
|
||||
+
|
||||
/**************************************************************************
|
||||
INIT - Look for an adapter, this routine's visible to the outside
|
||||
***************************************************************************/
|
||||
@@ -1195,6 +1212,7 @@ static const struct eth_ops rtl8169_eth_ops = {
|
||||
.send = rtl8169_eth_send,
|
||||
.recv = rtl8169_eth_recv,
|
||||
.stop = rtl8169_eth_stop,
|
||||
+ .write_hwaddr = rtl8169_write_hwaddr,
|
||||
};
|
||||
|
||||
static const struct udevice_id rtl8169_eth_ids[] = {
|
||||
|
||||
From patchwork Tue Apr 16 16:20:30 2019
|
||||
Content-Type: text/plain; charset="utf-8"
|
||||
MIME-Version: 1.0
|
||||
Content-Transfer-Encoding: 7bit
|
||||
Subject: [U-Boot,RESEND,2/2] net: rtl8169: Support RTL-8168h/8111h
|
||||
X-Patchwork-Submitter: Thierry Reding <thierry.reding@gmail.com>
|
||||
X-Patchwork-Id: 1086412
|
||||
Message-Id: <20190416162030.13590-2-thierry.reding@gmail.com>
|
||||
To: Joe Hershberger <joe.hershberger@ni.com>
|
||||
Cc: u-boot@lists.denx.de
|
||||
Date: Tue, 16 Apr 2019 18:20:30 +0200
|
||||
From: Thierry Reding <thierry.reding@gmail.com>
|
||||
List-Id: U-Boot discussion <u-boot.lists.denx.de>
|
||||
|
||||
From: Thierry Reding <treding@nvidia.com>
|
||||
|
||||
This version of the RTL-8168 is present on some development boards and
|
||||
is compatible with this driver. Add support for identifying this version
|
||||
of the chip so that U-Boot won't complain about it being unknown.
|
||||
|
||||
Signed-off-by: Thierry Reding <treding@nvidia.com>
|
||||
Acked-by: Joe Hershberger <joe.hershberger@ni.com>
|
||||
---
|
||||
drivers/net/rtl8169.c | 1 +
|
||||
1 file changed, 1 insertion(+)
|
||||
|
||||
diff --git a/drivers/net/rtl8169.c b/drivers/net/rtl8169.c
|
||||
index 27e27b34176b..bc052e72564b 100644
|
||||
--- a/drivers/net/rtl8169.c
|
||||
+++ b/drivers/net/rtl8169.c
|
||||
@@ -257,6 +257,7 @@ static struct {
|
||||
{"RTL-8168/8111g", 0x4c, 0xff7e1880,},
|
||||
{"RTL-8101e", 0x34, 0xff7e1880,},
|
||||
{"RTL-8100e", 0x32, 0xff7e1880,},
|
||||
+ {"RTL-8168h/8111h", 0x54, 0xff7e1880,},
|
||||
};
|
||||
|
||||
enum _DescStatusBit {
|
2
sources
2
sources
|
@ -1 +1 @@
|
|||
SHA512 (u-boot-2019.04-rc4.tar.bz2) = 33a57e4acb51dbe04123055b159a5b3a933ea8340aa81a4148572ee5fc12288413a6c6c0b80b6fe099ac79ea6359be2d9034ead1edfcc0403895f3f8eb56746e
|
||||
SHA512 (u-boot-2019.04.tar.bz2) = 357fe94b5b043885472ea1b7dcbbac601d0c1f7c64f71026b9e1279b53160847c6478d6ec98a2f678e562db21e39037d6e6fbc1e6b19beaac02ca14e93c5de0e
|
||||
|
|
|
@ -1,37 +0,0 @@
|
|||
From patchwork Fri Mar 8 20:10:23 2019
|
||||
Content-Type: text/plain; charset="utf-8"
|
||||
MIME-Version: 1.0
|
||||
Content-Transfer-Encoding: 7bit
|
||||
Subject: [U-Boot] p2371-2180: Build position independent binary
|
||||
X-Patchwork-Submitter: Thierry Reding <thierry.reding@gmail.com>
|
||||
X-Patchwork-Id: 1053674
|
||||
Message-Id: <20190308201023.2145-1-thierry.reding@gmail.com>
|
||||
To: Tom Warren <twarren@nvidia.com>
|
||||
Cc: u-boot@lists.denx.de, Stephen Warren <swarren@nvidia.com>
|
||||
Date: Fri, 8 Mar 2019 21:10:23 +0100
|
||||
From: Thierry Reding <thierry.reding@gmail.com>
|
||||
List-Id: U-Boot discussion <u-boot.lists.denx.de>
|
||||
|
||||
From: Thierry Reding <treding@nvidia.com>
|
||||
|
||||
In order to support chainloading of U-Boot by an earlier bootloader,
|
||||
make sure the binary is position independent, so that the earlier boot-
|
||||
loader can relocate it if necessary.
|
||||
|
||||
Signed-off-by: Thierry Reding <treding@nvidia.com>
|
||||
---
|
||||
configs/p2371-2180_defconfig | 1 +
|
||||
1 file changed, 1 insertion(+)
|
||||
|
||||
diff --git a/configs/p2371-2180_defconfig b/configs/p2371-2180_defconfig
|
||||
index b66459e379ac..8d7cf3fb5346 100644
|
||||
--- a/configs/p2371-2180_defconfig
|
||||
+++ b/configs/p2371-2180_defconfig
|
||||
@@ -1,6 +1,7 @@
|
||||
CONFIG_ARM=y
|
||||
CONFIG_TEGRA=y
|
||||
CONFIG_SYS_TEXT_BASE=0x80110000
|
||||
+CONFIG_POSITION_INDEPENDENT=y
|
||||
CONFIG_TEGRA210=y
|
||||
CONFIG_TARGET_P2371_2180=y
|
||||
CONFIG_NR_DRAM_BANKS=2
|
|
@ -0,0 +1,183 @@
|
|||
From patchwork Tue Mar 19 11:19:21 2019
|
||||
Content-Type: text/plain; charset="utf-8"
|
||||
MIME-Version: 1.0
|
||||
Content-Transfer-Encoding: 7bit
|
||||
Subject: [U-Boot] ti: am335x_evm: Enable CONFIG_SPL_OF_CONTROL
|
||||
X-Patchwork-Submitter: Tom Rini <trini@konsulko.com>
|
||||
X-Patchwork-Id: 1058350
|
||||
X-Patchwork-Delegate: trini@ti.com
|
||||
Message-Id: <1552994361-32058-1-git-send-email-trini@konsulko.com>
|
||||
To: u-boot@lists.denx.de
|
||||
Date: Tue, 19 Mar 2019 07:19:21 -0400
|
||||
From: Tom Rini <trini@konsulko.com>
|
||||
List-Id: U-Boot discussion <u-boot.lists.denx.de>
|
||||
|
||||
Enable support for SPL_OF_CONTROL on this platform. That means doing a
|
||||
few things:
|
||||
- Add u-boot,dm-pre-reloc to a number of nodes
|
||||
- Drop static platdata in the board file.
|
||||
- A lot of tweaks to the defconfig. We remove some things such as
|
||||
SPL_USE_ARCH_MEMCPY/SET for space. Increase our malloc len.
|
||||
- Drop, for now at least, USB SPL support as it's causing a hang.
|
||||
|
||||
Cc: Faiz Abbas <faiz_abbas@ti.com>
|
||||
Cc: Lokesh Vutla <lokeshvutla@ti.com>
|
||||
Signed-off-by: Tom Rini <trini@konsulko.com>
|
||||
---
|
||||
arch/arm/dts/am335x-evm-u-boot.dtsi | 45 +++++++++++++++++++++++++++++++++++--
|
||||
board/ti/am335x/board.c | 30 -------------------------
|
||||
configs/am335x_evm_defconfig | 14 ++++++++----
|
||||
3 files changed, 53 insertions(+), 36 deletions(-)
|
||||
|
||||
diff --git a/arch/arm/dts/am335x-evm-u-boot.dtsi b/arch/arm/dts/am335x-evm-u-boot.dtsi
|
||||
index b6b97ed16d91..16a9f855ad1f 100644
|
||||
--- a/arch/arm/dts/am335x-evm-u-boot.dtsi
|
||||
+++ b/arch/arm/dts/am335x-evm-u-boot.dtsi
|
||||
@@ -3,11 +3,52 @@
|
||||
* Copyright (C) 2017 Texas Instruments Incorporated - http://www.ti.com/
|
||||
*/
|
||||
|
||||
+#include "am33xx-u-boot.dtsi"
|
||||
|
||||
-&mmc3 {
|
||||
- status = "disabled";
|
||||
+&l4_wkup {
|
||||
+ u-boot,dm-pre-reloc;
|
||||
+};
|
||||
+
|
||||
+&scm {
|
||||
+ u-boot,dm-pre-reloc;
|
||||
+};
|
||||
+
|
||||
+&am33xx_pinmux {
|
||||
+ u-boot,dm-pre-reloc;
|
||||
+};
|
||||
+
|
||||
+&uart0_pins {
|
||||
+ u-boot,dm-pre-reloc;
|
||||
+};
|
||||
+
|
||||
+&uart0 {
|
||||
+ u-boot,dm-pre-reloc;
|
||||
+};
|
||||
+
|
||||
+&gpio0 {
|
||||
+ u-boot,dm-pre-reloc;
|
||||
+};
|
||||
+
|
||||
+&i2c0 {
|
||||
+ u-boot,dm-pre-reloc;
|
||||
+};
|
||||
+
|
||||
+&i2c0_pins {
|
||||
+ u-boot,dm-pre-reloc;
|
||||
};
|
||||
|
||||
&usb0 {
|
||||
dr_mode = "peripheral";
|
||||
};
|
||||
+
|
||||
+&mmc1 {
|
||||
+ u-boot,dm-pre-reloc;
|
||||
+};
|
||||
+
|
||||
+&mmc1_pins {
|
||||
+ u-boot,dm-pre-reloc;
|
||||
+};
|
||||
+
|
||||
+&mmc3 {
|
||||
+ status = "disabled";
|
||||
+};
|
||||
diff --git a/board/ti/am335x/board.c b/board/ti/am335x/board.c
|
||||
index d67f94ad47ba..bfad1a75a456 100644
|
||||
--- a/board/ti/am335x/board.c
|
||||
+++ b/board/ti/am335x/board.c
|
||||
@@ -1054,33 +1054,3 @@ void board_fit_image_post_process(void **p_image, size_t *p_size)
|
||||
secure_boot_verify_image(p_image, p_size);
|
||||
}
|
||||
#endif
|
||||
-
|
||||
-#if !CONFIG_IS_ENABLED(OF_CONTROL)
|
||||
-static const struct omap_hsmmc_plat am335x_mmc0_platdata = {
|
||||
- .base_addr = (struct hsmmc *)OMAP_HSMMC1_BASE,
|
||||
- .cfg.host_caps = MMC_MODE_HS_52MHz | MMC_MODE_HS | MMC_MODE_4BIT,
|
||||
- .cfg.f_min = 400000,
|
||||
- .cfg.f_max = 52000000,
|
||||
- .cfg.voltages = MMC_VDD_32_33 | MMC_VDD_33_34 | MMC_VDD_165_195,
|
||||
- .cfg.b_max = CONFIG_SYS_MMC_MAX_BLK_COUNT,
|
||||
-};
|
||||
-
|
||||
-U_BOOT_DEVICE(am335x_mmc0) = {
|
||||
- .name = "omap_hsmmc",
|
||||
- .platdata = &am335x_mmc0_platdata,
|
||||
-};
|
||||
-
|
||||
-static const struct omap_hsmmc_plat am335x_mmc1_platdata = {
|
||||
- .base_addr = (struct hsmmc *)OMAP_HSMMC2_BASE,
|
||||
- .cfg.host_caps = MMC_MODE_HS_52MHz | MMC_MODE_HS | MMC_MODE_8BIT,
|
||||
- .cfg.f_min = 400000,
|
||||
- .cfg.f_max = 52000000,
|
||||
- .cfg.voltages = MMC_VDD_32_33 | MMC_VDD_33_34 | MMC_VDD_165_195,
|
||||
- .cfg.b_max = CONFIG_SYS_MMC_MAX_BLK_COUNT,
|
||||
-};
|
||||
-
|
||||
-U_BOOT_DEVICE(am335x_mmc1) = {
|
||||
- .name = "omap_hsmmc",
|
||||
- .platdata = &am335x_mmc1_platdata,
|
||||
-};
|
||||
-#endif
|
||||
diff --git a/configs/am335x_evm_defconfig b/configs/am335x_evm_defconfig
|
||||
index 924116835251..dd690dcb495c 100644
|
||||
--- a/configs/am335x_evm_defconfig
|
||||
+++ b/configs/am335x_evm_defconfig
|
||||
@@ -1,23 +1,26 @@
|
||||
CONFIG_ARM=y
|
||||
+# CONFIG_SPL_USE_ARCH_MEMCPY is not set
|
||||
+# CONFIG_SPL_USE_ARCH_MEMSET is not set
|
||||
CONFIG_ARCH_OMAP2PLUS=y
|
||||
CONFIG_TI_COMMON_CMD_OPTIONS=y
|
||||
+CONFIG_SYS_MALLOC_F_LEN=0x4000
|
||||
CONFIG_AM33XX=y
|
||||
+CONFIG_SPL_SYS_MALLOC_F_LEN=0x1000
|
||||
CONFIG_SPL=y
|
||||
CONFIG_DISTRO_DEFAULTS=y
|
||||
+CONFIG_TPL_SYS_MALLOC_F_LEN=0x1000
|
||||
CONFIG_SPL_LOAD_FIT=y
|
||||
CONFIG_OF_BOARD_SETUP=y
|
||||
CONFIG_BOOTCOMMAND="if test ${boot_fit} -eq 1; then run update_to_fit; fi; run findfdt; run init_console; run envboot; run distro_bootcmd"
|
||||
+CONFIG_LOGLEVEL=3
|
||||
CONFIG_SYS_CONSOLE_INFO_QUIET=y
|
||||
CONFIG_VERSION_VARIABLE=y
|
||||
CONFIG_ARCH_MISC_INIT=y
|
||||
# CONFIG_SPL_FS_EXT4 is not set
|
||||
CONFIG_SPL_MTD_SUPPORT=y
|
||||
-CONFIG_SPL_MUSB_NEW_SUPPORT=y
|
||||
CONFIG_SPL_NET_SUPPORT=y
|
||||
CONFIG_SPL_NET_VCI_STRING="AM33xx U-Boot SPL"
|
||||
CONFIG_SPL_OS_BOOT=y
|
||||
-CONFIG_SPL_USB_GADGET=y
|
||||
-CONFIG_SPL_USB_ETHER=y
|
||||
CONFIG_CMD_SPL=y
|
||||
CONFIG_CMD_SPL_NAND_OFS=0x00080000
|
||||
# CONFIG_CMD_FLASH is not set
|
||||
@@ -28,10 +31,12 @@ CONFIG_MTDIDS_DEFAULT="nand0=nand.0"
|
||||
CONFIG_MTDPARTS_DEFAULT="mtdparts=nand.0:128k(NAND.SPL),128k(NAND.SPL.backup1),128k(NAND.SPL.backup2),128k(NAND.SPL.backup3),256k(NAND.u-boot-spl-os),1m(NAND.u-boot),128k(NAND.u-boot-env),128k(NAND.u-boot-env.backup1),8m(NAND.kernel),-(NAND.file-system)"
|
||||
# CONFIG_SPL_EFI_PARTITION is not set
|
||||
CONFIG_OF_CONTROL=y
|
||||
+CONFIG_SPL_OF_CONTROL=y
|
||||
CONFIG_DEFAULT_DEVICE_TREE="am335x-evm"
|
||||
CONFIG_OF_LIST="am335x-evm am335x-bone am335x-boneblack am335x-evmsk am335x-bonegreen am335x-icev2"
|
||||
+CONFIG_OF_SPL_REMOVE_PROPS="clocks clock-names interrupt-parent"
|
||||
CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y
|
||||
-# CONFIG_BLK is not set
|
||||
+CONFIG_SPL_OF_TRANSLATE=y
|
||||
CONFIG_BOOTCOUNT_LIMIT=y
|
||||
CONFIG_DFU_MMC=y
|
||||
CONFIG_DFU_NAND=y
|
||||
@@ -68,5 +73,6 @@ CONFIG_USB_GADGET_VENDOR_NUM=0x0451
|
||||
CONFIG_USB_GADGET_PRODUCT_NUM=0xd022
|
||||
CONFIG_USB_ETHER=y
|
||||
CONFIG_DYNAMIC_CRC_TABLE=y
|
||||
+CONFIG_SPL_TINY_MEMSET=y
|
||||
CONFIG_RSA=y
|
||||
CONFIG_LZO=y
|
|
@ -1,8 +1,8 @@
|
|||
%global candidate rc4
|
||||
#global candidate rc4
|
||||
|
||||
Name: uboot-tools
|
||||
Version: 2019.04
|
||||
Release: 0.6%{?candidate:.%{candidate}}.5.riscv64%{?dist}
|
||||
Release: 2%{?candidate:.%{candidate}}.0.riscv64%{?dist}
|
||||
Summary: U-Boot utilities
|
||||
License: GPLv2+ BSD LGPL-2.1+ LGPL-2.0+
|
||||
URL: http://www.denx.de/wiki/U-Boot
|
||||
|
@ -19,16 +19,19 @@ Source6: riscv64-boards
|
|||
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
|
||||
Patch2: usb-kbd-fixes.patch
|
||||
Patch3: uefi-distro-load-FDT-from-any-partition-on-boot-device.patch
|
||||
Patch4: uefi-fix-memory-calculation-overflow-on-32-bit-systems.patch
|
||||
Patch5: uefi-Change-FDT-memory-type-from-runtime-data-to-boot-services-data.patch
|
||||
|
||||
# Board fixes and enablement
|
||||
Patch10: rpi-Enable-using-the-DT-provided-by-the-Raspberry-Pi.patch
|
||||
Patch11: dragonboard-fixes.patch
|
||||
|
||||
Patch12: ARM-tegra-Add-NVIDIA-Jetson-Nano-Developer-Kit-support.patch
|
||||
Patch13: tegra-p2371-2180-Build-position-independent-binary.patch
|
||||
Patch14: net-eth-uclass-Write-MAC-address-to-hardware-after-probe.patch
|
||||
Patch12: ARM-tegra-Add-support-for-framebuffer-carveouts.patch
|
||||
Patch13: ARM-tegra-Miscellaneous-improvements.patch
|
||||
Patch15: net-eth-uclass-Write-MAC-address-to-hardware-after-probe.patch
|
||||
Patch16: net-rtl8169-Implement---hwaddr_write-callback.patch
|
||||
Patch17: arm-tegra-defaine-fdtfile-for-all-devices.patch
|
||||
|
||||
# RISC-V (riscv64)
|
||||
Patch30: u-boot-2019.04-rc4-riscv.patch
|
||||
|
@ -154,7 +157,7 @@ do
|
|||
# End ATF
|
||||
make $(echo $board)_defconfig O=builds/$(echo $board)/
|
||||
make HOSTCC="gcc $RPM_OPT_FLAGS" CROSS_COMPILE="" %{?_smp_mflags} V=1 O=builds/$(echo $board)/
|
||||
rk33xx=(evb-rk3399 firefly-rk3399)
|
||||
rk33xx=(evb-rk3399 ficus-rk3399 firefly-rk3399 puma-rk3399 rock960-rk3399)
|
||||
if [[ " ${rk33xx[*]} " == *" $board "* ]]; then
|
||||
echo "Board: $board using rk33xx"
|
||||
make HOSTCC="gcc $RPM_OPT_FLAGS" CROSS_COMPILE="" u-boot.itb V=1 O=builds/$(echo $board)/
|
||||
|
@ -354,23 +357,29 @@ cp -p board/warp7/README builds/docs/README.warp7
|
|||
%endif
|
||||
|
||||
%changelog
|
||||
* Mon Apr 08 2019 David Abdurachmanov <david.abdurachmanov@gmail.com> 2019.04-0.6-rc4.5.riscv64
|
||||
* Sun May 05 2019 David Abdurachmanov <david.abdurachmanov@gmail.com> 2019.04-2.0.riscv64
|
||||
- Apply pull request which incl. SMP support
|
||||
See: https://lists.denx.de/pipermail/u-boot/2019-April/364281.html
|
||||
|
||||
* Fri Apr 05 2019 David Abdurachmanov <david.abdurachmanov@gmail.com> 2019.04-0.6-rc4.3.riscv64
|
||||
- Set CONFIG_SYS_BOOTM_LEN to SZ_64M for qemu-riscv
|
||||
|
||||
* Sat Mar 30 2019 David Abdurachmanov <david.abdurachmanov@gmail.com> 2019.04-0.6-rc4.2.riscv64
|
||||
- Disable bootz (not supported)
|
||||
- Add CONFIG_PREBOOT for qemu-riscv to set fdt_addr for extlinux boot
|
||||
|
||||
* Tue Mar 26 2019 David Abdurachmanov <david.abdurachmanov@gmail.com> 2019.04-0.6-rc4.1.riscv64
|
||||
- Enable bootz and FAT fs commands for qemu-riscv64_smode
|
||||
|
||||
* Mon Mar 25 2019 David Abdurachmanov <david.abdurachmanov@gmail.com> 2019.04-0.6-rc4.0.riscv64
|
||||
- Add support for RISC-V (riscv64)
|
||||
|
||||
* Sat May 4 2019 Peter Robinson <pbrobinson@fedoraproject.org> 2019.04-2
|
||||
- Build and ship pre built SD/SPI SPL bits for all rk3399 boards
|
||||
|
||||
* Sun Apr 14 2019 Peter Robinson <pbrobinson@fedoraproject.org> 2019.04-1
|
||||
- 2019.04
|
||||
- Fixes for AllWinner and NVIDIA Jetson devices
|
||||
|
||||
* Thu Apr 4 2019 Peter Robinson <pbrobinson@fedoraproject.org> 2019.04-0.9-rc4
|
||||
- Latest Tegra patch revision
|
||||
|
||||
* Sun Mar 31 2019 Peter Robinson <pbrobinson@fedoraproject.org> 2019.04-0.8-rc4
|
||||
- Add ability to make creation of boot/dtb symlink configurable
|
||||
|
||||
* Sun Mar 24 2019 Peter Robinson <pbrobinson@fedoraproject.org> 2019.04-0.7-rc4
|
||||
- Minor UEFI fixes, Tegra Jetson TX series rebase
|
||||
|
||||
* Wed Mar 20 2019 Peter Robinson <pbrobinson@fedoraproject.org> 2019.04-0.6-rc4
|
||||
- Tegra Jetson TX-series improvements
|
||||
|
||||
|
|
|
@ -0,0 +1,54 @@
|
|||
From patchwork Fri Apr 12 18:26:28 2019
|
||||
Content-Type: text/plain; charset="utf-8"
|
||||
MIME-Version: 1.0
|
||||
Content-Transfer-Encoding: 7bit
|
||||
Subject: [U-Boot,
|
||||
U-boot] : Change FDT memory type from runtime data to boot services
|
||||
data
|
||||
X-Patchwork-Submitter: Ilias Apalodimas <ilias.apalodimas@linaro.org>
|
||||
X-Patchwork-Id: 1084888
|
||||
X-Patchwork-Delegate: xypron.glpk@gmx.de
|
||||
Message-Id: <1555093588-21916-1-git-send-email-ilias.apalodimas@linaro.org>
|
||||
To: u-boot@lists.denx.de,
|
||||
xypron.glpk@gmx.de
|
||||
Cc: Ilias Apalodimas <ilias.apalodimas@linaro.org>, agraf@csgraf.de,
|
||||
ard.biesheuvel@linaro.org
|
||||
Date: Fri, 12 Apr 2019 21:26:28 +0300
|
||||
From: Ilias Apalodimas <ilias.apalodimas@linaro.org>
|
||||
List-Id: U-Boot discussion <u-boot.lists.denx.de>
|
||||
|
||||
Following Ard's suggestion:
|
||||
Runtime data sections are intended for data that is used by the runtime
|
||||
services implementation.
|
||||
Let's change the type to EFI_BOOT_SERVICES_DATA
|
||||
|
||||
This also fixes booting of armv7 using efi and fdtcontroladdr
|
||||
|
||||
Suggested-by: Ard Biesheuvel <ard.biesheuvel@linaro.org>
|
||||
Signed-off-by: Ilias Apalodimas <ilias.apalodimas@linaro.org>
|
||||
Acked-by: Ard Biesheuvel <ard.biesheuvel@linaro.org>
|
||||
Reviewed-by: Heinrich Schuchardt <xypron.glpk@gmx.de>
|
||||
---
|
||||
cmd/bootefi.c | 4 ++--
|
||||
1 file changed, 2 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/cmd/bootefi.c b/cmd/bootefi.c
|
||||
index 3619a20e6433..15ee4af45667 100644
|
||||
--- a/cmd/bootefi.c
|
||||
+++ b/cmd/bootefi.c
|
||||
@@ -111,13 +111,13 @@ static efi_status_t copy_fdt(void **fdtp)
|
||||
new_fdt_addr = (uintptr_t)map_sysmem(fdt_ram_start + 0x7f00000 +
|
||||
fdt_size, 0);
|
||||
ret = efi_allocate_pages(EFI_ALLOCATE_MAX_ADDRESS,
|
||||
- EFI_RUNTIME_SERVICES_DATA, fdt_pages,
|
||||
+ EFI_BOOT_SERVICES_DATA, fdt_pages,
|
||||
&new_fdt_addr);
|
||||
if (ret != EFI_SUCCESS) {
|
||||
/* If we can't put it there, put it somewhere */
|
||||
new_fdt_addr = (ulong)memalign(EFI_PAGE_SIZE, fdt_size);
|
||||
ret = efi_allocate_pages(EFI_ALLOCATE_MAX_ADDRESS,
|
||||
- EFI_RUNTIME_SERVICES_DATA, fdt_pages,
|
||||
+ EFI_BOOT_SERVICES_DATA, fdt_pages,
|
||||
&new_fdt_addr);
|
||||
if (ret != EFI_SUCCESS) {
|
||||
printf("ERROR: Failed to reserve space for FDT\n");
|
|
@ -0,0 +1,46 @@
|
|||
From patchwork Tue Apr 9 20:58:30 2019
|
||||
Content-Type: text/plain; charset="utf-8"
|
||||
MIME-Version: 1.0
|
||||
Content-Transfer-Encoding: 7bit
|
||||
Subject: [U-Boot] efi: fix memory calculation overflow on 32-bit systems
|
||||
X-Patchwork-Submitter: Patrick Wildt <patrick@blueri.se>
|
||||
X-Patchwork-Id: 1082739
|
||||
X-Patchwork-Delegate: xypron.glpk@gmx.de
|
||||
Message-Id: <20190409205830.GA5818@nyx.fritz.box>
|
||||
To: u-boot@lists.denx.de
|
||||
Date: Tue, 9 Apr 2019 22:58:30 +0200
|
||||
From: Patrick Wildt <patrick@blueri.se>
|
||||
List-Id: U-Boot discussion <u-boot.lists.denx.de>
|
||||
|
||||
Hi,
|
||||
|
||||
There are Cubox-i machines out there with nearly 4 GiB of RAM. The
|
||||
RAM starts at 0x10000000 with a size of 0xf0000000. Thus the end
|
||||
of RAM is at 0x100000000. This overflows a 32-bit integer, which
|
||||
should be fine since in the EFI memory code the variables used are
|
||||
all 64-bit with a fixed size. Unfortunately EFI_PAGE_MASK, which is
|
||||
used in the EFI memory code to remove the lower bits, is based on
|
||||
the EFI_PAGE_SIZE macro which, uses 1UL with a shift. This means
|
||||
the resulting mask is UL, which is only 32-bit on ARMv7. Use ULL to
|
||||
make sure that even on 32-bit platforms we use a 64-bit long mask.
|
||||
Without this there will be no memory available in the EFI memory map
|
||||
and bootefi will fail allocating pages.
|
||||
|
||||
Best regards,
|
||||
Patrick
|
||||
Reviewed-by: Heinrich Schuchardt <xypron.glpk@gmx.de>
|
||||
Reviewed-by: Patrick Delaunay <patrick.delaunay@st.com>
|
||||
|
||||
diff --git a/include/efi.h b/include/efi.h
|
||||
index d98441ab19d..3c9d20f8c0b 100644
|
||||
--- a/include/efi.h
|
||||
+++ b/include/efi.h
|
||||
@@ -190,7 +190,7 @@ enum efi_mem_type {
|
||||
#define EFI_MEM_DESC_VERSION 1
|
||||
|
||||
#define EFI_PAGE_SHIFT 12
|
||||
-#define EFI_PAGE_SIZE (1UL << EFI_PAGE_SHIFT)
|
||||
+#define EFI_PAGE_SIZE (1ULL << EFI_PAGE_SHIFT)
|
||||
#define EFI_PAGE_MASK (EFI_PAGE_SIZE - 1)
|
||||
|
||||
struct efi_mem_desc {
|
Loading…
Reference in New Issue