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

uEFI improvements, Fixes for Rockchips rk33xx 64 bit devices, Build AllWinner 64 bit devices against new ATF

Browse Source
This commit is contained in:
Peter Robinson 2018-04-26 17:36:41 +01:00
parent c24d544f08
commit d8dcaeaa21
6 changed files with 1398 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
rk33xx-enable-make-itb.patch
View File

@ -1,7 +1,7 @@
From 5245a38260ff414e054d2f987907710f46e5a2e0 Mon Sep 17 00:00:00 2001
From e1f184f835291f46220d1fb6c0e54d62822803c0 Mon Sep 17 00:00:00 2001
From: Peter Robinson <pbrobinson@gmail.com>
Date: Sun, 25 Feb 2018 19:15:39 +0000
Subject: [PATCH] config: evb-rk3399: enable make itb
Date: Wed, 25 Apr 2018 10:48:19 +0100
Subject: [PATCH 2/2] config: evb-rk3399: enable make uboot.itb
Similar to firefly 3399 enable the ability to create a FIT image
with combined arm-trusted-firmware.
@ -12,22 +12,26 @@ Signed-off-by: Peter Robinson <pbrobinson@gmail.com>
1 file changed, 3 insertions(+)
diff --git a/configs/evb-rk3399_defconfig b/configs/evb-rk3399_defconfig
index b5ae073224..bf81b2f93a 100644
index b36f232dcb..67ba0ce015 100644
--- a/configs/evb-rk3399_defconfig
+++ b/configs/evb-rk3399_defconfig
@@ -11,9 +11,12 @@ CONFIG_DEFAULT_DEVICE_TREE="rk3399-evb"
@@ -11,6 +11,7 @@ CONFIG_DEFAULT_DEVICE_TREE="rk3399-evb"
CONFIG_DEBUG_UART=y
CONFIG_FIT=y
CONFIG_SPL_LOAD_FIT=y
+CONFIG_SPL_FIT_GENERATOR="arch/arm/mach-rockchip/make_fit_atf.py"
# CONFIG_DISPLAY_CPUINFO is not set
CONFIG_DISPLAY_BOARDINFO_LATE=y
CONFIG_SPL_STACK_R=y
CONFIG_SPL_STACK_R_MALLOC_SIMPLE_LEN=0x4000
@@ -25,6 +26,8 @@ CONFIG_CMD_TIME=y
CONFIG_SPL_OF_CONTROL=y
CONFIG_OF_SPL_REMOVE_PROPS="pinctrl-0 pinctrl-names clock-names interrupt-parent assigned-clocks assigned-clock-rates assigned-clock-parents"
CONFIG_SPL_OF_PLATDATA=y
+CONFIG_SPL_ATF=y
+CONFIG_SPL_ATF_NO_PLATFORM_PARAM=y
CONFIG_CMD_BOOTZ=y
CONFIG_CMD_GPT=y
CONFIG_CMD_MMC=y
CONFIG_ENV_IS_IN_MMC=y
CONFIG_NET_RANDOM_ETHADDR=y
CONFIG_REGMAP=y
--
2.14.3
2.17.0

5
rk33xx-make_fit_atf-fix.patch
View File

@ -1,4 +1,4 @@
From 319f90eb72054efc5022cc2183496fd7801a4e1e Mon Sep 17 00:00:00 2001
From 72ba581632c53ad16d1b7174ac507fb7b0ee47c1 Mon Sep 17 00:00:00 2001
From: Patrick Uiterwijk <patrick@puiterwijk.org>
Date: Wed, 14 Feb 2018 01:29:42 +0100
Subject: [PATCH 1/2] arm: rockchip: make_fit_atf: remove unneeded imports
@ -25,4 +25,5 @@ index 7c6dd57678..9a404d1d32 100755
ELF_SEG_P_TYPE='p_type'
ELF_SEG_P_PADDR='p_paddr'
--
2.14.3
2.17.0

103
rockchip-make_fit_atf-fix-warning-unit_address_vs_reg.patch Normal file
View File

@ -0,0 +1,103 @@
From patchwork Thu Apr 26 06:43:06 2018
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: [U-Boot] rockchip: make_fit_atf: fix warning unit_address_vs_reg
X-Patchwork-Submitter: Kever Yang <kever.yang@rock-chips.com>
X-Patchwork-Id: 904884
Message-Id: <1524724986-28497-1-git-send-email-kever.yang@rock-chips.com>
To: u-boot@lists.denx.de
Date: Thu, 26 Apr 2018 14:43:06 +0800
From: Kever Yang <kever.yang@rock-chips.com>
List-Id: U-Boot discussion <u-boot.lists.denx.de>
Patch fix warning:
/builddir/BUILD/u-boot-2018.05-rc2/"arch/arm/mach-rockchip/make_fit_atf.py" \
arch/arm/dts/rk3399-firefly.dtb > u-boot.its
./tools/mkimage -f u-boot.its -E u-boot.itb >/dev/null && cat
/dev/null
u-boot.itb.tmp: Warning (unit_address_vs_reg): Node /images/uboot@1
has a unit name, but no reg property
u-boot.itb.tmp: Warning (unit_address_vs_reg): Node /images/atf@1 has
a unit name, but no reg property
u-boot.itb.tmp: Warning (unit_address_vs_reg): Node /images/atf@2 has
a unit name, but no reg property
u-boot.itb.tmp: Warning (unit_address_vs_reg): Node /images/atf@3 has
a unit name, but no reg property
u-boot.itb.tmp: Warning (unit_address_vs_reg): Node /images/fdt@1 has
a unit name, but no reg property
u-boot.itb.tmp: Warning (unit_address_vs_reg): Node
/configurations/config@1 has a unit name, but no reg property
make[1]: Leaving directory
'/builddir/BUILD/u-boot-2018.05-rc2/builds/firefly-rk3399'
Reported-by: Peter Robinson <pbrobinson@gmail.com>
Signed-off-by: Kever Yang <kever.yang@rock-chips.com>
---
arch/arm/mach-rockchip/make_fit_atf.py | 18 +++++++++---------
1 file changed, 9 insertions(+), 9 deletions(-)
diff --git a/arch/arm/mach-rockchip/make_fit_atf.py b/arch/arm/mach-rockchip/make_fit_atf.py
index 7c6dd57..513e088 100755
--- a/arch/arm/mach-rockchip/make_fit_atf.py
+++ b/arch/arm/mach-rockchip/make_fit_atf.py
@@ -37,7 +37,7 @@ DT_HEADER="""/*
#address-cells = <1>;
images {
- uboot@1 {
+ uboot {
description = "U-Boot (64-bit)";
data = /incbin/("u-boot-nodtb.bin");
type = "standalone";
@@ -61,7 +61,7 @@ def append_atf_node(file, atf_index, phy_addr):
Append ATF DT node to input FIT dts file.
"""
data = 'bl31_0x%08x.bin' % phy_addr
- print >> file, '\t\tatf@%d {' % atf_index
+ print >> file, '\t\tatf_%d {' % atf_index
print >> file, '\t\t\tdescription = \"ARM Trusted Firmware\";'
print >> file, '\t\t\tdata = /incbin/("%s");' % data
print >> file, '\t\t\ttype = "firmware";'
@@ -81,7 +81,7 @@ def append_fdt_node(file, dtbs):
cnt = 1
for dtb in dtbs:
dtname = os.path.basename(dtb)
- print >> file, '\t\tfdt@%d {' % cnt
+ print >> file, '\t\tfdt_%d {' % cnt
print >> file, '\t\t\tdescription = "%s";' % dtname
print >> file, '\t\t\tdata = /incbin/("%s");' % dtb
print >> file, '\t\t\ttype = "flat_dt";'
@@ -91,17 +91,17 @@ def append_fdt_node(file, dtbs):
cnt = cnt + 1
def append_conf_section(file, cnt, dtname, atf_cnt):
- print >> file, '\t\tconfig@%d {' % cnt
+ print >> file, '\t\tconfig_%d {' % cnt
print >> file, '\t\t\tdescription = "%s";' % dtname
- print >> file, '\t\t\tfirmware = "atf@1";'
- print >> file, '\t\t\tloadables = "uboot@1",',
+ print >> file, '\t\t\tfirmware = "atf_1";'
+ print >> file, '\t\t\tloadables = "uboot",',
for i in range(1, atf_cnt):
- print >> file, '"atf@%d"' % (i+1),
+ print >> file, '"atf_%d"' % (i+1),
if i != (atf_cnt - 1):
print >> file, ',',
else:
print >> file, ';'
- print >> file, '\t\t\tfdt = "fdt@1";'
+ print >> file, '\t\t\tfdt = "fdt_1";'
print >> file, '\t\t};'
print >> file, ''
@@ -111,7 +111,7 @@ def append_conf_node(file, dtbs, atf_cnt):
"""
cnt = 1
print >> file, '\tconfigurations {'
- print >> file, '\t\tdefault = "config@1";'
+ print >> file, '\t\tdefault = "config_1";'
for dtb in dtbs:
dtname = os.path.basename(dtb)
append_conf_section(file, cnt, dtname, atf_cnt)

26
tegra186-jetson-tx2-disable-onboard-emmc.patch Normal file
View File

@ -0,0 +1,26 @@
From dbe4dff86520a1373076563d1bee5ada1d7fd7c5 Mon Sep 17 00:00:00 2001
From: Peter Robinson <pbrobinson@gmail.com>
Date: Thu, 26 Apr 2018 16:56:54 +0100
Subject: [PATCH] tegra186: jetson-tx2: disable onboard emmc
Signed-off-by: Peter Robinson <pbrobinson@gmail.com>
---
arch/arm/dts/tegra186-p2771-0000.dtsi | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/arch/arm/dts/tegra186-p2771-0000.dtsi b/arch/arm/dts/tegra186-p2771-0000.dtsi
index a1319dc493..e220f086ee 100644
--- a/arch/arm/dts/tegra186-p2771-0000.dtsi
+++ b/arch/arm/dts/tegra186-p2771-0000.dtsi
@@ -53,7 +53,7 @@
};
sdhci@3460000 {
- status = "okay";
+ status = "disabled";
bus-width = <8>;
non-removable;
};
--
2.17.0

28
uboot-tools.spec
View File

@ -2,7 +2,7 @@
Name: uboot-tools
Version: 2018.05
Release: 0.2%{?candidate:.%{candidate}}%{?dist}
Release: 0.3%{?candidate:.%{candidate}}%{?dist}
Summary: U-Boot utilities
License: GPLv2+ BSD LGPL-2.1+ LGPL-2.0+
URL: http://www.denx.de/wiki/U-Boot
@ -20,15 +20,18 @@ Patch1: uefi-use-Fedora-specific-path-name.patch
# general fixes
Patch2: uefi-distro-load-FDT-from-any-partition-on-boot-device.patch
Patch3: usb-kbd-fixes.patch
Patch4: rk33xx-make_fit_atf-fix.patch
#Patch5: rk33xx-enable-make-itb.patch
Patch4: uefi-upstream-test.patch
# Board fixes and enablement
Patch10: dragonboard-fixes.patch
Patch12: mx6cuboxi-add-support-for-detecting-Revision-1.5-SoM.patch
Patch13: rpi-Enable-using-the-DT-provided-by-the-Raspberry-Pi.patch
Patch19: mmc-mv_sdhci-zero-out-sdhci_host-structure.patch
Patch21: sunxi-improve-throughput-in-the-sunxi_mmc-driver.patch
Patch11: mx6cuboxi-add-support-for-detecting-Revision-1.5-SoM.patch
Patch12: dragonboard-fixes.patch
#Patch13: pi-Enable-using-the-DT-provided-by-the-Raspberry-Pi.patch
Patch14: rk33xx-make_fit_atf-fix.patch
Patch15: rk33xx-enable-make-itb.patch
Patch16: rockchip-make_fit_atf-fix-warning-unit_address_vs_reg.patch
Patch17: mmc-mv_sdhci-zero-out-sdhci_host-structure.patch
Patch18: sunxi-improve-throughput-in-the-sunxi_mmc-driver.patch
Patch19: tegra186-jetson-tx2-disable-onboard-emmc.patch
# Patch99: mvebu-enable-generic-distro-boot-config.patch
@ -130,6 +133,8 @@ do
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)/
builds/$(echo $board)/tools/mkimage -n rk3399 -T rksd -d builds/$(echo $board)/spl/u-boot-spl.bin builds/$(echo $board)/spl_sd.img
builds/$(echo $board)/tools/mkimage -n rk3399 -T rkspi -d builds/$(echo $board)/spl/u-boot-spl.bin builds/$(echo $board)/spl_spi.img
fi
done
@ -192,7 +197,7 @@ done
for board in $(cat %{_arch}-boards)
do
mkdir -p $RPM_BUILD_ROOT%{_datadir}/uboot/$(echo $board)/
for file in MLO SPL spl/arndale-spl.bin spl/origen-spl.bin spl/smdkv310-spl.bin u-boot.bin u-boot.dtb u-boot-dtb-tegra.bin u-boot.img u-boot.imx u-boot-nodtb-tegra.bin u-boot-spl.kwb u-boot-sunxi-with-spl.bin
for file in MLO SPL spl/arndale-spl.bin spl/origen-spl.bin spl/smdkv310-spl.bin u-boot.bin u-boot.dtb u-boot-dtb-tegra.bin u-boot.img u-boot.imx u-boot-nodtb-tegra.bin u-boot-spl.kwb u-boot-sunxi-with-spl.bin spl_sd.img spl_spi.img
do
if [ -f builds/$(echo $board)/$(echo $file) ]; then
install -p -m 0644 builds/$(echo $board)/$(echo $file) $RPM_BUILD_ROOT%{_datadir}/uboot/$(echo $board)/
@ -289,6 +294,11 @@ cp -p board/warp7/README builds/docs/README.warp7
%endif
%changelog
* Thu Apr 26 2018 Peter Robinson <pbrobinson@fedoraproject.org> 2018.05-0.3-rc2
- uEFI improvements
- Fixes for Rockchips rk33xx 64 bit devices
- Build AllWinner 64 bit devices against new ATF
* Tue Apr 17 2018 Peter Robinson <pbrobinson@fedoraproject.org> 2018.05-0.2-rc2
- 2018.05 RC2
- Enable Raspberry Pi option to use firmware DT

1233
uefi-upstream-test.patch Normal file
View File

File diff suppressed because it is too large Load Diff