svn commit: r409742 - in head/sysutils/u-boot-utilite: . files

[Raphael Kubo da Costa]

Author: rakuco
Date: Sun Feb 28 14:32:45 2016
New Revision: 409742
URL: https://svnweb.freebsd.org/changeset/ports/409742

Log:
  Apply some small fixes to the port.
  
  - Set correct number (3) for CONFIG_SYS_MMC_MAX_DEVICE
  - Remove "SSP_UNSAFE= yes" from Makefile. The port builds fine without it.
  - Add "PORTSCOUT= ignore" to Makefile. New versions only make sense if
    manufacturer (CompuLab) decides to move to upgraded u-boot version.
  
  PR:		207554
  Submitted by:	Martin Waschbüsch <martin at waschbuesch.de> (maintainer)

Modified:
  head/sysutils/u-boot-utilite/Makefile
  head/sysutils/u-boot-utilite/files/patch-include_configs_cm__fx6.h

Modified: head/sysutils/u-boot-utilite/Makefile
==============================================================================
--- head/sysutils/u-boot-utilite/Makefile	Sun Feb 28 13:52:05 2016	(r409741)
+++ head/sysutils/u-boot-utilite/Makefile	Sun Feb 28 14:32:45 2016	(r409742)
@@ -2,6 +2,7 @@
 
 PORTNAME=	u-boot
 PORTVERSION=	2015.07
+PORTREVISION=	1
 CATEGORIES=	sysutils
 MASTER_SITES=	ftp://ftp.denx.de/pub/u-boot/:source1 \
 		http://www.compulab.co.il/wp-content/uploads/2015/10/:source2
@@ -23,7 +24,8 @@ EXTRA_PATCHES=	${WRKDIR}/cm-fx6-u-boot/u
 NO_ARCH=	yes
 
 USES=		gmake
-SSP_UNSAFE=	yes # cross-build static linking dies with -fstack-protector
+
+PORTSCOUT=	ignore
 
 U_BOOT_DIR=	share/u-boot/${PORTNAME}${PKGNAMESUFFIX}
 

Modified: head/sysutils/u-boot-utilite/files/patch-include_configs_cm__fx6.h
==============================================================================
--- head/sysutils/u-boot-utilite/files/patch-include_configs_cm__fx6.h	Sun Feb 28 13:52:05 2016	(r409741)
+++ head/sysutils/u-boot-utilite/files/patch-include_configs_cm__fx6.h	Sun Feb 28 14:32:45 2016	(r409742)
@@ -1,11 +1,18 @@
---- include/configs/cm_fx6.h.orig	2016-02-27 13:29:39 UTC
+--- include/configs/cm_fx6.h.orig	2016-02-28 08:48:02 UTC
 +++ include/configs/cm_fx6.h
-@@ -174,6 +174,9 @@
+@@ -21,6 +21,7 @@
+ #define CONFIG_CMD_GREPENV
+ 
+ /* MMC */
++#define CONFIG_SYS_MMC_MAX_DEVICE	3
+ #define CONFIG_SYS_FSL_USDHC_NUM	3
+ #define CONFIG_SYS_FSL_ESDHC_ADDR	USDHC2_BASE_ADDR
+ 
+@@ -174,6 +175,8 @@
  
  /* NAND */
  #ifndef CONFIG_SPL_BUILD
 +#define CONFIG_CMD_ELF
-+#define CONFIG_SYS_MMC_MAX_DEVICE 4
 +#define CONFIG_API
  #define CONFIG_CMD_NAND
  #define CONFIG_SYS_NAND_BASE		0x40000000