arm: novena: Switch novena to config_distro_bootcmd

PATCH Superseded Marek Vasut 4 participants 6 messages Nov 24, 2015 – Dec 29, 2015

lore

Share & tools

lore

Marek Vasut

author

2015-11-24 23:37 UTC #0 lore raw

PATCH v2 1/1 arm: novena: Switch novena to config_distro_bootcmd

From: Vagrant Cascadian <[email protected]>

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

Signed-off-by Vagrant Cascadian <[email protected]>

Signed-off-by Marek Vasut <[email protected]>

Cc Sean Cross <[email protected]>

Cc Stefano Babic <[email protected]>

---
 include/configs/novena.h | 23 ++++++++++++++++++++++-
 1 file changed, 22 insertions(+), 1 deletion(-)

V2: Add fdtfile to specify the device tree blob.
Fix fdt_addr_r to point past kernel address.

include/configs/novena.h +22 -1

index 718989f..fc953f6 100644
@@ -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"		\
+	"pxefile_addr_r="__stringify(CONFIG_LOADADDR)"\0"		\
+	"scriptaddr="__stringify(CONFIG_LOADADDR)"\0"			\
+	"ramdisk_addr_r=0x28000000\0"		   			\
+	"fdt_addr_r=0x18000000\0"					\
+	"fdtfile=imx6q-novena.dtb\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 */

Signature · 1 line

2.1.4

Vagrant Cascadian

2015-11-25 21:30 UTC #1 lore raw

PATCH v2 1/1 arm: novena: Switch novena to config_distro_bootcmd

Quoted 8 lines · Marek Vasut

From: Vagrant Cascadian <[email protected]>
Switch Novena to distro bootcmd, so it can be used with debian easily.
Signed-off-by Vagrant Cascadian <[email protected]>
Signed-off-by Marek Vasut <[email protected]>
Cc Sean Cross <[email protected]>
Cc Stefano Babic <[email protected]>

Quoted 6 lines

---
 include/configs/novena.h | 23 ++++++++++++++++++++++-
 1 file changed, 22 insertions(+), 1 deletion(-)
V2: Add fdtfile to specify the device tree blob.
Fix fdt_addr_r to point past kernel address.

Tested-by Vagrant Cascadian <[email protected]>

Quoted 63 lines

include/configs/novena.h +22 -1

index 718989f..fc953f6 100644
@@ -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"		\
+	"pxefile_addr_r="__stringify(CONFIG_LOADADDR)"\0"		\
+	"scriptaddr="__stringify(CONFIG_LOADADDR)"\0"			\
+	"ramdisk_addr_r=0x28000000\0"		   			\
+	"fdt_addr_r=0x18000000\0"					\
+	"fdtfile=imx6q-novena.dtb\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 */

Signature · 1 line

2.1.4

-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 818 bytes
Desc: not available
URL: <http://lists.denx.de/pipermail/u-boot/attachments/20151125/c42928e0/attachment.sig>

Vagrant Cascadian

2015-12-12 23:16 UTC #2 lore raw

PATCH v2 1/1 arm: novena: Switch novena to config_distro_bootcmd

In reply to Marek Vasut

Quoted 3 lines · Marek Vasut

From: Vagrant Cascadian <[email protected]>
Switch Novena to distro bootcmd

Anything remaining on this? Can we hope to see it in 2016.01?

Quoted 1 line

so it can be used with debian easily.

I suspect other distros would appreciate this too. :)

live well,
vagrant

Quoted 74 lines

Signed-off-by Vagrant Cascadian <[email protected]>

Signed-off-by Marek Vasut <[email protected]>

Cc Sean Cross <[email protected]>

Cc Stefano Babic <[email protected]>

---
 include/configs/novena.h | 23 ++++++++++++++++++++++-
 1 file changed, 22 insertions(+), 1 deletion(-)

V2: Add fdtfile to specify the device tree blob.
Fix fdt_addr_r to point past kernel address.

include/configs/novena.h +22 -1

index 718989f..fc953f6 100644
@@ -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"		\
+	"pxefile_addr_r="__stringify(CONFIG_LOADADDR)"\0"		\
+	"scriptaddr="__stringify(CONFIG_LOADADDR)"\0"			\
+	"ramdisk_addr_r=0x28000000\0"		   			\
+	"fdt_addr_r=0x18000000\0"					\
+	"fdtfile=imx6q-novena.dtb\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 */

Signature · 1 line

2.1.4

Stefano Babic

2015-12-14 11:24 UTC #3 lore raw

PATCH v2 1/1 arm: novena: Switch novena to config_distro_bootcmd

Hi Vagrant,

Quoted 12 lines · Vagrant Cascadian

Quoted 3 lines · Marek Vasut
From: Vagrant Cascadian <[email protected]>
Switch Novena to distro bootcmd
Anything remaining on this? Can we hope to see it in 2016.01?
Quoted 1 line
so it can be used with debian easily.
I suspect other distros would appreciate this too. :)

It was missed because it was assigned to Albert - I have picked it up.

Applied to u-boot-imx, thanks !

Best regards,
Stefano Babic

Signature · 5 lines

=====================================================================
DENX Software Engineering GmbH,      Managing Director: Wolfgang Denk
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: +49-8142-66989-53 Fax: +49-8142-66989-80 Email: sbabic at denx.de
=====================================================================

Marek Vasut

author

2015-12-22 01:19 UTC #4 lore raw

PATCH v2 1/1 arm: novena: Switch novena to config_distro_bootcmd

Quoted 10 lines · Stefano Babic

Hi Vagrant,
Quoted 7 lines · Vagrant Cascadian
Quoted 3 lines · Marek Vasut
From: Vagrant Cascadian <[email protected]>
Switch Novena to distro bootcmd
Anything remaining on this? Can we hope to see it in 2016.01?

Quoted 7 lines

Quoted 3 lines
Quoted 1 line
so it can be used with debian easily.
I suspect other distros would appreciate this too. :)
It was missed because it was assigned to Albert - I have picked it up.
Applied to u-boot-imx, thanks !

This is still not in u-boot/master :-(

Best regards,
Marek Vasut

Marek Vasut

author

2015-12-29 18:50 UTC #5 lore raw

PATCH v2 1/1 arm: novena: Switch novena to config_distro_bootcmd

Quoted 13 lines · Marek Vasut

Quoted 12 lines · Stefano Babic
Hi Vagrant,
Quoted 9 lines · Vagrant Cascadian
Quoted 3 lines · Marek Vasut
From: Vagrant Cascadian <[email protected]>
Switch Novena to distro bootcmd
Anything remaining on this? Can we hope to see it in 2016.01?
Quoted 1 line
so it can be used with debian easily.

Quoted 7 lines

Quoted 5 lines
Quoted 1 line
I suspect other distros would appreciate this too. :)
It was missed because it was assigned to Albert - I have picked it up.
Applied to u-boot-imx, thanks !
This is still not in u-boot/master :-(

This patch didn't make it into mainline for over a month. This is actually required so we can use Debian on Novena.

Please apply.

Best regards,
Marek Vasut