u-boot-xlnx_2015.04: Drop this version

Newer version of u-boot-xlnx superseeds this version. Also remove any
patches which are only needed by this version of u-boot-xlnx.

Signed-off-by: Nathan Rossi <nathan@nathanrossi.com>

5 files changed, 0 insertions, 273 deletions

diff --git a/recipes-bsp/u-boot/u-boot-xlnx/ARM-zynq-Fix-up-the-target-file-name-for-u-boot.patch b/recipes-bsp/u-boot/u-boot-xlnx/ARM-zynq-Fix-up-the-target-file-name-for-u-boot.patch
deleted file mode 100644
index 2ab6fdd3..00000000
--- a/recipes-bsp/u-boot/u-boot-xlnx/ARM-zynq-Fix-up-the-target-file-name-for-u-boot.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From: Nathan Rossi <nathan@nathanrossi.com>
-Subject: [PATCH] ARM: zynq: Fix up the target file name for u-boot
-
-This should be 'u-boot.img' because all zynq configs are OF_EMBED.
-
-Signed-off-by: Nathan Rossi <nathan@nathanrossi.com>
-Upstream-Status: Configuration [mirror upstream...]
----
- include/configs/zynq-common.h | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/include/configs/zynq-common.h b/include/configs/zynq-common.h
-index e5f2fc5..10c9f18 100644
---- a/include/configs/zynq-common.h
-+++ b/include/configs/zynq-common.h
-@@ -501,7 +501,7 @@
- #define CONFIG_SYS_MMCSD_FS_BOOT_PARTITION     1
- #define CONFIG_SPL_LIBDISK_SUPPORT
- #define CONFIG_SPL_FAT_SUPPORT
--#define CONFIG_SPL_FS_LOAD_PAYLOAD_NAME     "u-boot-dtb.img"
-+#define CONFIG_SPL_FS_LOAD_PAYLOAD_NAME     "u-boot.img"
- #endif
- 
- /* Disable dcache for SPL just for sure */
--- 
-2.6.2
-
diff --git a/recipes-bsp/u-boot/u-boot-xlnx/microblaze-Fix-EMAC-Lite-initialization.patch b/recipes-bsp/u-boot/u-boot-xlnx/microblaze-Fix-EMAC-Lite-initialization.patch
deleted file mode 100644
index 09c48fbc..00000000
--- a/recipes-bsp/u-boot/u-boot-xlnx/microblaze-Fix-EMAC-Lite-initialization.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From 83f0e6e733aba458b9afac67f3c95c4e29712263 Mon Sep 17 00:00:00 2001
-From: Nathan Rossi <nathan.rossi@xilinx.com>
-Date: Tue, 14 Apr 2015 15:35:57 +1000
-Subject: [PATCH] microblaze: Fix EMAC Lite initialization
-
-It is possible for CONFIG_XILINX_EMACLITE to be defined without
-XILINX_EMACLITE_BASEADDR being defined as the EMAC Lite driver support
-OF init. Check that the driver is enabled and the base address is
-available before initializing with a static base address.
-
-Signed-off-by: Nathan Rossi <nathan.rossi@xilinx.com>
----
- board/xilinx/microblaze-generic/microblaze-generic.c |    2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/board/xilinx/microblaze-generic/microblaze-generic.c b/board/xilinx/microblaze-generic/microblaze-generic.c
-index eee5f6b..8c926a2 100644
---- a/board/xilinx/microblaze-generic/microblaze-generic.c
-+++ b/board/xilinx/microblaze-generic/microblaze-generic.c
-@@ -63,7 +63,7 @@ int board_eth_init(bd_t *bis)
-                                                XILINX_AXIDMA_BASEADDR);
- #endif
- 
--#ifdef CONFIG_XILINX_EMACLITE
-+#if defined(CONFIG_XILINX_EMACLITE) && defined(XILINX_EMACLITE_BASEADDR)
-        u32 txpp = 0;
-        u32 rxpp = 0;
- # ifdef CONFIG_XILINX_EMACLITE_TX_PING_PONG
--- 
-1.7.10.4
-
diff --git a/recipes-bsp/u-boot/u-boot-xlnx/microblaze-generic_defconfig-Disable-configs.patch b/recipes-bsp/u-boot/u-boot-xlnx/microblaze-generic_defconfig-Disable-configs.patch
deleted file mode 100644
index 316d89af..00000000
--- a/recipes-bsp/u-boot/u-boot-xlnx/microblaze-generic_defconfig-Disable-configs.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-From: Nathan Rossi <nathan.rossi@xilinx.com>
-Date: Mon, 20 Apr 2015 17:57:34 +1000
-Subject: [PATCH] microblaze-generic_defconfig: Disable configs
-
-Signed-off-by: Nathan Rossi <nathan.rossi@xilinx.com>
-Upstream-Status: Configuration
----
- configs/microblaze-generic_defconfig | 4 +---
- include/configs/microblaze-generic.h | 5 +++++
- 2 files changed, 6 insertions(+), 3 deletions(-)
-
-diff --git a/configs/microblaze-generic_defconfig b/configs/microblaze-generic_defconfig
-index 4211d71..69b8023 100644
---- a/configs/microblaze-generic_defconfig
-+++ b/configs/microblaze-generic_defconfig
-@@ -1,6 +1,4 @@
--CONFIG_SPL=y
- CONFIG_MICROBLAZE=y
- CONFIG_TARGET_MICROBLAZE_GENERIC=y
--CONFIG_OF_CONTROL=y
--CONFIG_OF_EMBED=y
- CONFIG_DEFAULT_DEVICE_TREE="microblaze-generic"
-+CONFIG_SYS_BOOTM_LEN=33554432
-diff --git a/include/configs/microblaze-generic.h b/include/configs/microblaze-generic.h
-index 073f3ef..26e85c7 100644
---- a/include/configs/microblaze-generic.h
-+++ b/include/configs/microblaze-generic.h
-@@ -219,6 +219,11 @@
- #endif
- 
- /*
-+ * BOOTM options
-+ */
-+#define CONFIG_SYS_BOOTM_LEN (32 * 1024 * 1024)
-+
-+/*
-  * BOOTP options
-  */
- #define CONFIG_BOOTP_BOOTFILESIZE
--- 
-2.5.1
-
diff --git a/recipes-bsp/u-boot/u-boot-xlnx/zynq-Add-Zynq-PicoZed-board-support.patch b/recipes-bsp/u-boot/u-boot-xlnx/zynq-Add-Zynq-PicoZed-board-support.patch
deleted file mode 100644
index 73220774..00000000
--- a/recipes-bsp/u-boot/u-boot-xlnx/zynq-Add-Zynq-PicoZed-board-support.patch
+++ /dev/null
@@ -1,143 +0,0 @@
-From 8d00cfe0fb3132a5d2035f5945e81c212121326e Mon Sep 17 00:00:00 2001
-From: Nathan Rossi <nathan.rossi@xilinx.com>
-Date: Tue, 14 Apr 2015 14:58:10 +1000
-Subject: [PATCH] zynq: Add Zynq PicoZed board support
-
-The PicoZed is a System-on-Module board which is marketed as part of
-the ZedBoard/MicroZed/etc. collection. It includes a Zynq-7000
-processor.
-
-This patch adds support that covers all the variants of the PicoZed
-including the SKUs with Z7010/Z7020 and Z7015/Z7030 Zynq chips. This
-patch set however only covers support for the System-on-Module and does
-not cover any extra components that are available on carrier boards
-(except those that are fanned out of the module itself).
-
-More information on this board, its variants and available carrier
-boards is available at: http://zedboard.org/product/picozed
-
-Signed-off-by: Nathan Rossi <nathan.rossi@xilinx.com>
-Signed-off-by: Michal Simek <michal.simek@xilinx.com>
-Upstream-Status: Backport
----
- arch/arm/cpu/armv7/zynq/Kconfig |  4 ++++
- arch/arm/dts/Makefile           |  1 +
- arch/arm/dts/zynq-picozed.dts   | 23 +++++++++++++++++++++++
- configs/zynq_picozed_defconfig  |  6 ++++++
- include/configs/zynq_picozed.h  | 27 +++++++++++++++++++++++++++
- 5 files changed, 61 insertions(+)
- create mode 100644 arch/arm/dts/zynq-picozed.dts
- create mode 100644 configs/zynq_picozed_defconfig
- create mode 100644 include/configs/zynq_picozed.h
-
-diff --git a/arch/arm/cpu/armv7/zynq/Kconfig b/arch/arm/cpu/armv7/zynq/Kconfig
-index 2482bbb..d0874ab 100644
---- a/arch/arm/cpu/armv7/zynq/Kconfig
-+++ b/arch/arm/cpu/armv7/zynq/Kconfig
-@@ -9,6 +9,9 @@ config TARGET_ZYNQ_ZED
- config TARGET_ZYNQ_MICROZED
-        bool "Zynq MicroZed"
- 
-+config TARGET_ZYNQ_PICOZED
-+       bool "Zynq PicoZed"
-+
- config TARGET_ZYNQ_ZC70X
-        bool "Zynq ZC702/ZC706 Board"
- 
-@@ -38,6 +41,7 @@ config SYS_SOC
- config SYS_CONFIG_NAME
-        default "zynq_zed" if TARGET_ZYNQ_ZED
-        default "zynq_microzed" if TARGET_ZYNQ_MICROZED
-+       default "zynq_picozed" if TARGET_ZYNQ_PICOZED
-        default "zynq_zc70x" if TARGET_ZYNQ_ZC70X
-        default "zynq_zc770" if TARGET_ZYNQ_ZC770
-        default "zynq_zybo" if TARGET_ZYNQ_ZYBO
-diff --git a/arch/arm/dts/Makefile b/arch/arm/dts/Makefile
-index e08546b..84b0bed 100644
---- a/arch/arm/dts/Makefile
-+++ b/arch/arm/dts/Makefile
-@@ -44,6 +44,7 @@ dtb-$(CONFIG_ZYNQ) += zynq-zc702.dtb \
-        zynq-zed.dtb \
-        zynq-zybo.dtb \
-        zynq-microzed.dtb \
-+       zynq-picozed.dtb \
-        zynq-cc108.dtb \
-        zynq-zc770-xm010.dtb \
-        zynq-zc770-xm011.dtb \
-diff --git a/arch/arm/dts/zynq-picozed.dts b/arch/arm/dts/zynq-picozed.dts
-new file mode 100644
-index 0000000..686b98f
---- /dev/null
-+++ b/arch/arm/dts/zynq-picozed.dts
-@@ -0,0 +1,23 @@
-+/*
-+ * Avnet PicoZed board DTS
-+ *
-+ * Copyright (C) 2015 Xilinx, Inc.
-+ *
-+ * SPDX-License-Identifier:    GPL-2.0+
-+ */
-+/dts-v1/;
-+#include "zynq-7000.dtsi"
-+
-+/ {
-+       model = "Zynq PicoZed Board";
-+       compatible = "xlnx,zynq-picozed", "xlnx,zynq-7000";
-+
-+       aliases {
-+               serial0 = &uart1;
-+       };
-+
-+       memory {
-+               device_type = "memory";
-+               reg = <0 0x40000000>;
-+       };
-+};
-diff --git a/configs/zynq_picozed_defconfig b/configs/zynq_picozed_defconfig
-new file mode 100644
-index 0000000..b782873
---- /dev/null
-+++ b/configs/zynq_picozed_defconfig
-@@ -0,0 +1,6 @@
-+CONFIG_SPL=y
-+CONFIG_ARM=y
-+CONFIG_ZYNQ=y
-+CONFIG_TARGET_ZYNQ_PICOZED=y
-+CONFIG_OF_CONTROL=n
-+CONFIG_DEFAULT_DEVICE_TREE="zynq-picozed"
-diff --git a/include/configs/zynq_picozed.h b/include/configs/zynq_picozed.h
-new file mode 100644
-index 0000000..d116e05
---- /dev/null
-+++ b/include/configs/zynq_picozed.h
-@@ -0,0 +1,27 @@
-+/*
-+ * (C) Copyright 2015 Xilinx, Inc.
-+ *
-+ * Configuration for PicoZed
-+ * See zynq-common.h for Zynq common configs
-+ *
-+ * SPDX-License-Identifier:    GPL-2.0+
-+ */
-+
-+#ifndef __CONFIG_ZYNQ_PICOZED_H
-+#define __CONFIG_ZYNQ_PICOZED_H
-+
-+#define CONFIG_SYS_SDRAM_SIZE          (1024 * 1024 * 1024)
-+
-+#define CONFIG_ZYNQ_SERIAL_UART1
-+#define CONFIG_ZYNQ_GEM0
-+#define CONFIG_ZYNQ_GEM_PHY_ADDR0      0
-+
-+#define CONFIG_SYS_NO_FLASH
-+
-+#define CONFIG_ZYNQ_SDHCI1
-+#define CONFIG_ZYNQ_USB
-+#define CONFIG_ZYNQ_BOOT_FREEBSD
-+
-+#include <configs/zynq-common.h>
-+
-+#endif /* __CONFIG_ZYNQ_PICOZED_H */
--- 
-2.5.1
-
diff --git a/recipes-bsp/u-boot/u-boot-xlnx_2015.04.bb b/recipes-bsp/u-boot/u-boot-xlnx_2015.04.bb
deleted file mode 100644
index 0bcbffd8..00000000
--- a/recipes-bsp/u-boot/u-boot-xlnx_2015.04.bb
+++ /dev/null
@@ -1,30 +0,0 @@
-include u-boot-xlnx.inc
-include u-boot-extra.inc
-include u-boot-spl-zynq-init.inc
-
-# this matches u-boot-xlnx 'xilinx-v2015.2' release tag
-SRCREV = "1160fbcc619f23bf87cde01ed651566474e17eb9"
-PV = "v2015.04${XILINX_EXTENSION}+git${SRCPV}"
-
-FILESEXTRAPATHS_prepend := "${THISDIR}/u-boot-xlnx:"
-SRC_URI += " \
-                file://ARM-zynq-Fix-up-the-target-file-name-for-u-boot.patch \
-                file://zynq-Add-Zynq-PicoZed-board-support.patch \
-                file://microblaze-Fix-EMAC-Lite-initialization.patch \
-                file://microblaze-generic_defconfig-Disable-configs.patch \
-                file://0001-microblaze-Fix-style-issues-in-header-files.patch \
-                file://0002-microblaze-Fix-C99-gnu99-compatiblity-for-inline-fun.patch \
-                "
-
-LIC_FILES_CHKSUM = "file://README;beginline=1;endline=6;md5=157ab8408beab40cd8ce1dc69f702a6c"
-
-UBOOT_ENV_zc702-zynq7 = "uEnv"
-UBOOT_ENV_zedboard-zynq7 = "uEnv"
-
-SRC_URI_append_zc702-zynq7 = " file://uEnv.txt"
-SRC_URI_append_zedboard-zynq7 = " file://uEnv.txt"
-
-# 2015.04 - does not split the zc702 and zc706 into two configs
-UBOOT_MACHINE_zc702-zynq7 = "zynq_zc70x_config"
-UBOOT_MACHINE_zc706-zynq7 = "zynq_zc70x_config"
-