* [U-Boot] [PATCH] arm: novena: Switch novena to config_distro_bootcmd
@ 2015-11-10 19:56 Marek Vasut
2015-11-10 20:54 ` Vagrant Cascadian
0 siblings, 1 reply; 3+ messages in thread
From: Marek Vasut @ 2015-11-10 19:56 UTC (permalink / raw)
To: u-boot
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(-)
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 */
--
2.1.4
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [U-Boot] [PATCH] arm: novena: Switch novena to config_distro_bootcmd
2015-11-10 19:56 [U-Boot] [PATCH] arm: novena: Switch novena to config_distro_bootcmd Marek Vasut
@ 2015-11-10 20:54 ` Vagrant Cascadian
2015-11-10 21:44 ` Marek Vasut
0 siblings, 1 reply; 3+ messages in thread
From: Vagrant Cascadian @ 2015-11-10 20:54 UTC (permalink / raw)
To: u-boot
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
-------------- 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/20151110/b549c5f8/attachment.sig>
^ permalink raw reply [flat|nested] 3+ messages in thread
* [U-Boot] [PATCH] arm: novena: Switch novena to config_distro_bootcmd
2015-11-10 20:54 ` Vagrant Cascadian
@ 2015-11-10 21:44 ` Marek Vasut
0 siblings, 0 replies; 3+ messages in thread
From: Marek Vasut @ 2015-11-10 21:44 UTC (permalink / raw)
To: u-boot
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
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2015-11-10 21:44 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2015-11-10 19:56 [U-Boot] [PATCH] arm: novena: Switch novena to config_distro_bootcmd Marek Vasut
2015-11-10 20:54 ` Vagrant Cascadian
2015-11-10 21:44 ` Marek Vasut
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.