xtensa: no extra u-boot required anymore

package/u-boot-xtensa/Makefile

@@ -1,58 +0,0 @@
-# This file is part of the OpenADK project. OpenADK is copyrighted
-# material, please see the LICENCE file in the top-level directory.
-
-include $(ADK_TOPDIR)/rules.mk
-
-PKG_NAME:=		u-boot-xtensa
-PKG_VERSION:=		fe85520cfb23b815207fa1a0ad840ec795eecedf
-PKG_GIT:=		hash
-PKG_RELEASE:=		1
-PKG_DESCR:=		portable bootloader
-PKG_SECTION:=		base/boot
-HOST_BUILDDEP:=		openssl-host device-tree-compiler-host
-PKG_BUILDDEP:=		u-boot-xtensa-host
-PKG_URL:=		https://github.com/jcmvbkbc/u-boot-xtensa/tree/xtensa-for-mainline
-PKG_SITES:=		https://github.com/jcmvbkbc/u-boot-xtensa.git
-
-PKG_SYSTEM_DEPENDS:=	xilinx-kintex7
-
-include $(ADK_TOPDIR)/mk/host.mk
-include $(ADK_TOPDIR)/mk/package.mk
-
-$(eval $(call HOST_template,U_BOOT_XTENSA,u-boot-xtensa,$(PKG_VERSION)-$(PKG_RELEASE)))
-$(eval $(call PKG_template,U_BOOT_XTENSA,u-boot-xtensa,$(PKG_VERSION)-$(PKG_RELEASE),$(PKG_DEPENDS),$(PKG_DESCR),$(PKG_SECTION)))
-
-UBOOT:=			u-boot.bin
-CONFIG:=		xtfpga_defconfig
-
-HOST_MAKE_FLAGS+=	HOSTCFLAGS="$(HOST_CPPFLAGS) $(HOST_CFLAGS)" \
-			HOSTLDFLAGS="$(HOST_LDFLAGS) -ldl"
-HOST_STYLE:=		manual
-CONFIG_STYLE:=		manual
-BUILD_STYLE:=		manual
-INSTALL_STYLE:=		manual
-
-host-build:
-	(cd $(WRKBUILD) && env $(HOST_MAKE_ENV) $(MAKE) -f $(MAKE_FILE) \
-		$(HOST_MAKE_FLAGS) sandbox_defconfig )
-	(cd $(WRKBUILD) && env $(HOST_MAKE_ENV) $(MAKE) -f $(MAKE_FILE) \
-		$(HOST_MAKE_FLAGS) tools $(MAKE_TRACE) )
-
-u-boot-xtensa-hostinstall:
-	$(INSTALL_BIN) $(WRKBUILD)/tools/mk{,env}image \
-		$(STAGING_HOST_DIR)/usr/bin
-
-do-configure:
-	(cd $(WRKBUILD) && $(MAKE) $(CONFIG))
-
-do-build:
-	(cd $(WRKBUILD) && env \
-		PATH='$(HOST_PATH)' \
-		CROSS_COMPILE='$(TARGET_CROSS)' \
-		GCC_HONOUR_COPTS=s $(MAKE))
-
-u-boot-xtensa-install:
-	$(CP) $(WRKBUILD)/$(UBOOT) $(FW_DIR)
-
-include $(ADK_TOPDIR)/mk/host-bottom.mk
-include $(ADK_TOPDIR)/mk/pkg-bottom.mk

package/u-boot-xtensa/files/fw_env.config

@@ -1 +0,0 @@
-/mnt/uboot.env      0x0000          0x4000

package/u-boot-xtensa/files/uboot_print_env

@@ -1,5 +0,0 @@
-#!/bin/sh
-
-mount -r /dev/mmcblk0p1 /mnt
-fw_printenv "$@"
-umount /mnt

package/u-boot-xtensa/files/uboot_set_env

@@ -1,5 +0,0 @@
-#!/bin/sh
-
-mount /dev/mmcblk0p1 /mnt
-fw_setenv "$@"
-umount /mnt

package/u-boot-xtensa/patches/patch-Makefile

@@ -1,12 +0,0 @@
---- u-boot-xtensa-fe85520cfb23b815207fa1a0ad840ec795eecedf.orig/Makefile	2015-05-27 14:16:15.000000000 -0500
-+++ u-boot-xtensa-fe85520cfb23b815207fa1a0ad840ec795eecedf/Makefile	2015-05-27 14:48:47.588823659 -0500
-@@ -561,9 +561,6 @@ KBUILD_AFLAGS += -Wa,-gstabs,-S
- endif
- endif
- 
--# Prohibit date/time macros, which would make the build non-deterministic
--KBUILD_CFLAGS   += $(call cc-option,-Werror=date-time)
--
- ifneq ($(CONFIG_SYS_TEXT_BASE),)
- KBUILD_CPPFLAGS += -DCONFIG_SYS_TEXT_BASE=$(CONFIG_SYS_TEXT_BASE)
- endif

package/u-boot-xtensa/patches/patch-tools_Makefile

@@ -1,11 +0,0 @@
---- u-boot-xtensa-fe85520cfb23b815207fa1a0ad840ec795eecedf.orig/tools/Makefile	2015-07-06 13:09:06.000000000 +0200
-+++ u-boot-xtensa-fe85520cfb23b815207fa1a0ad840ec795eecedf/tools/Makefile	2015-07-06 13:13:09.274561163 +0200
-@@ -114,7 +114,7 @@ endif
- 
- # MXSImage needs LibSSL
- ifneq ($(CONFIG_MX23)$(CONFIG_MX28)$(CONFIG_FIT_SIGNATURE),)
--HOSTLOADLIBES_mkimage += -lssl -lcrypto
-+HOSTLOADLIBES_mkimage += -lssl -lcrypto -ldl
- endif
- 
- HOSTLOADLIBES_dumpimage := $(HOSTLOADLIBES_mkimage)

target/config/Config.in.tools

@@ -83,10 +83,6 @@ config ADK_HOST_BUILD_U_BOOT
 	bool
 	default n
 
-config ADK_HOST_BUILD_U_BOOT_XTENSA
-	bool
-	default y if ADK_TARGET_ARCH_XTENSA
-
 config ADK_HOST_BUILD_OPENOCD
 	bool
 	default n

target/xtensa/Makefile

@@ -63,6 +63,8 @@ targethelp:
 	@echo "The RootFS tarball is: $(FW_DIR)/$(ROOTFSUSERTARBALL)"
 endif
 
+kernel-strip:
+
 kernel-install:
 	@cp $(KERNEL) $(FW_DIR)/${TARGET_KERNEL}
 

target/xtensa/systems/xilinx-kintex7

@@ -6,7 +6,7 @@ config ADK_TARGET_SYSTEM_XILINX_KINTEX7
 	select ADK_TARGET_WITH_NET
 	select ADK_TARGET_WITH_NETDEVICE
 	select ADK_TARGET_WITH_BLOCK
-	select ADK_HOST_BUILD_U_BOOT_XTENSA
+	select ADK_HOST_BUILD_U_BOOT
 	help
 	  Support for Xilinx Kintex 7 with Cadence daughterboard.