diff mbox

[U-Boot] arm: novena: Switch novena to config_distro_bootcmd

Message ID 1447185374-6075-1-git-send-email-marex@denx.de
State Superseded
Headers show

Commit Message

Marek Vasut Nov. 10, 2015, 7:56 p.m. UTC 
From: Vagrant Cascadian <vagrant@aikidev.net>

Switch Novena to distro bootcmd, so it can be used with debian easily.

Signed-off-by: Vagrant Cascadian <vagrant@aikidev.net>
Signed-off-by: Marek Vasut <marex@denx.de>
Cc: Sean Cross <xobs@kosagi.com>
Cc: Stefano Babic <sbabic@denx.de>
---
 include/configs/novena.h | 23 ++++++++++++++++++++++-
 1 file changed, 22 insertions(+), 1 deletion(-)

Comments

Vagrant Cascadian Nov. 10, 2015, 8:54 p.m. UTC | #1 
On 2015-11-10, Marek Vasut wrote:
> Switch Novena to distro bootcmd, so it can be used with debian easily.
...
> diff --git a/include/configs/novena.h b/include/configs/novena.h
> index 718989f..b0f4c02 100644
> --- a/include/configs/novena.h
> +++ b/include/configs/novena.h
> @@ -199,6 +201,11 @@
>  	"rootdev=/dev/mmcblk0p2\0"					\
>  	"netdev=eth0\0"							\
>  	"kernel_addr_r="__stringify(CONFIG_LOADADDR)"\0"		\
> +	"kernel_addr_r="__stringify(CONFIG_LOADADDR)"\0"		\
> +	"pxefile_addr_r="__stringify(CONFIG_LOADADDR)"\0"		\
> +	"scriptaddr="__stringify(CONFIG_LOADADDR)"\0"			\
> +	"ramdisk_addr_r=0x28000000\0"		   			\
> +	"fdt_addr_r=0x10000000\0"					\
>  	"addcons="							\
>  		"setenv bootargs ${bootargs} "				\
>  		"console=${consdev},${baudrate}\0"			\

kernel_addr_r only needs to be set once. :)

Thanks for submitting!

live well,
  vagrant
Marek Vasut Nov. 10, 2015, 9:44 p.m. UTC | #2 
On Tuesday, November 10, 2015 at 09:54:52 PM, Vagrant Cascadian wrote:
> On 2015-11-10, Marek Vasut wrote:
> > Switch Novena to distro bootcmd, so it can be used with debian easily.
> 
> ...
> 
> > diff --git a/include/configs/novena.h b/include/configs/novena.h
> > index 718989f..b0f4c02 100644
> > --- a/include/configs/novena.h
> > +++ b/include/configs/novena.h
> > @@ -199,6 +201,11 @@
> > 
> >  	"rootdev=/dev/mmcblk0p2\0"					\
> >  	"netdev=eth0\0"							\
> >  	"kernel_addr_r="__stringify(CONFIG_LOADADDR)"\0"		\
> > 
> > +	"kernel_addr_r="__stringify(CONFIG_LOADADDR)"\0"		\
> > +	"pxefile_addr_r="__stringify(CONFIG_LOADADDR)"\0"		\
> > +	"scriptaddr="__stringify(CONFIG_LOADADDR)"\0"			\
> > +	"ramdisk_addr_r=0x28000000\0"		   			\
> > +	"fdt_addr_r=0x10000000\0"					\
> > 
> >  	"addcons="							\
> >  	
> >  		"setenv bootargs ${bootargs} "				\
> >  		"console=${consdev},${baudrate}\0"			\
> 
> kernel_addr_r only needs to be set once. :)
> 
> Thanks for submitting!

Thanks for spotting this, done!

Best regards,
Marek Vasut
diff mbox

Patch

diff --git a/include/configs/novena.h b/include/configs/novena.h
index 718989f..b0f4c02 100644
--- a/include/configs/novena.h
+++ b/include/configs/novena.h
@@ -16,6 +16,7 @@ 
 #define CONFIG_FIT
 #define CONFIG_KEYBOARD
 
+#include <config_distro_defaults.h>
 #include "mx6_common.h"
 
 /* U-Boot Commands */
@@ -58,7 +59,7 @@ 
 /* Booting Linux */
 #define CONFIG_BOOTFILE			"fitImage"
 #define CONFIG_BOOTARGS			"console=ttymxc1,115200 "
-#define CONFIG_BOOTCOMMAND		"run net_nfs"
+#define CONFIG_BOOTCOMMAND		"run distro_bootcmd ; run net_nfs"
 #define CONFIG_HOSTNAME			novena
 
 /* Physical Memory Map */
@@ -190,6 +191,7 @@ 
 #endif
 
 /* Extra U-Boot environment. */
+#ifndef CONFIG_SPL_BUILD
 #define CONFIG_EXTRA_ENV_SETTINGS					\
 	"fdt_high=0xffffffff\0"						\
 	"initrd_high=0xffffffff\0"					\
@@ -199,6 +201,11 @@ 
 	"rootdev=/dev/mmcblk0p2\0"					\
 	"netdev=eth0\0"							\
 	"kernel_addr_r="__stringify(CONFIG_LOADADDR)"\0"		\
+	"kernel_addr_r="__stringify(CONFIG_LOADADDR)"\0"		\
+	"pxefile_addr_r="__stringify(CONFIG_LOADADDR)"\0"		\
+	"scriptaddr="__stringify(CONFIG_LOADADDR)"\0"			\
+	"ramdisk_addr_r=0x28000000\0"		   			\
+	"fdt_addr_r=0x10000000\0"					\
 	"addcons="							\
 		"setenv bootargs ${bootargs} "				\
 		"console=${consdev},${baudrate}\0"			\
@@ -242,5 +249,19 @@ 
 		"fatwrite mmc 0:1 ${loadaddr} u-boot.img ${filesize} ; "\
 		"fi ; "							\
 		"fi\0"							\
+	BOOTENV
+
+#define BOOT_TARGET_DEVICES(func) \
+	func(MMC, mmc, 0) \
+	func(USB, usb, 0) \
+	func(SATA, sata, 0) \
+	func(PXE, pxe, na) \
+	func(DHCP, dhcp, na)
+
+#include <config_distro_bootcmd.h>
+
+#else
+#define CONFIG_EXTRA_ENV_SETTINGS
+#endif /* CONFIG_SPL_BUILD */
 
 #endif				/* __CONFIG_H */