rpms
/
uboot-tools
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

2020.10

This commit is contained in:
Peter Robinson 2020-10-07 11:14:09 +01:00
parent cfe13af2a5
commit 68cd2ba55a
3 changed files with 12 additions and 54 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
0001-Define-default-CONFIG_PREBOOT-with-right-config-opti.patch
View File

@ -1,42 +0,0 @@
From 5cd7e94ea67d13d16628af865ae68b8fbc6ef62a Mon Sep 17 00:00:00 2001
From: Peter Robinson <pbrobinson@gmail.com>
Date: Tue, 29 Sep 2020 10:44:07 +0100
Subject: [PATCH] Define default CONFIG_PREBOOT with right config option
The 44758771ee commit removes CONFIG_PREBOOT but actually sets the USE_PREBOOT
Kconfig option which isn't CONFIG_PREBOOT and is also a bool option which means
we regress because 'usb start' isn't run when expected, it should also be run
for devices that have USB storage because keyboards aren't the only thing we
might need the USB bus for.
Fixes: 44758771ee ("arm: move CONFIG_PREBOOT="usb start" to KConfig")
Signed-off-by: Peter Robinson <pbrobinson@gmail.com>
Cc: Jonas Smedegaard <dr@jones.dk>
Cc: Neil Armstrong <narmstrong@baylibre.com>
---
common/Kconfig | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/common/Kconfig b/common/Kconfig
index b1934b3a9c..9c20a9738e 100644
--- a/common/Kconfig
+++ b/common/Kconfig
@@ -403,7 +403,6 @@ config BOOTCOMMAND
config USE_PREBOOT
bool "Enable preboot"
- default "usb start" if USB_KEYBOARD
help
When this option is enabled, the existence of the environment
variable "preboot" will be checked immediately before starting the
@@ -417,6 +416,7 @@ config USE_PREBOOT
config PREBOOT
string "preboot default value"
depends on USE_PREBOOT && !USE_DEFAULT_ENV_FILE
+ default "usb start" if USB_KEYBOARD || USB_STORAGE
default ""
help
This is the default of "preboot" environment variable.
--
2.26.2

2
sources
View File

@ -1 +1 @@
SHA512 (u-boot-2020.10-rc5.tar.bz2) = 8c0f6cceca4aeb67a51743886d65e420d95a70cc427acd17ac81281cad996339a9b376994ff76e46cb862d54797269da52dd05dfc7e12c8c271ed7aca828e2b4
SHA512 (u-boot-2020.10.tar.bz2) = fd26534f2d72ffc3167919c32067c550636f6a4ee5fead6937e2583ba4ff6165e88b8b50fbbddde7354a8c42701433d0cb2ce982e43c014db60b08415288baf9

22
uboot-tools.spec
View File

@ -1,8 +1,8 @@
%global candidate rc5
#global candidate rc5
Name: uboot-tools
Version: 2020.10
Release: 0.6%{?candidate:.%{candidate}}%{?dist}
Release: 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
@ -36,8 +36,7 @@ Patch12: 0001-Fix-BeagleAI-detection.patch
Patch13: arm-rk3399-enable-rng-on-rock960-and-firefly3399.patch
Patch14: rk3399-Pinebook-pro-EDP-support.patch
Patch15: rk3399-reset-display-hack.patch
Patch16: 0001-Define-default-CONFIG_PREBOOT-with-right-config-opti.patch
Patch17: rockchip-Rock960-Fix-up-USB-support.patch
Patch16: rockchip-Rock960-Fix-up-USB-support.patch
BuildRequires: bc
BuildRequires: dtc
@ -48,7 +47,7 @@ BuildRequires: devtoolset-7-build
BuildRequires: devtoolset-7-binutils
BuildRequires: devtoolset-7-gcc
BuildRequires: python2-devel
BuildRequires: python3-setuptools
BuildRequires: python2-setuptools
BuildRequires: python2-libfdt
%else
BuildRequires: gcc
@ -80,22 +79,20 @@ and fw_printenv/fw_setenv for manipulating the boot environment variables.
%ifarch aarch64
%package -n uboot-images-armv8
Summary: u-boot bootloader images for aarch64 boards
Requires: uboot-tools
Summary: U-Boot firmware images for aarch64 boards
BuildArch: noarch
%description -n uboot-images-armv8
u-boot bootloader binaries for aarch64 boards
U-Boot firmware binaries for aarch64 boards
%endif
%ifarch %{arm}
%package -n uboot-images-armv7
Summary: u-boot bootloader images for armv7 boards
Requires: uboot-tools
Summary: U-Boot firmware images for armv7 boards
BuildArch: noarch
%description -n uboot-images-armv7
u-boot bootloader binaries for armv7 boards
U-Boot firmware binaries for armv7 boards
%endif
%prep
@ -251,6 +248,9 @@ cp -p board/warp7/README builds/docs/README.warp7
%endif
%changelog
* Tue Oct 06 2020 Peter Robinson <pbrobinson@fedoraproject.org> - 2020.10-1
- Update to 2020.10
* Sun Sep 27 2020 Peter Robinson <pbrobinson@fedoraproject.org> - 2020.10-0.6.rc5
- Initial support for display output on Pinebook Pro