Merge branch 'master' of git+ssh://openadk.org/git/openadk

9 files changed, 49 insertions, 5 deletions

diff --git a/package/u-boot-git/Makefile b/package/u-boot-git/Makefile
index 4a7452476..47a44cc4a 100644
--- a/package/u-boot-git/Makefile
+++ b/package/u-boot-git/Makefile
@@ -13,8 +13,7 @@ PKG_BUILDDEP:=		u-boot-host
 PKG_URL:=		http://www.denx.de/wiki/U-Boot	
 PKG_SITES:=		git://git.denx.de/u-boot.git
 
-PKG_CFLINE_U_BOOT_GIT:=	select ADK_KERNEL_ATAGS if ADK_TARGET_ARCH_ARM
-PKG_SYSTEM_DEPENDS:=	raspberry-pi raspberry-pi2 atmel-ngw100 banana-pro
+PKG_SYSTEM_DEPENDS:=	raspberry-pi raspberry-pi2 atmel-ngw100 banana-pro xilinx-kintex7
 
 include $(ADK_TOPDIR)/mk/host.mk
 include $(ADK_TOPDIR)/mk/package.mk
diff --git a/package/u-boot-git/patches/patch-common_image_c b/package/u-boot-git/patches/patch-common_image_c
new file mode 100644
index 000000000..e10af8e3e
--- /dev/null
+++ b/package/u-boot-git/patches/patch-common_image_c
@@ -0,0 +1,10 @@
+--- u-boot-git-3bfe3ce2a6e3b04da1d04dbc0520dcc26e17f98a.orig/common/image.c	2015-05-22 17:03:30.000000000 -0500
++++ u-boot-git-3bfe3ce2a6e3b04da1d04dbc0520dcc26e17f98a/common/image.c	2015-05-22 18:14:50.658865101 -0500
+@@ -87,6 +87,7 @@ static const table_entry_t uimage_arch[]
+ 	{	IH_ARCH_ARM64,		"arm64",	"AArch64",	},
+ 	{	IH_ARCH_ARC,		"arc",		"ARC",		},
+ 	{	IH_ARCH_X86_64,		"x86_64",	"AMD x86_64",	},
++	{	IH_ARCH_XTENSA,		"xtensa",	"Xtensa",	},
+ 	{	-1,			"",		"",		},
+ };
+ 
diff --git a/package/u-boot-git/patches/patch-include_image_h b/package/u-boot-git/patches/patch-include_image_h
new file mode 100644
index 000000000..20f331a5a
--- /dev/null
+++ b/package/u-boot-git/patches/patch-include_image_h
@@ -0,0 +1,10 @@
+--- u-boot-git-3bfe3ce2a6e3b04da1d04dbc0520dcc26e17f98a.orig/include/image.h	2015-05-22 17:03:31.000000000 -0500
++++ u-boot-git-3bfe3ce2a6e3b04da1d04dbc0520dcc26e17f98a/include/image.h	2015-05-22 17:33:55.950887553 -0500
+@@ -182,6 +182,7 @@ struct lmb;
+ #define IH_ARCH_ARM64		22	/* ARM64	*/
+ #define IH_ARCH_ARC		23	/* Synopsys DesignWare ARC */
+ #define IH_ARCH_X86_64		24	/* AMD x86_64, Intel and Via */
++#define IH_ARCH_XTENSA		25	/* Xtensa */
+ 
+ /*
+  * Image Types
diff --git a/package/u-boot/Makefile b/package/u-boot/Makefile
index db93e919b..0b821228c 100644
--- a/package/u-boot/Makefile
+++ b/package/u-boot/Makefile
@@ -14,11 +14,9 @@ PKG_BUILDDEP:=		u-boot-host
 PKG_URL:=		http://www.denx.de/wiki/U-Boot	
 PKG_SITES:=		ftp://ftp.denx.de/pub/u-boot/
 
-PKG_CFLINE_U_BOOT:=	select ADK_KERNEL_ATAGS if ADK_TARGET_ARCH_ARM
-
 DISTFILES:=		$(PKG_NAME)-$(PKG_VERSION).tar.bz2
 
-PKG_SYSTEM_DEPENDS:=	raspberry-pi raspberry-pi2 atmel-ngw100
+PKG_SYSTEM_DEPENDS:=	raspberry-pi raspberry-pi2 atmel-ngw100 xilinx-kintex7
 
 include $(ADK_TOPDIR)/mk/host.mk
 include $(ADK_TOPDIR)/mk/package.mk
diff --git a/target/config/Config.in.kernel b/target/config/Config.in.kernel
index b51f094d6..effd374b3 100644
--- a/target/config/Config.in.kernel
+++ b/target/config/Config.in.kernel
@@ -76,3 +76,4 @@ config ADK_TARGET_KERNEL_MINICONFIG
 	default "apple-macmini" if ADK_TARGET_SYSTEM_APPLE_MACMINI
 	default "sun-voyager" if ADK_TARGET_SYSTEM_SUN_VOYAGER
 	default "banana-pro" if ADK_TARGET_SYSTEM_BANANA_PRO
+	default "xilinx-kintex7" if ADK_TARGET_SYSTEM_XILINX_KINTEX7
diff --git a/target/config/Config.in.tools b/target/config/Config.in.tools
index 5dc6877c8..3045d79c6 100644
--- a/target/config/Config.in.tools
+++ b/target/config/Config.in.tools
@@ -77,6 +77,10 @@ config ADK_HOST_BUILD_U_BOOT
 	bool
 	default n
 
+config ADK_HOST_BUILD_U_BOOT_GIT
+	bool
+	default n
+
 config ADK_HOST_BUILD_PATCH
 	bool
 	default n
diff --git a/target/xtensa/Makefile b/target/xtensa/Makefile
index 19f0a28f0..756bb020f 100644
--- a/target/xtensa/Makefile
+++ b/target/xtensa/Makefile
@@ -52,6 +52,11 @@ ifeq ($(ADK_TARGET_QEMU),y)
 	@echo 'qemu-system-${ADK_TARGET_CPU_ARCH} ${QEMU_ARGS} -kernel $(FW_DIR)/$(TARGET_KERNEL)'
 endif
 endif
+ifeq ($(ADK_TARGET_FS),nfsroot)
+targethelp:
+	@echo 'The kernel file is: $(FW_DIR)/${TARGET_KERNEL}'
+	@echo "The RootFS tarball is: $(FW_DIR)/$(ROOTFSUSERTARBALL)"
+endif
 
 kernel-install:
 	@cp $(KERNEL) $(FW_DIR)/${TARGET_KERNEL}
@@ -69,3 +74,6 @@ endif
 ifeq ($(ADK_TARGET_FS),initramfspiggyback)
 imageinstall: createinitramfs targethelp
 endif
+ifeq ($(ADK_TARGET_FS),nfsroot)
+imageinstall: kernel-install $(FW_DIR)/$(ROOTFSUSERTARBALL) targethelp
+endif
diff --git a/target/xtensa/kernel/xilinx-kintex7 b/target/xtensa/kernel/xilinx-kintex7
new file mode 100644
index 000000000..c7a401380
--- /dev/null
+++ b/target/xtensa/kernel/xilinx-kintex7
@@ -0,0 +1,5 @@
+CONFIG_XTENSA=y
+CONFIG_XTENSA_PLATFORM_XTFPGA=y
+CONFIG_SERIAL_CONSOLE=y
+CONFIG_SERIAL_8250=y
+CONFIG_SERIAL_8250_CONSOLE=y
diff --git a/target/xtensa/systems/xilinx-kintex7 b/target/xtensa/systems/xilinx-kintex7
new file mode 100644
index 000000000..af044e458
--- /dev/null
+++ b/target/xtensa/systems/xilinx-kintex7
@@ -0,0 +1,9 @@
+config ADK_TARGET_SYSTEM_XILINX_KINTEX7
+	bool "Xilinx Kintex 7"
+	select ADK_CPU_XTENSA
+	select ADK_TARGET_KERNEL_ZIMAGE
+	select ADK_HOST_BUILD_U_BOOT_GIT
+	help
+	 Support for Xilinx Kintex 7 with Cadence daughterboard.
+
+