===================================================================
@@ -24,7 +24,6 @@
#include <config_cmd_default.h>
#include <config_distro_defaults.h>
-#include <config_distro_bootcmd.h>
/* U-Boot commands */
#define CONFIG_CMD_MEMTEST
@@ -92,6 +91,8 @@
#define BOOT_TARGET_DEVICES(func) \
func(MMC, mmc, 0)
+#include <config_distro_bootcmd.h>
+
#define MEM_LAYOUT_ENV_SETTINGS \
"kernel_addr_r=0x70800000\0" \
"fdt_addr_r=0x71000000\0" \
I'd like to propose only setting bootargs when the default action is
kicking in to allow for a different root device, or root device
discovery from an initramfs, or boot scripts, etc... Something along
these lines (untested):
===================================================================
@@ -80,10 +80,9 @@
#define CONFIG_SYS_TEXT_BASE 0x77800000
#define CONFIG_SYS_LOAD_ADDR CONFIG_LOADADDR
#define CONFIG_HOSTNAME usbarmory
-#define CONFIG_BOOTARGS \
- "console=ttymxc0,115200 root=/dev/mmcblk0p1 rootwait rw"
#define CONFIG_BOOTCOMMAND \
"run distro_bootcmd; " \
+ "setenv bootargs console=${console} ${bootargs_default}; " \
"ext2load mmc 0:1 ${kernel_addr_r} /boot/uImage; " \
"ext2load mmc 0:1 ${fdt_addr_r} /boot/${fdtfile}; " \
"bootm ${kernel_addr_r} - ${fdt_addr_r}"
@@ -102,6 +101,7 @@
#define CONFIG_EXTRA_ENV_SETTINGS \
MEM_LAYOUT_ENV_SETTINGS \
+ "bootargs_default=root=/dev/mmcblk0p1 rootwait rw\0" \
"fdtfile=imx53-usbarmory.dtb\0" \
"console=ttymxc0,115200\0" \
BOOTENV