aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNathan Rossi <nathan@nathanrossi.com>2018-08-28 13:52:08 +1000
committerManjukumar Matha <manjukumar.harthikote-matha@xilinx.com>2019-01-01 20:03:46 -0800
commit040f8ee5d3ebee463a99a3d421905914fa280278 (patch)
tree42531eefb3a6e1fb1b318e5cfd9f0c9225117cc5
parentecc7f7eb933269d18f37ca207fb4022f8d78ae39 (diff)
downloadmeta-xilinx-040f8ee5d3ebee463a99a3d421905914fa280278.tar.gz
meta-xilinx-040f8ee5d3ebee463a99a3d421905914fa280278.tar.bz2
meta-xilinx-040f8ee5d3ebee463a99a3d421905914fa280278.zip
meta-xilinx-contrib/u-boot: Remove minized appends
The minized board is supported in the v2018.07 of u-boot which is the default provided by oe-core/meta. This includes all the configuration provided by the patch. Note however that neither upstream u-boot nor the patch in meta-xilinx-contrib provided ps7 init files for this board which makes the HAS_PLATFORM_INIT incorrect, as it will result in a boot.bin being built which does not include ps7 init configuration and thus will not boot correctly. As such this change also removes the boot.bin setup and use in the machine configuration to prevent the dependency on platform init files which are not available. Signed-off-by: Nathan Rossi <nathan@nathanrossi.com> Signed-off-by: Manjukumar Matha <manjukumar.harthikote-matha@xilinx.com>
-rw-r--r--meta-xilinx-contrib/conf/machine/minized-zynq7.conf3
-rw-r--r--meta-xilinx-contrib/recipes-bsp/u-boot/files/minized-u-boot.patch217
-rw-r--r--meta-xilinx-contrib/recipes-bsp/u-boot/u-boot_%.bbappend8
3 files changed, 0 insertions, 228 deletions
diff --git a/meta-xilinx-contrib/conf/machine/minized-zynq7.conf b/meta-xilinx-contrib/conf/machine/minized-zynq7.conf
index 2f55c787..5bacdd50 100644
--- a/meta-xilinx-contrib/conf/machine/minized-zynq7.conf
+++ b/meta-xilinx-contrib/conf/machine/minized-zynq7.conf
@@ -11,11 +11,9 @@ 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 \
"
SERIAL_CONSOLE = "115200 ttyPS0"
@@ -26,7 +24,6 @@ MACHINE_ESSENTIAL_EXTRA_RDEPENDS += "device-tree"
MACHINE_ESSENTIAL_EXTRA_RRECOMMENDS += "linux-firmware-bcm43430"
IMAGE_BOOT_FILES += " \
- boot.bin \
devicetree/${MACHINE}.dtb \
uEnv.txt \
"
diff --git a/meta-xilinx-contrib/recipes-bsp/u-boot/files/minized-u-boot.patch b/meta-xilinx-contrib/recipes-bsp/u-boot/files/minized-u-boot.patch
deleted file mode 100644
index 4b9d72be..00000000
--- a/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-contrib/recipes-bsp/u-boot/u-boot_%.bbappend b/meta-xilinx-contrib/recipes-bsp/u-boot/u-boot_%.bbappend
deleted file mode 100644
index 2fdbdb42..00000000
--- a/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 \
- "
-