Patchwork [U-Boot,v2] integrator: pass a Device Tree by default

login
register
mail settings
Submitter Linus Walleij
Date Jan. 25, 2013, 7:52 a.m.
Message ID <1359100359-15652-1-git-send-email-linus.walleij@linaro.org>
Download mbox | patch
Permalink /patch/215570/
State Superseded
Delegated to: Albert ARIBAUD
Headers show

Comments

Linus Walleij - Jan. 25, 2013, 7:52 a.m.
This, enabled the FDT library for the Integrators, updates
the Integrator/CP default command to load and pass a Device
Tree when booting the kernel from the on-board ethernet,
define same environment for the Integrator/AP and move the
load address around to something even.

Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
---
ChangeLog v1->v2:
- Skip definition of $loadaddr, rely on CONFIG_LOAD_ADDR instead.
---
 include/configs/integrator-common.h | 3 ++-
 include/configs/integratorap.h      | 7 +++++--
 include/configs/integratorcp.h      | 9 ++++++---
 3 files changed, 13 insertions(+), 6 deletions(-)
Marek Vasut - Jan. 25, 2013, 11:14 a.m.
Dear Linus Walleij,

> This, enabled the FDT library for the Integrators, updates
> the Integrator/CP default command to load and pass a Device
> Tree when booting the kernel from the on-board ethernet,
> define same environment for the Integrator/AP and move the
> load address around to something even.
> 
> Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
> ---
> ChangeLog v1->v2:
> - Skip definition of $loadaddr, rely on CONFIG_LOAD_ADDR instead.
> ---
>  include/configs/integrator-common.h | 3 ++-
>  include/configs/integratorap.h      | 7 +++++--
>  include/configs/integratorcp.h      | 9 ++++++---
>  3 files changed, 13 insertions(+), 6 deletions(-)
> 
> diff --git a/include/configs/integrator-common.h
> b/include/configs/integrator-common.h index 564b418..f4a182c 100644
> --- a/include/configs/integrator-common.h
> +++ b/include/configs/integrator-common.h
> @@ -30,7 +30,7 @@
>  #define CONFIG_SYS_MEMTEST_END		0x10000000
>  #define CONFIG_SYS_HZ			1000
>  #define CONFIG_SYS_TIMERBASE		0x13000100	/* Timer1 */
> -#define CONFIG_SYS_LOAD_ADDR		0x7fc0	/* default load address */
> +#define CONFIG_SYS_LOAD_ADDR		0x800	/* default load address */
>  #define CONFIG_SYS_LONGHELP
>  #define CONFIG_SYS_HUSH_PARSER
>  #define CONFIG_SYS_CBSIZE		256	/* Console I/O Buffer Size*/
> @@ -41,6 +41,7 @@
> 
>  #define CONFIG_CMDLINE_TAG		/* enable passing of ATAGs  */
>  #define CONFIG_SETUP_MEMORY_TAGS
> +#define CONFIG_OF_LIBFDT		/* enable passing a Device Tree */
>  #define CONFIG_MISC_INIT_R		/* call misc_init_r during start up */
> 
>  /*
> diff --git a/include/configs/integratorap.h
> b/include/configs/integratorap.h index c6907b5..f409f2a 100644
> --- a/include/configs/integratorap.h
> +++ b/include/configs/integratorap.h
> @@ -62,9 +62,12 @@
>   */
>  #include <config_cmd_default.h>
> 
> -#define CONFIG_BOOTDELAY	2
> +#define CONFIG_BOOTDELAY	0
>  #define CONFIG_BOOTARGS		"root=/dev/mtdblock0 console=ttyAM0 
console=tty"
> -#define CONFIG_BOOTCOMMAND	""
> +#define CONFIG_BOOTCOMMAND	"setenv servip 192.168.1.100 ; " \
> +  "setenv fdtaddr 0x00800000 ; " \
> +  "echo \"\\\\$loadaddr = $loadaddr, \\\\$fdtaddr=$fdtaddr\" ; " \
> +  "echo \"load binaries then: bootm $loadaddr - $fdtaddr\""
> 
>  /*
>   * Miscellaneous configurable options
> diff --git a/include/configs/integratorcp.h
> b/include/configs/integratorcp.h index ca02a6f..9446edb 100644
> --- a/include/configs/integratorcp.h
> +++ b/include/configs/integratorcp.h
> @@ -60,11 +60,14 @@
>  #include <config_cmd_default.h>
> 
>  #define CONFIG_BOOTDELAY	2
> -#define CONFIG_BOOTARGS	"root=/dev/mtdblock0 console=ttyAMA0 console=tty
> ip=dhcp netdev=27,0,0xfc800000,0xfc800010,eth0 video=clcdfb:0" -#define
> CONFIG_BOOTCOMMAND "tftpboot ; bootm"
>  #define CONFIG_SERVERIP 192.168.1.100
>  #define CONFIG_IPADDR 192.168.1.104
> -#define CONFIG_BOOTFILE "uImage"
> +#define CONFIG_BOOTARGS	"root=/dev/mtdblock0 console=ttyAMA0 console=tty
> ip=dhcp netdev=27,0,0xfc800000,0xfc800010,eth0 video=clcdfb:0" +#define
> CONFIG_BOOTCOMMAND "setenv servip 192.168.1.100 ; " \
> +  "setenv fdtaddr 0x00800000 ; " \
> +  "bootp $loadaddr $servip:uImage ; " \
> +  "bootp $fdtaddr $servip:integratorcp.dtb ; " \
> +  "bootm $loadaddr - $fdtaddr"

Do you mean to use "serverip" here? Since "serverip" is the IP of the TFTP 
server and it's used across uboot.

Patch

diff --git a/include/configs/integrator-common.h b/include/configs/integrator-common.h
index 564b418..f4a182c 100644
--- a/include/configs/integrator-common.h
+++ b/include/configs/integrator-common.h
@@ -30,7 +30,7 @@ 
 #define CONFIG_SYS_MEMTEST_END		0x10000000
 #define CONFIG_SYS_HZ			1000
 #define CONFIG_SYS_TIMERBASE		0x13000100	/* Timer1 */
-#define CONFIG_SYS_LOAD_ADDR		0x7fc0	/* default load address */
+#define CONFIG_SYS_LOAD_ADDR		0x800	/* default load address */
 #define CONFIG_SYS_LONGHELP
 #define CONFIG_SYS_HUSH_PARSER
 #define CONFIG_SYS_CBSIZE		256	/* Console I/O Buffer Size*/
@@ -41,6 +41,7 @@ 
 
 #define CONFIG_CMDLINE_TAG		/* enable passing of ATAGs  */
 #define CONFIG_SETUP_MEMORY_TAGS
+#define CONFIG_OF_LIBFDT		/* enable passing a Device Tree */
 #define CONFIG_MISC_INIT_R		/* call misc_init_r during start up */
 
 /*
diff --git a/include/configs/integratorap.h b/include/configs/integratorap.h
index c6907b5..f409f2a 100644
--- a/include/configs/integratorap.h
+++ b/include/configs/integratorap.h
@@ -62,9 +62,12 @@ 
  */
 #include <config_cmd_default.h>
 
-#define CONFIG_BOOTDELAY	2
+#define CONFIG_BOOTDELAY	0
 #define CONFIG_BOOTARGS		"root=/dev/mtdblock0 console=ttyAM0 console=tty"
-#define CONFIG_BOOTCOMMAND	""
+#define CONFIG_BOOTCOMMAND	"setenv servip 192.168.1.100 ; " \
+  "setenv fdtaddr 0x00800000 ; " \
+  "echo \"\\\\$loadaddr = $loadaddr, \\\\$fdtaddr=$fdtaddr\" ; " \
+  "echo \"load binaries then: bootm $loadaddr - $fdtaddr\""
 
 /*
  * Miscellaneous configurable options
diff --git a/include/configs/integratorcp.h b/include/configs/integratorcp.h
index ca02a6f..9446edb 100644
--- a/include/configs/integratorcp.h
+++ b/include/configs/integratorcp.h
@@ -60,11 +60,14 @@ 
 #include <config_cmd_default.h>
 
 #define CONFIG_BOOTDELAY	2
-#define CONFIG_BOOTARGS	"root=/dev/mtdblock0 console=ttyAMA0 console=tty ip=dhcp netdev=27,0,0xfc800000,0xfc800010,eth0 video=clcdfb:0"
-#define CONFIG_BOOTCOMMAND "tftpboot ; bootm"
 #define CONFIG_SERVERIP 192.168.1.100
 #define CONFIG_IPADDR 192.168.1.104
-#define CONFIG_BOOTFILE "uImage"
+#define CONFIG_BOOTARGS	"root=/dev/mtdblock0 console=ttyAMA0 console=tty ip=dhcp netdev=27,0,0xfc800000,0xfc800010,eth0 video=clcdfb:0"
+#define CONFIG_BOOTCOMMAND "setenv servip 192.168.1.100 ; " \
+  "setenv fdtaddr 0x00800000 ; " \
+  "bootp $loadaddr $servip:uImage ; " \
+  "bootp $fdtaddr $servip:integratorcp.dtb ; " \
+  "bootm $loadaddr - $fdtaddr"
 
 /*
  * Miscellaneous configurable options