From a23bba7d6b5c9ed5081b3e5f8b6eb80153cd9398 Mon Sep 17 00:00:00 2001 From: Peter Robinson Date: Tue, 17 Apr 2018 17:32:44 +0100 Subject: [PATCH] Enable Raspberry Pi option to use firmware DT (again), Xilinx zcu100 (Ultra96) --- aarch64-boards | 1 + ...-the-DT-provided-by-the-Raspberry-Pi.patch | 84 ++++++++++++++----- uboot-tools.spec | 11 ++- 3 files changed, 73 insertions(+), 23 deletions(-) diff --git a/aarch64-boards b/aarch64-boards index abe7f96..d4cae13 100644 --- a/aarch64-boards +++ b/aarch64-boards @@ -27,3 +27,4 @@ sopine_baseboard vexpress_aemv8a_dram vexpress_aemv8a_juno vexpress_aemv8a_semi +xilinx_zynqmp_zcu100_revC diff --git a/rpi-Enable-using-the-DT-provided-by-the-Raspberry-Pi.patch b/rpi-Enable-using-the-DT-provided-by-the-Raspberry-Pi.patch index a7d59f2..acb4b18 100644 --- a/rpi-Enable-using-the-DT-provided-by-the-Raspberry-Pi.patch +++ b/rpi-Enable-using-the-DT-provided-by-the-Raspberry-Pi.patch @@ -1,52 +1,96 @@ -From e8df52eda084c1610a2a3569960905e3aa2557c2 Mon Sep 17 00:00:00 2001 +From 8a423a24f3d6f0d9deae23172372b9075a95851b Mon Sep 17 00:00:00 2001 From: Peter Robinson -Date: Fri, 6 Apr 2018 16:27:26 +0100 -Subject: [PATCH] rpi: Enable using the DT provided by the Raspberry Pi - firmware +Date: Tue, 17 Apr 2018 13:50:49 +0100 +Subject: [PATCH] rpi: Use firmware provided device tree Signed-off-by: Peter Robinson --- - configs/rpi_2_defconfig | 1 + - configs/rpi_3_32b_defconfig | 1 + - configs/rpi_3_defconfig | 1 + - 3 files changed, 3 insertions(+) + configs/rpi_0_w_defconfig | 2 +- + configs/rpi_2_defconfig | 2 +- + configs/rpi_3_32b_defconfig | 2 +- + configs/rpi_3_defconfig | 2 +- + configs/rpi_defconfig | 2 +- + include/configs/rpi.h | 2 +- + 6 files changed, 6 insertions(+), 6 deletions(-) +diff --git a/configs/rpi_0_w_defconfig b/configs/rpi_0_w_defconfig +index fcc2ae68c9..48b656cdb2 100644 +--- a/configs/rpi_0_w_defconfig ++++ b/configs/rpi_0_w_defconfig +@@ -12,7 +12,7 @@ CONFIG_SYS_PROMPT="U-Boot> " + CONFIG_CMD_GPIO=y + CONFIG_CMD_MMC=y + CONFIG_CMD_USB=y +-CONFIG_OF_EMBED=y ++CONFIG_OF_BOARD=y + CONFIG_ENV_FAT_INTERFACE="mmc" + CONFIG_ENV_FAT_DEVICE_AND_PART="0:1" + CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y diff --git a/configs/rpi_2_defconfig b/configs/rpi_2_defconfig -index dd3c60cc93..05aff1d700 100644 +index 204af74239..ed60fd96d8 100644 --- a/configs/rpi_2_defconfig +++ b/configs/rpi_2_defconfig -@@ -13,6 +13,7 @@ CONFIG_CMD_GPIO=y +@@ -12,7 +12,7 @@ CONFIG_SYS_PROMPT="U-Boot> " + CONFIG_CMD_GPIO=y CONFIG_CMD_MMC=y CONFIG_CMD_USB=y - CONFIG_OF_EMBED=y +-CONFIG_OF_EMBED=y +CONFIG_OF_BOARD=y CONFIG_ENV_FAT_INTERFACE="mmc" CONFIG_ENV_FAT_DEVICE_AND_PART="0:1" - CONFIG_DM_KEYBOARD=y + CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y diff --git a/configs/rpi_3_32b_defconfig b/configs/rpi_3_32b_defconfig -index 4e59c14fdf..38704f67c9 100644 +index 9e142cae63..465e97b662 100644 --- a/configs/rpi_3_32b_defconfig +++ b/configs/rpi_3_32b_defconfig -@@ -14,6 +14,7 @@ CONFIG_CMD_GPIO=y +@@ -13,7 +13,7 @@ CONFIG_SYS_PROMPT="U-Boot> " + CONFIG_CMD_GPIO=y CONFIG_CMD_MMC=y CONFIG_CMD_USB=y - CONFIG_OF_EMBED=y +-CONFIG_OF_EMBED=y +CONFIG_OF_BOARD=y CONFIG_ENV_FAT_INTERFACE="mmc" CONFIG_ENV_FAT_DEVICE_AND_PART="0:1" - CONFIG_DM_KEYBOARD=y + CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y diff --git a/configs/rpi_3_defconfig b/configs/rpi_3_defconfig -index 810b60344f..4f1509f4ee 100644 +index f46e504497..cbae3d198b 100644 --- a/configs/rpi_3_defconfig +++ b/configs/rpi_3_defconfig -@@ -14,6 +14,7 @@ CONFIG_CMD_GPIO=y +@@ -13,7 +13,7 @@ CONFIG_SYS_PROMPT="U-Boot> " + CONFIG_CMD_GPIO=y CONFIG_CMD_MMC=y CONFIG_CMD_USB=y - CONFIG_OF_EMBED=y +-CONFIG_OF_EMBED=y +CONFIG_OF_BOARD=y CONFIG_ENV_FAT_INTERFACE="mmc" CONFIG_ENV_FAT_DEVICE_AND_PART="0:1" - CONFIG_DM_KEYBOARD=y + CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y +diff --git a/configs/rpi_defconfig b/configs/rpi_defconfig +index 82c90d40e1..916b6df5a6 100644 +--- a/configs/rpi_defconfig ++++ b/configs/rpi_defconfig +@@ -12,7 +12,7 @@ CONFIG_SYS_PROMPT="U-Boot> " + CONFIG_CMD_GPIO=y + CONFIG_CMD_MMC=y + CONFIG_CMD_USB=y +-CONFIG_OF_EMBED=y ++CONFIG_OF_BOARD=y + CONFIG_ENV_FAT_INTERFACE="mmc" + CONFIG_ENV_FAT_DEVICE_AND_PART="0:1" + CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y +diff --git a/include/configs/rpi.h b/include/configs/rpi.h +index 325e52a019..fcf7e0976b 100644 +--- a/include/configs/rpi.h ++++ b/include/configs/rpi.h +@@ -124,7 +124,7 @@ + #define ENV_MEM_LAYOUT_SETTINGS \ + "fdt_high=ffffffff\0" \ + "initrd_high=ffffffff\0" \ +- "fdt_addr_r=0x00000100\0" \ ++ "fdt_addr_r=0x01f00000\0" \ + "pxefile_addr_r=0x00100000\0" \ + "kernel_addr_r=0x01000000\0" \ + "scriptaddr=0x02000000\0" \ -- 2.17.0 diff --git a/uboot-tools.spec b/uboot-tools.spec index 31340d4..fa39af9 100644 --- a/uboot-tools.spec +++ b/uboot-tools.spec @@ -2,7 +2,7 @@ Name: uboot-tools Version: 2018.05 -Release: 0.1%{?candidate:.%{candidate}}%{?dist} +Release: 0.2%{?candidate:.%{candidate}}%{?dist} Summary: U-Boot utilities License: GPLv2+ BSD LGPL-2.1+ LGPL-2.0+ URL: http://www.denx.de/wiki/U-Boot @@ -26,7 +26,7 @@ Patch4: rk33xx-make_fit_atf-fix.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 +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 @@ -289,7 +289,12 @@ cp -p board/warp7/README builds/docs/README.warp7 %endif %changelog -* Sun Apr 8 2018 Peter Robinson 2018.05-0.1 +* Tue Apr 17 2018 Peter Robinson 2018.05-0.2-rc2 +- 2018.05 RC2 +- Enable Raspberry Pi option to use firmware DT +- Enable Xilinx zcu100 (Ultra96) + +* Sun Apr 8 2018 Peter Robinson 2018.05-0.1-rc1 - 2018.05 RC1 * Fri Apr 6 2018 Peter Robinson 2018.03-4