Merge branch 'master' of ssh://pkgs.fedoraproject.org/uboot-tools

This commit is contained in:
Peter Robinson 2015-10-13 00:18:17 +00:00
commit 758fe6e537
6 changed files with 23 additions and 24 deletions

View File

@ -1,4 +1,4 @@
From 5a8f9d701fd16b4e1821b6699e18df683dbe9d7d Mon Sep 17 00:00:00 2001
From 4546255d8c19441cd1fb0724c94865c7549344bc Mon Sep 17 00:00:00 2001
From: Peter Robinson <pbrobinson@gmail.com>
Date: Tue, 4 Aug 2015 09:35:43 +0100
Subject: [PATCH 1/5] wandboard: add support for generic distro boot

View File

@ -1,7 +1,7 @@
From 18836113635324d0272ac06c761b3fb419a90676 Mon Sep 17 00:00:00 2001
From cd539722680e4463fcfcf2335f0cf3df1663345f Mon Sep 17 00:00:00 2001
From: Peter Robinson <pbrobinson@gmail.com>
Date: Tue, 4 Aug 2015 09:36:08 +0100
Subject: [PATCH 2/5] am33xx: add support for generic distro boot
Date: Tue, 29 Sep 2015 09:43:34 +0100
Subject: [PATCH 4/5] am33xx: add support for generic distro boot
---
include/configs/am335x_evm.h | 28 ++++++++++++++++++----------
@ -9,7 +9,7 @@ Subject: [PATCH 2/5] am33xx: add support for generic distro boot
2 files changed, 19 insertions(+), 10 deletions(-)
diff --git a/include/configs/am335x_evm.h b/include/configs/am335x_evm.h
index 633391b..f81e7a6 100644
index 3cf768e..bf78902 100644
--- a/include/configs/am335x_evm.h
+++ b/include/configs/am335x_evm.h
@@ -18,6 +18,21 @@
@ -34,16 +34,16 @@ index 633391b..f81e7a6 100644
#ifndef CONFIG_SPL_BUILD
#ifndef CONFIG_FIT
# define CONFIG_FIT
@@ -71,7 +86,7 @@
#define CONFIG_EXTRA_ENV_SETTINGS \
@@ -72,7 +87,7 @@
DEFAULT_LINUX_BOOT_ENV \
DEFAULT_MMC_TI_ARGS \
"boot_fdt=try\0" \
- "bootpart=0:2\0" \
+ "bootpart=1\0" \
"bootdir=/boot\0" \
"bootfile=zImage\0" \
"fdtfile=undefined\0" \
@@ -166,17 +181,10 @@
@@ -160,17 +175,10 @@
"echo WARNING: Could not determine device tree to use; fi; \0" \
NANDARGS \
NETARGS \
@ -64,7 +64,7 @@ index 633391b..f81e7a6 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 6dc5ebd..64949b8 100644
index 6dc6515..684d616 100644
--- a/include/configs/ti_armv7_common.h
+++ b/include/configs/ti_armv7_common.h
@@ -52,6 +52,7 @@

View File

@ -1,7 +1,7 @@
From 50a199d4ea2f6901e572a803e1bb33d250cd2acd Mon Sep 17 00:00:00 2001
From 0f2d7c287a2b2de862cb8dc091053a8bc01f7194 Mon Sep 17 00:00:00 2001
From: Peter Robinson <pbrobinson@gmail.com>
Date: Tue, 4 Aug 2015 09:36:49 +0100
Subject: [PATCH 3/5] Switch omap4 boards to use config_distro_defaults and
Date: Tue, 29 Sep 2015 09:46:26 +0100
Subject: [PATCH 5/5] Switch omap4 boards to use config_distro_defaults and
config_distro_bootcmd
---
@ -10,7 +10,7 @@ Subject: [PATCH 3/5] Switch omap4 boards to use config_distro_defaults and
2 files changed, 19 insertions(+), 25 deletions(-)
diff --git a/include/configs/ti_armv7_common.h b/include/configs/ti_armv7_common.h
index 64949b8..523e2ec 100644
index 684d616..c29a157 100644
--- a/include/configs/ti_armv7_common.h
+++ b/include/configs/ti_armv7_common.h
@@ -52,7 +52,8 @@
@ -24,7 +24,7 @@ index 64949b8..523e2ec 100644
"fdt_addr_r=0x88000000\0" \
"rdaddr=0x88080000\0" \
diff --git a/include/configs/ti_omap4_common.h b/include/configs/ti_omap4_common.h
index b299aed..e0f2035 100644
index 1cd7dae..0e210af 100644
--- a/include/configs/ti_omap4_common.h
+++ b/include/configs/ti_omap4_common.h
@@ -78,6 +78,18 @@
@ -46,8 +46,8 @@ index b299aed..e0f2035 100644
/*
* Environment setup
*/
@@ -85,7 +97,7 @@
DEFAULT_LINUX_BOOT_ENV \
@@ -86,7 +98,7 @@
DEFAULT_MMC_TI_ARGS \
"console=ttyO2,115200n8\0" \
"fdtfile=undefined\0" \
- "bootpart=0:2\0" \
@ -55,7 +55,7 @@ index b299aed..e0f2035 100644
"bootdir=/boot\0" \
"bootfile=zImage\0" \
"usbtty=cdc_acm\0" \
@@ -125,30 +137,11 @@
@@ -119,30 +131,11 @@
"if test $fdtfile = undefined; then " \
"echo WARNING: Could not determine device tree to use; fi; \0" \
"loadfdt=load mmc ${bootpart} ${fdtaddr} ${bootdir}/${fdtfile}\0" \

View File

@ -1,7 +1,7 @@
From 0fbd61016856c536998ce3ef248079cbf4de0777 Mon Sep 17 00:00:00 2001
From 6e9ac1e8c6b51189dc0908585eb2b0240f213821 Mon Sep 17 00:00:00 2001
From: Peter Robinson <pbrobinson@gmail.com>
Date: Thu, 2 Jul 2015 23:28:56 +0100
Subject: [PATCH 4/5] Add BOOTENV_INIT_COMMAND for commands that may be needed
Subject: [PATCH 2/5] 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.

View File

@ -1,14 +1,14 @@
From dec80e7e7b8ae019adf5fda70a5be838d11ae7ea Mon Sep 17 00:00:00 2001
From ad8f78f7df2cbfd271d73afc5296941972b38119 Mon Sep 17 00:00:00 2001
From: Peter Robinson <pbrobinson@gmail.com>
Date: Tue, 4 Aug 2015 09:37:38 +0100
Subject: [PATCH 5/5] port utilite to distro generic boot commands
Subject: [PATCH 3/5] port utilite to distro generic boot commands
---
include/configs/cm_fx6.h | 107 ++++++++++++-----------------------------------
1 file changed, 27 insertions(+), 80 deletions(-)
diff --git a/include/configs/cm_fx6.h b/include/configs/cm_fx6.h
index bbd9f38..2fb8b7f 100644
index 12734a1..602c178 100644
--- a/include/configs/cm_fx6.h
+++ b/include/configs/cm_fx6.h
@@ -11,6 +11,7 @@
@ -19,7 +19,7 @@ index bbd9f38..2fb8b7f 100644
#include "mx6_common.h"
/* Machine config */
@@ -65,97 +66,43 @@
@@ -64,97 +65,43 @@
#define CONFIG_ENV_SIZE (8 * 1024)
#define CONFIG_ENV_OFFSET (768 * 1024)

View File

@ -65,7 +65,6 @@ riotboard
rpi_2
smdkv310
snow
snowball
sunxi_Gemei_G9
trimslice
TZX-Q8-713B7