diff options
author | Brad Bishop <bradleyb@fuzziesquirrel.com> | 2018-12-17 04:11:34 +0300 |
---|---|---|
committer | Brad Bishop <bradleyb@fuzziesquirrel.com> | 2019-01-09 02:21:44 +0300 |
commit | 1a4b7ee28bf7413af6513fb45ad0d0736048f866 (patch) | |
tree | 79f6d8ea698cab8f2eaf4f54b793d2ca7a1451ce /meta-xilinx/meta-xilinx-contrib | |
parent | 5b9ede0403237c7dace972affa65cf64a1aadd0e (diff) | |
download | openbmc-1a4b7ee28bf7413af6513fb45ad0d0736048f866.tar.xz |
reset upstream subtrees to yocto 2.6
Reset the following subtrees on thud HEAD:
poky: 87e3a9739d
meta-openembedded: 6094ae18c8
meta-security: 31dc4e7532
meta-raspberrypi: a48743dc36
meta-xilinx: c42016e2e6
Also re-apply backports that didn't make it into thud:
poky:
17726d0 systemd-systemctl-native: handle Install wildcards
meta-openembedded:
4321a5d libtinyxml2: update to 7.0.1
042f0a3 libcereal: Add native and nativesdk classes
e23284f libcereal: Allow empty package
030e8d4 rsyslog: curl-less build with fmhttp PACKAGECONFIG
179a1b9 gtest: update to 1.8.1
Squashed OpenBMC subtree compatibility updates:
meta-aspeed:
Brad Bishop (1):
aspeed: add yocto 2.6 compatibility
meta-ibm:
Brad Bishop (1):
ibm: prepare for yocto 2.6
meta-ingrasys:
Brad Bishop (1):
ingrasys: set layer compatibility to yocto 2.6
meta-openpower:
Brad Bishop (1):
openpower: set layer compatibility to yocto 2.6
meta-phosphor:
Brad Bishop (3):
phosphor: set layer compatibility to thud
phosphor: libgpg-error: drop patches
phosphor: react to fitimage artifact rename
Ed Tanous (4):
Dropbear: upgrade options for latest upgrade
yocto2.6: update openssl options
busybox: remove upstream watchdog patch
systemd: Rebase CONFIG_CGROUP_BPF patch
Change-Id: I7b1fe71cca880d0372a82d94b5fd785323e3a9e7
Signed-off-by: Brad Bishop <bradleyb@fuzziesquirrel.com>
Diffstat (limited to 'meta-xilinx/meta-xilinx-contrib')
10 files changed, 2 insertions, 245 deletions
diff --git a/meta-xilinx/meta-xilinx-contrib/conf/layer.conf b/meta-xilinx/meta-xilinx-contrib/conf/layer.conf index ad2487714..58c2a46bc 100644 --- a/meta-xilinx/meta-xilinx-contrib/conf/layer.conf +++ b/meta-xilinx/meta-xilinx-contrib/conf/layer.conf @@ -12,5 +12,5 @@ BBFILE_PRIORITY_xilinx-contrib = "5" LAYERDEPENDS_xilinx-contrib = "core" LAYERDEPENDS_xilinx-contrib = "xilinx" -LAYERSERIES_COMPAT_xilinx-contrib = "sumo" +LAYERSERIES_COMPAT_xilinx-contrib = "sumo thud" diff --git a/meta-xilinx/meta-xilinx-contrib/conf/machine/minized-zynq7.conf b/meta-xilinx/meta-xilinx-contrib/conf/machine/minized-zynq7.conf index 8ee1980b4..de617d0b6 100644 --- a/meta-xilinx/meta-xilinx-contrib/conf/machine/minized-zynq7.conf +++ b/meta-xilinx/meta-xilinx-contrib/conf/machine/minized-zynq7.conf @@ -4,18 +4,16 @@ require conf/machine/include/tune-zynq.inc require conf/machine/include/machine-xilinx-default.inc -require conf/machine/include/machine-xilinx-board.inc MACHINE_FEATURES = "ext2 vfat usbhost wifi bluetooth" # u-boot configuration PREFERRED_PROVIDER_virtual/bootloader = "u-boot" UBOOT_MACHINE = "zynq_minized_config" -SPL_BINARY = "spl/boot.bin" EXTRA_IMAGEDEPENDS += " \ u-boot-zynq-uenv \ - virtual/boot-bin \ + virtual/bootloader \ " SERIAL_CONSOLE = "115200 ttyPS0" @@ -26,7 +24,5 @@ MACHINE_ESSENTIAL_EXTRA_RDEPENDS += "device-tree" MACHINE_ESSENTIAL_EXTRA_RRECOMMENDS += "linux-firmware-bcm43430" IMAGE_BOOT_FILES += " \ - boot.bin \ - ${MACHINE}.dtb \ uEnv.txt \ " diff --git a/meta-xilinx/meta-xilinx-contrib/recipes-bsp/u-boot/files/minized-u-boot.patch b/meta-xilinx/meta-xilinx-contrib/recipes-bsp/u-boot/files/minized-u-boot.patch deleted file mode 100644 index 4b9d72beb..000000000 --- a/meta-xilinx/meta-xilinx-contrib/recipes-bsp/u-boot/files/minized-u-boot.patch +++ /dev/null @@ -1,217 +0,0 @@ -From dfe572bcea9b74086d5bd9b963af26e64a043336 Mon Sep 17 00:00:00 2001 -From: Clement Laigle <clement.laigle8@gmail.com> -Date: Sun, 10 Jun 2018 23:21:28 +0200 -Subject: [PATCH] zynq: Add initial support for Avnet MiniZed - -Initial support for Avnet MiniZed board. - -Signed-off-by: Clement Laigle <clement.laigle8@gmail.com> ---- - arch/arm/dts/Makefile | 1 + - arch/arm/dts/zynq-minized.dts | 106 +++++++++++++++++++++++++++++++++++++++++ - configs/zynq_minized_defconfig | 68 ++++++++++++++++++++++++++ - 3 files changed, 175 insertions(+) - create mode 100644 arch/arm/dts/zynq-minized.dts - create mode 100644 configs/zynq_minized_defconfig - -diff --git a/arch/arm/dts/Makefile b/arch/arm/dts/Makefile -index a895c70..32f9ae1 100644 ---- a/arch/arm/dts/Makefile -+++ b/arch/arm/dts/Makefile -@@ -132,6 +132,7 @@ dtb-$(CONFIG_ARCH_ZYNQ) += \ - zynq-cse-qspi-single.dtb \ - zynq-microzed.dtb \ - zynq-picozed.dtb \ -+ zynq-minized.dtb \ - zynq-syzygy-hub.dtb \ - zynq-topic-miami.dtb \ - zynq-topic-miamilite.dtb \ -diff --git a/arch/arm/dts/zynq-minized.dts b/arch/arm/dts/zynq-minized.dts -new file mode 100644 -index 0000000..3a05518 ---- /dev/null -+++ b/arch/arm/dts/zynq-minized.dts -@@ -0,0 +1,106 @@ -+// SPDX-License-Identifier: GPL-2.0+ -+/* -+ * dts file for Avnet MiniZed board -+ * -+ * (C) Copyright 2017 - 2018, Xilinx, Inc. -+ * -+ * Ibai Erkiaga <ibai.erkiaga-elorza@xilinx.com> -+ */ -+ -+/dts-v1/; -+#include "zynq-7000.dtsi" -+ -+/ { -+ model = "Avnet Zynq MiniZed Development Board"; -+ compatible = "avnet,minized", "xlnx,zynq-7000"; -+ -+ aliases { -+ serial0 = &uart1; -+ serial1 = &uart0; -+ spi0 = &qspi; -+ mmc0 = &sdhci0; -+ }; -+ -+ memory@0 { -+ device_type = "memory"; -+ reg = <0x0 0x20000000>; -+ }; -+ -+ chosen { -+ bootargs = ""; -+ stdout-path = "serial0:115200n8"; -+ }; -+ -+ usb_phy0: phy0 { -+ compatible = "usb-nop-xceiv"; -+ #phy-cells = <0>; -+ }; -+}; -+ -+&qspi { -+ status = "okay"; -+ is-dual = <0>; -+ num-cs = <1>; -+ flash@0 { -+ compatible = "micron,m25p128"; -+ reg = <0x0>; -+ spi-tx-bus-width = <4>; -+ spi-rx-bus-width = <4>; -+ spi-max-frequency = <50000000>; -+ partitions { -+ compatible = "fixed-partitions"; -+ #address-cells = <1>; -+ #size-cells = <1>; -+ partition@0 { -+ label = "boot"; -+ reg = <0x0 0xff0000>; -+ }; -+ -+ partition@270000 { -+ label = "kernel"; -+ reg = <0x270000 0xd80000>; -+ }; -+ -+ partition@ff0000 { -+ label = "bootenv"; -+ reg = <0xff0000 0x10000>; -+ }; -+ -+ partition@1000000 { -+ label = "spare"; -+ reg = <0x1000000 0x0>; -+ }; -+ }; -+ }; -+}; -+ -+&uart0 { -+ status = "okay"; -+}; -+ -+&uart1 { -+ u-boot,dm-pre-reloc; -+ status = "okay"; -+}; -+ -+&usb0 { -+ status = "okay"; -+ dr_mode = "host"; -+ usb-phy = <&usb_phy0>; -+ usb-reset = <&gpio0 7 0>; /* USB_RST_N-MIO7 */ -+}; -+ -+&sdhci1 { -+ status = "okay"; -+ non-removable; -+ bus-width = <4>; -+ max-frequency = <12000000>; -+ -+ #address-cells = <1>; -+ #size-cells = <0>; -+ mmccard: mmccard@0 { -+ compatible = "mmc-card"; -+ reg = <0>; -+ broken-hpi; -+ }; -+}; -diff --git a/configs/zynq_minized_defconfig b/configs/zynq_minized_defconfig -new file mode 100644 -index 0000000..44d65fc ---- /dev/null -+++ b/configs/zynq_minized_defconfig -@@ -0,0 +1,68 @@ -+CONFIG_ARM=y -+CONFIG_ARCH_ZYNQ=y -+CONFIG_SYS_TEXT_BASE=0x4000000 -+CONFIG_SPL=y -+CONFIG_SPL_STACK_R_ADDR=0x200000 -+CONFIG_DEFAULT_DEVICE_TREE="zynq-minized" -+CONFIG_DEBUG_UART=y -+CONFIG_DISTRO_DEFAULTS=y -+# CONFIG_DISPLAY_CPUINFO is not set -+CONFIG_FIT=y -+CONFIG_FIT_SIGNATURE=y -+CONFIG_FIT_VERBOSE=y -+CONFIG_BOOTCOMMAND="run $modeboot || run distro_bootcmd" -+CONFIG_SPL_STACK_R=y -+CONFIG_SPL_OS_BOOT=y -+CONFIG_SYS_PROMPT="Zynq> " -+CONFIG_CMD_THOR_DOWNLOAD=y -+CONFIG_CMD_DFU=y -+# CONFIG_CMD_FLASH is not set -+CONFIG_CMD_FPGA_LOADBP=y -+CONFIG_CMD_FPGA_LOADFS=y -+CONFIG_CMD_FPGA_LOADMK=y -+CONFIG_CMD_FPGA_LOADP=y -+CONFIG_CMD_GPIO=y -+CONFIG_CMD_MMC=y -+CONFIG_CMD_SF=y -+CONFIG_CMD_USB=y -+# CONFIG_CMD_SETEXPR is not set -+CONFIG_CMD_TFTPPUT=y -+CONFIG_CMD_CACHE=y -+CONFIG_CMD_EXT4_WRITE=y -+CONFIG_ENV_IS_IN_SPI_FLASH=y -+CONFIG_NET_RANDOM_ETHADDR=y -+CONFIG_SPL_DM_SEQ_ALIAS=y -+CONFIG_DFU_MMC=y -+CONFIG_DFU_RAM=y -+CONFIG_FPGA_XILINX=y -+CONFIG_FPGA_ZYNQPL=y -+CONFIG_DM_GPIO=y -+CONFIG_MMC_SDHCI=y -+CONFIG_MMC_SDHCI_ZYNQ=y -+CONFIG_SPI_FLASH=y -+CONFIG_SPI_FLASH_BAR=y -+CONFIG_SPI_FLASH_SPANSION=y -+CONFIG_SPI_FLASH_STMICRO=y -+CONFIG_SPI_FLASH_WINBOND=y -+CONFIG_PHY_MARVELL=y -+CONFIG_PHY_REALTEK=y -+CONFIG_PHY_XILINX=y -+CONFIG_ZYNQ_GEM=y -+CONFIG_DEBUG_UART_ZYNQ=y -+CONFIG_DEBUG_UART_BASE=0xe0001000 -+CONFIG_DEBUG_UART_CLOCK=50000000 -+CONFIG_ZYNQ_SERIAL=y -+CONFIG_ZYNQ_QSPI=y -+CONFIG_USB=y -+CONFIG_USB_EHCI_HCD=y -+CONFIG_USB_ULPI_VIEWPORT=y -+CONFIG_USB_ULPI=y -+CONFIG_USB_STORAGE=y -+CONFIG_USB_GADGET=y -+CONFIG_USB_GADGET_MANUFACTURER="Xilinx" -+CONFIG_USB_GADGET_VENDOR_NUM=0x03fd -+CONFIG_USB_GADGET_PRODUCT_NUM=0x0300 -+CONFIG_CI_UDC=y -+CONFIG_USB_GADGET_DOWNLOAD=y -+CONFIG_USB_FUNCTION_THOR=y -+CONFIG_OF_EMBED=y --- -2.7.4 - diff --git a/meta-xilinx/meta-xilinx-contrib/recipes-bsp/u-boot/u-boot_%.bbappend b/meta-xilinx/meta-xilinx-contrib/recipes-bsp/u-boot/u-boot_%.bbappend deleted file mode 100644 index 2fdbdb42d..000000000 --- a/meta-xilinx/meta-xilinx-contrib/recipes-bsp/u-boot/u-boot_%.bbappend +++ /dev/null @@ -1,8 +0,0 @@ -FILESEXTRAPATHS_prepend := "${THISDIR}/files:" - -SRC_URI_append = " file://minized-u-boot.patch" - -HAS_PLATFORM_INIT_append = " \ - zynq_minized_config \ - " - diff --git a/meta-xilinx/meta-xilinx-contrib/recipes-kernel/linux-firmware/linux-firmware_%.bbappend b/meta-xilinx/meta-xilinx-contrib/recipes-kernel/linux-firmware/linux-firmware_%.bbappend index 7655cafc1..b34eea349 100644 --- a/meta-xilinx/meta-xilinx-contrib/recipes-kernel/linux-firmware/linux-firmware_%.bbappend +++ b/meta-xilinx/meta-xilinx-contrib/recipes-kernel/linux-firmware/linux-firmware_%.bbappend @@ -1,11 +1,3 @@ -LICENSE_append_minized-zynq7 = "\ - & Firmware-cypress \ -" - -LIC_FILES_CHKSUM_append_minized-zynq7 = "\ - file://LICENCE.cypress;md5=cbc5f665d04f741f1e006d2096236ba7 \ -" -NO_GENERIC_LICENSE[Firmware-cypress] = "LICENCE.cypress" SRC_URI_append_minized-zynq7 = " \ git://github.com/murata-wireless/cyw-fmac-nvram;protocol=git;branch=orga;destsuffix=cyw-fmac-nvram;name=cyw-fmac-nvram \ @@ -28,7 +20,6 @@ do_install_append_minized-zynq7() { } PACKAGES_prepend_minized-zynq7 = "\ - ${PN}-cypress-license \ ${PN}-bcm43430a1-hcd \ ${PN}-mfgtest \ " @@ -41,11 +32,6 @@ FILES_${PN}-bcm43430_append_minized-zynq7 = " \ ${nonarch_base_libdir}/firmware/brcm/ brcmfmac43430-sdio.txt \ " -# For additional Cypress -FILES_${PN}-cypress-license = "\ - ${nonarch_base_libdir}/firmware/LICENCE.cypress \ -" - LICENSE_${PN}-bcm43430a1-hcd = "Firmware-cypress" FILES_${PN}-bcm43430a1-hcd = " \ diff --git a/meta-xilinx/meta-xilinx-contrib/recipes-kernel/linux/linux-xlnx/v2018.1/0001-drm-xilinx-Add-encoder-for-Digilent-boards.patch b/meta-xilinx/meta-xilinx-contrib/recipes-kernel/linux/linux-xlnx/v2018.3/0001-drm-xilinx-Add-encoder-for-Digilent-boards.patch index b8ba70ea2..b8ba70ea2 100644 --- a/meta-xilinx/meta-xilinx-contrib/recipes-kernel/linux/linux-xlnx/v2018.1/0001-drm-xilinx-Add-encoder-for-Digilent-boards.patch +++ b/meta-xilinx/meta-xilinx-contrib/recipes-kernel/linux/linux-xlnx/v2018.3/0001-drm-xilinx-Add-encoder-for-Digilent-boards.patch diff --git a/meta-xilinx/meta-xilinx-contrib/recipes-kernel/linux/linux-xlnx/v2018.1/0002-clk-Add-driver-for-axi_dynclk-IP-Core.patch b/meta-xilinx/meta-xilinx-contrib/recipes-kernel/linux/linux-xlnx/v2018.3/0002-clk-Add-driver-for-axi_dynclk-IP-Core.patch index 9b6229db0..9b6229db0 100644 --- a/meta-xilinx/meta-xilinx-contrib/recipes-kernel/linux/linux-xlnx/v2018.1/0002-clk-Add-driver-for-axi_dynclk-IP-Core.patch +++ b/meta-xilinx/meta-xilinx-contrib/recipes-kernel/linux/linux-xlnx/v2018.3/0002-clk-Add-driver-for-axi_dynclk-IP-Core.patch diff --git a/meta-xilinx/meta-xilinx-contrib/recipes-kernel/linux/linux-xlnx/v2018.1/0003-drm-xilinx-Fix-DPMS-transition-to-on.patch b/meta-xilinx/meta-xilinx-contrib/recipes-kernel/linux/linux-xlnx/v2018.3/0003-drm-xilinx-Fix-DPMS-transition-to-on.patch index a98d84c55..a98d84c55 100644 --- a/meta-xilinx/meta-xilinx-contrib/recipes-kernel/linux/linux-xlnx/v2018.1/0003-drm-xilinx-Fix-DPMS-transition-to-on.patch +++ b/meta-xilinx/meta-xilinx-contrib/recipes-kernel/linux/linux-xlnx/v2018.3/0003-drm-xilinx-Fix-DPMS-transition-to-on.patch diff --git a/meta-xilinx/meta-xilinx-contrib/recipes-kernel/linux/linux-xlnx/v2018.1/0004-minized-wifi-bluetooth.cfg b/meta-xilinx/meta-xilinx-contrib/recipes-kernel/linux/linux-xlnx/v2018.3/0004-minized-wifi-bluetooth.cfg index f71e53abb..f71e53abb 100644 --- a/meta-xilinx/meta-xilinx-contrib/recipes-kernel/linux/linux-xlnx/v2018.1/0004-minized-wifi-bluetooth.cfg +++ b/meta-xilinx/meta-xilinx-contrib/recipes-kernel/linux/linux-xlnx/v2018.3/0004-minized-wifi-bluetooth.cfg diff --git a/meta-xilinx/meta-xilinx-contrib/recipes-kernel/linux/linux-xlnx_2018.1.bbappend b/meta-xilinx/meta-xilinx-contrib/recipes-kernel/linux/linux-xlnx_2018.3.bbappend index 535fbb264..535fbb264 100644 --- a/meta-xilinx/meta-xilinx-contrib/recipes-kernel/linux/linux-xlnx_2018.1.bbappend +++ b/meta-xilinx/meta-xilinx-contrib/recipes-kernel/linux/linux-xlnx_2018.3.bbappend |