rpms/uboot-tools
3
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

update to 2014.10 final release

Browse Source
This commit is contained in:
Dennis Gilmore 2014-10-14 19:48:49 -05:00
parent df895de383
commit 354b25edcc
15 changed files with 44 additions and 128 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
0001-make-sure-that-the-filesystem-is-a-type-of-fat.patch
View File

@ -1,7 +1,7 @@
From 1200fce02e1c8a9ae41efc769e2075ab5ae0d776 Mon Sep 17 00:00:00 2001
From 43a31dc85859cef2bc0b24ff2516d6fb069f4eec Mon Sep 17 00:00:00 2001
From: Dennis Gilmore <dennis@ausil.us>
Date: Tue, 14 Oct 2014 00:38:28 -0500
Subject: [PATCH 01/13] make sure that the filesystem is a type of fat
Subject: [PATCH 01/11] make sure that the filesystem is a type of fat
parted marks the partition table as being fat32 though we may pyt a fat16
filesystem on it.

4
0002-Allow-checking-in-multiple-partitions-for-scan_dev_f.patch
View File

@ -1,7 +1,7 @@
From fcb6578b126b4dee8d16080943344769ea50ba36 Mon Sep 17 00:00:00 2001
From 2ca45b547dedc76f403ed25405ddf9b69afa07a6 Mon Sep 17 00:00:00 2001
From: Vagrant Cascadian <vagrant@debian.org>
Date: Wed, 1 Oct 2014 13:20:53 -0700
Subject: [PATCH 02/13] Allow checking in multiple partitions for
Subject: [PATCH 02/11] Allow checking in multiple partitions for
scan_dev_for_boot.
---

4
0003-Allow-overriding-boot_partitions-default-value-by-se.patch
View File

@ -1,7 +1,7 @@
From f37a40d5bc721f725801f6897445e6d3f476739e Mon Sep 17 00:00:00 2001
From 1f21a89342cf8897aa140a75fe4302908baf2431 Mon Sep 17 00:00:00 2001
From: Vagrant Cascadian <vagrant@debian.org>
Date: Wed, 1 Oct 2014 12:55:58 -0700
Subject: [PATCH 03/13] Allow overriding boot_partitions default value by
Subject: [PATCH 03/11] Allow overriding boot_partitions default value by
setting BOOTENV_BOOT_PARTITIONS before including config_distro_bootcmd.
---

4
0004-Add-BOOTENV_INIT_COMMAND-for-commands-that-may-be-ne.patch
View File

@ -1,7 +1,7 @@
From 77469eb5a83041a18d9c81ac659f420267be4e02 Mon Sep 17 00:00:00 2001
From 8ecd007b88f92de2e5c585f434d3dcffdfe6ee7e Mon Sep 17 00:00:00 2001
From: Vagrant Cascadian <vagrant@debian.org>
Date: Tue, 30 Sep 2014 20:02:26 -0700
Subject: [PATCH 04/13] Add BOOTENV_INIT_COMMAND for commands that may be
Subject: [PATCH 04/11] Add BOOTENV_INIT_COMMAND for commands that may be
needed to run before bootcmd, such as setting the fdt file variables for
platfroms that detect on boot.

4
0005-Add-BOOTENV_POST_COMMAND-which-is-appended-to-the-en.patch
View File

@ -1,7 +1,7 @@
From 8c11ded6be23a2be2956d250a3154b6f45b4841e Mon Sep 17 00:00:00 2001
From 92f36f70d6df4ce4024e8b0b9e88dc9b8b055e31 Mon Sep 17 00:00:00 2001
From: Vagrant Cascadian <vagrant@debian.org>
Date: Wed, 1 Oct 2014 14:04:01 -0700
Subject: [PATCH 05/13] Add BOOTENV_POST_COMMAND, which is appended to the end
Subject: [PATCH 05/11] Add BOOTENV_POST_COMMAND, which is appended to the end
of bootcmd.
---

4
0006-Only-set-CONFIG_BOOTDELAY-if-not-already-set.patch
View File

@ -1,7 +1,7 @@
From 71e80f29e7a051913da85d74b21b1db105367cf6 Mon Sep 17 00:00:00 2001
From d4ec2d9e7134d8deb403f82577b04c63e724ab08 Mon Sep 17 00:00:00 2001
From: Vagrant Cascadian <vagrant@debian.org>
Date: Tue, 30 Sep 2014 20:34:19 -0700
Subject: [PATCH 06/13] Only set CONFIG_BOOTDELAY if not already set.
Subject: [PATCH 06/11] Only set CONFIG_BOOTDELAY if not already set.
---
include/config_distro_defaults.h | 2 ++

4
0007-Add-support-for-loading-environment-from-uEnv.txt-in.patch
View File

@ -1,7 +1,7 @@
From 95e17627b776a48737c90fa5b2bc298214ba77e3 Mon Sep 17 00:00:00 2001
From e35f16a3b1d651e2ce0b07ec67572f55fafff092 Mon Sep 17 00:00:00 2001
From: Vagrant Cascadian <vagrant@debian.org>
Date: Wed, 1 Oct 2014 10:29:36 -0700
Subject: [PATCH 07/13] Add support for loading environment from uEnv.txt in
Subject: [PATCH 07/11] Add support for loading environment from uEnv.txt in
config_distro_bootcmd.
---

6
0008-Switch-am335x_evm.h-to-use-config_distro_defaults-an.patch
View File

@ -1,7 +1,7 @@
From 661a4ba5ba38378ef2a84b70530bc87ca770af25 Mon Sep 17 00:00:00 2001
From 2a0974e667c0b19d5ebce0f4db576f9123f33c7e Mon Sep 17 00:00:00 2001
From: Vagrant Cascadian <vagrant@debian.org>
Date: Wed, 1 Oct 2014 13:28:18 -0700
Subject: [PATCH 08/13] Switch am335x_evm.h to use config_distro_defaults and
Subject: [PATCH 08/11] Switch am335x_evm.h to use config_distro_defaults and
config_distro_bootcmd. Add scriptaddr to DEFAULT_LINUX_BOOT_ENV, as
scriptaddr is used for boot scripts in config_distro_defaults.
@ -11,7 +11,7 @@ Subject: [PATCH 08/13] Switch am335x_evm.h to use config_distro_defaults and
2 files changed, 18 insertions(+), 9 deletions(-)
diff --git a/include/configs/am335x_evm.h b/include/configs/am335x_evm.h
index e2f7ead..b25d990 100644
index 476430d..3452b61 100644
--- a/include/configs/am335x_evm.h
+++ b/include/configs/am335x_evm.h
@@ -18,6 +18,21 @@

28
0009-wandboard-port-to-generic-distro-booting.patch
View File

@ -1,7 +1,7 @@
From dc6a468f1fb40b473ae6468e5b24be38ecf566ed Mon Sep 17 00:00:00 2001
From 3574f372237e9861461801d518830df92f1d70c3 Mon Sep 17 00:00:00 2001
From: Dennis Gilmore <dennis@ausil.us>
Date: Wed, 10 Sep 2014 10:57:16 -0500
Subject: [PATCH 09/13] wandboard: port to generic distro booting
Date: Tue, 14 Oct 2014 19:42:32 -0500
Subject: [PATCH 09/11] wandboard: port to generic distro booting
set the variables and functions needed for generic distro booting.
---
@ -9,7 +9,7 @@ set the variables and functions needed for generic distro booting.
1 file changed, 26 insertions(+), 22 deletions(-)
diff --git a/include/configs/wandboard.h b/include/configs/wandboard.h
index 7d96908..cd42523 100644
index 9fb501a..5fd89ec 100644
--- a/include/configs/wandboard.h
+++ b/include/configs/wandboard.h
@@ -51,8 +51,6 @@
@ -37,9 +37,9 @@ index 7d96908..cd42523 100644
#define CONFIG_FEC_MXC
#define CONFIG_MII
#define IMX_FEC_BASE ENET_BASE_ADDR
@@ -110,6 +101,16 @@
#define CONFIG_IMX_HDMI
#define CONFIG_IMX_VIDEO_SKIP
@@ -115,6 +106,16 @@
#define CONFIG_MXC_OCOTP
#endif
+#ifndef CONFIG_SPL_BUILD
+#include <config_distro_defaults.h>
@ -54,7 +54,7 @@ index 7d96908..cd42523 100644
#if defined(CONFIG_MX6DL) || defined(CONFIG_MX6S)
#define CONFIG_DEFAULT_FDT_FILE "imx6dl-wandboard.dtb"
#elif defined(CONFIG_MX6Q)
@@ -119,13 +120,16 @@
@@ -124,13 +125,16 @@
#define CONFIG_EXTRA_ENV_SETTINGS \
"script=boot.scr\0" \
"image=zImage\0" \
@ -76,7 +76,7 @@ index 7d96908..cd42523 100644
"ip_dyn=yes\0" \
"mmcdev=" __stringify(CONFIG_SYS_MMC_ENV_DEV) "\0" \
"mmcpart=1\0" \
@@ -144,7 +148,7 @@
@@ -149,7 +153,7 @@
"mmc write ${loadaddr} 0x2 ${fw_sz}; " \
"fi; " \
"fi\0" \
@ -85,7 +85,7 @@ index 7d96908..cd42523 100644
"root=${mmcroot}; run videoargs\0" \
"videoargs=" \
"setenv nextcon 0; " \
@@ -193,7 +197,7 @@
@@ -198,7 +202,7 @@
"else " \
"bootz; " \
"fi;\0" \
@ -94,7 +94,7 @@ index 7d96908..cd42523 100644
"root=/dev/nfs " \
"ip=dhcp nfsroot=${serverip}:${nfsroot},v3,tcp\0" \
"netboot=echo Booting from net ...; " \
@@ -216,7 +220,8 @@
@@ -221,7 +225,8 @@
"fi; " \
"else " \
"bootz; " \
@ -104,7 +104,7 @@ index 7d96908..cd42523 100644
#define CONFIG_BOOTCOMMAND \
"mmc dev ${mmcdev}; if mmc rescan; then " \
@@ -230,6 +235,10 @@
@@ -235,6 +240,10 @@
"fi; " \
"else run netboot; fi"
@ -115,7 +115,7 @@ index 7d96908..cd42523 100644
/* Miscellaneous configurable options */
#define CONFIG_SYS_LONGHELP
#define CONFIG_SYS_HUSH_PARSER
@@ -243,8 +252,6 @@
@@ -248,8 +257,6 @@
#define CONFIG_SYS_LOAD_ADDR CONFIG_LOADADDR
@ -124,7 +124,7 @@ index 7d96908..cd42523 100644
/* Physical Memory Map */
#define CONFIG_NR_DRAM_BANKS 1
#define PHYS_SDRAM MMDC0_ARB_BASE_ADDR
@@ -267,9 +274,6 @@
@@ -272,9 +279,6 @@
#define CONFIG_ENV_OFFSET (6 * 64 * 1024)
#define CONFIG_SYS_MMC_ENV_DEV 0

4
0012-port-the-riotboard-to-distro-generic-configs-patch-b.patch → 0010-port-the-riotboard-to-distro-generic-configs-patch-b.patch
View File

@ -1,7 +1,7 @@
From 7e0336cebce63d25a8e54cf4430dbd00dc445e7b Mon Sep 17 00:00:00 2001
From f1258593e81ec2445f45f2a15cf20c9238f51fdb Mon Sep 17 00:00:00 2001
From: Dennis Gilmore <dennis@ausil.us>
Date: Mon, 13 Oct 2014 23:17:32 -0500
Subject: [PATCH 12/13] port the riotboard to distro generic configs, patch by
Subject: [PATCH 10/11] port the riotboard to distro generic configs, patch by
pbrobinson
---

50
0010-sunxi-Fix-gmac-not-working-reliable-on-the-Bananapi.patch
View File

@ -1,50 +0,0 @@
From 11c5ff65fbdbea4d4839b9bc34467ebcb2bbf72c Mon Sep 17 00:00:00 2001
From: Hans de Goede <hdegoede@redhat.com>
Date: Tue, 30 Sep 2014 18:45:32 +0200
Subject: [PATCH 10/13] sunxi: Fix gmac not working reliable on the Bananapi
In order for the gmac nic to work reliable on the Bananapi, we need to set
bits 10-12 GTXDC "GMAC Transmit Clock Delay Chain" of the GMAC clk register
(0x01c20164) to 3.
Without this about 9 out of 10 ethernet packets get lost, with this setting
there is no packet loss.
So far setting these bits is only necessary on the Bananapi, so this commit
solves this with a bit of #ifdef CONFIG_BANANAPI code. If in the future we
need to do something similar for other boards, we can create a specific
CONFIG_FOO option for this then.
Reported-by: Karsten Merker <merker@debian.org>
Signed-off-by: Hans de Goede <hdegoede@redhat.com>
Tested-by: Karsten Merker <merker@debian.org>
Tested-by: Zoltan HERPAI <wigyori@openwrt.org>
Tested-by: Tony Zhang <tony.zhang@lemaker.org>
Acked-by: Ian Campbell <ijc@hellion.org.uk>
---
board/sunxi/gmac.c | 9 +++++++++
1 file changed, 9 insertions(+)
diff --git a/board/sunxi/gmac.c b/board/sunxi/gmac.c
index e7ff952..6348d27 100644
--- a/board/sunxi/gmac.c
+++ b/board/sunxi/gmac.c
@@ -24,6 +24,15 @@ int sunxi_gmac_initialize(bd_t *bis)
CCM_GMAC_CTRL_GPIT_MII);
#endif
+ /*
+ * In order for the gmac nic to work reliable on the Bananapi, we
+ * need to set bits 10-12 GTXDC "GMAC Transmit Clock Delay Chain"
+ * of the GMAC clk register to 3.
+ */
+#ifdef CONFIG_BANANAPI
+ setbits_le32(&ccm->gmac_clk_cfg, 0x3 << 10);
+#endif
+
/* Configure pin mux settings for GMAC */
for (pin = SUNXI_GPA(0); pin <= SUNXI_GPA(16); pin++) {
#ifdef CONFIG_RGMII
--
2.1.0

35
0011-compulab-eeprom-add-default-eeprom-bus.patch
View File

@ -1,35 +0,0 @@
From 9c40737e76859bcac903713fdb735e1d4e850497 Mon Sep 17 00:00:00 2001
From: Nikita Kiryanov <nikita@compulab.co.il>
Date: Wed, 17 Sep 2014 15:59:25 +0300
Subject: [PATCH 11/13] compulab: eeprom: add default eeprom bus
Add default eeprom bus setting.
This addresses the trimslice compile error that was introduced
with the addition of this setting.
Cc: Albert ARIBAUD <albert.u.boot@aribaud.net>
Cc: Igor Grinberg <grinberg@compulab.co.il>
Signed-off-by: Nikita Kiryanov <nikita@compulab.co.il>
Acked-by: Igor Grinberg <grinberg@compulab.co.il>
---
board/compulab/common/eeprom.c | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/board/compulab/common/eeprom.c b/board/compulab/common/eeprom.c
index 85442cd..2df3ada 100644
--- a/board/compulab/common/eeprom.c
+++ b/board/compulab/common/eeprom.c
@@ -15,6 +15,10 @@
# define CONFIG_SYS_I2C_EEPROM_ADDR_LEN 1
#endif
+#ifndef CONFIG_SYS_I2C_EEPROM_BUS
+#define CONFIG_SYS_I2C_EEPROM_BUS 0
+#endif
+
#define EEPROM_LAYOUT_VER_OFFSET 44
#define BOARD_SERIAL_OFFSET 20
#define BOARD_SERIAL_OFFSET_LEGACY 8
--
2.1.0

6
0013-port-utilite-to-distro-generic-boot-commands.patch → 0011-port-utilite-to-distro-generic-boot-commands.patch
View File

@ -1,14 +1,14 @@
From 6ade0ead09904ad524964bf3735b64a2c24736f8 Mon Sep 17 00:00:00 2001
From b51bfda152ff4f738a96a0864cac2b4b039500e8 Mon Sep 17 00:00:00 2001
From: Dennis Gilmore <dennis@ausil.us>
Date: Mon, 13 Oct 2014 23:58:13 -0500
Subject: [PATCH 13/13] port utilite to distro generic boot commands
Subject: [PATCH 11/11] port utilite to distro generic boot commands
---
include/configs/cm_fx6.h | 112 +++++++++++------------------------------------
1 file changed, 26 insertions(+), 86 deletions(-)
diff --git a/include/configs/cm_fx6.h b/include/configs/cm_fx6.h
index 10d02b4..1f0179e 100644
index 7cf241e..3c7615f 100644
--- a/include/configs/cm_fx6.h
+++ b/include/configs/cm_fx6.h
@@ -12,7 +12,6 @@

2
sources
View File

@ -1 +1 @@
4f174648568bd1ec60a7f203c37f8759 u-boot-2014.10-rc3.tar.bz2
3ddcaee2f05b7c464778112ec83664b5 u-boot-2014.10.tar.bz2

13
uboot-tools.spec
View File

@ -1,8 +1,8 @@
%global candidate rc3
#global candidate
Name: uboot-tools
Version: 2014.10
Release: 0.7%{?candidate:.%{candidate}}%{?dist}
Release: 1%{?candidate:.%{candidate}}%{?dist}
Summary: U-Boot utilities
Group: Development/Tools
@ -20,10 +20,8 @@ Patch6: 0006-Only-set-CONFIG_BOOTDELAY-if-not-already-set.patch
Patch7: 0007-Add-support-for-loading-environment-from-uEnv.txt-in.patch
Patch8: 0008-Switch-am335x_evm.h-to-use-config_distro_defaults-an.patch
Patch9: 0009-wandboard-port-to-generic-distro-booting.patch
Patch10: 0010-sunxi-Fix-gmac-not-working-reliable-on-the-Bananapi.patch
Patch11: 0011-compulab-eeprom-add-default-eeprom-bus.patch
Patch12: 0012-port-the-riotboard-to-distro-generic-configs-patch-b.patch
Patch13: 0013-port-utilite-to-distro-generic-boot-commands.patch
Patch12: 0010-port-the-riotboard-to-distro-generic-configs-patch-b.patch
Patch13: 0011-port-utilite-to-distro-generic-boot-commands.patch
BuildRequires: dtc, openssl-devel
BuildRequires: fedora-logos, netpbm-progs
@ -475,6 +473,9 @@ install -p -m 0644 tools/env/fw_env.config $RPM_BUILD_ROOT%{_sysconfdir}
%endif
%changelog
* Wed Oct 15 2014 Dennis Gilmore <dennis@ausil.us> - 2014.10-1
- update to 2014.10 final release
* Tue Oct 14 2014 Dennis Gilmore <dennis@ausil.us> - 2014.10-0.7.rc3
- refacter making directories for images
- make cm_fx6 image for utilite