529744c22f
OBS-URL: https://build.opensuse.org/request/show/802701 OBS-URL: https://build.opensuse.org/package/show/hardware:boot/u-boot?expand=0&rev=98
139 lines
4.2 KiB
Diff
139 lines
4.2 KiB
Diff
From 7c75345077bc8f04a6a736b8e960df9799de20ac Mon Sep 17 00:00:00 2001
|
|
From: Marek Szyprowski <m.szyprowski@samsung.com>
|
|
Date: Mon, 4 May 2020 14:45:23 +0200
|
|
Subject: [PATCH] config: Enable support for the XHCI controller on RPI4 board
|
|
|
|
This requires enabling BRCMSTB PCIe and XHCI_PCI drivers as well as PCI
|
|
and USB commands. To get it working one has to call the following commands:
|
|
"pci enum; usb start;", thus such commands have been added to the default
|
|
"preboot" environment variable. One has to update their environment if it
|
|
is already configured to get this feature working out of the box.
|
|
|
|
Signed-off-by: Marek Szyprowski <m.szyprowski@samsung.com>
|
|
Signed-off-by: Sylwester Nawrocki <s.nawrocki@samsung.com>
|
|
---
|
|
configs/rpi_4_32b_defconfig | 9 +++++++++
|
|
configs/rpi_4_defconfig | 9 +++++++++
|
|
configs/rpi_arm64_defconfig | 8 +++++++-
|
|
3 files changed, 25 insertions(+), 1 deletion(-)
|
|
|
|
diff --git a/configs/rpi_4_32b_defconfig b/configs/rpi_4_32b_defconfig
|
|
index 72cda5d949..1315f7449f 100644
|
|
--- a/configs/rpi_4_32b_defconfig
|
|
+++ b/configs/rpi_4_32b_defconfig
|
|
@@ -8,6 +8,8 @@ CONFIG_NR_DRAM_BANKS=2
|
|
CONFIG_DISTRO_DEFAULTS=y
|
|
CONFIG_OF_BOARD_SETUP=y
|
|
# CONFIG_ARCH_FIXUP_FDT_MEMORY is not set
|
|
+CONFIG_USE_PREBOOT=y
|
|
+CONFIG_PREBOOT="pci enum; usb start;"
|
|
CONFIG_MISC_INIT_R=y
|
|
# CONFIG_DISPLAY_CPUINFO is not set
|
|
# CONFIG_DISPLAY_BOARDINFO is not set
|
|
@@ -15,6 +17,8 @@ CONFIG_SYS_PROMPT="U-Boot> "
|
|
CONFIG_CMD_DFU=y
|
|
CONFIG_CMD_GPIO=y
|
|
CONFIG_CMD_MMC=y
|
|
+CONFIG_CMD_PCI=y
|
|
+CONFIG_CMD_USB=y
|
|
CONFIG_CMD_FS_UUID=y
|
|
CONFIG_OF_BOARD=y
|
|
CONFIG_ENV_FAT_INTERFACE="mmc"
|
|
@@ -28,6 +32,9 @@ CONFIG_MMC_SDHCI=y
|
|
CONFIG_MMC_SDHCI_BCM2835=y
|
|
CONFIG_DM_ETH=y
|
|
CONFIG_BCMGENET=y
|
|
+CONFIG_PCI=y
|
|
+CONFIG_DM_PCI=y
|
|
+CONFIG_PCI_BRCMSTB=y
|
|
CONFIG_PINCTRL=y
|
|
# CONFIG_PINCTRL_GENERIC is not set
|
|
# CONFIG_REQUIRE_SERIAL_CONSOLE is not set
|
|
@@ -40,6 +47,8 @@ CONFIG_USB_GADGET_VENDOR_NUM=0x0525
|
|
CONFIG_USB_GADGET_PRODUCT_NUM=0xa4a5
|
|
CONFIG_USB_GADGET_DWC2_OTG=y
|
|
CONFIG_USB_GADGET_DOWNLOAD=y
|
|
+CONFIG_USB_XHCI_HCD=y
|
|
+CONFIG_USB_XHCI_PCI=y
|
|
CONFIG_DM_VIDEO=y
|
|
# CONFIG_VIDEO_BPP8 is not set
|
|
# CONFIG_VIDEO_BPP16 is not set
|
|
diff --git a/configs/rpi_4_defconfig b/configs/rpi_4_defconfig
|
|
index 6d148dab07..5051b8812f 100644
|
|
--- a/configs/rpi_4_defconfig
|
|
+++ b/configs/rpi_4_defconfig
|
|
@@ -8,6 +8,8 @@ CONFIG_NR_DRAM_BANKS=2
|
|
CONFIG_DISTRO_DEFAULTS=y
|
|
CONFIG_OF_BOARD_SETUP=y
|
|
# CONFIG_ARCH_FIXUP_FDT_MEMORY is not set
|
|
+CONFIG_USE_PREBOOT=y
|
|
+CONFIG_PREBOOT="pci enum; usb start;"
|
|
CONFIG_MISC_INIT_R=y
|
|
# CONFIG_DISPLAY_CPUINFO is not set
|
|
# CONFIG_DISPLAY_BOARDINFO is not set
|
|
@@ -15,6 +17,8 @@ CONFIG_SYS_PROMPT="U-Boot> "
|
|
CONFIG_CMD_DFU=y
|
|
CONFIG_CMD_GPIO=y
|
|
CONFIG_CMD_MMC=y
|
|
+CONFIG_CMD_PCI=y
|
|
+CONFIG_CMD_USB=y
|
|
CONFIG_CMD_FS_UUID=y
|
|
CONFIG_OF_BOARD=y
|
|
CONFIG_ENV_FAT_INTERFACE="mmc"
|
|
@@ -28,6 +32,9 @@ CONFIG_MMC_SDHCI=y
|
|
CONFIG_MMC_SDHCI_BCM2835=y
|
|
CONFIG_DM_ETH=y
|
|
CONFIG_BCMGENET=y
|
|
+CONFIG_PCI=y
|
|
+CONFIG_DM_PCI=y
|
|
+CONFIG_PCI_BRCMSTB=y
|
|
CONFIG_PINCTRL=y
|
|
# CONFIG_PINCTRL_GENERIC is not set
|
|
# CONFIG_REQUIRE_SERIAL_CONSOLE is not set
|
|
@@ -40,6 +47,8 @@ CONFIG_USB_GADGET_VENDOR_NUM=0x0525
|
|
CONFIG_USB_GADGET_PRODUCT_NUM=0xa4a5
|
|
CONFIG_USB_GADGET_DWC2_OTG=y
|
|
CONFIG_USB_GADGET_DOWNLOAD=y
|
|
+CONFIG_USB_XHCI_HCD=y
|
|
+CONFIG_USB_XHCI_PCI=y
|
|
CONFIG_DM_VIDEO=y
|
|
# CONFIG_VIDEO_BPP8 is not set
|
|
# CONFIG_VIDEO_BPP16 is not set
|
|
diff --git a/configs/rpi_arm64_defconfig b/configs/rpi_arm64_defconfig
|
|
index fea86be8b0..f12d1e340c 100644
|
|
--- a/configs/rpi_arm64_defconfig
|
|
+++ b/configs/rpi_arm64_defconfig
|
|
@@ -7,13 +7,14 @@ CONFIG_NR_DRAM_BANKS=2
|
|
CONFIG_DISTRO_DEFAULTS=y
|
|
CONFIG_OF_BOARD_SETUP=y
|
|
CONFIG_USE_PREBOOT=y
|
|
-CONFIG_PREBOOT="usb start"
|
|
+CONFIG_PREBOOT="pci enum; usb start;"
|
|
CONFIG_MISC_INIT_R=y
|
|
# CONFIG_DISPLAY_CPUINFO is not set
|
|
# CONFIG_DISPLAY_BOARDINFO is not set
|
|
CONFIG_SYS_PROMPT="U-Boot> "
|
|
CONFIG_CMD_GPIO=y
|
|
CONFIG_CMD_MMC=y
|
|
+CONFIG_CMD_PCI=y
|
|
CONFIG_CMD_USB=y
|
|
CONFIG_CMD_FS_UUID=y
|
|
CONFIG_OF_BOARD=y
|
|
@@ -26,11 +27,16 @@ CONFIG_MMC_SDHCI=y
|
|
CONFIG_MMC_SDHCI_BCM2835=y
|
|
CONFIG_DM_ETH=y
|
|
CONFIG_BCMGENET=y
|
|
+CONFIG_PCI=y
|
|
+CONFIG_DM_PCI=y
|
|
+CONFIG_PCI_BRCMSTB=y
|
|
CONFIG_PINCTRL=y
|
|
# CONFIG_PINCTRL_GENERIC is not set
|
|
# CONFIG_REQUIRE_SERIAL_CONSOLE is not set
|
|
CONFIG_USB=y
|
|
CONFIG_DM_USB=y
|
|
+CONFIG_USB_XHCI_HCD=y
|
|
+CONFIG_USB_XHCI_PCI=y
|
|
CONFIG_USB_DWC2=y
|
|
CONFIG_USB_KEYBOARD=y
|
|
CONFIG_USB_HOST_ETHER=y
|