2019.07 RC4, Obsolete unused elf packages, new rk3399 devices
This commit is contained in:
parent
4f63e87d51
commit
c529a6c6e8
@ -0,0 +1,34 @@
|
||||
From 68b90e57bc034e237923b02acb633dc4e91d44cb Mon Sep 17 00:00:00 2001
|
||||
From: Heinrich Schuchardt <xypron.glpk@gmx.de>
|
||||
Date: Wed, 27 Feb 2019 20:05:43 +0100
|
||||
Subject: [PATCH] configs: tinker-rk3288 disable CONFIG_SPL_I2C_SUPPORT
|
||||
|
||||
The SPL for the Tinker Board has to fit into 32 KiB. Currently this limit
|
||||
is exceeded.
|
||||
|
||||
CONFIG_SPL_I2C_SUPPORT is not needed to move to main U-Boot. So let's
|
||||
disable it.
|
||||
|
||||
Suggested-by: David Wu <david.wu@rock-chips.com>
|
||||
Signed-off-by: Heinrich Schuchardt <xypron.glpk@gmx.de>
|
||||
Reviewed-by: David Wu <david.wu@rock-chips.com>
|
||||
Reviewed-by: Philipp Tomsich <philipp.tomsich@theobroma-systems.com>
|
||||
---
|
||||
configs/tinker-rk3288_defconfig | 1 -
|
||||
1 file changed, 1 deletion(-)
|
||||
|
||||
diff --git a/configs/tinker-rk3288_defconfig b/configs/tinker-rk3288_defconfig
|
||||
index 4b48689ee8..0e8cf73fe9 100644
|
||||
--- a/configs/tinker-rk3288_defconfig
|
||||
+++ b/configs/tinker-rk3288_defconfig
|
||||
@@ -20,7 +20,6 @@ CONFIG_DISPLAY_BOARDINFO_LATE=y
|
||||
CONFIG_SPL_TEXT_BASE=0xff704000
|
||||
CONFIG_SPL_STACK_R=y
|
||||
CONFIG_SPL_STACK_R_MALLOC_SIMPLE_LEN=0x2000
|
||||
-CONFIG_SPL_I2C_SUPPORT=y
|
||||
CONFIG_CMD_GPIO=y
|
||||
CONFIG_CMD_GPT=y
|
||||
CONFIG_CMD_I2C=y
|
||||
--
|
||||
2.21.0
|
||||
|
862
ARM-tegra-Add-NVIDIA-Jetson-Nano.patch
Normal file
862
ARM-tegra-Add-NVIDIA-Jetson-Nano.patch
Normal file
@ -0,0 +1,862 @@
|
||||
From patchwork Mon Apr 15 09:32:39 2019
|
||||
Content-Type: text/plain; charset="utf-8"
|
||||
MIME-Version: 1.0
|
||||
Content-Transfer-Encoding: 7bit
|
||||
Subject: [U-Boot, v5,
|
||||
27/27] ARM: tegra: Add NVIDIA Jetson Nano Developer Kit support
|
||||
X-Patchwork-Submitter: Thierry Reding <thierry.reding@gmail.com>
|
||||
X-Patchwork-Id: 1085538
|
||||
X-Patchwork-Delegate: twarren@nvidia.com
|
||||
Message-Id: <20190415093239.27509-28-thierry.reding@gmail.com>
|
||||
To: Tom Warren <twarren@nvidia.com>,
|
||||
Simon Glass <sjg@chromium.org>
|
||||
Cc: u-boot@lists.denx.de, Jon Hunter <jonathanh@nvidia.com>
|
||||
Date: Mon, 15 Apr 2019 11:32:39 +0200
|
||||
From: Thierry Reding <thierry.reding@gmail.com>
|
||||
List-Id: U-Boot discussion <u-boot.lists.denx.de>
|
||||
|
||||
From: Thierry Reding <treding@nvidia.com>
|
||||
|
||||
The Jetson Nano Developer Kit is a Tegra X1 based development board. It
|
||||
is similar to Jetson TX1 but it is not pin compatible. It features 4 GB
|
||||
of LPDDR4, an SPI NOR flash for early boot firmware and an SD card slot
|
||||
used for storage.
|
||||
|
||||
HDMI 2.0 or DP 1.2 are available for display, four USB ports (3 USB 2.0
|
||||
and 1 USB 3.0) can be used to attach a variety of peripherals and a PCI
|
||||
Ethernet controller provides onboard network connectivity.
|
||||
|
||||
A 40-pin header on the board can be used to extend the capabilities and
|
||||
exposed interfaces of the Jetson Nano.
|
||||
|
||||
Signed-off-by: Thierry Reding <treding@nvidia.com>
|
||||
---
|
||||
Changes in v5:
|
||||
- add "ethernet" alias and store an empty MAC address as placeholder
|
||||
|
||||
Changes in v3:
|
||||
- rename "Development Kit" to "Developer Kit"
|
||||
- drop alias for non-existent eMMC interface
|
||||
- import pinmux from A02 spreadsheet
|
||||
- drop preboot support for now
|
||||
- fixup text base
|
||||
|
||||
arch/arm/dts/Makefile | 3 +-
|
||||
arch/arm/dts/tegra210-p3450-0000.dts | 135 +++++++++
|
||||
arch/arm/mach-tegra/tegra210/Kconfig | 7 +
|
||||
board/nvidia/p3450-0000/Kconfig | 12 +
|
||||
board/nvidia/p3450-0000/MAINTAINERS | 6 +
|
||||
board/nvidia/p3450-0000/Makefile | 8 +
|
||||
board/nvidia/p3450-0000/p3450-0000.c | 198 +++++++++++++
|
||||
.../p3450-0000/pinmux-config-p3450-0000.h | 265 ++++++++++++++++++
|
||||
configs/p3450-0000_defconfig | 55 ++++
|
||||
include/configs/p3450-0000.h | 34 +++
|
||||
10 files changed, 722 insertions(+), 1 deletion(-)
|
||||
create mode 100644 arch/arm/dts/tegra210-p3450-0000.dts
|
||||
create mode 100644 board/nvidia/p3450-0000/Kconfig
|
||||
create mode 100644 board/nvidia/p3450-0000/MAINTAINERS
|
||||
create mode 100644 board/nvidia/p3450-0000/Makefile
|
||||
create mode 100644 board/nvidia/p3450-0000/p3450-0000.c
|
||||
create mode 100644 board/nvidia/p3450-0000/pinmux-config-p3450-0000.h
|
||||
create mode 100644 configs/p3450-0000_defconfig
|
||||
create mode 100644 include/configs/p3450-0000.h
|
||||
|
||||
diff --git a/arch/arm/dts/Makefile b/arch/arm/dts/Makefile
|
||||
index 8167cdb4e856..f8d3441663c0 100644
|
||||
--- a/arch/arm/dts/Makefile
|
||||
+++ b/arch/arm/dts/Makefile
|
||||
@@ -127,7 +127,8 @@ dtb-$(CONFIG_TEGRA) += tegra20-harmony.dtb \
|
||||
tegra210-e2220-1170.dtb \
|
||||
tegra210-p2371-0000.dtb \
|
||||
tegra210-p2371-2180.dtb \
|
||||
- tegra210-p2571.dtb
|
||||
+ tegra210-p2571.dtb \
|
||||
+ tegra210-p3450-0000.dtb
|
||||
|
||||
dtb-$(CONFIG_ARCH_MVEBU) += \
|
||||
armada-3720-db.dtb \
|
||||
diff --git a/arch/arm/dts/tegra210-p3450-0000.dts b/arch/arm/dts/tegra210-p3450-0000.dts
|
||||
new file mode 100644
|
||||
index 000000000000..d45ee9afc016
|
||||
--- /dev/null
|
||||
+++ b/arch/arm/dts/tegra210-p3450-0000.dts
|
||||
@@ -0,0 +1,135 @@
|
||||
+/dts-v1/;
|
||||
+
|
||||
+#include "tegra210.dtsi"
|
||||
+
|
||||
+/ {
|
||||
+ model = "NVIDIA Jetson Nano Developer Kit";
|
||||
+ compatible = "nvidia,p3450-0000", "nvidia,tegra210";
|
||||
+
|
||||
+ chosen {
|
||||
+ stdout-path = &uarta;
|
||||
+ };
|
||||
+
|
||||
+ aliases {
|
||||
+ ethernet = "/pcie@1003000/pci@2,0/ethernet@0,0";
|
||||
+ i2c0 = "/i2c@7000d000";
|
||||
+ i2c2 = "/i2c@7000c400";
|
||||
+ i2c3 = "/i2c@7000c500";
|
||||
+ i2c4 = "/i2c@7000c700";
|
||||
+ sdhci0 = "/sdhci@700b0000";
|
||||
+ spi0 = "/spi@70410000";
|
||||
+ usb0 = "/usb@7d000000";
|
||||
+ };
|
||||
+
|
||||
+ memory {
|
||||
+ reg = <0x0 0x80000000 0x0 0xc0000000>;
|
||||
+ };
|
||||
+
|
||||
+ pcie@1003000 {
|
||||
+ status = "okay";
|
||||
+
|
||||
+ pci@1,0 {
|
||||
+ status = "okay";
|
||||
+ };
|
||||
+
|
||||
+ pci@2,0 {
|
||||
+ status = "okay";
|
||||
+
|
||||
+ ethernet@0,0 {
|
||||
+ reg = <0x000000 0 0 0 0>;
|
||||
+ local-mac-address = [ 00 00 00 00 00 00 ];
|
||||
+ };
|
||||
+ };
|
||||
+ };
|
||||
+
|
||||
+ serial@70006000 {
|
||||
+ status = "okay";
|
||||
+ };
|
||||
+
|
||||
+ padctl@7009f000 {
|
||||
+ pinctrl-0 = <&padctl_default>;
|
||||
+ pinctrl-names = "default";
|
||||
+
|
||||
+ padctl_default: pinmux {
|
||||
+ xusb {
|
||||
+ nvidia,lanes = "otg-1", "otg-2";
|
||||
+ nvidia,function = "xusb";
|
||||
+ nvidia,iddq = <0>;
|
||||
+ };
|
||||
+
|
||||
+ usb3 {
|
||||
+ nvidia,lanes = "pcie-5", "pcie-6";
|
||||
+ nvidia,function = "usb3";
|
||||
+ nvidia,iddq = <0>;
|
||||
+ };
|
||||
+
|
||||
+ pcie-x1 {
|
||||
+ nvidia,lanes = "pcie-0";
|
||||
+ nvidia,function = "pcie-x1";
|
||||
+ nvidia,iddq = <0>;
|
||||
+ };
|
||||
+
|
||||
+ pcie-x4 {
|
||||
+ nvidia,lanes = "pcie-1", "pcie-2",
|
||||
+ "pcie-3", "pcie-4";
|
||||
+ nvidia,function = "pcie-x4";
|
||||
+ nvidia,iddq = <0>;
|
||||
+ };
|
||||
+
|
||||
+ sata {
|
||||
+ nvidia,lanes = "sata-0";
|
||||
+ nvidia,function = "sata";
|
||||
+ nvidia,iddq = <0>;
|
||||
+ };
|
||||
+ };
|
||||
+ };
|
||||
+
|
||||
+ sdhci@700b0000 {
|
||||
+ status = "okay";
|
||||
+ cd-gpios = <&gpio TEGRA_GPIO(Z, 1) GPIO_ACTIVE_LOW>;
|
||||
+ power-gpios = <&gpio TEGRA_GPIO(Z, 3) GPIO_ACTIVE_HIGH>;
|
||||
+ bus-width = <4>;
|
||||
+ };
|
||||
+
|
||||
+ i2c@7000c400 {
|
||||
+ status = "okay";
|
||||
+ clock-frequency = <400000>;
|
||||
+ };
|
||||
+
|
||||
+ i2c@7000c500 {
|
||||
+ status = "okay";
|
||||
+ clock-frequency = <400000>;
|
||||
+ };
|
||||
+
|
||||
+ i2c@7000c700 {
|
||||
+ status = "okay";
|
||||
+ clock-frequency = <400000>;
|
||||
+ };
|
||||
+
|
||||
+ i2c@7000d000 {
|
||||
+ status = "okay";
|
||||
+ clock-frequency = <400000>;
|
||||
+ };
|
||||
+
|
||||
+ spi@70410000 {
|
||||
+ status = "okay";
|
||||
+ };
|
||||
+
|
||||
+ usb@7d000000 {
|
||||
+ status = "okay";
|
||||
+ dr_mode = "peripheral";
|
||||
+ };
|
||||
+
|
||||
+ clocks {
|
||||
+ compatible = "simple-bus";
|
||||
+ #address-cells = <1>;
|
||||
+ #size-cells = <0>;
|
||||
+
|
||||
+ clk32k_in: clock@0 {
|
||||
+ compatible = "fixed-clock";
|
||||
+ reg = <0>;
|
||||
+ #clock-cells = <0>;
|
||||
+ clock-frequency = <32768>;
|
||||
+ };
|
||||
+ };
|
||||
+};
|
||||
diff --git a/arch/arm/mach-tegra/tegra210/Kconfig b/arch/arm/mach-tegra/tegra210/Kconfig
|
||||
index 250738aed312..ea28392c0f3a 100644
|
||||
--- a/arch/arm/mach-tegra/tegra210/Kconfig
|
||||
+++ b/arch/arm/mach-tegra/tegra210/Kconfig
|
||||
@@ -35,6 +35,12 @@ config TARGET_P2571
|
||||
help
|
||||
P2571 is a P2530 married to a P1963 I/O board
|
||||
|
||||
+config TARGET_P3450_0000
|
||||
+ bool "NVIDIA Jetson Nano Developer Kit"
|
||||
+ select BOARD_LATE_INIT
|
||||
+ help
|
||||
+ P3450-0000 is a P3448 CPU board married to a P3449 I/O board.
|
||||
+
|
||||
endchoice
|
||||
|
||||
config SYS_SOC
|
||||
@@ -47,5 +53,6 @@ source "board/nvidia/e2220-1170/Kconfig"
|
||||
source "board/nvidia/p2371-0000/Kconfig"
|
||||
source "board/nvidia/p2371-2180/Kconfig"
|
||||
source "board/nvidia/p2571/Kconfig"
|
||||
+source "board/nvidia/p3450-0000/Kconfig"
|
||||
|
||||
endif
|
||||
diff --git a/board/nvidia/p3450-0000/Kconfig b/board/nvidia/p3450-0000/Kconfig
|
||||
new file mode 100644
|
||||
index 000000000000..7a08cd88675f
|
||||
--- /dev/null
|
||||
+++ b/board/nvidia/p3450-0000/Kconfig
|
||||
@@ -0,0 +1,12 @@
|
||||
+if TARGET_P3450_0000
|
||||
+
|
||||
+config SYS_BOARD
|
||||
+ default "p3450-0000"
|
||||
+
|
||||
+config SYS_VENDOR
|
||||
+ default "nvidia"
|
||||
+
|
||||
+config SYS_CONFIG_NAME
|
||||
+ default "p3450-0000"
|
||||
+
|
||||
+endif
|
||||
diff --git a/board/nvidia/p3450-0000/MAINTAINERS b/board/nvidia/p3450-0000/MAINTAINERS
|
||||
new file mode 100644
|
||||
index 000000000000..40700066bf39
|
||||
--- /dev/null
|
||||
+++ b/board/nvidia/p3450-0000/MAINTAINERS
|
||||
@@ -0,0 +1,6 @@
|
||||
+P3450-0000 BOARD
|
||||
+M: Tom Warren <twarren@nvidia.com>
|
||||
+S: Maintained
|
||||
+F: board/nvidia/p3450-0000/
|
||||
+F: include/configs/p3450-0000.h
|
||||
+F: configs/p3450-0000_defconfig
|
||||
diff --git a/board/nvidia/p3450-0000/Makefile b/board/nvidia/p3450-0000/Makefile
|
||||
new file mode 100644
|
||||
index 000000000000..993c506d8200
|
||||
--- /dev/null
|
||||
+++ b/board/nvidia/p3450-0000/Makefile
|
||||
@@ -0,0 +1,8 @@
|
||||
+#
|
||||
+# (C) Copyright 2018
|
||||
+# NVIDIA Corporation <www.nvidia.com>
|
||||
+#
|
||||
+# SPDX-License-Identifier: GPL-2.0+
|
||||
+#
|
||||
+
|
||||
+obj-y += p3450-0000.o
|
||||
diff --git a/board/nvidia/p3450-0000/p3450-0000.c b/board/nvidia/p3450-0000/p3450-0000.c
|
||||
new file mode 100644
|
||||
index 000000000000..432179e92605
|
||||
--- /dev/null
|
||||
+++ b/board/nvidia/p3450-0000/p3450-0000.c
|
||||
@@ -0,0 +1,198 @@
|
||||
+/*
|
||||
+ * (C) Copyright 2018
|
||||
+ * NVIDIA Corporation <www.nvidia.com>
|
||||
+ *
|
||||
+ * SPDX-License-Identifier: GPL-2.0+
|
||||
+ */
|
||||
+
|
||||
+#include <common.h>
|
||||
+#include <environment.h>
|
||||
+#include <fdtdec.h>
|
||||
+#include <i2c.h>
|
||||
+#include <linux/libfdt.h>
|
||||
+#include <pca953x.h>
|
||||
+#include <asm/arch-tegra/cboot.h>
|
||||
+#include <asm/arch/gpio.h>
|
||||
+#include <asm/arch/pinmux.h>
|
||||
+#include "../p2571/max77620_init.h"
|
||||
+#include "pinmux-config-p3450-0000.h"
|
||||
+
|
||||
+void pin_mux_mmc(void)
|
||||
+{
|
||||
+ struct udevice *dev;
|
||||
+ uchar val;
|
||||
+ int ret;
|
||||
+
|
||||
+ /* Turn on MAX77620 LDO2 to 3.3V for SD card power */
|
||||
+ debug("%s: Set LDO2 for VDDIO_SDMMC_AP power to 3.3V\n", __func__);
|
||||
+ ret = i2c_get_chip_for_busnum(0, MAX77620_I2C_ADDR_7BIT, 1, &dev);
|
||||
+ if (ret) {
|
||||
+ printf("%s: Cannot find MAX77620 I2C chip\n", __func__);
|
||||
+ return;
|
||||
+ }
|
||||
+ /* 0xF2 for 3.3v, enabled: bit7:6 = 11 = enable, bit5:0 = voltage */
|
||||
+ val = 0xF2;
|
||||
+ ret = dm_i2c_write(dev, MAX77620_CNFG1_L2_REG, &val, 1);
|
||||
+ if (ret)
|
||||
+ printf("i2c_write 0 0x3c 0x27 failed: %d\n", ret);
|
||||
+
|
||||
+ /* Disable LDO4 discharge */
|
||||
+ ret = dm_i2c_read(dev, MAX77620_CNFG2_L4_REG, &val, 1);
|
||||
+ if (ret) {
|
||||
+ printf("i2c_read 0 0x3c 0x2c failed: %d\n", ret);
|
||||
+ } else {
|
||||
+ val &= ~BIT(1); /* ADE */
|
||||
+ ret = dm_i2c_write(dev, MAX77620_CNFG2_L4_REG, &val, 1);
|
||||
+ if (ret)
|
||||
+ printf("i2c_write 0 0x3c 0x2c failed: %d\n", ret);
|
||||
+ }
|
||||
+
|
||||
+ /* Set MBLPD */
|
||||
+ ret = dm_i2c_read(dev, MAX77620_CNFGGLBL1_REG, &val, 1);
|
||||
+ if (ret) {
|
||||
+ printf("i2c_write 0 0x3c 0x00 failed: %d\n", ret);
|
||||
+ } else {
|
||||
+ val |= BIT(6); /* MBLPD */
|
||||
+ ret = dm_i2c_write(dev, MAX77620_CNFGGLBL1_REG, &val, 1);
|
||||
+ if (ret)
|
||||
+ printf("i2c_write 0 0x3c 0x00 failed: %d\n", ret);
|
||||
+ }
|
||||
+}
|
||||
+
|
||||
+/*
|
||||
+ * Routine: pinmux_init
|
||||
+ * Description: Do individual peripheral pinmux configs
|
||||
+ */
|
||||
+void pinmux_init(void)
|
||||
+{
|
||||
+ pinmux_clear_tristate_input_clamping();
|
||||
+
|
||||
+ gpio_config_table(p3450_0000_gpio_inits,
|
||||
+ ARRAY_SIZE(p3450_0000_gpio_inits));
|
||||
+
|
||||
+ pinmux_config_pingrp_table(p3450_0000_pingrps,
|
||||
+ ARRAY_SIZE(p3450_0000_pingrps));
|
||||
+
|
||||
+ pinmux_config_drvgrp_table(p3450_0000_drvgrps,
|
||||
+ ARRAY_SIZE(p3450_0000_drvgrps));
|
||||
+}
|
||||
+
|
||||
+#ifdef CONFIG_PCI_TEGRA
|
||||
+int tegra_pcie_board_init(void)
|
||||
+{
|
||||
+ struct udevice *dev;
|
||||
+ uchar val;
|
||||
+ int ret;
|
||||
+
|
||||
+ /* Turn on MAX77620 LDO1 to 1.05V for PEX power */
|
||||
+ debug("%s: Set LDO1 for PEX power to 1.05V\n", __func__);
|
||||
+ ret = i2c_get_chip_for_busnum(0, MAX77620_I2C_ADDR_7BIT, 1, &dev);
|
||||
+ if (ret) {
|
||||
+ printf("%s: Cannot find MAX77620 I2C chip\n", __func__);
|
||||
+ return -1;
|
||||
+ }
|
||||
+ /* 0xCA for 1.05v, enabled: bit7:6 = 11 = enable, bit5:0 = voltage */
|
||||
+ val = 0xCA;
|
||||
+ ret = dm_i2c_write(dev, MAX77620_CNFG1_L1_REG, &val, 1);
|
||||
+ if (ret)
|
||||
+ printf("i2c_write 0 0x3c 0x25 failed: %d\n", ret);
|
||||
+
|
||||
+ return 0;
|
||||
+}
|
||||
+#endif /* PCI */
|
||||
+
|
||||
+static void ft_mac_address_setup(void *fdt)
|
||||
+{
|
||||
+ const void *cboot_fdt = (const void *)cboot_boot_x0;
|
||||
+ uint8_t mac[ETH_ALEN], local_mac[ETH_ALEN];
|
||||
+ const char *path;
|
||||
+ int offset, err;
|
||||
+
|
||||
+ err = cboot_get_ethaddr(cboot_fdt, local_mac);
|
||||
+ if (err < 0)
|
||||
+ memset(local_mac, 0, ETH_ALEN);
|
||||
+
|
||||
+ path = fdt_get_alias(fdt, "ethernet");
|
||||
+ if (!path)
|
||||
+ return;
|
||||
+
|
||||
+ debug("ethernet alias found: %s\n", path);
|
||||
+
|
||||
+ offset = fdt_path_offset(fdt, path);
|
||||
+ if (offset < 0) {
|
||||
+ printf("ethernet alias points to absent node %s\n", path);
|
||||
+ return;
|
||||
+ }
|
||||
+
|
||||
+ if (is_valid_ethaddr(local_mac)) {
|
||||
+ err = fdt_setprop(fdt, offset, "local-mac-address", local_mac,
|
||||
+ ETH_ALEN);
|
||||
+ if (!err)
|
||||
+ debug("Local MAC address set: %pM\n", local_mac);
|
||||
+ }
|
||||
+
|
||||
+ if (eth_env_get_enetaddr("ethaddr", mac)) {
|
||||
+ if (memcmp(local_mac, mac, ETH_ALEN) != 0) {
|
||||
+ err = fdt_setprop(fdt, offset, "mac-address", mac,
|
||||
+ ETH_ALEN);
|
||||
+ if (!err)
|
||||
+ debug("MAC address set: %pM\n", mac);
|
||||
+ }
|
||||
+ }
|
||||
+}
|
||||
+
|
||||
+static int ft_copy_carveout(void *dst, const void *src, const char *node)
|
||||
+{
|
||||
+ struct fdt_memory fb;
|
||||
+ int err;
|
||||
+
|
||||
+ err = fdtdec_get_carveout(src, node, "memory-region", 0, &fb);
|
||||
+ if (err < 0) {
|
||||
+ if (err != -FDT_ERR_NOTFOUND)
|
||||
+ printf("failed to get carveout for %s: %d\n", node,
|
||||
+ err);
|
||||
+
|
||||
+ return err;
|
||||
+ }
|
||||
+
|
||||
+ err = fdtdec_set_carveout(dst, node, "memory-region", 0, "framebuffer",
|
||||
+ &fb);
|
||||
+ if (err < 0) {
|
||||
+ printf("failed to set carveout for %s: %d\n", node, err);
|
||||
+ return err;
|
||||
+ }
|
||||
+
|
||||
+ return 0;
|
||||
+}
|
||||
+
|
||||
+static void ft_carveout_setup(void *fdt)
|
||||
+{
|
||||
+ const void *cboot_fdt = (const void *)cboot_boot_x0;
|
||||
+ static const char * const nodes[] = {
|
||||
+ "/host1x@50000000/dc@54200000",
|
||||
+ "/host1x@50000000/dc@54240000",
|
||||
+ };
|
||||
+ unsigned int i;
|
||||
+ int err;
|
||||
+
|
||||
+ for (i = 0; i < ARRAY_SIZE(nodes); i++) {
|
||||
+ printf("copying carveout for %s...\n", nodes[i]);
|
||||
+
|
||||
+ err = ft_copy_carveout(fdt, cboot_fdt, nodes[i]);
|
||||
+ if (err < 0) {
|
||||
+ if (err != -FDT_ERR_NOTFOUND)
|
||||
+ printf("failed to copy carveout for %s: %d\n",
|
||||
+ nodes[i], err);
|
||||
+
|
||||
+ continue;
|
||||
+ }
|
||||
+ }
|
||||
+}
|
||||
+
|
||||
+int ft_board_setup(void *fdt, bd_t *bd)
|
||||
+{
|
||||
+ ft_mac_address_setup(fdt);
|
||||
+ ft_carveout_setup(fdt);
|
||||
+
|
||||
+ return 0;
|
||||
+}
|
||||
diff --git a/board/nvidia/p3450-0000/pinmux-config-p3450-0000.h b/board/nvidia/p3450-0000/pinmux-config-p3450-0000.h
|
||||
new file mode 100644
|
||||
index 000000000000..722da4973542
|
||||
--- /dev/null
|
||||
+++ b/board/nvidia/p3450-0000/pinmux-config-p3450-0000.h
|
||||
@@ -0,0 +1,265 @@
|
||||
+/*
|
||||
+ * Copyright (c) 2019, NVIDIA CORPORATION. All rights reserved.
|
||||
+ *
|
||||
+ * SPDX-License-Identifier: GPL-2.0+
|
||||
+ */
|
||||
+
|
||||
+/*
|
||||
+ * THIS FILE IS AUTO-GENERATED - DO NOT EDIT!
|
||||
+ *
|
||||
+ * To generate this file, use the tegra-pinmux-scripts tool available from
|
||||
+ * https://github.com/NVIDIA/tegra-pinmux-scripts
|
||||
+ * Run "board-to-uboot.py p3450-0000".
|
||||
+ */
|
||||
+
|
||||
+#ifndef _PINMUX_CONFIG_P3450_0000_H_
|
||||
+#define _PINMUX_CONFIG_P3450_0000_H_
|
||||
+
|
||||
+#define GPIO_INIT(_port, _gpio, _init) \
|
||||
+ { \
|
||||
+ .gpio = TEGRA_GPIO(_port, _gpio), \
|
||||
+ .init = TEGRA_GPIO_INIT_##_init, \
|
||||
+ }
|
||||
+
|
||||
+static const struct tegra_gpio_config p3450_0000_gpio_inits[] = {
|
||||
+ /* port, pin, init_val */
|
||||
+ GPIO_INIT(A, 5, IN),
|
||||
+ GPIO_INIT(A, 6, OUT1),
|
||||
+ GPIO_INIT(B, 4, IN),
|
||||
+ GPIO_INIT(B, 5, IN),
|
||||
+ GPIO_INIT(B, 6, IN),
|
||||
+ GPIO_INIT(B, 7, IN),
|
||||
+ GPIO_INIT(C, 0, IN),
|
||||
+ GPIO_INIT(C, 1, IN),
|
||||
+ GPIO_INIT(C, 2, IN),
|
||||
+ GPIO_INIT(C, 3, IN),
|
||||
+ GPIO_INIT(C, 4, IN),
|
||||
+ GPIO_INIT(E, 6, IN),
|
||||
+ GPIO_INIT(G, 2, IN),
|
||||
+ GPIO_INIT(G, 3, IN),
|
||||
+ GPIO_INIT(H, 0, OUT0),
|
||||
+ GPIO_INIT(H, 2, IN),
|
||||
+ GPIO_INIT(H, 3, OUT0),
|
||||
+ GPIO_INIT(H, 4, OUT0),
|
||||
+ GPIO_INIT(H, 5, IN),
|
||||
+ GPIO_INIT(H, 6, IN),
|
||||
+ GPIO_INIT(H, 7, OUT0),
|
||||
+ GPIO_INIT(I, 0, OUT0),
|
||||
+ GPIO_INIT(I, 1, IN),
|
||||
+ GPIO_INIT(I, 2, OUT0),
|
||||
+ GPIO_INIT(J, 4, IN),
|
||||
+ GPIO_INIT(J, 5, IN),
|
||||
+ GPIO_INIT(J, 6, IN),
|
||||
+ GPIO_INIT(J, 7, IN),
|
||||
+ GPIO_INIT(S, 5, IN),
|
||||
+ GPIO_INIT(S, 7, OUT0),
|
||||
+ GPIO_INIT(T, 0, OUT0),
|
||||
+ GPIO_INIT(V, 0, IN),
|
||||
+ GPIO_INIT(V, 1, IN),
|
||||
+ GPIO_INIT(X, 3, OUT1),
|
||||
+ GPIO_INIT(X, 4, IN),
|
||||
+ GPIO_INIT(X, 5, IN),
|
||||
+ GPIO_INIT(X, 6, IN),
|
||||
+ GPIO_INIT(Y, 1, IN),
|
||||
+ GPIO_INIT(Y, 2, IN),
|
||||
+ GPIO_INIT(Z, 0, IN),
|
||||
+ GPIO_INIT(Z, 2, IN),
|
||||
+ GPIO_INIT(Z, 3, OUT0),
|
||||
+ GPIO_INIT(BB, 0, IN),
|
||||
+ GPIO_INIT(CC, 4, IN),
|
||||
+ GPIO_INIT(DD, 0, IN),
|
||||
+};
|
||||
+
|
||||
+#define PINCFG(_pingrp, _mux, _pull, _tri, _io, _od, _e_io_hv) \
|
||||
+ { \
|
||||
+ .pingrp = PMUX_PINGRP_##_pingrp, \
|
||||
+ .func = PMUX_FUNC_##_mux, \
|
||||
+ .pull = PMUX_PULL_##_pull, \
|
||||
+ .tristate = PMUX_TRI_##_tri, \
|
||||
+ .io = PMUX_PIN_##_io, \
|
||||
+ .od = PMUX_PIN_OD_##_od, \
|
||||
+ .e_io_hv = PMUX_PIN_E_IO_HV_##_e_io_hv, \
|
||||
+ .lock = PMUX_PIN_LOCK_DEFAULT, \
|
||||
+ }
|
||||
+
|
||||
+static const struct pmux_pingrp_config p3450_0000_pingrps[] = {
|
||||
+ /* pingrp, mux, pull, tri, e_input, od, e_io_hv */
|
||||
+ PINCFG(PEX_L0_RST_N_PA0, PE0, NORMAL, NORMAL, OUTPUT, DISABLE, HIGH),
|
||||
+ PINCFG(PEX_L0_CLKREQ_N_PA1, PE0, NORMAL, NORMAL, INPUT, DISABLE, HIGH),
|
||||
+ PINCFG(PEX_WAKE_N_PA2, PE, NORMAL, NORMAL, INPUT, DISABLE, HIGH),
|
||||
+ PINCFG(PEX_L1_RST_N_PA3, PE1, NORMAL, NORMAL, OUTPUT, DISABLE, HIGH),
|
||||
+ PINCFG(PEX_L1_CLKREQ_N_PA4, PE1, NORMAL, NORMAL, INPUT, DISABLE, HIGH),
|
||||
+ PINCFG(SATA_LED_ACTIVE_PA5, DEFAULT, UP, NORMAL, INPUT, DISABLE, DEFAULT),
|
||||
+ PINCFG(PA6, DEFAULT, NORMAL, NORMAL, OUTPUT, DISABLE, DEFAULT),
|
||||
+ PINCFG(DAP1_FS_PB0, RSVD1, DOWN, TRISTATE, OUTPUT, DISABLE, DEFAULT),
|
||||
+ PINCFG(DAP1_DIN_PB1, RSVD1, DOWN, TRISTATE, OUTPUT, DISABLE, DEFAULT),
|
||||
+ PINCFG(DAP1_DOUT_PB2, RSVD1, DOWN, TRISTATE, OUTPUT, DISABLE, DEFAULT),
|
||||
+ PINCFG(DAP1_SCLK_PB3, RSVD1, DOWN, TRISTATE, OUTPUT, DISABLE, DEFAULT),
|
||||
+ PINCFG(SPI2_MOSI_PB4, DEFAULT, DOWN, NORMAL, INPUT, DISABLE, DEFAULT),
|
||||
+ PINCFG(SPI2_MISO_PB5, DEFAULT, DOWN, NORMAL, INPUT, DISABLE, DEFAULT),
|
||||
+ PINCFG(SPI2_SCK_PB6, DEFAULT, DOWN, NORMAL, INPUT, DISABLE, DEFAULT),
|
||||
+ PINCFG(SPI2_CS0_PB7, DEFAULT, DOWN, NORMAL, INPUT, DISABLE, DEFAULT),
|
||||
+ PINCFG(SPI1_MOSI_PC0, DEFAULT, DOWN, NORMAL, INPUT, DISABLE, DEFAULT),
|
||||
+ PINCFG(SPI1_MISO_PC1, DEFAULT, DOWN, NORMAL, INPUT, DISABLE, DEFAULT),
|
||||
+ PINCFG(SPI1_SCK_PC2, DEFAULT, DOWN, NORMAL, INPUT, DISABLE, DEFAULT),
|
||||
+ PINCFG(SPI1_CS0_PC3, DEFAULT, UP, NORMAL, INPUT, DISABLE, DEFAULT),
|
||||
+ PINCFG(SPI1_CS1_PC4, DEFAULT, UP, NORMAL, INPUT, DISABLE, DEFAULT),
|
||||
+ PINCFG(SPI4_SCK_PC5, RSVD1, DOWN, TRISTATE, OUTPUT, DISABLE, DEFAULT),
|
||||
+ PINCFG(SPI4_CS0_PC6, RSVD1, DOWN, TRISTATE, OUTPUT, DISABLE, DEFAULT),
|
||||
+ PINCFG(SPI4_MOSI_PC7, RSVD1, DOWN, TRISTATE, OUTPUT, DISABLE, DEFAULT),
|
||||
+ PINCFG(SPI4_MISO_PD0, RSVD1, DOWN, TRISTATE, OUTPUT, DISABLE, DEFAULT),
|
||||
+ PINCFG(UART3_TX_PD1, UARTC, NORMAL, NORMAL, OUTPUT, DISABLE, DEFAULT),
|
||||
+ PINCFG(UART3_RX_PD2, UARTC, NORMAL, NORMAL, INPUT, DISABLE, DEFAULT),
|
||||
+ PINCFG(UART3_RTS_PD3, UARTC, UP, NORMAL, OUTPUT, DISABLE, DEFAULT),
|
||||
+ PINCFG(UART3_CTS_PD4, UARTC, UP, NORMAL, INPUT, DISABLE, DEFAULT),
|
||||
+ PINCFG(DMIC1_CLK_PE0, I2S3, NORMAL, NORMAL, INPUT, DISABLE, DEFAULT),
|
||||
+ PINCFG(DMIC1_DAT_PE1, I2S3, NORMAL, NORMAL, INPUT, DISABLE, DEFAULT),
|
||||
+ PINCFG(DMIC2_CLK_PE2, I2S3, NORMAL, NORMAL, INPUT, DISABLE, DEFAULT),
|
||||
+ PINCFG(DMIC2_DAT_PE3, I2S3, NORMAL, NORMAL, INPUT, DISABLE, DEFAULT),
|
||||
+ PINCFG(DMIC3_CLK_PE4, RSVD2, DOWN, TRISTATE, OUTPUT, DISABLE, DEFAULT),
|
||||
+ PINCFG(DMIC3_DAT_PE5, RSVD2, DOWN, TRISTATE, OUTPUT, DISABLE, DEFAULT),
|
||||
+ PINCFG(PE6, DEFAULT, DOWN, NORMAL, INPUT, DISABLE, DEFAULT),
|
||||
+ PINCFG(PE7, PWM3, NORMAL, NORMAL, OUTPUT, DISABLE, DEFAULT),
|
||||
+ PINCFG(GEN3_I2C_SCL_PF0, I2C3, NORMAL, NORMAL, INPUT, DISABLE, NORMAL),
|
||||
+ PINCFG(GEN3_I2C_SDA_PF1, I2C3, NORMAL, NORMAL, INPUT, DISABLE, NORMAL),
|
||||
+ PINCFG(UART2_TX_PG0, UARTB, NORMAL, NORMAL, OUTPUT, DISABLE, DEFAULT),
|
||||
+ PINCFG(UART2_RX_PG1, UARTB, DOWN, NORMAL, INPUT, DISABLE, DEFAULT),
|
||||
+ PINCFG(UART2_RTS_PG2, DEFAULT, DOWN, NORMAL, INPUT, DISABLE, DEFAULT),
|
||||
+ PINCFG(UART2_CTS_PG3, DEFAULT, DOWN, NORMAL, INPUT, DISABLE, DEFAULT),
|
||||
+ PINCFG(WIFI_EN_PH0, DEFAULT, NORMAL, NORMAL, OUTPUT, DISABLE, DEFAULT),
|
||||
+ PINCFG(WIFI_RST_PH1, RSVD0, DOWN, TRISTATE, OUTPUT, DISABLE, DEFAULT),
|
||||
+ PINCFG(WIFI_WAKE_AP_PH2, DEFAULT, DOWN, NORMAL, INPUT, DISABLE, DEFAULT),
|
||||
+ PINCFG(AP_WAKE_BT_PH3, DEFAULT, NORMAL, NORMAL, OUTPUT, DISABLE, DEFAULT),
|
||||
+ PINCFG(BT_RST_PH4, DEFAULT, NORMAL, NORMAL, OUTPUT, DISABLE, DEFAULT),
|
||||
+ PINCFG(BT_WAKE_AP_PH5, DEFAULT, UP, NORMAL, INPUT, DISABLE, DEFAULT),
|
||||
+ PINCFG(PH6, DEFAULT, UP, NORMAL, INPUT, DISABLE, DEFAULT),
|
||||
+ PINCFG(AP_WAKE_NFC_PH7, DEFAULT, NORMAL, NORMAL, OUTPUT, DISABLE, DEFAULT),
|
||||
+ PINCFG(NFC_EN_PI0, DEFAULT, NORMAL, NORMAL, OUTPUT, DISABLE, DEFAULT),
|
||||
+ PINCFG(NFC_INT_PI1, DEFAULT, DOWN, NORMAL, INPUT, DISABLE, DEFAULT),
|
||||
+ PINCFG(GPS_EN_PI2, DEFAULT, NORMAL, NORMAL, OUTPUT, DISABLE, DEFAULT),
|
||||
+ PINCFG(GPS_RST_PI3, RSVD0, DOWN, TRISTATE, OUTPUT, DISABLE, DEFAULT),
|
||||
+ PINCFG(UART4_TX_PI4, UARTD, NORMAL, NORMAL, OUTPUT, DISABLE, DEFAULT),
|
||||
+ PINCFG(UART4_RX_PI5, UARTD, NORMAL, NORMAL, INPUT, DISABLE, DEFAULT),
|
||||
+ PINCFG(UART4_RTS_PI6, UARTD, NORMAL, NORMAL, OUTPUT, DISABLE, DEFAULT),
|
||||
+ PINCFG(UART4_CTS_PI7, UARTD, UP, NORMAL, INPUT, DISABLE, DEFAULT),
|
||||
+ PINCFG(GEN1_I2C_SDA_PJ0, I2C1, NORMAL, NORMAL, INPUT, DISABLE, HIGH),
|
||||
+ PINCFG(GEN1_I2C_SCL_PJ1, I2C1, NORMAL, NORMAL, INPUT, DISABLE, HIGH),
|
||||
+ PINCFG(GEN2_I2C_SCL_PJ2, I2C2, NORMAL, NORMAL, INPUT, DISABLE, HIGH),
|
||||
+ PINCFG(GEN2_I2C_SDA_PJ3, I2C2, NORMAL, NORMAL, INPUT, DISABLE, HIGH),
|
||||
+ PINCFG(DAP4_FS_PJ4, DEFAULT, DOWN, NORMAL, INPUT, DISABLE, DEFAULT),
|
||||
+ PINCFG(DAP4_DIN_PJ5, DEFAULT, DOWN, NORMAL, INPUT, DISABLE, DEFAULT),
|
||||
+ PINCFG(DAP4_DOUT_PJ6, DEFAULT, DOWN, NORMAL, INPUT, DISABLE, DEFAULT),
|
||||
+ PINCFG(DAP4_SCLK_PJ7, DEFAULT, DOWN, NORMAL, INPUT, DISABLE, DEFAULT),
|
||||
+ PINCFG(PK0, RSVD2, DOWN, TRISTATE, OUTPUT, DISABLE, DEFAULT),
|
||||
+ PINCFG(PK1, RSVD2, DOWN, TRISTATE, OUTPUT, DISABLE, DEFAULT),
|
||||
+ PINCFG(PK2, RSVD2, DOWN, TRISTATE, OUTPUT, DISABLE, DEFAULT),
|
||||
+ PINCFG(PK3, RSVD2, DOWN, TRISTATE, OUTPUT, DISABLE, DEFAULT),
|
||||
+ PINCFG(PK4, RSVD1, DOWN, TRISTATE, OUTPUT, DISABLE, DEFAULT),
|
||||
+ PINCFG(PK5, RSVD1, DOWN, TRISTATE, OUTPUT, DISABLE, DEFAULT),
|
||||
+ PINCFG(PK6, RSVD1, DOWN, TRISTATE, OUTPUT, DISABLE, DEFAULT),
|
||||
+ PINCFG(PK7, RSVD1, DOWN, TRISTATE, OUTPUT, DISABLE, DEFAULT),
|
||||
+ PINCFG(PL0, RSVD0, DOWN, TRISTATE, OUTPUT, DISABLE, DEFAULT),
|
||||
+ PINCFG(PL1, RSVD1, DOWN, TRISTATE, OUTPUT, DISABLE, DEFAULT),
|
||||
+ PINCFG(SDMMC1_CLK_PM0, SDMMC1, NORMAL, NORMAL, INPUT, DISABLE, DEFAULT),
|
||||
+ PINCFG(SDMMC1_CMD_PM1, SDMMC1, UP, NORMAL, INPUT, DISABLE, DEFAULT),
|
||||
+ PINCFG(SDMMC1_DAT3_PM2, SDMMC1, UP, NORMAL, INPUT, DISABLE, DEFAULT),
|
||||
+ PINCFG(SDMMC1_DAT2_PM3, SDMMC1, UP, NORMAL, INPUT, DISABLE, DEFAULT),
|
||||
+ PINCFG(SDMMC1_DAT1_PM4, SDMMC1, UP, NORMAL, INPUT, DISABLE, DEFAULT),
|
||||
+ PINCFG(SDMMC1_DAT0_PM5, SDMMC1, UP, NORMAL, INPUT, DISABLE, DEFAULT),
|
||||
+ PINCFG(SDMMC3_CLK_PP0, SDMMC3, NORMAL, NORMAL, INPUT, DISABLE, DEFAULT),
|
||||
+ PINCFG(SDMMC3_CMD_PP1, SDMMC3, UP, NORMAL, INPUT, DISABLE, DEFAULT),
|
||||
+ PINCFG(SDMMC3_DAT3_PP2, SDMMC3, UP, NORMAL, INPUT, DISABLE, DEFAULT),
|
||||
+ PINCFG(SDMMC3_DAT2_PP3, SDMMC3, UP, NORMAL, INPUT, DISABLE, DEFAULT),
|
||||
+ PINCFG(SDMMC3_DAT1_PP4, SDMMC3, UP, NORMAL, INPUT, DISABLE, DEFAULT),
|
||||
+ PINCFG(SDMMC3_DAT0_PP5, SDMMC3, UP, NORMAL, INPUT, DISABLE, DEFAULT),
|
||||
+ PINCFG(CAM1_MCLK_PS0, EXTPERIPH3, NORMAL, NORMAL, OUTPUT, DISABLE, DEFAULT),
|
||||
+ PINCFG(CAM2_MCLK_PS1, EXTPERIPH3, NORMAL, NORMAL, OUTPUT, DISABLE, DEFAULT),
|
||||
+ PINCFG(CAM_I2C_SCL_PS2, I2CVI, NORMAL, NORMAL, INPUT, DISABLE, HIGH),
|
||||
+ PINCFG(CAM_I2C_SDA_PS3, I2CVI, NORMAL, NORMAL, INPUT, DISABLE, HIGH),
|
||||
+ PINCFG(CAM_RST_PS4, RSVD1, DOWN, TRISTATE, OUTPUT, DISABLE, DEFAULT),
|
||||
+ PINCFG(CAM_AF_EN_PS5, DEFAULT, UP, NORMAL, INPUT, DISABLE, DEFAULT),
|
||||
+ PINCFG(CAM_FLASH_EN_PS6, RSVD2, DOWN, TRISTATE, OUTPUT, DISABLE, DEFAULT),
|
||||
+ PINCFG(CAM1_PWDN_PS7, DEFAULT, NORMAL, NORMAL, OUTPUT, DISABLE, DEFAULT),
|
||||
+ PINCFG(CAM2_PWDN_PT0, DEFAULT, NORMAL, NORMAL, OUTPUT, DISABLE, DEFAULT),
|
||||
+ PINCFG(CAM1_STROBE_PT1, RSVD1, DOWN, TRISTATE, OUTPUT, DISABLE, DEFAULT),
|
||||
+ PINCFG(UART1_TX_PU0, UARTA, NORMAL, NORMAL, OUTPUT, DISABLE, DEFAULT),
|
||||
+ PINCFG(UART1_RX_PU1, UARTA, NORMAL, NORMAL, INPUT, DISABLE, DEFAULT),
|
||||
+ PINCFG(UART1_RTS_PU2, RSVD1, DOWN, TRISTATE, OUTPUT, DISABLE, DEFAULT),
|
||||
+ PINCFG(UART1_CTS_PU3, RSVD1, DOWN, TRISTATE, OUTPUT, DISABLE, DEFAULT),
|
||||
+ PINCFG(LCD_BL_PWM_PV0, DEFAULT, DOWN, NORMAL, INPUT, DISABLE, DEFAULT),
|
||||
+ PINCFG(LCD_BL_EN_PV1, DEFAULT, NORMAL, NORMAL, INPUT, DISABLE, DEFAULT),
|
||||
+ PINCFG(LCD_RST_PV2, RSVD0, DOWN, TRISTATE, OUTPUT, DISABLE, DEFAULT),
|
||||
+ PINCFG(LCD_GPIO1_PV3, RSVD1, DOWN, TRISTATE, OUTPUT, DISABLE, DEFAULT),
|
||||
+ PINCFG(LCD_GPIO2_PV4, PWM1, NORMAL, NORMAL, OUTPUT, DISABLE, DEFAULT),
|
||||
+ PINCFG(AP_READY_PV5, RSVD0, DOWN, TRISTATE, OUTPUT, DISABLE, DEFAULT),
|
||||
+ PINCFG(TOUCH_RST_PV6, RSVD0, DOWN, TRISTATE, OUTPUT, DISABLE, DEFAULT),
|
||||
+ PINCFG(TOUCH_CLK_PV7, RSVD1, DOWN, TRISTATE, OUTPUT, DISABLE, DEFAULT),
|
||||
+ PINCFG(MODEM_WAKE_AP_PX0, RSVD0, DOWN, TRISTATE, OUTPUT, DISABLE, DEFAULT),
|
||||
+ PINCFG(TOUCH_INT_PX1, RSVD0, DOWN, TRISTATE, OUTPUT, DISABLE, DEFAULT),
|
||||
+ PINCFG(MOTION_INT_PX2, RSVD0, DOWN, TRISTATE, OUTPUT, DISABLE, DEFAULT),
|
||||
+ PINCFG(ALS_PROX_INT_PX3, DEFAULT, NORMAL, NORMAL, OUTPUT, DISABLE, DEFAULT),
|
||||
+ PINCFG(TEMP_ALERT_PX4, DEFAULT, UP, NORMAL, INPUT, DISABLE, DEFAULT),
|
||||
+ PINCFG(BUTTON_POWER_ON_PX5, DEFAULT, UP, NORMAL, INPUT, DISABLE, DEFAULT),
|
||||
+ PINCFG(BUTTON_VOL_UP_PX6, DEFAULT, UP, NORMAL, INPUT, DISABLE, DEFAULT),
|
||||
+ PINCFG(BUTTON_VOL_DOWN_PX7, RSVD0, DOWN, TRISTATE, OUTPUT, DISABLE, DEFAULT),
|
||||
+ PINCFG(BUTTON_SLIDE_SW_PY0, RSVD0, DOWN, TRISTATE, OUTPUT, DISABLE, DEFAULT),
|
||||
+ PINCFG(BUTTON_HOME_PY1, DEFAULT, UP, NORMAL, INPUT, DISABLE, DEFAULT),
|
||||
+ PINCFG(LCD_TE_PY2, DEFAULT, DOWN, NORMAL, INPUT, DISABLE, DEFAULT),
|
||||
+ PINCFG(PWR_I2C_SCL_PY3, I2CPMU, NORMAL, NORMAL, INPUT, DISABLE, NORMAL),
|
||||
+ PINCFG(PWR_I2C_SDA_PY4, I2CPMU, NORMAL, NORMAL, INPUT, DISABLE, NORMAL),
|
||||
+ PINCFG(CLK_32K_OUT_PY5, RSVD2, DOWN, TRISTATE, OUTPUT, DISABLE, DEFAULT),
|
||||
+ PINCFG(PZ0, DEFAULT, UP, NORMAL, INPUT, DISABLE, DEFAULT),
|
||||
+ PINCFG(PZ1, SDMMC1, UP, NORMAL, INPUT, DISABLE, DEFAULT),
|
||||
+ PINCFG(PZ2, DEFAULT, UP, NORMAL, INPUT, DISABLE, DEFAULT),
|
||||
+ PINCFG(PZ3, DEFAULT, NORMAL, NORMAL, OUTPUT, DISABLE, DEFAULT),
|
||||
+ PINCFG(PZ4, RSVD1, DOWN, TRISTATE, OUTPUT, DISABLE, DEFAULT),
|
||||
+ PINCFG(PZ5, SOC, UP, NORMAL, INPUT, DISABLE, DEFAULT),
|
||||
+ PINCFG(DAP2_FS_PAA0, I2S2, NORMAL, NORMAL, INPUT, DISABLE, DEFAULT),
|
||||
+ PINCFG(DAP2_SCLK_PAA1, I2S2, NORMAL, NORMAL, INPUT, DISABLE, DEFAULT),
|
||||
+ PINCFG(DAP2_DIN_PAA2, I2S2, NORMAL, NORMAL, INPUT, DISABLE, DEFAULT),
|
||||
+ PINCFG(DAP2_DOUT_PAA3, I2S2, NORMAL, NORMAL, INPUT, DISABLE, DEFAULT),
|
||||
+ PINCFG(AUD_MCLK_PBB0, DEFAULT, UP, NORMAL, INPUT, DISABLE, DEFAULT),
|
||||
+ PINCFG(DVFS_PWM_PBB1, CLDVFS, NORMAL, TRISTATE, OUTPUT, DISABLE, DEFAULT),
|
||||
+ PINCFG(DVFS_CLK_PBB2, RSVD0, DOWN, TRISTATE, OUTPUT, DISABLE, DEFAULT),
|
||||
+ PINCFG(GPIO_X1_AUD_PBB3, RSVD0, DOWN, TRISTATE, OUTPUT, DISABLE, DEFAULT),
|
||||
+ PINCFG(GPIO_X3_AUD_PBB4, RSVD0, DOWN, TRISTATE, OUTPUT, DISABLE, DEFAULT),
|
||||
+ PINCFG(HDMI_CEC_PCC0, CEC, NORMAL, NORMAL, INPUT, DISABLE, HIGH),
|
||||
+ PINCFG(HDMI_INT_DP_HPD_PCC1, DP, NORMAL, NORMAL, INPUT, DISABLE, NORMAL),
|
||||
+ PINCFG(SPDIF_OUT_PCC2, RSVD1, DOWN, TRISTATE, OUTPUT, DISABLE, DEFAULT),
|
||||
+ PINCFG(SPDIF_IN_PCC3, RSVD1, DOWN, TRISTATE, OUTPUT, DISABLE, DEFAULT),
|
||||
+ PINCFG(USB_VBUS_EN0_PCC4, DEFAULT, UP, NORMAL, INPUT, DISABLE, NORMAL),
|
||||
+ PINCFG(USB_VBUS_EN1_PCC5, RSVD1, DOWN, TRISTATE, OUTPUT, DISABLE, NORMAL),
|
||||
+ PINCFG(DP_HPD0_PCC6, DP, NORMAL, NORMAL, INPUT, DISABLE, DEFAULT),
|
||||
+ PINCFG(PCC7, RSVD0, DOWN, TRISTATE, OUTPUT, DISABLE, NORMAL),
|
||||
+ PINCFG(SPI2_CS1_PDD0, DEFAULT, DOWN, NORMAL, INPUT, DISABLE, DEFAULT),
|
||||
+ PINCFG(QSPI_SCK_PEE0, QSPI, NORMAL, NORMAL, INPUT, DISABLE, DEFAULT),
|
||||
+ PINCFG(QSPI_CS_N_PEE1, QSPI, NORMAL, NORMAL, OUTPUT, DISABLE, DEFAULT),
|
||||
+ PINCFG(QSPI_IO0_PEE2, QSPI, NORMAL, NORMAL, INPUT, DISABLE, DEFAULT),
|
||||
+ PINCFG(QSPI_IO1_PEE3, QSPI, NORMAL, NORMAL, INPUT, DISABLE, DEFAULT),
|
||||
+ PINCFG(QSPI_IO2_PEE4, QSPI, NORMAL, NORMAL, INPUT, DISABLE, DEFAULT),
|
||||
+ PINCFG(QSPI_IO3_PEE5, QSPI, NORMAL, NORMAL, INPUT, DISABLE, DEFAULT),
|
||||
+ PINCFG(CORE_PWR_REQ, CORE, NORMAL, NORMAL, OUTPUT, DISABLE, DEFAULT),
|
||||
+ PINCFG(CPU_PWR_REQ, RSVD1, DOWN, TRISTATE, OUTPUT, DISABLE, DEFAULT),
|
||||
+ PINCFG(PWR_INT_N, PMI, UP, NORMAL, INPUT, DISABLE, DEFAULT),
|
||||
+ PINCFG(CLK_32K_IN, CLK, NORMAL, NORMAL, INPUT, DISABLE, DEFAULT),
|
||||
+ PINCFG(JTAG_RTCK, JTAG, NORMAL, NORMAL, OUTPUT, DISABLE, DEFAULT),
|
||||
+ PINCFG(CLK_REQ, RSVD1, DOWN, TRISTATE, OUTPUT, DISABLE, DEFAULT),
|
||||
+ PINCFG(SHUTDOWN, SHUTDOWN, NORMAL, NORMAL, OUTPUT, DISABLE, DEFAULT),
|
||||
+};
|
||||
+
|
||||
+#define DRVCFG(_drvgrp, _slwf, _slwr, _drvup, _drvdn, _lpmd, _schmt, _hsm) \
|
||||
+ { \
|
||||
+ .drvgrp = PMUX_DRVGRP_##_drvgrp, \
|
||||
+ .slwf = _slwf, \
|
||||
+ .slwr = _slwr, \
|
||||
+ .drvup = _drvup, \
|
||||
+ .drvdn = _drvdn, \
|
||||
+ .lpmd = PMUX_LPMD_##_lpmd, \
|
||||
+ .schmt = PMUX_SCHMT_##_schmt, \
|
||||
+ .hsm = PMUX_HSM_##_hsm, \
|
||||
+ }
|
||||
+
|
||||
+static const struct pmux_drvgrp_config p3450_0000_drvgrps[] = {
|
||||
+};
|
||||
+
|
||||
+#endif /* PINMUX_CONFIG_P3450_0000_H */
|
||||
diff --git a/configs/p3450-0000_defconfig b/configs/p3450-0000_defconfig
|
||||
new file mode 100644
|
||||
index 000000000000..3a95028279d3
|
||||
--- /dev/null
|
||||
+++ b/configs/p3450-0000_defconfig
|
||||
@@ -0,0 +1,55 @@
|
||||
+CONFIG_ARM=y
|
||||
+CONFIG_TEGRA=y
|
||||
+CONFIG_SYS_TEXT_BASE=0x80080000
|
||||
+CONFIG_TEGRA210=y
|
||||
+CONFIG_TARGET_P3450_0000=y
|
||||
+CONFIG_NR_DRAM_BANKS=2
|
||||
+CONFIG_OF_SYSTEM_SETUP=y
|
||||
+CONFIG_OF_BOARD_SETUP=y
|
||||
+CONFIG_CONSOLE_MUX=y
|
||||
+CONFIG_SYS_STDIO_DEREGISTER=y
|
||||
+CONFIG_SYS_PROMPT="Tegra210 (P3450-0000) # "
|
||||
+# CONFIG_CMD_IMI is not set
|
||||
+CONFIG_CMD_DFU=y
|
||||
+# CONFIG_CMD_FLASH is not set
|
||||
+CONFIG_CMD_GPIO=y
|
||||
+CONFIG_CMD_I2C=y
|
||||
+CONFIG_CMD_MMC=y
|
||||
+CONFIG_CMD_PCI=y
|
||||
+CONFIG_CMD_SF=y
|
||||
+CONFIG_CMD_SPI=y
|
||||
+CONFIG_CMD_USB=y
|
||||
+CONFIG_CMD_USB_MASS_STORAGE=y
|
||||
+# CONFIG_CMD_SETEXPR is not set
|
||||
+# CONFIG_CMD_NFS is not set
|
||||
+CONFIG_CMD_EXT4_WRITE=y
|
||||
+CONFIG_OF_LIVE=y
|
||||
+CONFIG_DEFAULT_DEVICE_TREE="tegra210-p3450-0000"
|
||||
+CONFIG_DFU_MMC=y
|
||||
+CONFIG_DFU_RAM=y
|
||||
+CONFIG_DFU_SF=y
|
||||
+CONFIG_SYS_I2C_TEGRA=y
|
||||
+CONFIG_SPI_FLASH=y
|
||||
+CONFIG_SF_DEFAULT_MODE=0
|
||||
+CONFIG_SF_DEFAULT_SPEED=24000000
|
||||
+CONFIG_SPI_FLASH_WINBOND=y
|
||||
+CONFIG_RTL8169=y
|
||||
+CONFIG_PCI=y
|
||||
+CONFIG_DM_PCI=y
|
||||
+CONFIG_DM_PCI_COMPAT=y
|
||||
+CONFIG_PCI_TEGRA=y
|
||||
+CONFIG_SYS_NS16550=y
|
||||
+CONFIG_TEGRA114_SPI=y
|
||||
+CONFIG_USB=y
|
||||
+CONFIG_DM_USB=y
|
||||
+CONFIG_USB_EHCI_HCD=y
|
||||
+CONFIG_USB_EHCI_TEGRA=y
|
||||
+CONFIG_USB_GADGET=y
|
||||
+CONFIG_USB_GADGET_MANUFACTURER="NVIDIA"
|
||||
+CONFIG_USB_GADGET_VENDOR_NUM=0x0955
|
||||
+CONFIG_USB_GADGET_PRODUCT_NUM=0x701a
|
||||
+CONFIG_CI_UDC=y
|
||||
+CONFIG_USB_GADGET_DOWNLOAD=y
|
||||
+CONFIG_USB_HOST_ETHER=y
|
||||
+CONFIG_USB_ETHER_ASIX=y
|
||||
+# CONFIG_ENV_IS_IN_MMC is not set
|
||||
diff --git a/include/configs/p3450-0000.h b/include/configs/p3450-0000.h
|
||||
new file mode 100644
|
||||
index 000000000000..ee819b7573b0
|
||||
--- /dev/null
|
||||
+++ b/include/configs/p3450-0000.h
|
||||
@@ -0,0 +1,34 @@
|
||||
+/* SPDX-License-Identifier: GPL-2.0+ */
|
||||
+/*
|
||||
+ * (C) Copyright 2018-2019 NVIDIA Corporation. All rights reserved.
|
||||
+ */
|
||||
+
|
||||
+#ifndef _P3450_0000_H
|
||||
+#define _P3450_0000_H
|
||||
+
|
||||
+#include <linux/sizes.h>
|
||||
+
|
||||
+#include "tegra210-common.h"
|
||||
+
|
||||
+/* High-level configuration options */
|
||||
+#define CONFIG_TEGRA_BOARD_STRING "NVIDIA P3450-0000"
|
||||
+
|
||||
+/* Board-specific serial config */
|
||||
+#define CONFIG_TEGRA_ENABLE_UARTA
|
||||
+
|
||||
+/* Only MMC1/PXE/DHCP for now, add USB back in later when supported */
|
||||
+#define BOOT_TARGET_DEVICES(func) \
|
||||
+ func(MMC, mmc, 0) \
|
||||
+ func(PXE, pxe, na) \
|
||||
+ func(DHCP, dhcp, na)
|
||||
+
|
||||
+/* SPI */
|
||||
+#define CONFIG_SPI_FLASH_SIZE (4 << 20)
|
||||
+
|
||||
+#include "tegra-common-usb-gadget.h"
|
||||
+#include "tegra-common-post.h"
|
||||
+
|
||||
+/* Crystal is 38.4MHz. clk_m runs at half that rate */
|
||||
+#define COUNTER_FREQUENCY 19200000
|
||||
+
|
||||
+#endif /* _P3450_0000_H */
|
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
@ -14,19 +14,24 @@ geekbox
|
||||
hikey
|
||||
khadas-vim
|
||||
khadas-vim2
|
||||
libretech-ac
|
||||
libretech_all_h3_cc_h5
|
||||
libretech-cc
|
||||
mvebu_espressobin-88f3720
|
||||
mvebu_mcbin-88f8040
|
||||
nanopc-t4-rk3399
|
||||
nanopi_a64
|
||||
nanopi-k2
|
||||
nanopi-m4-rk3399
|
||||
nanopi_neo2
|
||||
nanopi-neo4-rk3399
|
||||
nanopi_neo_plus2
|
||||
odroid-c2
|
||||
orangepi_lite2
|
||||
orangepi_one_plus
|
||||
orangepi_pc2
|
||||
orangepi_prime
|
||||
orangepi-rk3399
|
||||
orangepi_win
|
||||
orangepi_zero_plus
|
||||
orangepi_zero_plus2
|
||||
@ -41,8 +46,11 @@ pine_h64
|
||||
poplar
|
||||
puma-rk3399
|
||||
rock960-rk3399
|
||||
rock-pi-4-rk3399
|
||||
rockpro64-rk3399
|
||||
rpi_3
|
||||
sopine_baseboard
|
||||
teres_i
|
||||
turris_mox
|
||||
vexpress_aemv8a_dram
|
||||
vexpress_aemv8a_juno
|
||||
|
@ -9,6 +9,7 @@ A20-OLinuXino_MICRO
|
||||
am335x_evm
|
||||
am57xx_evm
|
||||
Ampe_A76
|
||||
apalis_imx6
|
||||
arndale
|
||||
Auxtek-T003
|
||||
Auxtek-T004
|
||||
@ -25,7 +26,6 @@ chiliboard
|
||||
CHIP
|
||||
Chuwi_V7_CW0825
|
||||
clearfog
|
||||
cl-som-am57x
|
||||
cm_fx6
|
||||
Colombus
|
||||
colorfly_e708_q1
|
||||
|
@ -1,197 +0,0 @@
|
||||
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, 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: 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>
|
||||
|
||||
From: Thierry Reding <treding@nvidia.com>
|
||||
|
||||
In order for the device to use the proper MAC address, which can have
|
||||
been configured in the environment prior to the device being registered,
|
||||
ensure that the MAC address is written after the device has been probed.
|
||||
For devices that are registered before the network stack is initialized,
|
||||
this is already done during eth_initialize(). If the Ethernet device is
|
||||
on a bus that is not initialized on early boot, such as PCI, the device
|
||||
is not available at the time eth_initialize() is called, so we need the
|
||||
MAC address programming to also happen after probe.
|
||||
|
||||
Signed-off-by: Thierry Reding <treding@nvidia.com>
|
||||
---
|
||||
net/eth-uclass.c | 2 ++
|
||||
1 file changed, 2 insertions(+)
|
||||
|
||||
diff --git a/net/eth-uclass.c b/net/eth-uclass.c
|
||||
index 2ef20df19203..4225aabf1fa1 100644
|
||||
--- a/net/eth-uclass.c
|
||||
+++ b/net/eth-uclass.c
|
||||
@@ -524,6 +524,8 @@ static int eth_post_probe(struct udevice *dev)
|
||||
#endif
|
||||
}
|
||||
|
||||
+ eth_write_hwaddr(dev);
|
||||
+
|
||||
return 0;
|
||||
}
|
||||
|
||||
|
||||
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,v2,2/2] net: eth-uclass: Support device tree MAC addresses
|
||||
X-Patchwork-Submitter: Thierry Reding <thierry.reding@gmail.com>
|
||||
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>
|
||||
|
||||
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>
|
||||
---
|
||||
Changes in v2:
|
||||
- use dev_read_u8_array_ptr()
|
||||
|
||||
.../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;
|
||||
}
|
||||
|
||||
+static bool eth_dev_get_mac_address(struct udevice *dev, u8 mac[ARP_HLEN])
|
||||
+{
|
||||
+ const uint8_t *p;
|
||||
+
|
||||
+ 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);
|
||||
+
|
||||
+ if (!p) {
|
||||
+ memset(mac, 0, ARP_HLEN);
|
||||
+ return false;
|
||||
+ }
|
||||
+
|
||||
+ 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)
|
||||
|
||||
priv->state = ETH_STATE_INIT;
|
||||
|
||||
- /* 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);
|
||||
+ }
|
||||
|
||||
eth_env_get_enetaddr_by_index("eth", dev->seq, env_enetaddr);
|
||||
if (!is_zero_ethaddr(env_enetaddr)) {
|
@ -1,102 +0,0 @@
|
||||
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.tar.bz2) = 357fe94b5b043885472ea1b7dcbbac601d0c1f7c64f71026b9e1279b53160847c6478d6ec98a2f678e562db21e39037d6e6fbc1e6b19beaac02ca14e93c5de0e
|
||||
SHA512 (u-boot-2019.07-rc4.tar.bz2) = 71aa6e2eb30a3abf136a4128fb8bf00c8b1b71d6bc35cc65daac058fd4dae135080e4683c092edefffc6c1ba227bf07b49721b889ddfa02e7872beb5ab5fe92f
|
||||
|
@ -1,8 +1,8 @@
|
||||
#global candidate rc4
|
||||
%global candidate rc4
|
||||
|
||||
Name: uboot-tools
|
||||
Version: 2019.04
|
||||
Release: 2%{?candidate:.%{candidate}}%{?dist}
|
||||
Version: 2019.07
|
||||
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
|
||||
@ -15,22 +15,17 @@ Source4: aarch64-chromebooks
|
||||
Source5: 10-devicetree.install
|
||||
|
||||
# Fedoraisms patches
|
||||
Patch1: uefi-use-Fedora-specific-path-name.patch
|
||||
|
||||
# general fixes
|
||||
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
|
||||
Patch1: uefi-distro-load-FDT-from-any-partition-on-boot-device.patch
|
||||
Patch2: uefi-use-Fedora-specific-path-name.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-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
|
||||
Patch5: usb-kbd-fixes.patch
|
||||
Patch6: rpi-Enable-using-the-DT-provided-by-the-Raspberry-Pi.patch
|
||||
Patch7: raspberrypi-add-serial-and-revision-to-the-device-tree.patch
|
||||
Patch8: dragonboard-fixes.patch
|
||||
Patch9: ARM-tegra-Add-NVIDIA-Jetson-Nano.patch
|
||||
Patch10: arm-tegra-defaine-fdtfile-for-all-devices.patch
|
||||
Patch11: 0001-configs-tinker-rk3288-disable-CONFIG_SPL_I2C_SUPPORT.patch
|
||||
|
||||
BuildRequires: bc
|
||||
BuildRequires: dtc
|
||||
@ -67,6 +62,10 @@ BuildRequires: arm-trusted-firmware-armv8
|
||||
|
||||
Requires: dtc
|
||||
Requires: systemd
|
||||
%ifarch aarch64 %{arm}
|
||||
Obsoletes: uboot-images-elf < 2019.07
|
||||
Provides: uboot-images-elf < 2019.07
|
||||
%endif
|
||||
|
||||
%description
|
||||
This package contains a few U-Boot utilities - mkimage for creating boot images
|
||||
@ -92,17 +91,6 @@ BuildArch: noarch
|
||||
u-boot bootloader binaries for armv7 boards
|
||||
%endif
|
||||
|
||||
%ifarch %{arm} aarch64
|
||||
%package -n uboot-images-elf
|
||||
Summary: u-boot bootloader images for armv7 boards
|
||||
Requires: uboot-tools
|
||||
Obsoletes: uboot-images-qemu
|
||||
Provides: uboot-images-qemu
|
||||
|
||||
%description -n uboot-images-elf
|
||||
u-boot bootloader ELF binaries for use with qemu and other platforms
|
||||
%endif
|
||||
|
||||
%prep
|
||||
%autosetup -p1 -n u-boot-%{version}%{?candidate:-%{candidate}}
|
||||
|
||||
@ -122,7 +110,7 @@ do
|
||||
echo "Building board: $board"
|
||||
mkdir builds/$(echo $board)/
|
||||
# ATF selection, needs improving, suggestions of ATF SoC to Board matrix welcome
|
||||
sun50i=(a64-olinuxino amarula_a64_relic bananapi_m2_plus_h5 bananapi_m64 nanopi_a64 orangepi_win pine64-lts pine64_plus pinebook sopine_baseboard libretech_all_h3_cc_h5 nanopi_neo2 nanopi_neo_plus2 orangepi_pc2 orangepi_prime orangepi_zero_plus2 orangepi_zero_plus)
|
||||
sun50i=(a64-olinuxino amarula_a64_relic bananapi_m2_plus_h5 bananapi_m64 libretech_all_h3_cc_h5 nanopi_a64 nanopi_neo2 nanopi_neo_plus2 orangepi_pc2 orangepi_prime orangepi_win orangepi_zero_plus orangepi_zero_plus2 pine64-lts pine64_plus pinebook sopine_baseboard teres_i)
|
||||
if [[ " ${sun50i[*]} " == *" $board "* ]]; then
|
||||
echo "Board: $board using sun50i_a64"
|
||||
cp /usr/share/arm-trusted-firmware/sun50i_a64/* builds/$(echo $board)/
|
||||
@ -132,7 +120,7 @@ do
|
||||
echo "Board: $board using sun50i_h6"
|
||||
cp /usr/share/arm-trusted-firmware/sun50i_h6/* builds/$(echo $board)/
|
||||
fi
|
||||
rk3399=(evb-rk3399 ficus-rk3399 firefly-rk3399 puma-rk3399 rock960-rk3399)
|
||||
rk3399=(evb-rk3399 ficus-rk3399 firefly-rk3399 nanopc-t4-rk3399 nanopi-m4-rk3399 nanopi-neo4-rk3399 orangepi-rk3399 orangepi-rk3399 puma-rk3399 rock960-rk3399 rock-pi-4-rk3399 rockpro64-rk3399)
|
||||
if [[ " ${rk3399[*]} " == *" $board "* ]]; then
|
||||
echo "Board: $board using rk3399"
|
||||
cp /usr/share/arm-trusted-firmware/rk3399/* builds/$(echo $board)/
|
||||
@ -140,7 +128,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 ficus-rk3399 firefly-rk3399 puma-rk3399 rock960-rk3399)
|
||||
rk33xx=(evb-rk3399 ficus-rk3399 firefly-rk3399 nanopc-t4-rk3399 nanopi-m4-rk3399 nanopi-neo4-rk3399 orangepi-rk3399 orangepi-rk3399 puma-rk3399 rock960-rk3399 rock-pi-4-rk3399 rockpro64-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)/
|
||||
@ -217,33 +205,6 @@ mkdir -p $RPM_BUILD_ROOT%{_datadir}/uboot/$(echo $board)/
|
||||
done
|
||||
%endif
|
||||
|
||||
# ELF binaries
|
||||
%ifarch %{arm}
|
||||
for board in vexpress_ca15_tc2 vexpress_ca9x4
|
||||
do
|
||||
mkdir -p $RPM_BUILD_ROOT%{_datadir}/uboot/elf/$(echo $board)/
|
||||
for file in u-boot
|
||||
do
|
||||
if [ -f builds/$(echo $board)/$(echo $file) ]; then
|
||||
install -p -m 0644 builds/$(echo $board)/$(echo $file) $RPM_BUILD_ROOT%{_datadir}/uboot/elf/$(echo $board)/
|
||||
fi
|
||||
done
|
||||
done
|
||||
%endif
|
||||
|
||||
%ifarch aarch64
|
||||
for board in $(cat %{_arch}-boards)
|
||||
do
|
||||
mkdir -p $RPM_BUILD_ROOT%{_datadir}/uboot/elf/$(echo $board)/
|
||||
for file in u-boot
|
||||
do
|
||||
if [ -f builds/$(echo $board)/$(echo $file) ]; then
|
||||
install -p -m 0644 builds/$(echo $board)/$(echo $file) $RPM_BUILD_ROOT%{_datadir}/uboot/elf/$(echo $board)/
|
||||
fi
|
||||
done
|
||||
done
|
||||
%endif
|
||||
|
||||
for tool in bmp_logo dumpimage easylogo/easylogo env/fw_printenv fit_check_sign fit_info gdb/gdbcont gdb/gdbsend gen_eth_addr gen_ethaddr_crc img2srec mkenvimage mkimage mksunxiboot ncb proftool sunxi-spl-image-builder ubsha1 xway-swap-bytes
|
||||
do
|
||||
install -p -m 0755 builds/tools/$tool $RPM_BUILD_ROOT%{_bindir}
|
||||
@ -261,7 +222,7 @@ install -p -m 0755 %{SOURCE5} $RPM_BUILD_ROOT/lib/kernel/install.d/
|
||||
|
||||
# Copy sone useful docs over
|
||||
mkdir -p builds/docs
|
||||
cp -p board/amlogic/odroid-c2/README.odroid-c2 builds/docs/README.odroid-c2
|
||||
cp -p board/amlogic/p200/README.odroid-c2 builds/docs/README.odroid-c2
|
||||
cp -p board/hisilicon/hikey/README builds/docs/README.hikey
|
||||
cp -p board/hisilicon/hikey/README builds/docs/README.hikey
|
||||
cp -p board/Marvell/db-88f6820-gp/README builds/docs/README.mvebu-db-88f6820
|
||||
@ -290,21 +251,19 @@ cp -p board/warp7/README builds/docs/README.warp7
|
||||
%ifarch aarch64
|
||||
%files -n uboot-images-armv8
|
||||
%{_datadir}/uboot/*
|
||||
%exclude %{_datadir}/uboot/elf
|
||||
%endif
|
||||
|
||||
%ifarch %{arm}
|
||||
%files -n uboot-images-armv7
|
||||
%{_datadir}/uboot/*
|
||||
%exclude %{_datadir}/uboot/elf
|
||||
%endif
|
||||
|
||||
%ifarch %{arm} aarch64
|
||||
%files -n uboot-images-elf
|
||||
%{_datadir}/uboot/elf
|
||||
%endif
|
||||
|
||||
%changelog
|
||||
* Tue Jun 18 2019 Peter Robinson <pbrobinson@fedoraproject.org> 2019.07-0.1-rc4
|
||||
- 2019.07 RC4
|
||||
- Obsolete unused elf packages
|
||||
- A number of new rk3399 devices
|
||||
|
||||
* 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
|
||||
|
||||
|
@ -1,54 +0,0 @@
|
||||
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");
|
@ -1,7 +1,7 @@
|
||||
From 8bc6f62541436ebaf87133792726d9b48f878d09 Mon Sep 17 00:00:00 2001
|
||||
From 67c05a07288ef24b3ac9d013f35a0868d26a34c7 Mon Sep 17 00:00:00 2001
|
||||
From: Peter Robinson <pbrobinson@gmail.com>
|
||||
Date: Tue, 5 Dec 2017 00:11:08 +0000
|
||||
Subject: [PATCH] distro: load FDT from any partition on boot device
|
||||
Date: Tue, 18 Jun 2019 11:51:21 +0100
|
||||
Subject: [PATCH 1/2] distro: load FDT from any partition on boot device
|
||||
|
||||
In the EFI_LOADER boot path, we were only checking the FAT partition
|
||||
containing the EFI payload for dtb files. But this is somewhat of a
|
||||
@ -22,14 +22,14 @@ knows) and SoC/board specific ${fdtfile} (which grub does not know).
|
||||
Signed-off-by: Rob Clark <robdclark@gmail.com>
|
||||
Signed-off-by: Peter Robinson <pbrobinson@gmail.com>
|
||||
---
|
||||
include/config_distro_bootcmd.h | 34 +++++++++++++++++++++++-----------
|
||||
include/config_distro_bootcmd.h | 34 ++++++++++++++++++++++-----------
|
||||
1 file changed, 23 insertions(+), 11 deletions(-)
|
||||
|
||||
diff --git a/include/config_distro_bootcmd.h b/include/config_distro_bootcmd.h
|
||||
index 7746366ec8..c87f7c2a42 100644
|
||||
index 4993303f4d..f4b3b62fca 100644
|
||||
--- a/include/config_distro_bootcmd.h
|
||||
+++ b/include/config_distro_bootcmd.h
|
||||
@@ -135,25 +135,37 @@
|
||||
@@ -138,25 +138,37 @@
|
||||
"fi\0" \
|
||||
\
|
||||
"load_efi_dtb=" \
|
||||
@ -70,14 +70,14 @@ index 7746366ec8..c87f7c2a42 100644
|
||||
+ "run boot_efi_binary\0" \
|
||||
+ "scan_dev_for_efi=" \
|
||||
"if test -e ${devtype} ${devnum}:${distro_bootpart} " \
|
||||
"efi/fedora/"BOOTEFI_NAME"; then " \
|
||||
"efi/boot/"BOOTEFI_NAME"; then " \
|
||||
"echo Found EFI removable media binary " \
|
||||
"efi/fedora/"BOOTEFI_NAME"; " \
|
||||
"efi/boot/"BOOTEFI_NAME"; " \
|
||||
- "run boot_efi_binary; " \
|
||||
+ "run scan_dev_for_dtb; " \
|
||||
"echo EFI LOAD FAILED: continuing...; " \
|
||||
"fi; " \
|
||||
"setenv efi_fdtfile\0"
|
||||
--
|
||||
2.14.3
|
||||
2.21.0
|
||||
|
||||
|
@ -1,46 +0,0 @@
|
||||
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 {
|
@ -1,7 +1,7 @@
|
||||
From c8e3063259c19e8f03c9f3e053ec6384d2d3f861 Mon Sep 17 00:00:00 2001
|
||||
From 3cc3f7de06dcf9614554d63b159f0cd6710b96b0 Mon Sep 17 00:00:00 2001
|
||||
From: Peter Robinson <pbrobinson@gmail.com>
|
||||
Date: Tue, 19 Mar 2019 10:48:48 +0000
|
||||
Subject: [PATCH] use Fedora specific EFI path/name
|
||||
Date: Tue, 18 Jun 2019 12:08:57 +0100
|
||||
Subject: [PATCH 2/2] use Fedora specific EFI path/name
|
||||
|
||||
Signed-off-by: Peter Robinson <pbrobinson@gmail.com>
|
||||
---
|
||||
@ -9,7 +9,7 @@ Signed-off-by: Peter Robinson <pbrobinson@gmail.com>
|
||||
1 file changed, 5 insertions(+), 5 deletions(-)
|
||||
|
||||
diff --git a/include/config_distro_bootcmd.h b/include/config_distro_bootcmd.h
|
||||
index 4993303f4d..1aba509962 100644
|
||||
index f4b3b62fca..2dc8be9815 100644
|
||||
--- a/include/config_distro_bootcmd.h
|
||||
+++ b/include/config_distro_bootcmd.h
|
||||
@@ -92,9 +92,9 @@
|
||||
@ -33,18 +33,18 @@ index 4993303f4d..1aba509962 100644
|
||||
"if fdt addr ${fdt_addr_r}; then " \
|
||||
"bootefi ${kernel_addr_r} ${fdt_addr_r};" \
|
||||
"else " \
|
||||
@@ -153,9 +153,9 @@
|
||||
"fi;" \
|
||||
"done;" \
|
||||
@@ -165,9 +165,9 @@
|
||||
"run boot_efi_binary\0" \
|
||||
"scan_dev_for_efi=" \
|
||||
"if test -e ${devtype} ${devnum}:${distro_bootpart} " \
|
||||
- "efi/boot/"BOOTEFI_NAME"; then " \
|
||||
+ "efi/fedora/"BOOTEFI_NAME"; then " \
|
||||
"echo Found EFI removable media binary " \
|
||||
- "efi/boot/"BOOTEFI_NAME"; " \
|
||||
+ "efi/fedora/"BOOTEFI_NAME"; " \
|
||||
"run boot_efi_binary; " \
|
||||
"run scan_dev_for_dtb; " \
|
||||
"echo EFI LOAD FAILED: continuing...; " \
|
||||
"fi; " \
|
||||
--
|
||||
2.20.1
|
||||
2.21.0
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user