-
Notifications
You must be signed in to change notification settings - Fork 76
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #1183 from balena-os/update_uboot_patches_as_per_y…
…octo_requirements u-boot: Correct patches' Upstream-Status
- Loading branch information
Showing
7 changed files
with
7 additions
and
7 deletions.
There are no files selected for viewing
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 |
---|---|---|
|
@@ -9,7 +9,7 @@ thus preventing the board from booting. | |
|
||
Let's add a retry count to unblock in such cases. | ||
|
||
Upstream-status: Inappropriate [configuration] | ||
Upstream-Status: Inappropriate [configuration] | ||
Signed-off-by: Alexandru Costache <[email protected]> | ||
--- | ||
drivers/serial/serial_bcm283x_mu.c | 12 +++++++++--- | ||
|
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 |
---|---|---|
|
@@ -10,7 +10,7 @@ executed without reason when booting | |
from sd-card, IF "usb" is also present | ||
in resin_uboot_device_types array. | ||
|
||
Upstream-status: Inappropriate[configuration] | ||
Upstream-Status: Inappropriate [configuration] | ||
Signed-off-by: Alexandru Costache <[email protected]> | ||
--- | ||
include/configs/rpi.h | 3 ++- | ||
|
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 |
---|---|---|
|
@@ -5,7 +5,7 @@ Subject: [PATCH] Revert "remove include/config_defaults.h" | |
|
||
This reverts commit 5c6a4d5a2779d7c2611319076d9aa4a23981855f. | ||
|
||
Upstream-status: Inappropriate [configuration] | ||
Upstream-Status: Inappropriate [configuration] | ||
Signed-off-by: Alexandru Costache <[email protected]> | ||
--- | ||
include/config_defaults.h | 12 ++++++++++++ | ||
|
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 |
---|---|---|
|
@@ -13,7 +13,7 @@ u-boot won't crash or reset. | |
Rebased from last patch in this series: | ||
http://u-boot.10912.n7.nabble.com/RFC-PATCH-v2-0-5-Improve-USB-Keyboard-support-for-rpi3-rpi4-td418314.html#a418316 | ||
|
||
Upstream-status: Pending | ||
Upstream-Status: Pending | ||
Signed-off-by: Alexandru Costache <[email protected]> | ||
--- | ||
drivers/usb/host/xhci-ring.c | 15 +++++++++++---- | ||
|
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 |
---|---|---|
|
@@ -6,7 +6,7 @@ Subject: [PATCH] include/configs: Use config defaults | |
Upstream does not include the config defaults | ||
as added by meta-balena. Let's include them. | ||
|
||
Upstream-status: Inappropriate[configuration] | ||
Upstream-Status: Inappropriate [configuration] | ||
Signed-off-by: Alexandru Costache <[email protected]> | ||
--- | ||
include/configs/rpi.h | 6 ++++++ | ||
|
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 |
---|---|---|
|
@@ -8,7 +8,7 @@ to the console if uart has been disabled or is incorrectly | |
configured. Let's add a retry timeout and give up if impossible | ||
to put chars on the line, like we did for bcm283x_mu. | ||
|
||
Upstream-status: Inappropriate [configuration] | ||
Upstream-Status: Inappropriate [configuration] | ||
Signed-off-by: Alexandru Costache <[email protected]> | ||
--- | ||
drivers/serial/serial_pl01x.c | 11 +++++++++-- | ||
|
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 |
---|---|---|
|
@@ -9,7 +9,7 @@ This config was removed from rpi.h and moved to the defconfigs, | |
so we add it back for all PIs except for Pi4 and Pi400 where | ||
there were requests to boot from USB drives. | ||
|
||
Upstream-status: Inappropriate [configuration] | ||
Upstream-Status: Inappropriate [configuration] | ||
Signed-off-by: Alexandru Costache <[email protected]> | ||
--- | ||
configs/rpi_0_w_defconfig | 2 +- | ||
|