fix up bbb and wandboard to autoboot again
This commit is contained in:
Dennis Gilmore
parent
163f6f6d5e
commit
2cbdff5d3f
|
|
@ -1,7 +1,7 @@
|
|||
From 0ddef6baeedc39a496858b4c01903df078af1a7d Mon Sep 17 00:00:00 2001
|
||||
From dd24ce0e4a2614848431d3734669741f524f010e 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/11] make sure that the filesystem is a type of fat
|
||||
Subject: [PATCH 01/14] 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.
|
||||
|
|
@ -23,5 +23,5 @@ index bccc3e3..15f84ad 100644
|
|||
|
||||
cur_dev = NULL;
|
||||
--
|
||||
2.3.1
|
||||
2.3.2
|
||||
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
From 14598c51bc66832804633984539f335ef199932c Mon Sep 17 00:00:00 2001
|
||||
From 5ba14a142d5d3083f694dadbb1997f23fa171f0b Mon Sep 17 00:00:00 2001
|
||||
From: Peter Robinson <pbrobinson@gmail.com>
|
||||
Date: Fri, 6 Mar 2015 10:29:28 +0000
|
||||
Subject: [PATCH 02/11] Add BOOTENV_POST_COMMAND, which is appended to the end
|
||||
Subject: [PATCH 02/14] Add BOOTENV_POST_COMMAND, which is appended to the end
|
||||
of bootcmd
|
||||
|
||||
---
|
||||
|
|
@ -9,10 +9,10 @@ Subject: [PATCH 02/11] Add BOOTENV_POST_COMMAND, which is appended to the end
|
|||
1 file changed, 7 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/include/config_distro_bootcmd.h b/include/config_distro_bootcmd.h
|
||||
index 07a0b3b..3292375 100644
|
||||
index 73f093f..7f8b393 100644
|
||||
--- a/include/config_distro_bootcmd.h
|
||||
+++ b/include/config_distro_bootcmd.h
|
||||
@@ -148,6 +148,10 @@
|
||||
@@ -164,6 +164,10 @@
|
||||
#define BOOTENV_BOOT_TARGETS \
|
||||
"boot_targets=" BOOT_TARGET_DEVICES(BOOTENV_DEV_NAME) "\0"
|
||||
|
||||
|
|
@ -23,7 +23,7 @@ index 07a0b3b..3292375 100644
|
|||
#define BOOTENV_DEV(devtypeu, devtypel, instance) \
|
||||
BOOTENV_DEV_##devtypeu(devtypeu, devtypel, instance)
|
||||
#define BOOTENV \
|
||||
@@ -210,7 +214,9 @@
|
||||
@@ -226,7 +230,9 @@
|
||||
"distro_bootcmd=" BOOTENV_SET_SCSI_NEED_INIT \
|
||||
"for target in ${boot_targets}; do " \
|
||||
"run bootcmd_${target}; " \
|
||||
|
|
@ -35,5 +35,5 @@ index 07a0b3b..3292375 100644
|
|||
#ifndef CONFIG_BOOTCOMMAND
|
||||
#define CONFIG_BOOTCOMMAND "run distro_bootcmd"
|
||||
--
|
||||
2.3.1
|
||||
2.3.2
|
||||
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
From 006758f3cd6d24d7390133a52134b2e78b9c781f Mon Sep 17 00:00:00 2001
|
||||
From 707026f080b057cf553b67cd23b3e81cd90c6efe Mon Sep 17 00:00:00 2001
|
||||
From: Peter Robinson <pbrobinson@gmail.com>
|
||||
Date: Fri, 6 Mar 2015 10:30:06 +0000
|
||||
Subject: [PATCH 03/11] Only set CONFIG_BOOTDELAY if not already set.
|
||||
Subject: [PATCH 03/14] Only set CONFIG_BOOTDELAY if not already set.
|
||||
|
||||
---
|
||||
include/config_distro_defaults.h | 2 ++
|
||||
|
|
@ -22,5 +22,5 @@ index 1ecc0bb..b23eb04 100644
|
|||
#define CONFIG_MENU
|
||||
#define CONFIG_DOS_PARTITION
|
||||
--
|
||||
2.3.1
|
||||
2.3.2
|
||||
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
From bfba958bb582b73ea1c6bcdf8ccfca1a39511a9d Mon Sep 17 00:00:00 2001
|
||||
From ecb7a2bbcf68921cdca7aed2740561b6bb14970b Mon Sep 17 00:00:00 2001
|
||||
From: Peter Robinson <pbrobinson@gmail.com>
|
||||
Date: Fri, 6 Mar 2015 10:31:19 +0000
|
||||
Subject: [PATCH 04/11] Switch am335x_evm.h to use config_distro_defaults and
|
||||
Subject: [PATCH 04/14] 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 04/11] 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 f1c270c..c702d8b 100644
|
||||
index a87059c..3fb175e 100644
|
||||
--- a/include/configs/am335x_evm.h
|
||||
+++ b/include/configs/am335x_evm.h
|
||||
@@ -18,6 +18,21 @@
|
||||
|
|
@ -57,7 +57,7 @@ index f1c270c..c702d8b 100644
|
|||
#define CONFIG_SYS_NS16550_COM1 0x44e09000 /* Base EVM has UART0 */
|
||||
#define CONFIG_SYS_NS16550_COM2 0x48022000 /* UART1 */
|
||||
diff --git a/include/configs/ti_armv7_common.h b/include/configs/ti_armv7_common.h
|
||||
index 2bd1164..e409c7f 100644
|
||||
index 110a4f8..b6e37b3 100644
|
||||
--- a/include/configs/ti_armv7_common.h
|
||||
+++ b/include/configs/ti_armv7_common.h
|
||||
@@ -54,6 +54,7 @@
|
||||
|
|
@ -69,5 +69,5 @@ index 2bd1164..e409c7f 100644
|
|||
"fdt_addr_r=0x88000000\0" \
|
||||
"rdaddr=0x88080000\0" \
|
||||
--
|
||||
2.3.1
|
||||
2.3.2
|
||||
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
From dddde5d4c96f1f64b066e77ad774a7dda863904d Mon Sep 17 00:00:00 2001
|
||||
From 8c3c5af7d22366bcebd48817190b22ddbb119f9d Mon Sep 17 00:00:00 2001
|
||||
From: Peter Robinson <pbrobinson@gmail.com>
|
||||
Date: Fri, 6 Mar 2015 10:32:40 +0000
|
||||
Subject: [PATCH 05/11] add back adding console= to the bootargs if not
|
||||
Subject: [PATCH 05/14] add back adding console= to the bootargs if not
|
||||
present.
|
||||
|
||||
A better soloution is needed, not upstreamable
|
||||
|
|
@ -51,5 +51,5 @@ index 7e32c95..4f3c15d 100644
|
|||
strcat(bootargs, mac_str);
|
||||
|
||||
--
|
||||
2.3.1
|
||||
2.3.2
|
||||
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
From f1dfa1551a4b222f0c551f0b028cbeda3aebc491 Mon Sep 17 00:00:00 2001
|
||||
From d5e9f0b3d2495bcf81647887c8aaadf02223d108 Mon Sep 17 00:00:00 2001
|
||||
From: Peter Robinson <pbrobinson@gmail.com>
|
||||
Date: Fri, 6 Mar 2015 10:33:25 +0000
|
||||
Subject: [PATCH 06/11] wandboard: port to generic distro booting
|
||||
Subject: [PATCH 06/14] wandboard: port to generic distro booting
|
||||
|
||||
set the variables and functions needed for generic distro booting.
|
||||
---
|
||||
|
|
@ -140,5 +140,5 @@ index 117d1f7..1d8459c 100644
|
|||
#define CONFIG_CMD_CACHE
|
||||
#endif
|
||||
--
|
||||
2.3.1
|
||||
2.3.2
|
||||
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
From 07a6e8cf586b2cf541edabb5d11d0789833a4d99 Mon Sep 17 00:00:00 2001
|
||||
From 2080f6a04c624b414b8934c7717b40836ed4dbcd Mon Sep 17 00:00:00 2001
|
||||
From: Peter Robinson <pbrobinson@gmail.com>
|
||||
Date: Fri, 6 Mar 2015 10:38:05 +0000
|
||||
Subject: [PATCH 07/11] Switch omap4 boards to use config_distro_defaults and
|
||||
Subject: [PATCH 07/14] Switch omap4 boards to use config_distro_defaults and
|
||||
config_distro_bootcmd.
|
||||
|
||||
Add pxefile_addr_r to DEFAULT_LINUX_BOOT_ENV, as pxefile_addr_r is used
|
||||
|
|
@ -13,7 +13,7 @@ Subject: [PATCH 07/11] Switch omap4 boards to use config_distro_defaults and
|
|||
2 files changed, 18 insertions(+), 24 deletions(-)
|
||||
|
||||
diff --git a/include/configs/ti_armv7_common.h b/include/configs/ti_armv7_common.h
|
||||
index e409c7f..f280534 100644
|
||||
index b6e37b3..d1e259e 100644
|
||||
--- a/include/configs/ti_armv7_common.h
|
||||
+++ b/include/configs/ti_armv7_common.h
|
||||
@@ -54,7 +54,8 @@
|
||||
|
|
@ -85,5 +85,5 @@ index 1c93aab..5402793 100644
|
|||
/*
|
||||
* Defines for SPL
|
||||
--
|
||||
2.3.1
|
||||
2.3.2
|
||||
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
From da76356b5c9df13e3e948fc1409b0a0921e8d158 Mon Sep 17 00:00:00 2001
|
||||
From b357a39500d81754e496f9e3f298a46cd92212b5 Mon Sep 17 00:00:00 2001
|
||||
From: Peter Robinson <pbrobinson@gmail.com>
|
||||
Date: Fri, 6 Mar 2015 10:45:22 +0000
|
||||
Subject: [PATCH 08/11] port utilite to distro generic boot commands
|
||||
Subject: [PATCH 08/14] port utilite to distro generic boot commands
|
||||
|
||||
---
|
||||
include/configs/cm_fx6.h | 109 ++++++++++++-----------------------------------
|
||||
|
|
@ -145,5 +145,5 @@ index 4207504..58dd5e1 100644
|
|||
#define CONFIG_PREBOOT "usb start"
|
||||
|
||||
--
|
||||
2.3.1
|
||||
2.3.2
|
||||
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
From 222035e0351121f9feb92daa782756f73c4927d9 Mon Sep 17 00:00:00 2001
|
||||
From bd6c9bae1941c74cb9c963a702ff491a57d61ab3 Mon Sep 17 00:00:00 2001
|
||||
From: Peter Robinson <pbrobinson@gmail.com>
|
||||
Date: Fri, 6 Mar 2015 10:49:53 +0000
|
||||
Subject: [PATCH 09/11] RiOT board: set console speed
|
||||
Subject: [PATCH 09/14] RiOT board: set console speed
|
||||
|
||||
---
|
||||
include/configs/embestmx6boards.h | 2 +-
|
||||
|
|
@ -21,5 +21,5 @@ index b4b3ae8..b8696a3 100644
|
|||
|
||||
#define PHYS_SDRAM_SIZE (1u * 1024 * 1024 * 1024)
|
||||
--
|
||||
2.3.1
|
||||
2.3.2
|
||||
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
From f113d6b6c7077fbf807e18f569d302ea2223c5ad Mon Sep 17 00:00:00 2001
|
||||
From cfee6c407f7ed0ab2ed0f98645c10b2d34497f46 Mon Sep 17 00:00:00 2001
|
||||
From: Peter Robinson <pbrobinson@gmail.com>
|
||||
Date: Fri, 6 Mar 2015 10:52:53 +0000
|
||||
Subject: [PATCH 10/11] Add support for loading environment from uEnv.txt in
|
||||
Subject: [PATCH 10/14] Add support for loading environment from uEnv.txt in
|
||||
config_distro_bootcmd.
|
||||
|
||||
---
|
||||
|
|
@ -9,10 +9,10 @@ Subject: [PATCH 10/11] Add support for loading environment from uEnv.txt in
|
|||
1 file changed, 21 insertions(+)
|
||||
|
||||
diff --git a/include/config_distro_bootcmd.h b/include/config_distro_bootcmd.h
|
||||
index 3292375..5c6cec1 100644
|
||||
index 7f8b393..8614cc4 100644
|
||||
--- a/include/config_distro_bootcmd.h
|
||||
+++ b/include/config_distro_bootcmd.h
|
||||
@@ -163,6 +163,7 @@
|
||||
@@ -179,6 +179,7 @@
|
||||
"boot_prefixes=/ /boot/\0" \
|
||||
"boot_scripts=boot.scr.uimg boot.scr\0" \
|
||||
"boot_script_dhcp=boot.scr.uimg\0" \
|
||||
|
|
@ -20,7 +20,7 @@ index 3292375..5c6cec1 100644
|
|||
BOOTENV_BOOT_TARGETS \
|
||||
\
|
||||
"boot_extlinux=" \
|
||||
@@ -193,11 +194,31 @@
|
||||
@@ -209,11 +210,31 @@
|
||||
"fi; " \
|
||||
"done\0" \
|
||||
\
|
||||
|
|
@ -53,5 +53,5 @@ index 3292375..5c6cec1 100644
|
|||
\
|
||||
"scan_dev_for_boot_part=" \
|
||||
--
|
||||
2.3.1
|
||||
2.3.2
|
||||
|
||||
|
|
|
|||
|
|
@ -1,8 +1,8 @@
|
|||
From 330ef191351986782a12d2e9f695715ffda3508f Mon Sep 17 00:00:00 2001
|
||||
From 3391ec0e884965315e6b18f87d3713db4fd461e2 Mon Sep 17 00:00:00 2001
|
||||
From: Peter Robinson <pbrobinson@gmail.com>
|
||||
Date: Fri, 6 Mar 2015 11:11:51 +0000
|
||||
Subject: [PATCH 11/11] Add BOOTENV_INIT_COMMAND for commands that may be
|
||||
needed to run before bootcmd, such as setting the fdt file variables for
|
||||
Subject: [PATCH 11/14] 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.
|
||||
|
||||
---
|
||||
|
|
@ -10,10 +10,10 @@ Subject: [PATCH 11/11] Add BOOTENV_INIT_COMMAND for commands that may be
|
|||
1 file changed, 5 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/include/config_distro_bootcmd.h b/include/config_distro_bootcmd.h
|
||||
index 5c6cec1..608b65f 100644
|
||||
index 8614cc4..1461eaf 100644
|
||||
--- a/include/config_distro_bootcmd.h
|
||||
+++ b/include/config_distro_bootcmd.h
|
||||
@@ -148,6 +148,10 @@
|
||||
@@ -164,6 +164,10 @@
|
||||
#define BOOTENV_BOOT_TARGETS \
|
||||
"boot_targets=" BOOT_TARGET_DEVICES(BOOTENV_DEV_NAME) "\0"
|
||||
|
||||
|
|
@ -24,7 +24,7 @@ index 5c6cec1..608b65f 100644
|
|||
#ifndef BOOTENV_POST_COMMAND
|
||||
#define BOOTENV_POST_COMMAND
|
||||
#endif
|
||||
@@ -232,7 +236,7 @@
|
||||
@@ -248,7 +252,7 @@
|
||||
\
|
||||
BOOT_TARGET_DEVICES(BOOTENV_DEV) \
|
||||
\
|
||||
|
|
@ -34,5 +34,5 @@ index 5c6cec1..608b65f 100644
|
|||
"run bootcmd_${target}; " \
|
||||
"done;" \
|
||||
--
|
||||
2.3.1
|
||||
2.3.2
|
||||
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
From 0d4a05fb5f42a7a4f9689336872762070c45c9be Mon Sep 17 00:00:00 2001
|
||||
From 93e869c13a91418a0024b059f3c13063bfbceca4 Mon Sep 17 00:00:00 2001
|
||||
From: Peter Robinson <pbrobinson@gmail.com>
|
||||
Date: Fri, 6 Mar 2015 14:05:39 +0000
|
||||
Subject: [PATCH 12/12] beagle board: use ext support in the SPL
|
||||
Subject: [PATCH 12/14] beagle board: use ext support in the SPL
|
||||
|
||||
---
|
||||
include/configs/omap3_beagle.h | 3 +++
|
||||
|
|
@ -22,5 +22,5 @@ index f25a940..eb782d8 100644
|
|||
#define CONFIG_SYS_NAND_BUSWIDTH_16BIT 16
|
||||
#define CONFIG_SYS_NAND_5_ADDR_CYCLE
|
||||
--
|
||||
2.3.1
|
||||
2.3.2
|
||||
|
||||
|
|
|
|||
|
|
@ -0,0 +1,25 @@
|
|||
From c1b63c708f15f8840307507b649c36abb529c08f Mon Sep 17 00:00:00 2001
|
||||
From: Dennis Gilmore <dennis@ausil.us>
|
||||
Date: Sat, 21 Mar 2015 12:17:08 -0500
|
||||
Subject: [PATCH 13/14] WANDBOARD: run the dsitro bootcmd first before falling
|
||||
back to old settings
|
||||
|
||||
---
|
||||
include/configs/wandboard.h | 1 +
|
||||
1 file changed, 1 insertion(+)
|
||||
|
||||
diff --git a/include/configs/wandboard.h b/include/configs/wandboard.h
|
||||
index 1d8459c..07c3d63 100644
|
||||
--- a/include/configs/wandboard.h
|
||||
+++ b/include/configs/wandboard.h
|
||||
@@ -238,6 +238,7 @@
|
||||
BOOTENV
|
||||
|
||||
#define CONFIG_BOOTCOMMAND \
|
||||
+ "run distro_bootcmd;" \
|
||||
"mmc dev ${mmcdev}; if mmc rescan; then " \
|
||||
"if run loadbootscript; then " \
|
||||
"run bootscript; " \
|
||||
--
|
||||
2.3.2
|
||||
|
||||
|
|
@ -0,0 +1,26 @@
|
|||
From 78f73ac35437d852f432a60ec4aac279cb46cb29 Mon Sep 17 00:00:00 2001
|
||||
From: Dennis Gilmore <dennis@ausil.us>
|
||||
Date: Sat, 21 Mar 2015 12:36:45 -0500
|
||||
Subject: [PATCH 14/14] BBB tell u-boot to look in the first partition to load
|
||||
contents
|
||||
|
||||
---
|
||||
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 3fb175e..f223309 100644
|
||||
--- a/include/configs/am335x_evm.h
|
||||
+++ b/include/configs/am335x_evm.h
|
||||
@@ -86,7 +86,7 @@
|
||||
#define CONFIG_EXTRA_ENV_SETTINGS \
|
||||
DEFAULT_LINUX_BOOT_ENV \
|
||||
"boot_fdt=try\0" \
|
||||
- "bootpart=0:2\0" \
|
||||
+ "bootpart=1\0" \
|
||||
"bootdir=/boot\0" \
|
||||
"bootfile=zImage\0" \
|
||||
"fdtfile=undefined\0" \
|
||||
--
|
||||
2.3.2
|
||||
|
||||
|
|
@ -2,7 +2,7 @@
|
|||
|
||||
Name: uboot-tools
|
||||
Version: 2015.04
|
||||
Release: 0.2%{?candidate:.%{candidate}}%{?dist}
|
||||
Release: 0.3%{?candidate:.%{candidate}}%{?dist}
|
||||
Summary: U-Boot utilities
|
||||
|
||||
Group: Development/Tools
|
||||
|
|
@ -22,6 +22,8 @@ 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
|
||||
|
||||
BuildRequires: dtc, openssl-devel
|
||||
BuildRequires: fedora-logos, netpbm-progs
|
||||
|
|
@ -513,8 +515,11 @@ install -p -m 0644 tools/env/fw_env.config $RPM_BUILD_ROOT%{_sysconfdir}
|
|||
%endif
|
||||
|
||||
%changelog
|
||||
* Sat Mar 21 2015 Dennis Gilmore <dennis@ausil.us> - 2015.04-0.3.rc4
|
||||
- fix up bbb and wandboard to autoboot again
|
||||
|
||||
* Fri Mar 20 2015 Peter Robinson <pbrobinson@fedoraproject.org> 2015.04-0.2.rc4
|
||||
- Update to 2015.04 rc3
|
||||
- Update to 2015.04 rc4
|
||||
|
||||
* Fri Mar 6 2015 Peter Robinson <pbrobinson@fedoraproject.org> 2015.04-0.1.rc3
|
||||
- Update to 2015.04 rc3
|
||||
|
|
|
|||
Loading…
Reference in New Issue