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

fix merge

This commit is contained in:
Peter Robinson 2013-09-02 21:08:24 +01:00
parent 68ca48edf6 86207dd2ab
commit 13ed032d20
23 changed files with 316 additions and 183 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

81
0001-Add-wandboard-quad-support.patch Normal file
View File

@ -0,0 +1,81 @@
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/15] Add wandboard quad support
---
board/boundary/nitrogen6x/nitrogen6quad.cfg | 45 +++++++++++++++++++++++++++++
board/wandboard/README | 5 ++++
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
new file mode 100644
index 0000000..dccd497
--- /dev/null
+++ b/board/boundary/nitrogen6x/nitrogen6quad.cfg
@@ -0,0 +1,45 @@
+/*
+ * Copyright (C) 2013 Boundary Devices
+ *
+ * See file CREDITS for list of people who contributed to this
+ * project.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation; either version 2 of
+ * the License or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not write to the Free Software
+ * Foundation Inc. 51 Franklin Street Fifth Floor Boston,
+ * MA 02110-1301 USA
+ *
+ * Refer doc/README.imximage for more details about how-to configure
+ * and create imximage boot image
+ *
+ * The syntax is taken as close as possible with the kwbimage
+ */
+
+/* image version */
+IMAGE_VERSION 2
+
+/*
+ * Boot Device : one of
+ * spi, sd (the board has no nand neither onenand)
+ */
+BOOT_FROM sd
+
+#define __ASSEMBLY__
+#include <config.h>
+#include "asm/arch/mx6-ddr.h"
+#include "asm/arch/iomux.h"
+#include "asm/arch/crm_regs.h"
+
+#include "ddr-setup.cfg"
+#include "800mhz_4x256mx16.cfg"
+#include "clocks.cfg"
diff --git a/board/wandboard/README b/board/wandboard/README
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:
$ make wandboard_dl_config
$ make
+To build U-Boot for the Wandboard Quad version:
+
+$ make wandboard_quad_config
+$ make
+
To build U-Boot for the Wandboard Solo version:
$ make wandboard_solo_config
--
1.8.3.1

27
0001-beaglebone-default-to-beaglebone-black-for-unknown-E.patch
View File

@ -1,27 +0,0 @@
From d4b58fe48083ee98dd86af5b0ec9e831433c98e3 Mon Sep 17 00:00:00 2001
From: Koen Kooi <koen@dominion.thruhere.net>
Date: Wed, 3 Apr 2013 08:22:53 +0200
Subject: [PATCH 01/14] beaglebone: default to beaglebone black for unknown
EEPROMs
Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
---
include/configs/am335x_evm.h | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/include/configs/am335x_evm.h b/include/configs/am335x_evm.h
index ef00306..2ac89af 100644
--- a/include/configs/am335x_evm.h
+++ b/include/configs/am335x_evm.h
@@ -59,7 +59,7 @@
"rdaddr=0x81000000\0" \
"bootdir=/boot\0" \
"bootfile=uImage\0" \
- "fdtfile=\0" \
+ "fdtfile=am335x-boneblack.dtb\0" \
"console=ttyO0,115200n8\0" \
"optargs=\0" \
"mtdids=" MTDIDS_DEFAULT "\0" \
--
1.8.1.4

6
0002-am335x-mux-don-t-hang-on-unknown-EEPROMs-assume-Beag.patch
View File

@ -1,7 +1,7 @@
From fbce545279c4f1e882431fa7d08130e1bc25cd93 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>
@ -28,5 +28,5 @@ index 0283708..ab42011 100644
}
}
--
1.8.1.4
1.8.3.1

12
0003-beaglebone-HACK-always-return-1-for-is_bone_lt.patch
View File

@ -1,7 +1,7 @@
From d73f1f024a8f179e38ce15dc66938ee40325e5b3 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
@ -11,10 +11,10 @@ Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/board/ti/am335x/board.c b/board/ti/am335x/board.c
index b371376..c92e1e9 100644
index fdbe26c..f9e7803 100644
--- a/board/ti/am335x/board.c
+++ b/board/ti/am335x/board.c
@@ -60,7 +60,8 @@ static inline int board_is_bone(void)
@@ -57,7 +57,8 @@ static inline int board_is_bone(void)
static inline int board_is_bone_lt(void)
{
@ -24,7 +24,7 @@ index b371376..c92e1e9 100644
}
static inline int board_is_evm_sk(void)
@@ -378,7 +379,7 @@ void s_init(void)
@@ -359,7 +360,7 @@ void s_init(void)
if (board_is_evm_sk())
config_ddr(303, MT41J128MJT125_IOCTRL_VALUE, &ddr3_data,
&ddr3_cmd_ctrl_data, &ddr3_emif_reg_data, 0);
@ -34,5 +34,5 @@ index b371376..c92e1e9 100644
&ddr3_beagleblack_data,
&ddr3_beagleblack_cmd_ctrl_data,
--
1.8.1.4
1.8.3.1

10
0004-beaglebone-HACK-raise-USB-current-limit.patch
View File

@ -1,7 +1,7 @@
From 713fb639c8d4920ae7581908de8da9fbbe83f3ae 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>
---
@ -9,10 +9,10 @@ Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
1 file changed, 1 insertion(+)
diff --git a/include/configs/am335x_evm.h b/include/configs/am335x_evm.h
index 2ac89af..8de4cc9 100644
index c5a6d4b..c143137 100644
--- a/include/configs/am335x_evm.h
+++ b/include/configs/am335x_evm.h
@@ -149,6 +149,7 @@
@@ -151,6 +151,7 @@
#endif
#define CONFIG_BOOTCOMMAND \
@ -21,5 +21,5 @@ index 2ac89af..8de4cc9 100644
"mmc dev ${mmcdev}; if mmc rescan; then " \
"echo SD/MMC found on device ${mmcdev};" \
--
1.8.1.4
1.8.3.1

12
0005-beaglebone-use-kloadaddr-to-avoid-copying-the-kernel.patch
View File

@ -1,7 +1,7 @@
From a8861624e48f2ecf0f39da3827211c485ed2f0cb 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>
@ -10,10 +10,10 @@ Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/include/configs/am335x_evm.h b/include/configs/am335x_evm.h
index 8de4cc9..14b0a08 100644
index c143137..7a9628e 100644
--- a/include/configs/am335x_evm.h
+++ b/include/configs/am335x_evm.h
@@ -54,6 +54,7 @@
@@ -55,6 +55,7 @@
#ifndef CONFIG_SPL_BUILD
#define CONFIG_EXTRA_ENV_SETTINGS \
"loadaddr=0x80200000\0" \
@ -21,7 +21,7 @@ index 8de4cc9..14b0a08 100644
"fdtaddr=0x80F80000\0" \
"fdt_high=0xffffffff\0" \
"rdaddr=0x81000000\0" \
@@ -112,11 +113,11 @@
@@ -113,11 +114,11 @@
"root=${ramroot} " \
"rootfstype=${ramrootfstype}\0" \
"loadramdisk=load mmc ${mmcdev} ${rdaddr} ramdisk.gz\0" \
@ -36,5 +36,5 @@ index 8de4cc9..14b0a08 100644
"run nandargs; " \
"nand read ${loadaddr} ${nandsrcaddr} ${nandimgsize}; " \
--
1.8.1.4
1.8.3.1

10
0006-beaglebone-try-to-load-uEnv-uImage-from-eMMC-first.patch
View File

@ -1,7 +1,7 @@
From 987104bc6bf3c2ddbf023b524c486ffdf583f001 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.
@ -11,10 +11,10 @@ Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
1 file changed, 18 insertions(+)
diff --git a/include/configs/am335x_evm.h b/include/configs/am335x_evm.h
index 14b0a08..a21fe8e 100644
index 7a9628e..2547a87 100644
--- a/include/configs/am335x_evm.h
+++ b/include/configs/am335x_evm.h
@@ -152,6 +152,24 @@
@@ -154,6 +154,24 @@
#define CONFIG_BOOTCOMMAND \
"i2c mw 0x24 1 0x3e; " \
"run findfdt; " \
@ -40,5 +40,5 @@ index 14b0a08..a21fe8e 100644
"echo SD/MMC found on device ${mmcdev};" \
"if run loadbootenv; then " \
--
1.8.1.4
1.8.3.1

12
0007-beaglebone-Don-t-trigger-uboot-variable-lenght-limit.patch
View File

@ -1,7 +1,7 @@
From 2bb3b2b5b50dc70af4ef6686642350cbd5ec870a 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>
---
@ -9,10 +9,10 @@ Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
1 file changed, 3 insertions(+), 17 deletions(-)
diff --git a/include/configs/am335x_evm.h b/include/configs/am335x_evm.h
index a21fe8e..9051249 100644
index 2547a87..afe7348 100644
--- a/include/configs/am335x_evm.h
+++ b/include/configs/am335x_evm.h
@@ -152,23 +152,11 @@
@@ -154,23 +154,11 @@
#define CONFIG_BOOTCOMMAND \
"i2c mw 0x24 1 0x3e; " \
"run findfdt; " \
@ -39,7 +39,7 @@ index a21fe8e..9051249 100644
"fi;" \
"mmc dev ${mmcdev}; if mmc rescan; then " \
"echo SD/MMC found on device ${mmcdev};" \
@@ -184,8 +172,6 @@
@@ -186,8 +174,6 @@
"run loadfdt;" \
"run mmcboot;" \
"fi;" \
@ -49,5 +49,5 @@ index a21fe8e..9051249 100644
/* Clock Defines */
--
1.8.1.4
1.8.3.1

10
0008-beaglebone-HACK-change-mmc-order-to-avoid-u-boot-cra.patch
View File

@ -1,7 +1,7 @@
From 8ef64f73b14e5e5657b740ecae8cf62db1511138 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>
@ -10,10 +10,10 @@ Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
1 file changed, 5 insertions(+), 4 deletions(-)
diff --git a/include/configs/am335x_evm.h b/include/configs/am335x_evm.h
index 9051249..8dc3a8a 100644
index afe7348..485f26b 100644
--- a/include/configs/am335x_evm.h
+++ b/include/configs/am335x_evm.h
@@ -152,11 +152,12 @@
@@ -154,11 +154,12 @@
#define CONFIG_BOOTCOMMAND \
"i2c mw 0x24 1 0x3e; " \
"run findfdt; " \
@ -31,5 +31,5 @@ index 9051249..8dc3a8a 100644
"mmc dev ${mmcdev}; if mmc rescan; then " \
"echo SD/MMC found on device ${mmcdev};" \
--
1.8.1.4
1.8.3.1

10
0009-beaglebone-update-bootpart-variable-after-mmc-scan.patch
View File

@ -1,7 +1,7 @@
From 59af9f65dd21d9a4e0c78478c5c0bd83e7d2da7e 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>
---
@ -9,10 +9,10 @@ Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
1 file changed, 1 insertion(+)
diff --git a/include/configs/am335x_evm.h b/include/configs/am335x_evm.h
index 8dc3a8a..489f882 100644
index 485f26b..941c6fb 100644
--- a/include/configs/am335x_evm.h
+++ b/include/configs/am335x_evm.h
@@ -159,6 +159,7 @@
@@ -161,6 +161,7 @@
"echo No micro SD card found, setting mmcdev to 1;" \
"setenv mmcdev 1;"\
"fi;" \
@ -21,5 +21,5 @@ index 8dc3a8a..489f882 100644
"echo SD/MMC found on device ${mmcdev};" \
"if run loadbootenv; then " \
--
1.8.1.4
1.8.3.1

10
0010-am335x_evm-enable-gpio-command.patch
View File

@ -1,17 +1,17 @@
From 88c09ce2919919d1943a85e9f9475d17b347702e 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 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/include/configs/am335x_evm.h b/include/configs/am335x_evm.h
index 489f882..f2838ac 100644
index 941c6fb..70ace70 100644
--- a/include/configs/am335x_evm.h
+++ b/include/configs/am335x_evm.h
@@ -43,7 +43,7 @@
@@ -44,7 +44,7 @@
/* commands to include */
#include <config_cmd_default.h>
@ -21,5 +21,5 @@ index 489f882..f2838ac 100644
#define CONFIG_VERSION_VARIABLE
--
1.8.1.4
1.8.3.1

14
0011-am335x_evm-HACK-to-turn-on-BeagleBone-LEDs.patch
View File

@ -1,7 +1,7 @@
From bcfde7885d6adbf067db5dd54cd4d9cea7426870 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
---
@ -9,10 +9,10 @@ Subject: [PATCH 11/14] am335x_evm: HACK to turn on BeagleBone LEDs
1 file changed, 4 insertions(+)
diff --git a/include/configs/am335x_evm.h b/include/configs/am335x_evm.h
index f2838ac..9e39d00 100644
index 70ace70..37c4b2b 100644
--- a/include/configs/am335x_evm.h
+++ b/include/configs/am335x_evm.h
@@ -150,6 +150,7 @@
@@ -152,6 +152,7 @@
#endif
#define CONFIG_BOOTCOMMAND \
@ -20,7 +20,7 @@ index f2838ac..9e39d00 100644
"i2c mw 0x24 1 0x3e; " \
"run findfdt; " \
"mmc dev 0; if mmc rescan ; then " \
@@ -161,6 +162,7 @@
@@ -163,6 +164,7 @@
"fi;" \
"setenv bootpart ${mmcdev}:2;" \
"mmc dev ${mmcdev}; if mmc rescan; then " \
@ -28,7 +28,7 @@ index f2838ac..9e39d00 100644
"echo SD/MMC found on device ${mmcdev};" \
"if run loadbootenv; then " \
"echo Loaded environment from ${bootenv};" \
@@ -170,7 +172,9 @@
@@ -172,7 +174,9 @@
"echo Running uenvcmd ...;" \
"run uenvcmd;" \
"fi;" \
@ -39,5 +39,5 @@ index f2838ac..9e39d00 100644
"run mmcboot;" \
"fi;" \
--
1.8.1.4
1.8.3.1

6
0012-Fix-for-screen-rolling-when-video-played-back-in-bro.patch
View File

@ -1,7 +1,7 @@
From 1e04086fc3b0d00222904472af56a14fba9bcd28 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
@ -40,5 +40,5 @@ index d1e2fd3..3a93db1 100644
/**
--
1.8.1.4
1.8.3.1

10
0013-beaglebone-enable-CONFIG_SUPPORT_RAW_INITRD-option.patch
View File

@ -1,7 +1,7 @@
From 1886ba872060e54cb4b5732ffa24fcc3eb6172e8 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>
---
@ -9,10 +9,10 @@ Signed-off-by: Robert Nelson <robertcnelson@gmail.com>
1 file changed, 1 insertion(+)
diff --git a/include/configs/am335x_evm.h b/include/configs/am335x_evm.h
index 9e39d00..04eaa8b 100644
index 37c4b2b..d6b79ca 100644
--- a/include/configs/am335x_evm.h
+++ b/include/configs/am335x_evm.h
@@ -35,6 +35,7 @@
@@ -36,6 +36,7 @@
#define CONFIG_OF_LIBFDT
#define CONFIG_CMD_BOOTZ
@ -21,5 +21,5 @@ index 9e39d00..04eaa8b 100644
#define CONFIG_SETUP_MEMORY_TAGS
#define CONFIG_INITRD_TAG
--
1.8.1.4
1.8.3.1

50
0014-mmc-Add-RSTN-enable-for-emmc.patch
View File

@ -1,23 +1,23 @@
From 6d70e6f0a9fbb9dc6ec2429292619f7cbc4d6a5b Mon Sep 17 00:00:00 2001
From: Pantelis Antoniou <panto@antoniou-consulting.com>
Date: Fri, 10 May 2013 17:48:20 +0300
Subject: [PATCH 14/14] mmc: Add RSTN enable for emmc
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/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.
Signed-off-by: Pantelis Antoniou <panto@antoniou-consulting.com>
---
common/cmd_mmc.c | 26 +++++++++++++++++++++++++-
common/cmd_mmc.c | 24 ++++++++++++++++++++++++
drivers/mmc/mmc.c | 32 ++++++++++++++++++++++++++++++++
include/mmc.h | 4 ++++
3 files changed, 61 insertions(+), 1 deletion(-)
3 files changed, 60 insertions(+)
diff --git a/common/cmd_mmc.c b/common/cmd_mmc.c
index 7d82469..dcfbf19 100644
index 5f1ed43..87f8577 100644
--- a/common/cmd_mmc.c
+++ b/common/cmd_mmc.c
@@ -208,6 +208,29 @@ static int do_mmcops(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
@@ -238,6 +238,29 @@ static int do_mmcops(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
return CMD_RET_USAGE;
print_mmc_devices('\n');
return 0;
@ -47,22 +47,22 @@ index 7d82469..dcfbf19 100644
} else if (strcmp(argv[1], "dev") == 0) {
int dev, part = -1;
struct mmc *mmc;
@@ -334,5 +357,6 @@ U_BOOT_CMD(
"mmc rescan\n"
@@ -431,6 +454,7 @@ U_BOOT_CMD(
"mmc part - lists available partition on current mmc device\n"
"mmc dev [dev] [part] - show or set current mmc device [partition]\n"
- "mmc list - lists available devices");
+ "mmc list - lists available devices\n"
+ "mmc rstn - enable hardware reset of emmc");
#endif
"mmc list - lists available devices\n"
+ "mmc rstn - enable hardware reset of emmc\n"
#ifdef CONFIG_SUPPORT_EMMC_BOOT
"mmc open <dev> <boot_partition>\n"
" - Enable boot_part for booting and enable R/W access of boot_part\n"
diff --git a/drivers/mmc/mmc.c b/drivers/mmc/mmc.c
index f65a7b0..4fffc87 100644
index 73f7195..b866d77 100644
--- a/drivers/mmc/mmc.c
+++ b/drivers/mmc/mmc.c
@@ -1360,6 +1360,38 @@ int get_mmc_num(void)
return cur_dev_num;
@@ -1491,6 +1491,38 @@ static void do_preinit(void)
}
+/* enable hardware reset signal */
+int mmc_set_rst_n(struct mmc *mmc, u8 val)
+{
@ -99,18 +99,18 @@ index f65a7b0..4fffc87 100644
{
INIT_LIST_HEAD (&mmc_devices);
diff --git a/include/mmc.h b/include/mmc.h
index f0d4820..a1fc8c0 100644
index 583c30e..a9f68dc 100644
--- a/include/mmc.h
+++ b/include/mmc.h
@@ -158,6 +158,7 @@
* EXT_CSD fields
@@ -165,6 +165,7 @@
*/
#define EXT_CSD_GP_SIZE_MULT 143 /* R/W */
#define EXT_CSD_PARTITIONING_SUPPORT 160 /* RO */
+#define EXT_CSD_RST_N_FUNCTION 162 /* R/W */
#define EXT_CSD_RPMB_MULT 168 /* RO */
#define EXT_CSD_ERASE_GROUP_DEF 175 /* R/W */
#define EXT_CSD_PART_CONF 179 /* R/W */
#define EXT_CSD_BUS_WIDTH 183 /* R/W */
@@ -168,6 +169,7 @@
#define EXT_CSD_BOOT_BUS_WIDTH 177
@@ -178,6 +179,7 @@
#define EXT_CSD_HC_ERASE_GRP_SIZE 224 /* RO */
#define EXT_CSD_BOOT_MULT 226 /* RO */
@ -118,7 +118,7 @@ index f0d4820..a1fc8c0 100644
/*
* EXT_CSD field definitions
*/
@@ -291,4 +293,6 @@ struct mmc *mmc_spi_init(uint bus, uint cs, uint speed, uint mode);
@@ -357,4 +359,6 @@ struct mmc *mmc_spi_init(uint bus, uint cs, uint speed, uint mode);
int mmc_legacy_init(int verbose);
#endif
@ -126,5 +126,5 @@ index f0d4820..a1fc8c0 100644
+
#endif /* _MMC_H_ */
--
1.8.1.4
1.8.3.1

97
0015-wandboard-add-pxe-support-set-default-boot-command-l.patch Normal file
View File

@ -0,0 +1,97 @@
From e156720cf4ca48c3e955b0e48f17bf324fe992f4 Mon Sep 17 00:00:00 2001
From: Dennis Gilmore <dennis@ausil.us>
Date: Wed, 17 Jul 2013 09:11:57 -0500
Subject: [PATCH 15/15] wandboard: add pxe support, set default boot command
like highbank
---
include/configs/wandboard.h | 42 +++++++++++++++++++++++++++++++++++++++---
1 file changed, 39 insertions(+), 3 deletions(-)
diff --git a/include/configs/wandboard.h b/include/configs/wandboard.h
index ee6bf21..159f950 100644
--- a/include/configs/wandboard.h
+++ b/include/configs/wandboard.h
@@ -58,6 +58,8 @@
#define CONFIG_LOADADDR 0x12000000
#define CONFIG_SYS_TEXT_BASE 0x17800000
+#define CONFIG_SUPPORT_RAW_INITRD
+
/* MMC Configuration */
#define CONFIG_FSL_ESDHC
#define CONFIG_FSL_USDHC
@@ -72,6 +74,14 @@
#define CONFIG_CMD_FAT
#define CONFIG_DOS_PARTITION
+/* PXE support */
+#define CONFIG_BOOTP_PXE
+#define CONFIG_BOOTP_PXE_CLIENTARCH 0x100
+#define CONFIG_BOOTP_VCI_STRING "U-boot.armv7.wandboard"
+#define CONFIG_CMD_PXE
+#define CONFIG_MENU
+
+
/* Ethernet Configuration */
#define CONFIG_CMD_PING
#define CONFIG_CMD_DHCP
@@ -117,7 +127,32 @@
"initrd_high=0xffffffff\0" \
"fdt_file=" CONFIG_DEFAULT_FDT_FILE "\0" \
"fdt_addr=0x11000000\0" \
+ "pxefile_addr_r=0x12000000\0" \
+ "kernel_addr_r=0x13000000\0" \
+ "ramdisk_addr_r=0x32000000\0" \
+ "fdt_addr_r=0x11000000\0" \
"boot_fdt=try\0" \
+ "bootcmd_setup=mmc rescan\0" \
+ "bootcmd_pxe=setenv bootfile \"\" ;dhcp; pxe get; pxe boot\0" \
+ "bootcmd_disk_scr=ext2load ${boot_ifc} ${bootdevice} ${scr_addr_r} boot.scr && source ${scr_addr_r}\0" \
+ "bootcmd_disk_sysboot1=setenv bootfile /boot/extlinux/extlinux.conf; sysboot ${boot_ifc} ${bootdevice} ext2\0" \
+ "bootcmd_disk_sysboot2=setenv bootfile /extlinux/extlinux.conf; sysboot ${boot_ifc} ${bootdevice} ext2\0" \
+ "bootcmd_disk_uenv=ext2load ${boot_ifc} ${bootdevice} ${uenv_addr_r} uEnv.txt; env import -t ${uenv_addr_r} ${filesize}; run bootcmd_uenv\0" \
+ "bootcmd_disk_kernel=ext2load ${boot_ifc} ${bootdevice} ${kernel_addr_r} vmlinuz && ext2load ${boot_ifc} ${bootdevice} ${ramdisk_addr_r} initrd.img && bootz ${kernel_addr_r} ${ramdisk_addr_r}:${filesize} ${fdt_addr}\0" \
+ "bootcmd_disk=run bootcmd_disk_sysboot1; run bootcmd_disk_sysboot2; run bootcmd_disk_uenv; run bootcmd_disk_scr; run bootcmd_disk_kernel\0" \
+ "bootcmd_sata=setenv boot_ifc scsi; scsi scan && run bootcmd_disk\0" \
+ "bootcmd_mmc=setenv boot_ifc mmc; mmc rescan && run bootcmd_disk\0" \
+ "bootcmd_default=run bootcmd_mmc; run bootcmd_sata; run bootcmd_pxe\0" \
+ "bootcmd0=run bootcmd_setup; run bootcmd_default\0" \
+ "bootcmd1=run bootcmd_setup; run bootcmd_pxe; run bootcmd_default\0" \
+ "bootcmd2=run bootcmd_setup; run bootcmd_sata; run bootcmd_default\0" \
+ "bootcmd15=run bootcmd_setup; run bootcmd_mmc; run bootcmd_default\0" \
+ "localcmd=run bootcmd_sata\0" \
+ "bootdevice=0\0" \
+ "bootargs=console=ttymxc0 root=LABEL=rootfs\0" \
+ "bootdelay=2\0" \
+ "bootretry=90\0" \
+ "netretry=once\0" \
"ip_dyn=yes\0" \
"mmcdev=" __stringify(CONFIG_SYS_MMC_ENV_DEV) "\0" \
"mmcpart=1\0" \
@@ -139,11 +174,11 @@
"mmcargs=setenv bootargs console=${console},${baudrate} " \
"root=${mmcroot}\0" \
"loadbootscript=" \
- "fatload mmc ${mmcdev}:${mmcpart} ${loadaddr} ${script};\0" \
+ "load mmc ${mmcdev}:${mmcpart} ${loadaddr} ${script};\0" \
"bootscript=echo Running bootscript from mmc ...; " \
"source\0" \
- "loaduimage=fatload mmc ${mmcdev}:${mmcpart} ${loadaddr} ${uimage}\0" \
- "loadfdt=fatload mmc ${mmcdev}:${mmcpart} ${fdt_addr} ${fdt_file}\0" \
+ "loaduimage=load mmc ${mmcdev}:${mmcpart} ${loadaddr} ${uimage}\0" \
+ "loadfdt=load mmc ${mmcdev}:${mmcpart} ${fdt_addr} ${fdt_file}\0" \
"mmcboot=echo Booting from mmc ...; " \
"run mmcargs; " \
"if test ${boot_fdt} = yes || test ${boot_fdt} = try; then " \
@@ -186,6 +221,7 @@
#define CONFIG_BOOTCOMMAND \
"mmc dev ${mmcdev}; if mmc rescan; then " \
+ "run bootcmd_default; " \
"if run loadbootscript; then " \
"run bootscript; " \
"else " \
--
1.8.3.1

11
omap4-panda-memtiming.patch Normal file
View File

@ -0,0 +1,11 @@
--- u-boot-2013.07/include/configs/omap4_common.h.orig 2013-09-01 19:46:54.646300234 +0100
+++ u-boot-2013.07/include/configs/omap4_common.h 2013-09-01 19:47:11.972540353 +0100
@@ -255,8 +255,6 @@
#define CONFIG_SYS_CACHELINE_SIZE 32
/* Defines for SDRAM init */
-#define CONFIG_SYS_EMIF_PRECALCULATED_TIMING_REGS
-
#ifndef CONFIG_SYS_EMIF_PRECALCULATED_TIMING_REGS
#define CONFIG_SYS_AUTOMATIC_SDRAM_DETECTION
#define CONFIG_SYS_DEFAULT_LPDDR2_TIMINGS

2
sources
View File

@ -1 +1 @@
21bf962d69938ed4ed783b792b2b074e u-boot-2013.04.tar.bz2
8445162690052e6afd4b8f87af2bb557 u-boot-2013.07.tar.bz2

3
uEnv.txt.beagle
View File

@ -1,4 +1,5 @@
abcboard=omap3-beagle
bootpart=0:3
bootfile=boot.scr
uenvcmd=ext4load mmc ${bootpart} ${loadaddr} ${bootdir}/${bootfile}; echo Running boot.scr script from mmc ...; source ${loadaddr}
bootdir=/boot
uenvcmd=ext2load mmc ${bootpart} ${loadaddr} ${bootdir}/${bootfile}; echo Running boot.scr script from mmc ...; source ${loadaddr}

3
uEnv.txt.beagle_xm
View File

@ -1,4 +1,5 @@
abcboard=omap3-beagle-xm
bootpart=0:3
bootfile=boot.scr
uenvcmd=ext4load mmc ${bootpart} ${loadaddr} ${bootdir}/${bootfile}; echo Running boot.scr script from mmc ...; source ${loadaddr}
bootdir=/boot
uenvcmd=ext2load mmc ${bootpart} ${loadaddr} ${bootdir}/${bootfile}; echo Running boot.scr script from mmc ...; source ${loadaddr}

3
uEnv.txt.beaglebone
View File

@ -1,4 +1,5 @@
abcboard=am335x-bone
bootpart=0:3
bootfile=boot.scr
uenvcmd=ext4load mmc ${bootpart} ${loadaddr} ${bootdir}/${bootfile}; echo Running boot.scr script from mmc ...; source ${loadaddr}
bootdir=/boot
uenvcmd=ext2load mmc ${bootpart} ${loadaddr} ${bootdir}/${bootfile}; echo Running boot.scr script from mmc ...; source ${loadaddr}

62
uboot-tools.spec
View File

@ -1,8 +1,9 @@
#global candidate
#global candidate rc
%global _default_patch_fuzz 2
Name: uboot-tools
Version: 2013.04
Release: 5%{?candidate:.%{candidate}}%{?dist}.1
Version: 2013.07
Release: 2%{?candidate:.%{candidate}}%{?dist}
Summary: U-Boot utilities
Group: Development/Tools
@ -21,8 +22,9 @@ Patch2: uboot-omap-fit.patch
Patch3: mlo-ext.patch
Patch4: exynos-ext.patch
# Wandboard quad support
Patch10: 0001-Add-wandboard-quad-support.patch
# Beagle Bone Black support
Patch10: 0001-beaglebone-default-to-beaglebone-black-for-unknown-E.patch
Patch11: 0002-am335x-mux-don-t-hang-on-unknown-EEPROMs-assume-Beag.patch
Patch12: 0003-beaglebone-HACK-always-return-1-for-is_bone_lt.patch
Patch13: 0004-beaglebone-HACK-raise-USB-current-limit.patch
@ -36,8 +38,11 @@ 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
# Panda ES memory timing issue
Patch25: omap4-panda-memtiming.patch
Patch30: uboot-wandboard-quad.patch
Requires: dtc
@ -122,22 +127,18 @@ 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
%setup -q -n u-boot-%{version}%{?candidate:-%{candidate}}
%patch1 -p1
%patch2 -p1
#patch3 -p1
#patch4 -p1
# Beagle Bone Black support
# wandboard quad support
%patch10 -p1
# Beagle Bone Black support
%patch11 -p1
%patch12 -p1
%patch13 -p1
@ -151,8 +152,8 @@ u-boot bootloader binaries for vexpress
%patch21 -p1
%patch22 -p1
%patch23 -p1
%patch30 -p1
%patch24 -p1
%patch25 -p1 -b .panda
mkdir builds
@ -165,11 +166,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 +262,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 +340,24 @@ 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
* Sun Sep 1 2013 Peter Robinson <pbrobinson@fedoraproject.org> 2013.07-2
- Add patch for Panda ES memory type issue
* Fri Jul 26 2013 Dennis Gilmore <dennis@ausil.us> - 2013.07-1
- update to 2013.07 final
* 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
- upstream 2013.07-rc2 update
* Mon Jun 17 2013 Dennis Gilmore <dennis@ausil.us> - 2013.04-5.1
- dont apply ext mlo patches

38
uboot-wandboard-quad.patch
View File

@ -1,38 +0,0 @@
diff -ur u-boot-2013.04.orig/board/wandboard/README u-boot-2013.04/board/wandboard/README
--- u-boot-2013.04.orig/board/wandboard/README 2013-04-19 09:25:43.000000000 -0500
+++ u-boot-2013.04/board/wandboard/README 2013-06-14 09:01:59.935818158 -0500
@@ -17,6 +17,11 @@
$ make wanboard_dl_config
$ make
+To build U-Boot for the Wandboard Quad version:
+
+$ make wandboard_quad_config
+$ make
+
To build U-Boot for the Wandboard Solo version:
$ make wanboard_solo_config
diff -ur u-boot-2013.04.orig/boards.cfg u-boot-2013.04/boards.cfg
--- u-boot-2013.04.orig/boards.cfg 2013-04-19 09:25:43.000000000 -0500
+++ u-boot-2013.04/boards.cfg 2013-06-14 09:04:30.281695305 -0500
@@ -267,6 +267,7 @@
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
cm_t35 arm armv7 cm_t35 - omap3
omap3_overo arm armv7 overo - omap3
diff -ur u-boot-2013.04.orig/include/configs/wandboard.h u-boot-2013.04/include/configs/wandboard.h
--- u-boot-2013.04.orig/include/configs/wandboard.h 2013-04-19 09:25:43.000000000 -0500
+++ u-boot-2013.04/include/configs/wandboard.h 2013-06-14 09:05:38.164639557 -0500
@@ -83,6 +83,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