-
-
Notifications
You must be signed in to change notification settings - Fork 10
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- Loading branch information
Showing
10 changed files
with
119 additions
and
207 deletions.
There are no files selected for viewing
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,23 @@ | ||
| CONFIG_DEFAULT_DEVICE_TREE="bcm2836-rpi-2-b" | ||
|
|
||
| # keep serial enabled | ||
| CONFIG_SERIAL_PRESENT=y | ||
|
|
||
| CONFIG_USB_GADGET=y | ||
| CONFIG_USB_GADGET_MANUFACTURER="RaspberryPi" | ||
| CONFIG_USB_GADGET_VENDOR_NUM=0x0a5c | ||
| CONFIG_USB_GADGET_PRODUCT_NUM=0x000e | ||
| CONFIG_USB_GADGET_DOWNLOAD=y | ||
|
|
||
| CONFIG_CMD_NVME=y | ||
|
|
||
| CONFIG_USB_STORAGE=y | ||
| CONFIG_USB_FUNCTION_MASS_STORAGE=y | ||
| CONFIG_USB_EHCI_HCD=y | ||
| CONFIG_USB_EHCI_GENERIC=y | ||
| CONFIG_USB_OHCI_HCD=y | ||
|
|
||
| CONFIG_USB_XHCI_BRCM=y | ||
|
|
||
| CONFIG_NVME=y | ||
| CONFIG_NVME_PCI=y |
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,10 +1,8 @@ | ||
| From febaf077f14b86da1edaa01abee2d0bfcf7bdece Mon Sep 17 00:00:00 2001 | ||
| Message-Id: <febaf077f14b86da1edaa01abee2d0bfcf7bdece.1609281882.git.stefan@agner.ch> | ||
| In-Reply-To: <3651b4af52d63d4e37f40c7a6d0809b0a6c9dd73.1609281882.git.stefan@agner.ch> | ||
| References: <3651b4af52d63d4e37f40c7a6d0809b0a6c9dd73.1609281882.git.stefan@agner.ch> | ||
| From 57188c09ac02bfa61cce55932ccba43ec7210e54 Mon Sep 17 00:00:00 2001 | ||
| Message-Id: <57188c09ac02bfa61cce55932ccba43ec7210e54.1677499675.git.stefan@agner.ch> | ||
| From: Pascal Vizeli <[email protected]> | ||
| Date: Tue, 2 Jun 2020 21:20:08 +0000 | ||
| Subject: [PATCH 8/8] ARM: dts: bcm283x: add compatible picked up by U-Boot | ||
| Subject: [PATCH] ARM: dts: bcm283x: add compatible picked up by U-Boot | ||
|
|
||
| Without brcm,bcm2835-pl011 in compatible U-Boot uses the regular PL011 | ||
| driver which seems to crash when enable_uart=1 is not used. Using | ||
|
|
@@ -14,15 +12,15 @@ not using that compatible string. | |
| Signed-off-by: Pascal Vizeli <[email protected]> | ||
| Signed-off-by: Stefan Agner <[email protected]> | ||
| --- | ||
| arch/arm/boot/dts/bcm2711.dtsi | 8 ++++---- | ||
| arch/arm/boot/dts/bcm283x.dtsi | 2 +- | ||
| arch/arm/boot/dts/broadcom/bcm2711.dtsi | 8 ++++---- | ||
| arch/arm/boot/dts/broadcom/bcm283x.dtsi | 2 +- | ||
| 2 files changed, 5 insertions(+), 5 deletions(-) | ||
|
|
||
| diff --git a/arch/arm/boot/dts/bcm2711.dtsi b/arch/arm/boot/dts/bcm2711.dtsi | ||
| index 4f87bb4fd3d1..12f0d90e8957 100644 | ||
| --- a/arch/arm/boot/dts/bcm2711.dtsi | ||
| +++ b/arch/arm/boot/dts/bcm2711.dtsi | ||
| @@ -110,7 +110,7 @@ | ||
| diff --git a/arch/arm/boot/dts/broadcom/bcm2711.dtsi b/arch/arm/boot/dts/broadcom/bcm2711.dtsi | ||
| index 941c4d16791b..3cd49fa4bafd 100644 | ||
| --- a/arch/arm/boot/dts/broadcom/bcm2711.dtsi | ||
| +++ b/arch/arm/boot/dts/broadcom/bcm2711.dtsi | ||
| @@ -128,7 +128,7 @@ rng@7e104000 { | ||
| }; | ||
|
|
||
| uart2: serial@7e201400 { | ||
|
|
@@ -31,7 +29,7 @@ index 4f87bb4fd3d1..12f0d90e8957 100644 | |
| reg = <0x7e201400 0x200>; | ||
| interrupts = <GIC_SPI 121 IRQ_TYPE_LEVEL_HIGH>; | ||
| clocks = <&clocks BCM2835_CLOCK_UART>, | ||
| @@ -121,7 +121,7 @@ | ||
| @@ -139,7 +139,7 @@ uart2: serial@7e201400 { | ||
| }; | ||
|
|
||
| uart3: serial@7e201600 { | ||
|
|
@@ -40,7 +38,7 @@ index 4f87bb4fd3d1..12f0d90e8957 100644 | |
| reg = <0x7e201600 0x200>; | ||
| interrupts = <GIC_SPI 121 IRQ_TYPE_LEVEL_HIGH>; | ||
| clocks = <&clocks BCM2835_CLOCK_UART>, | ||
| @@ -132,7 +132,7 @@ | ||
| @@ -150,7 +150,7 @@ uart3: serial@7e201600 { | ||
| }; | ||
|
|
||
| uart4: serial@7e201800 { | ||
|
|
@@ -49,7 +47,7 @@ index 4f87bb4fd3d1..12f0d90e8957 100644 | |
| reg = <0x7e201800 0x200>; | ||
| interrupts = <GIC_SPI 121 IRQ_TYPE_LEVEL_HIGH>; | ||
| clocks = <&clocks BCM2835_CLOCK_UART>, | ||
| @@ -143,7 +143,7 @@ | ||
| @@ -161,7 +161,7 @@ uart4: serial@7e201800 { | ||
| }; | ||
|
|
||
| uart5: serial@7e201a00 { | ||
|
|
@@ -58,11 +56,11 @@ index 4f87bb4fd3d1..12f0d90e8957 100644 | |
| reg = <0x7e201a00 0x200>; | ||
| interrupts = <GIC_SPI 121 IRQ_TYPE_LEVEL_HIGH>; | ||
| clocks = <&clocks BCM2835_CLOCK_UART>, | ||
| diff --git a/arch/arm/boot/dts/bcm283x.dtsi b/arch/arm/boot/dts/bcm283x.dtsi | ||
| index 4426f9e6ba92..abcf677fe416 100644 | ||
| --- a/arch/arm/boot/dts/bcm283x.dtsi | ||
| +++ b/arch/arm/boot/dts/bcm283x.dtsi | ||
| @@ -306,7 +306,7 @@ | ||
| diff --git a/arch/arm/boot/dts/broadcom/bcm283x.dtsi b/arch/arm/boot/dts/broadcom/bcm283x.dtsi | ||
| index d2d9c6e67f39..7b9a2e8cf529 100644 | ||
| --- a/arch/arm/boot/dts/broadcom/bcm283x.dtsi | ||
| +++ b/arch/arm/boot/dts/broadcom/bcm283x.dtsi | ||
| @@ -302,7 +302,7 @@ uart1_ctsrts_gpio42: uart1_ctsrts_gpio42 { | ||
| }; | ||
|
|
||
| uart0: serial@7e201000 { | ||
|
|
@@ -72,5 +70,5 @@ index 4426f9e6ba92..abcf677fe416 100644 | |
| interrupts = <2 25>; | ||
| clocks = <&clocks BCM2835_CLOCK_UART>, | ||
| -- | ||
| 2.29.2 | ||
| 2.39.1 | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,38 @@ | ||
| # CONFIG_LOCALVERSION_AUTO is not set | ||
| CONFIG_DISTRO_DEFAULTS=y | ||
| CONFIG_EXPERT=y | ||
| # CONFIG_DISPLAY_CPUINFO is not set | ||
| # CONFIG_DISPLAY_BOARDINFO is not set | ||
| CONFIG_BOOTDELAY=-2 | ||
| CONFIG_SYS_PROMPT="TR> " | ||
| CONFIG_DOS_PARTITION=y | ||
| # CONFIG_ISO_PARTITION is not set | ||
| # CONFIG_EFI_PARTITION is not set | ||
| CONFIG_FS_EXT4=y | ||
| CONFIG_FS_FAT=y | ||
| # CONFIG_ENV_IS_IN_FAT is not set | ||
| # CONFIG_ENV_IS_IN_EXT4 is not set | ||
| # CONFIG_ENV_IS_IN_MMC is not set | ||
| CONFIG_ENV_IS_NOWHERE=y | ||
| # CONFIG_EFI_LOADER is not set | ||
| CONFIG_CMD_SETEXPR=y | ||
| CONFIG_AUTOBOOT_KEYED=y | ||
| CONFIG_AUTOBOOT_PROMPT="Hit <CTRL-X> to stop autoboot in %2ds\n" | ||
| CONFIG_AUTOBOOT_DELAY_STR="\x18" | ||
| CONFIG_BOOT_RETRY=y | ||
| CONFIG_BOOT_RETRY_TIME=20 | ||
| CONFIG_RESET_TO_RETRY=y | ||
| CONFIG_SILENT_CONSOLE=y | ||
| CONFIG_SPL_SILENT_CONSOLE=y | ||
| CONFIG_TPL_SILENT_CONSOLE=y | ||
| CONFIG_SILENT_U_BOOT_ONLY=y | ||
| CONFIG_DISPLAY_BOARDINFO=y | ||
| # CONFIG_REQUIRE_SERIAL_CONSOLE is not set | ||
| # CONFIG_SERIAL_PRESENT is not set | ||
| CONFIG_USB_EHCI_HCD=y | ||
| CONFIG_USB_EHCI_GENERIC=y | ||
| CONFIG_USB_OHCI_HCD=y | ||
| # CONFIG_VIDEO_LOGO is not set | ||
| CONFIG_USB_FUNCTION_MASS_STORAGE=y | ||
| CONFIG_ERRNO_STR=y | ||
| CONFIG_LZ4=y |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.