Initial rebase to 2015.07rc2, Enable mx6cuboxi, 32 bit vexpress, Update builds for name changes, merges etc
This commit is contained in:
Peter Robinson
parent
3ae540d44b
commit
c5f597cdfb
|
|
@ -0,0 +1,34 @@
|
|||
From 4ff418fa70e038b1ce17545294d7638cb0e12390 Mon Sep 17 00:00:00 2001
|
||||
From: Peter Robinson <pbrobinson@gmail.com>
|
||||
Date: Mon, 15 Jun 2015 15:52:09 +0100
|
||||
Subject: [PATCH] If CONFIG_SANDBOX isn't defined the build fails in fw_env.c
|
||||
due to a with with the following error:
|
||||
|
||||
error: expected '}' before 'BOOT_TARGET_DEVICES_references_HOST_without_CONFIG_SANDBOX'
|
||||
CONFIG_EXTRA_ENV_SETTINGS
|
||||
|
||||
A check to see if it's defined fixes this issue.
|
||||
|
||||
Signed-off-by: Peter Robinson <pbrobinson@gmail.com>
|
||||
---
|
||||
include/configs/sandbox.h | 4 ++++
|
||||
1 file changed, 4 insertions(+)
|
||||
|
||||
diff --git a/include/configs/sandbox.h b/include/configs/sandbox.h
|
||||
index 3caa83c..f72675b 100644
|
||||
--- a/include/configs/sandbox.h
|
||||
+++ b/include/configs/sandbox.h
|
||||
@@ -6,6 +6,10 @@
|
||||
#ifndef __CONFIG_H
|
||||
#define __CONFIG_H
|
||||
|
||||
+#ifndef CONFIG_SANDBOX
|
||||
+#define CONFIG_SANDBOX
|
||||
+#endif
|
||||
+
|
||||
#ifdef FTRACE
|
||||
#define CONFIG_TRACE
|
||||
#define CONFIG_CMD_TRACE
|
||||
--
|
||||
2.4.3
|
||||
|
||||
12
armv7-boards
12
armv7-boards
|
|
@ -23,20 +23,19 @@ db-mv784mp-gp
|
|||
forfun_q88db
|
||||
highbank
|
||||
Hummingbird_A31
|
||||
hummingboard_solo
|
||||
Hyundai_A7HD
|
||||
i12-tvbox
|
||||
Inet_86VS
|
||||
iNet_86VS
|
||||
Ippo_q8h_v1_2
|
||||
Ippo_q8h_v5
|
||||
jesurun_q5
|
||||
jetson-tk1
|
||||
Linksprite_pcDuino
|
||||
Linksprite_pcDuino3
|
||||
Linksprite_pcDuino3_fdt
|
||||
Linksprite_pcDuino3_Nano
|
||||
Marsboard_A10
|
||||
Mele_A1000
|
||||
Mele_A1000G_quad
|
||||
Mele_I7
|
||||
Mele_M3
|
||||
Mele_M5
|
||||
|
|
@ -48,6 +47,7 @@ mk802ii
|
|||
MK808C
|
||||
MSI_Primo73
|
||||
MSI_Primo81
|
||||
mx6cuboxi
|
||||
novena
|
||||
nyan-big
|
||||
odroid
|
||||
|
|
@ -70,9 +70,9 @@ trimslice
|
|||
TZX-Q8-713B7
|
||||
udoo_quad
|
||||
UTOO_P66
|
||||
wandboard_dl
|
||||
wandboard_quad
|
||||
wandboard_solo
|
||||
vexpress_ca15_tc2
|
||||
vexpress_ca9x4
|
||||
wandboard
|
||||
Wexler_TAB7200
|
||||
Wits_Pro_A20_DKT
|
||||
zynq_microzed
|
||||
|
|
|
|||
2
sources
2
sources
|
|
@ -1 +1 @@
|
|||
570bdc2c47270c2a98ca60ff6c5c74cd u-boot-2015.04.tar.bz2
|
||||
dafee1b3cb07086f81035aec64bc2342 u-boot-2015.07-rc2.tar.bz2
|
||||
|
|
|
|||
|
|
@ -1,8 +1,8 @@
|
|||
#global candidate rc1
|
||||
%global candidate rc2
|
||||
|
||||
Name: uboot-tools
|
||||
Version: 2015.04
|
||||
Release: 3%{?candidate:.%{candidate}}%{?dist}
|
||||
Version: 2015.07
|
||||
Release: 0.1%{?candidate:.%{candidate}}%{?dist}
|
||||
Summary: U-Boot utilities
|
||||
|
||||
Group: Development/Tools
|
||||
|
|
@ -11,25 +11,30 @@ URL: http://www.denx.de/wiki/U-Boot
|
|||
Source0: ftp://ftp.denx.de/pub/u-boot/u-boot-%{version}%{?candidate:-%{candidate}}.tar.bz2
|
||||
Source1: armv7-boards
|
||||
|
||||
Patch1: 0001-make-sure-that-the-filesystem-is-a-type-of-fat.patch
|
||||
Patch2: 0002-Add-BOOTENV_POST_COMMAND-which-is-appended-to-the-en.patch
|
||||
Patch3: 0003-Only-set-CONFIG_BOOTDELAY-if-not-already-set.patch
|
||||
Patch4: 0004-Switch-am335x_evm.h-to-use-config_distro_defaults-an.patch
|
||||
Patch5: 0005-add-back-adding-console-to-the-bootargs-if-not-prese.patch
|
||||
Patch6: 0006-wandboard-port-to-generic-distro-booting.patch
|
||||
Patch7: 0007-Switch-omap4-boards-to-use-config_distro_defaults-an.patch
|
||||
Patch8: 0008-port-utilite-to-distro-generic-boot-commands.patch
|
||||
Patch9: 0009-RiOT-board-set-console-speed.patch
|
||||
Patch10: 0010-Add-support-for-loading-environment-from-uEnv.txt-in.patch
|
||||
Patch11: 0011-Add-BOOTENV_INIT_COMMAND-for-commands-that-may-be-ne.patch
|
||||
Patch12: 0012-beagle-board-use-ext-support-in-the-SPL.patch
|
||||
Patch13: 0013-WANDBOARD-run-the-dsitro-bootcmd-first-before-fallin.patch
|
||||
Patch14: 0014-BBB-tell-u-boot-to-look-in-the-first-partition-to-lo.patch
|
||||
Patch15: 0001-omap4-distro-boot-partition-fixup.patch
|
||||
Patch0: 0001-If-CONFIG_SANDBOX-isn-t-defined-the-build-fails-in-f.patch
|
||||
#Patch1: 0001-make-sure-that-the-filesystem-is-a-type-of-fat.patch
|
||||
#Patch2: 0002-Add-BOOTENV_POST_COMMAND-which-is-appended-to-the-en.patch
|
||||
#Patch3: 0003-Only-set-CONFIG_BOOTDELAY-if-not-already-set.patch
|
||||
#Patch4: 0004-Switch-am335x_evm.h-to-use-config_distro_defaults-an.patch
|
||||
#Patch5: 0005-add-back-adding-console-to-the-bootargs-if-not-prese.patch
|
||||
#Patch6: 0006-wandboard-port-to-generic-distro-booting.patch
|
||||
#Patch7: 0007-Switch-omap4-boards-to-use-config_distro_defaults-an.patch
|
||||
#Patch8: 0008-port-utilite-to-distro-generic-boot-commands.patch
|
||||
#Patch9: 0009-RiOT-board-set-console-speed.patch
|
||||
#Patch10: 0010-Add-support-for-loading-environment-from-uEnv.txt-in.patch
|
||||
#Patch11: 0011-Add-BOOTENV_INIT_COMMAND-for-commands-that-may-be-ne.patch
|
||||
#Patch12: 0012-beagle-board-use-ext-support-in-the-SPL.patch
|
||||
#Patch13: 0013-WANDBOARD-run-the-dsitro-bootcmd-first-before-fallin.patch
|
||||
#Patch14: 0014-BBB-tell-u-boot-to-look-in-the-first-partition-to-lo.patch
|
||||
#Patch15: 0001-omap4-distro-boot-partition-fixup.patch
|
||||
|
||||
BuildRequires: dtc, openssl-devel
|
||||
BuildRequires: fedora-logos, netpbm-progs
|
||||
BuildRequires: git, bc
|
||||
BuildRequires: bc
|
||||
BuildRequires: dtc
|
||||
BuildRequires: fedora-logos
|
||||
BuildRequires: git
|
||||
BuildRequires: netpbm-progs
|
||||
BuildRequires: openssl-devel
|
||||
BuildRequires: SDL-devel
|
||||
Requires: dtc
|
||||
|
||||
%description
|
||||
|
|
@ -186,6 +191,11 @@ install -p -m 0644 tools/env/fw_env.config $RPM_BUILD_ROOT%{_sysconfdir}
|
|||
%endif
|
||||
|
||||
%changelog
|
||||
* Tue Jun 9 2015 Peter Robinson <pbrobinson@fedoraproject.org> 2015.07-0.1rc2
|
||||
- Initial rebase to 2015.07rc2
|
||||
- Enable mx6cuboxi, 32 bit vexpress
|
||||
- Update builds for name changes, merges etc
|
||||
|
||||
* Wed May 27 2015 Peter Robinson <pbrobinson@fedoraproject.org> 2015.04-3
|
||||
- Enable Zynq microzed, zed and zybo
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue