On 2015-11-24, Marek Vasut marex@denx.de wrote:

From: Vagrant Cascadian vagrant@aikidev.net

Switch Novena to distro bootcmd

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

so it can be used with debian easily.

I suspect other distros would appreciate this too. :)

live well, vagrant

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(-)

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

diff --git a/include/configs/novena.h b/include/configs/novena.h index 718989f..fc953f6 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" \

• "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 */

2.1.4