update to 2013.07 rc3
- set wandboard to use extlinux.conf by default
This commit is contained in:
Dennis Gilmore
parent
ccbb7a9b37
commit
ada8b2fb79
|
|
@ -1,14 +1,12 @@
|
|||
From 1ff842e1735d07a41a0e152bca0b9076768a889a Mon Sep 17 00:00:00 2001
|
||||
From f7687f75a5cba567a8dbccb43dc5826c9deb8de4 Mon Sep 17 00:00:00 2001
|
||||
From: Dennis Gilmore <dennis@ausil.us>
|
||||
Date: Sun, 30 Jun 2013 15:18:08 -0500
|
||||
Subject: [PATCH 01/14] Add wandboard quad support
|
||||
Subject: [PATCH 01/15] Add wandboard quad support
|
||||
|
||||
---
|
||||
board/boundary/nitrogen6x/nitrogen6quad.cfg | 45 +++++++++++++++++++++++++++++
|
||||
board/wandboard/README | 5 ++++
|
||||
boards.cfg | 1 +
|
||||
include/configs/wandboard.h | 2 ++
|
||||
4 files changed, 53 insertions(+)
|
||||
2 files changed, 50 insertions(+)
|
||||
create mode 100644 board/boundary/nitrogen6x/nitrogen6quad.cfg
|
||||
|
||||
diff --git a/board/boundary/nitrogen6x/nitrogen6quad.cfg b/board/boundary/nitrogen6x/nitrogen6quad.cfg
|
||||
|
|
@ -63,7 +61,7 @@ index 0000000..dccd497
|
|||
+#include "800mhz_4x256mx16.cfg"
|
||||
+#include "clocks.cfg"
|
||||
diff --git a/board/wandboard/README b/board/wandboard/README
|
||||
index ce83bbe..65d3d05 100644
|
||||
index 498db2f..4e54ee3 100644
|
||||
--- a/board/wandboard/README
|
||||
+++ b/board/wandboard/README
|
||||
@@ -17,6 +17,11 @@ To build U-Boot for the Wandboard Dual Lite version:
|
||||
|
|
@ -78,31 +76,6 @@ index ce83bbe..65d3d05 100644
|
|||
To build U-Boot for the Wandboard Solo version:
|
||||
|
||||
$ make wandboard_solo_config
|
||||
diff --git a/boards.cfg b/boards.cfg
|
||||
index c0c4282..9604bf2 100644
|
||||
--- a/boards.cfg
|
||||
+++ b/boards.cfg
|
||||
@@ -281,6 +281,7 @@ nitrogen6q2g arm armv7 nitrogen6x boundar
|
||||
nitrogen6s arm armv7 nitrogen6x boundary mx6 nitrogen6x:IMX_CONFIG=board/boundary/nitrogen6x/nitrogen6s.cfg,MX6S,DDR_MB=512
|
||||
nitrogen6s1g arm armv7 nitrogen6x boundary mx6 nitrogen6x:IMX_CONFIG=board/boundary/nitrogen6x/nitrogen6s1g.cfg,MX6S,DDR_MB=1024
|
||||
wandboard_dl arm armv7 wandboard - mx6 wandboard:IMX_CONFIG=board/boundary/nitrogen6x/nitrogen6dl.cfg,MX6DL,DDR_MB=1024
|
||||
+wandboard_quad arm armv7 wandboard - mx6 wandboard:IMX_CONFIG=board/boundary/nitrogen6x/nitrogen6q2g.cfg,MX6Q,DDR_MB=2048
|
||||
wandboard_solo arm armv7 wandboard - mx6 wandboard:IMX_CONFIG=board/boundary/nitrogen6x/nitrogen6s.cfg,MX6S,DDR_MB=512
|
||||
omap3_overo arm armv7 overo - omap3
|
||||
omap3_pandora arm armv7 pandora - omap3
|
||||
diff --git a/include/configs/wandboard.h b/include/configs/wandboard.h
|
||||
index 5593f1c..b2995d8 100644
|
||||
--- a/include/configs/wandboard.h
|
||||
+++ b/include/configs/wandboard.h
|
||||
@@ -103,6 +103,8 @@
|
||||
|
||||
#if defined(CONFIG_MX6DL)
|
||||
#define CONFIG_DEFAULT_FDT_FILE "imx6dl-wandboard.dtb"
|
||||
+#elif defined(CONFIG_MX6Q)
|
||||
+#define CONFIG_DEFAULT_FDT_FILE "imx6q-wandboard.dtb"
|
||||
#elif defined(CONFIG_MX6S)
|
||||
#define CONFIG_DEFAULT_FDT_FILE "imx6s-wandboard.dtb"
|
||||
#endif
|
||||
--
|
||||
1.8.3.1
|
||||
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
From a22eae1c609b807e9bc65283021b18c0f1386fe1 Mon Sep 17 00:00:00 2001
|
||||
From 9a379b9ffc8b601f7e6907ceb5c56fa68217de8d Mon Sep 17 00:00:00 2001
|
||||
From: Koen Kooi <koen@dominion.thruhere.net>
|
||||
Date: Wed, 3 Apr 2013 08:32:19 +0200
|
||||
Subject: [PATCH 02/14] am335x mux: don't hang on unknown EEPROMs, assume
|
||||
Subject: [PATCH 02/15] am335x mux: don't hang on unknown EEPROMs, assume
|
||||
BeagleBone Black
|
||||
|
||||
Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
From 899b013b6bde94d13533b2df1e986a40eb4eb038 Mon Sep 17 00:00:00 2001
|
||||
From a34b729d67b97cd0bc78747406e249b1c0995cdf Mon Sep 17 00:00:00 2001
|
||||
From: Koen Kooi <koen@dominion.thruhere.net>
|
||||
Date: Wed, 3 Apr 2013 08:33:28 +0200
|
||||
Subject: [PATCH 03/14] beaglebone: HACK: always return 1 for is_bone_lt
|
||||
Subject: [PATCH 03/15] beaglebone: HACK: always return 1 for is_bone_lt
|
||||
|
||||
This is to make the eMMC flasher work, the EEPROM hasn't been populated yet
|
||||
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
From 3be081c0e46b1608d0d2e6d81de62c3c254700dd Mon Sep 17 00:00:00 2001
|
||||
From a7eb66eefa4a536e4eec37f9d005bae31ce14ae4 Mon Sep 17 00:00:00 2001
|
||||
From: Koen Kooi <koen@dominion.thruhere.net>
|
||||
Date: Wed, 3 Apr 2013 08:27:09 +0200
|
||||
Subject: [PATCH 04/14] beaglebone: HACK: raise USB current limit
|
||||
Subject: [PATCH 04/15] beaglebone: HACK: raise USB current limit
|
||||
|
||||
Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
|
||||
---
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
From 4a23caa5663bfd11fc7a802339568a4dc08bfd24 Mon Sep 17 00:00:00 2001
|
||||
From 939bbe4dad5072738b0e4453d8d0d7cebd889450 Mon Sep 17 00:00:00 2001
|
||||
From: Koen Kooi <koen@dominion.thruhere.net>
|
||||
Date: Wed, 3 Apr 2013 08:25:04 +0200
|
||||
Subject: [PATCH 05/14] beaglebone: use kloadaddr to avoid copying the kernel
|
||||
Subject: [PATCH 05/15] beaglebone: use kloadaddr to avoid copying the kernel
|
||||
around
|
||||
|
||||
Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
From b194b3c0f3e3c3a559f09df8f80f810ca3e54248 Mon Sep 17 00:00:00 2001
|
||||
From 41a2805057a24940731b7299af711a49ab64b0c4 Mon Sep 17 00:00:00 2001
|
||||
From: Koen Kooi <koen@dominion.thruhere.net>
|
||||
Date: Wed, 3 Apr 2013 08:44:03 +0200
|
||||
Subject: [PATCH 06/14] beaglebone: try to load uEnv/uImage from eMMC first
|
||||
Subject: [PATCH 06/15] beaglebone: try to load uEnv/uImage from eMMC first
|
||||
|
||||
If u-boot detects the eMMC, try to load from there, if that fails fall back to uSD. Due to linux "features" rootdev can remain mmcblk0p1.
|
||||
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
From bdd305d2ca2ab1704f8b937de6a13bf421999bac Mon Sep 17 00:00:00 2001
|
||||
From 88dfa478398f9fdf8e99c19b39f98b4ce1def19b Mon Sep 17 00:00:00 2001
|
||||
From: Koen Kooi <koen@dominion.thruhere.net>
|
||||
Date: Wed, 3 Apr 2013 11:39:16 +0200
|
||||
Subject: [PATCH 07/14] beaglebone: Don't trigger uboot variable lenght limit
|
||||
Subject: [PATCH 07/15] beaglebone: Don't trigger uboot variable lenght limit
|
||||
|
||||
Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
|
||||
---
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
From eb995f5314a6419f09646b6f520fd5aade42dec4 Mon Sep 17 00:00:00 2001
|
||||
From 3cda7e03119219824f71694ab789e0040d5a5e18 Mon Sep 17 00:00:00 2001
|
||||
From: Koen Kooi <koen@dominion.thruhere.net>
|
||||
Date: Wed, 3 Apr 2013 11:47:14 +0200
|
||||
Subject: [PATCH 08/14] beaglebone: HACK: change mmc order to avoid u-boot
|
||||
Subject: [PATCH 08/15] beaglebone: HACK: change mmc order to avoid u-boot
|
||||
crashing
|
||||
|
||||
Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
From c9241c210fc2dddf0d0966197574a3841b1e972e Mon Sep 17 00:00:00 2001
|
||||
From f6a70dd6dc7f02c177ac37bae2438415910d2f07 Mon Sep 17 00:00:00 2001
|
||||
From: Koen Kooi <koen@dominion.thruhere.net>
|
||||
Date: Wed, 3 Apr 2013 12:04:17 +0200
|
||||
Subject: [PATCH 09/14] beaglebone: update bootpart variable after mmc scan
|
||||
Subject: [PATCH 09/15] beaglebone: update bootpart variable after mmc scan
|
||||
|
||||
Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
|
||||
---
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
From 83085bea9e67cb86ad5827f35c6d831301161591 Mon Sep 17 00:00:00 2001
|
||||
From ecc20428e97df32c85d07dbadd5ac43d3d7a2977 Mon Sep 17 00:00:00 2001
|
||||
From: Jason Kridner <jdk@ti.com>
|
||||
Date: Thu, 4 Apr 2013 05:57:00 +0000
|
||||
Subject: [PATCH 10/14] am335x_evm: enable gpio command
|
||||
Subject: [PATCH 10/15] am335x_evm: enable gpio command
|
||||
|
||||
---
|
||||
include/configs/am335x_evm.h | 2 +-
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
From 8190afe7c16163db1d10670983b67f6e0bbb45f2 Mon Sep 17 00:00:00 2001
|
||||
From 49f32a629c69828226995fc6234818b1e206e2c3 Mon Sep 17 00:00:00 2001
|
||||
From: Jason Kridner <jdk@ti.com>
|
||||
Date: Thu, 4 Apr 2013 07:16:41 +0000
|
||||
Subject: [PATCH 11/14] am335x_evm: HACK to turn on BeagleBone LEDs
|
||||
Subject: [PATCH 11/15] am335x_evm: HACK to turn on BeagleBone LEDs
|
||||
|
||||
* This might break non-BeagleBone platforms
|
||||
---
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
From 41c71ddc1bddc26629073928af3ec2c206e7906b Mon Sep 17 00:00:00 2001
|
||||
From b5ed0359e7d6a489fc8a293d8b427515e08b90dc Mon Sep 17 00:00:00 2001
|
||||
From: Darren Etheridge <detheridge@ti.com>
|
||||
Date: Tue, 9 Apr 2013 16:49:38 -0500
|
||||
Subject: [PATCH 12/14] Fix for screen rolling when video played back in
|
||||
Subject: [PATCH 12/15] Fix for screen rolling when video played back in
|
||||
browser on BeagleBone Black This value might need some tweaking, but it
|
||||
effectively allows the LCDC and the ARM to play fairer in memory, so the LCDC
|
||||
does not get starved causing the screen to roll See Page 439 in spruh73g
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
From 8c6c1b898473226483c7c155aac22bb0bb84e832 Mon Sep 17 00:00:00 2001
|
||||
From 69204af251563cc8300ef681bfd5132944972a40 Mon Sep 17 00:00:00 2001
|
||||
From: Robert Nelson <robertcnelson@gmail.com>
|
||||
Date: Thu, 25 Apr 2013 13:50:35 -0500
|
||||
Subject: [PATCH 13/14] beaglebone: enable CONFIG_SUPPORT_RAW_INITRD option
|
||||
Subject: [PATCH 13/15] beaglebone: enable CONFIG_SUPPORT_RAW_INITRD option
|
||||
|
||||
Signed-off-by: Robert Nelson <robertcnelson@gmail.com>
|
||||
---
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
From e561e4c80077e9876d1609cb5379023d53f09b5c Mon Sep 17 00:00:00 2001
|
||||
From d24d6e58aa0d5d64c3d9df3fd4d20c17680a6e8e Mon Sep 17 00:00:00 2001
|
||||
From: Dennis Gilmore <dennis@ausil.us>
|
||||
Date: Thu, 4 Jul 2013 10:53:10 -0500
|
||||
Subject: [PATCH 14/14] mmc: Add RSTN enable for emmc
|
||||
Subject: [PATCH 14/15] mmc: Add RSTN enable for emmc
|
||||
|
||||
eMMC has the capability of using an external RSTn line.
|
||||
It has to be enabled via an access to the ECSD so add a command to do so.
|
||||
|
|
|
|||
|
|
@ -1,8 +1,9 @@
|
|||
%global candidate rc2
|
||||
%global candidate rc3
|
||||
%global _default_patch_fuzz 2
|
||||
|
||||
Name: uboot-tools
|
||||
Version: 2013.07
|
||||
Release: 0.1%{?candidate:.%{candidate}}%{?dist}
|
||||
Release: 0.2%{?candidate:.%{candidate}}%{?dist}
|
||||
Summary: U-Boot utilities
|
||||
|
||||
Group: Development/Tools
|
||||
|
|
@ -37,6 +38,7 @@ Patch20: 0011-am335x_evm-HACK-to-turn-on-BeagleBone-LEDs.patch
|
|||
Patch21: 0012-Fix-for-screen-rolling-when-video-played-back-in-bro.patch
|
||||
Patch22: 0013-beaglebone-enable-CONFIG_SUPPORT_RAW_INITRD-option.patch
|
||||
Patch23: 0014-mmc-Add-RSTN-enable-for-emmc.patch
|
||||
Patch24: 0015-wandboard-add-pxe-support-set-default-boot-command-l.patch
|
||||
|
||||
Requires: dtc
|
||||
|
||||
|
|
@ -121,13 +123,6 @@ Requires: uboot-tools
|
|||
%description -n uboot-wandboard_solo
|
||||
u-boot bootloader binaries for Wandboard i.MX6 Solo
|
||||
|
||||
%package -n uboot-vexpress
|
||||
Summary: u-boot bootloader binaries for vexpress
|
||||
Requires: uboot-tools
|
||||
BuildArch: noarch
|
||||
|
||||
%description -n uboot-vexpress
|
||||
u-boot bootloader binaries for vexpress
|
||||
%endif
|
||||
|
||||
%prep
|
||||
|
|
@ -153,6 +148,7 @@ u-boot bootloader binaries for vexpress
|
|||
%patch21 -p1
|
||||
%patch22 -p1
|
||||
%patch23 -p1
|
||||
%patch24 -p1
|
||||
|
||||
mkdir builds
|
||||
|
||||
|
|
@ -165,11 +161,6 @@ cp -p u-boot.img builds/u-boot.img.beaglebone
|
|||
cp -p u-boot.bin builds/u-boot.bin.beaglebone
|
||||
make distclean
|
||||
|
||||
make CROSS_COMPILE="" ca9x4_ct_vxp_config
|
||||
make HOSTCC="gcc $RPM_OPT_FLAGS" CROSS_COMPILE=""
|
||||
cp -p u-boot.bin builds/u-boot.bin.vexpress
|
||||
make distclean
|
||||
|
||||
make CROSS_COMPILE="" omap3_beagle_config
|
||||
make HOSTCC="gcc $RPM_OPT_FLAGS" CROSS_COMPILE=""
|
||||
cp -p MLO builds/MLO.beagle
|
||||
|
|
@ -266,11 +257,10 @@ install -p -m 0644 builds/u-boot.bin.origen $RPM_BUILD_ROOT%{_datadir}/uboot-ori
|
|||
install -p -m 0644 builds/smdkv310-spl.bin.smdkv310 $RPM_BUILD_ROOT%{_datadir}/uboot-smdkv310/smdkv310-spl.bin
|
||||
install -p -m 0644 builds/u-boot.bin.smdkv310 $RPM_BUILD_ROOT%{_datadir}/uboot-smdkv310/u-boot.bin
|
||||
|
||||
install -p -m 0644 builds/u-boot.imx.dl $RPM_BUILD_ROOT%{_datadir}/uboot-imx6dl/u-boot.bin
|
||||
install -p -m 0644 builds/u-boot.imx.quad $RPM_BUILD_ROOT%{_datadir}/uboot-imx6quad/u-boot.bin
|
||||
install -p -m 0644 builds/u-boot.imx.solo $RPM_BUILD_ROOT%{_datadir}/uboot-imx6solo/u-boot.bin
|
||||
install -p -m 0644 builds/u-boot.imx.dl $RPM_BUILD_ROOT%{_datadir}/uboot-imx6dl/u-boot.imx
|
||||
install -p -m 0644 builds/u-boot.imx.quad $RPM_BUILD_ROOT%{_datadir}/uboot-imx6quad/u-boot.imx
|
||||
install -p -m 0644 builds/u-boot.imx.solo $RPM_BUILD_ROOT%{_datadir}/uboot-imx6solo/u-boot.imx
|
||||
|
||||
install -p -m 0644 builds/u-boot.bin.vexpress $RPM_BUILD_ROOT%{_datadir}/uboot-vexpress/u-boot.bin
|
||||
|
||||
install -p -m 0644 %{SOURCE1} $RPM_BUILD_ROOT%{_datadir}/uboot-beagle/uEnv.txt.beagle
|
||||
install -p -m 0644 %{SOURCE2} $RPM_BUILD_ROOT%{_datadir}/uboot-beaglebone/uEnv.txt.beaglebone
|
||||
|
|
@ -345,13 +335,13 @@ rm -rf $RPM_BUILD_ROOT
|
|||
%files -n uboot-uevm
|
||||
%defattr(-,root,root,-)
|
||||
%{_datadir}/uboot-uevm/
|
||||
|
||||
%files -n uboot-vexpress
|
||||
%defattr(-,root,root,-)
|
||||
%{_datadir}/uboot-vexpress/
|
||||
%endif
|
||||
|
||||
%changelog
|
||||
* Thu Jul 18 2013 Dennis Gilmore <dennis@ausil.us> - 2013.07-0.2.rc3
|
||||
- update to 2013.07 rc3
|
||||
- set wandboard to use extlinux.conf by default
|
||||
|
||||
* Thu Jul 04 2013 Dennis Gilmore <dennis@ausil.us> - 2013.07-0.1.rc2
|
||||
- update beaglebone patches
|
||||
- update wandboard quad patch
|
||||
|
|
|
|||
Loading…
Reference in New Issue