diff mbox

[U-Boot] common/board_r: Restore non-cached memory setup

Message ID 54FD41F6.5060208@siemens.com
State Accepted
Delegated to: Tom Rini
Headers show

Commit Message

Jan Kiszka March 9, 2015, 6:47 a.m. UTC 
This fixes a regression of e310b93ec1, affecting Ethernet on the Jetson
TK1, e.g.

Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com>
---
 common/board_r.c | 11 +++++++++++
 1 file changed, 11 insertions(+)

Comments

Jan Kiszka March 9, 2015, 6:51 a.m. UTC | #1 
[resent with updated address of Tom]

On 2015-03-09 07:47, Jan Kiszka wrote:
> This fixes a regression of e310b93ec1, affecting Ethernet on the Jetson
> TK1, e.g.
> 
> Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com>
> ---
>  common/board_r.c | 11 +++++++++++
>  1 file changed, 11 insertions(+)
> 
> diff --git a/common/board_r.c b/common/board_r.c
> index 38be09b..0335f6b 100644
> --- a/common/board_r.c
> +++ b/common/board_r.c
> @@ -271,6 +271,14 @@ static int initr_malloc(void)
>  	return 0;
>  }
>  
> +#ifdef CONFIG_SYS_NONCACHED_MEMORY
> +static int initr_noncached(void)
> +{
> +	noncached_init();
> +	return 0;
> +}
> +#endif
> +
>  #ifdef CONFIG_DM
>  static int initr_dm(void)
>  {
> @@ -698,6 +706,9 @@ init_fnc_t init_sequence_r[] = {
>  #endif
>  	initr_barrier,
>  	initr_malloc,
> +#ifdef CONFIG_SYS_NONCACHED_MEMORY
> +	initr_noncached,
> +#endif
>  	bootstage_relocate,
>  #ifdef CONFIG_DM
>  	initr_dm,
>
Tom Rini March 9, 2015, 4:47 p.m. UTC | #2 
On Mon, Mar 09, 2015 at 07:47:18AM +0100, Jan Kiszka wrote:

> This fixes a regression of e310b93ec1, affecting Ethernet on the Jetson
> TK1, e.g.
> 
> Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com>

Applied to u-boot/master, thanks!
diff mbox

Patch

diff --git a/common/board_r.c b/common/board_r.c
index 38be09b..0335f6b 100644
--- a/common/board_r.c
+++ b/common/board_r.c
@@ -271,6 +271,14 @@  static int initr_malloc(void)
 	return 0;
 }
 
+#ifdef CONFIG_SYS_NONCACHED_MEMORY
+static int initr_noncached(void)
+{
+	noncached_init();
+	return 0;
+}
+#endif
+
 #ifdef CONFIG_DM
 static int initr_dm(void)
 {
@@ -698,6 +706,9 @@  init_fnc_t init_sequence_r[] = {
 #endif
 	initr_barrier,
 	initr_malloc,
+#ifdef CONFIG_SYS_NONCACHED_MEMORY
+	initr_noncached,
+#endif
 	bootstage_relocate,
 #ifdef CONFIG_DM
 	initr_dm,