diff --git a/device-tree-overlays.patch b/device-tree-overlays.patch new file mode 100644 index 0000000..38a1dad --- /dev/null +++ b/device-tree-overlays.patch @@ -0,0 +1,221 @@ +From ab10d8b4580a94c46ee25e6fc85a5a93946ee8a2 Mon Sep 17 00:00:00 2001 +From: Peter Robinson +Date: Wed, 21 Jun 2017 15:20:50 +0100 +Subject: [PATCH 1/4] raspberry pi: add device tree overlay support + +Raspberry Pi has numerous HAT and other HW expansion options such as screens and +cameras some of which need overlays from the beginning so it makes sense to +enable evice tree overlays. + +Signed-off-by: Peter Robinson +--- + configs/rpi_2_defconfig | 1 + + configs/rpi_3_32b_defconfig | 1 + + configs/rpi_3_defconfig | 1 + + configs/rpi_defconfig | 1 + + 4 files changed, 4 insertions(+) + +diff --git a/configs/rpi_2_defconfig b/configs/rpi_2_defconfig +index 9875f5d295..1be794a06c 100644 +--- a/configs/rpi_2_defconfig ++++ b/configs/rpi_2_defconfig +@@ -14,6 +14,7 @@ CONFIG_CMD_USB=y + # CONFIG_CMD_FPGA is not set + CONFIG_CMD_GPIO=y + CONFIG_OF_EMBED=y ++CONFIG_OF_LIBFDT_OVERLAY=y + CONFIG_MMC_SDHCI=y + CONFIG_MMC_SDHCI_BCM2835=y + CONFIG_USB=y +diff --git a/configs/rpi_3_32b_defconfig b/configs/rpi_3_32b_defconfig +index e4a81b882d..8c0226d107 100644 +--- a/configs/rpi_3_32b_defconfig ++++ b/configs/rpi_3_32b_defconfig +@@ -15,6 +15,7 @@ CONFIG_CMD_USB=y + # CONFIG_CMD_FPGA is not set + CONFIG_CMD_GPIO=y + CONFIG_OF_EMBED=y ++CONFIG_OF_LIBFDT_OVERLAY=y + CONFIG_MMC_SDHCI=y + CONFIG_MMC_SDHCI_BCM2835=y + # CONFIG_REQUIRE_SERIAL_CONSOLE is not set +diff --git a/configs/rpi_3_defconfig b/configs/rpi_3_defconfig +index e0be6c76f8..604c83b634 100644 +--- a/configs/rpi_3_defconfig ++++ b/configs/rpi_3_defconfig +@@ -15,6 +15,7 @@ CONFIG_CMD_USB=y + # CONFIG_CMD_FPGA is not set + CONFIG_CMD_GPIO=y + CONFIG_OF_EMBED=y ++CONFIG_OF_LIBFDT_OVERLAY=y + CONFIG_MMC_SDHCI=y + CONFIG_MMC_SDHCI_BCM2835=y + # CONFIG_REQUIRE_SERIAL_CONSOLE is not set +diff --git a/configs/rpi_defconfig b/configs/rpi_defconfig +index a07d69800c..ecc0dbaa1a 100644 +--- a/configs/rpi_defconfig ++++ b/configs/rpi_defconfig +@@ -14,6 +14,7 @@ CONFIG_CMD_USB=y + # CONFIG_CMD_FPGA is not set + CONFIG_CMD_GPIO=y + CONFIG_OF_EMBED=y ++CONFIG_OF_LIBFDT_OVERLAY=y + CONFIG_MMC_SDHCI=y + CONFIG_MMC_SDHCI_BCM2835=y + CONFIG_USB=y +-- +2.13.0 + +From 1a96e1676bf60fd3f63e0f64f266480a6b81005f Mon Sep 17 00:00:00 2001 +From: Peter Robinson +Date: Sat, 24 Jun 2017 12:53:25 +0100 +Subject: [PATCH 2/4] am335x: beagle/evm: add device tree overlay support + +TI am33xx devices such as the BeagleBone devices have numerous cape options such +as screens some of which need overlays from the beginning so it makes sense to +enable evice tree overlays. + +Signed-off-by: Peter Robinson +--- + configs/am335x_boneblack_defconfig | 1 + + configs/am335x_evm_defconfig | 2 ++ + configs/am335x_evm_nor_defconfig | 1 + + configs/am335x_evm_norboot_defconfig | 1 + + configs/am335x_evm_spiboot_defconfig | 1 + + configs/am335x_evm_usbspl_defconfig | 1 + + 6 files changed, 7 insertions(+) + +diff --git a/configs/am335x_boneblack_defconfig b/configs/am335x_boneblack_defconfig +index d3cb828e41..1f99c4131d 100644 +--- a/configs/am335x_boneblack_defconfig ++++ b/configs/am335x_boneblack_defconfig +@@ -47,3 +47,4 @@ CONFIG_G_DNL_MANUFACTURER="Texas Instruments" + CONFIG_G_DNL_VENDOR_NUM=0x0451 + CONFIG_G_DNL_PRODUCT_NUM=0xd022 + CONFIG_OF_LIBFDT=y ++CONFIG_OF_LIBFDT_OVERLAY=y +diff --git a/configs/am335x_evm_defconfig b/configs/am335x_evm_defconfig +index 5d07a151f7..24ea9bab8b 100644 +--- a/configs/am335x_evm_defconfig ++++ b/configs/am335x_evm_defconfig +@@ -57,3 +57,5 @@ CONFIG_G_DNL_MANUFACTURER="Texas Instruments" + CONFIG_G_DNL_VENDOR_NUM=0x0451 + CONFIG_G_DNL_PRODUCT_NUM=0xd022 + CONFIG_RSA=y ++CONFIG_OF_LIBFDT=y ++CONFIG_OF_LIBFDT_OVERLAY=y +diff --git a/configs/am335x_evm_nor_defconfig b/configs/am335x_evm_nor_defconfig +index 000099eb1f..5eb7ec90ab 100644 +--- a/configs/am335x_evm_nor_defconfig ++++ b/configs/am335x_evm_nor_defconfig +@@ -44,3 +44,4 @@ CONFIG_G_DNL_MANUFACTURER="Texas Instruments" + CONFIG_G_DNL_VENDOR_NUM=0x0451 + CONFIG_G_DNL_PRODUCT_NUM=0xd022 + CONFIG_OF_LIBFDT=y ++CONFIG_OF_LIBFDT_OVERLAY=y +diff --git a/configs/am335x_evm_norboot_defconfig b/configs/am335x_evm_norboot_defconfig +index 023cea461c..60f564654c 100644 +--- a/configs/am335x_evm_norboot_defconfig ++++ b/configs/am335x_evm_norboot_defconfig +@@ -39,3 +39,4 @@ CONFIG_G_DNL_MANUFACTURER="Texas Instruments" + CONFIG_G_DNL_VENDOR_NUM=0x0451 + CONFIG_G_DNL_PRODUCT_NUM=0xd022 + CONFIG_OF_LIBFDT=y ++CONFIG_OF_LIBFDT_OVERLAY=y +diff --git a/configs/am335x_evm_spiboot_defconfig b/configs/am335x_evm_spiboot_defconfig +index c9373f9157..5e20305f4a 100644 +--- a/configs/am335x_evm_spiboot_defconfig ++++ b/configs/am335x_evm_spiboot_defconfig +@@ -44,3 +44,4 @@ CONFIG_G_DNL_MANUFACTURER="Texas Instruments" + CONFIG_G_DNL_VENDOR_NUM=0x0451 + CONFIG_G_DNL_PRODUCT_NUM=0xd022 + CONFIG_OF_LIBFDT=y ++CONFIG_OF_LIBFDT_OVERLAY=y +diff --git a/configs/am335x_evm_usbspl_defconfig b/configs/am335x_evm_usbspl_defconfig +index 04005f0e77..02e27ef92e 100644 +--- a/configs/am335x_evm_usbspl_defconfig ++++ b/configs/am335x_evm_usbspl_defconfig +@@ -44,3 +44,4 @@ CONFIG_G_DNL_MANUFACTURER="Texas Instruments" + CONFIG_G_DNL_VENDOR_NUM=0x0451 + CONFIG_G_DNL_PRODUCT_NUM=0xd022 + CONFIG_OF_LIBFDT=y ++CONFIG_OF_LIBFDT_OVERLAY=y +-- +2.13.0 + +From 8f3100bedb9749629ff01a4bbaf7fed0d81cc198 Mon Sep 17 00:00:00 2001 +From: Peter Robinson +Date: Thu, 22 Jun 2017 09:01:34 +0100 +Subject: [PATCH 3/4] CHIP: add device tree overlay support + +CHIP and CHIP Pro devices have options of DIP addon boards some of which need +overlays from the beginning so it makes sense to enable device tree overlays. + +Signed-off-by: Peter Robinson +--- + configs/CHIP_defconfig | 2 ++ + configs/CHIP_pro_defconfig | 2 ++ + 2 files changed, 4 insertions(+) + +diff --git a/configs/CHIP_defconfig b/configs/CHIP_defconfig +index 9b9e0b7e62..6b07eab21e 100644 +--- a/configs/CHIP_defconfig ++++ b/configs/CHIP_defconfig +@@ -24,3 +24,5 @@ CONFIG_USB_GADGET_DOWNLOAD=y + CONFIG_G_DNL_MANUFACTURER="Allwinner Technology" + CONFIG_G_DNL_VENDOR_NUM=0x1f3a + CONFIG_G_DNL_PRODUCT_NUM=0x1010 ++CONFIG_OF_LIBFDT=y ++CONFIG_OF_LIBFDT_OVERLAY=y +diff --git a/configs/CHIP_pro_defconfig b/configs/CHIP_pro_defconfig +index 52572bd055..2c73c35c5c 100644 +--- a/configs/CHIP_pro_defconfig ++++ b/configs/CHIP_pro_defconfig +@@ -30,3 +30,5 @@ CONFIG_USB_GADGET_DOWNLOAD=y + CONFIG_G_DNL_MANUFACTURER="Allwinner Technology" + CONFIG_G_DNL_VENDOR_NUM=0x1f3a + CONFIG_G_DNL_PRODUCT_NUM=0x1010 ++CONFIG_OF_LIBFDT=y ++CONFIG_OF_LIBFDT_OVERLAY=y +-- +2.13.0 + +From bec4ce10a38bced9a70f083514b4f6106e44255e Mon Sep 17 00:00:00 2001 +From: Peter Robinson +Date: Sat, 24 Jun 2017 12:55:47 +0100 +Subject: [PATCH 4/4] 96boards: dragonboard/hikey: add device tree overlay + support + +96boards CE devices such as the DragonBoard and Hikey devices have numerous +mezzanine options some of which need overlays from the beginning so it makes +sense to enable device tree overlays. + +Signed-off-by: Peter Robinson +--- + configs/dragonboard410c_defconfig | 2 ++ + configs/hikey_defconfig | 2 ++ + 2 files changed, 4 insertions(+) + +diff --git a/configs/dragonboard410c_defconfig b/configs/dragonboard410c_defconfig +index 90c145aa15..79ac7dd423 100644 +--- a/configs/dragonboard410c_defconfig ++++ b/configs/dragonboard410c_defconfig +@@ -37,3 +37,5 @@ CONFIG_USB_EHCI_MSM=y + CONFIG_USB_ULPI_VIEWPORT=y + CONFIG_USB_ULPI=y + CONFIG_USB_STORAGE=y ++CONFIG_OF_LIBFDT=y ++CONFIG_OF_LIBFDT_OVERLAY=y +diff --git a/configs/hikey_defconfig b/configs/hikey_defconfig +index b112be2ef5..8a35cd3c87 100644 +--- a/configs/hikey_defconfig ++++ b/configs/hikey_defconfig +@@ -16,3 +16,5 @@ CONFIG_MMC_DW=y + CONFIG_MMC_DW_K3=y + CONFIG_USB=y + CONFIG_USB_STORAGE=y ++CONFIG_OF_LIBFDT=y ++CONFIG_OF_LIBFDT_OVERLAY=y +-- +2.13.0 + diff --git a/uboot-tools.spec b/uboot-tools.spec index e562b9d..e1328b8 100644 --- a/uboot-tools.spec +++ b/uboot-tools.spec @@ -2,7 +2,7 @@ Name: uboot-tools Version: 2017.05 -Release: 3%{?candidate:.%{candidate}}%{?dist} +Release: 4%{?candidate:.%{candidate}}%{?dist} Summary: U-Boot utilities License: GPLv2+ BSD LGPL-2.1+ LGPL-2.0+ URL: http://www.denx.de/wiki/U-Boot @@ -22,6 +22,7 @@ Patch8: clearfog-distroboot.patch Patch9: arm-tegra-nyan-chromebook.patch Patch10: dragonboard-fixes.patch Patch11: uefi-fixes.patch +Patch12: device-tree-overlays.patch # Patch19: 0001-arm-mvebu-enable-generic-distro-boot-config.patch @@ -154,7 +155,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/sunxi-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 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)/ @@ -246,6 +247,10 @@ cp -p board/warp7/README builds/docs/README.warp7 %endif %changelog +* Sat Jun 24 2017 Peter Robinson 2017.05-4 +- Fix bug in aarch64 builds that dropped some files +- Add DT Overlay support for RPi/BeagleBone/CHIP/96boards devices + * Thu Jun 29 2017 Peter Robinson 2017.05-3 - Further uEFI and DragonBoard fixes