On 6/24/2016 8:59 AM, Fabien Lahoudere wrote:
In order to simplify the use of various images on various media for nitrogen6x, the configuration of the board must follow the generic distro configuration (doc/README.distro).
In order to boot your old rootfs, move your kernel and your device tree in /boot/. Then create /boot/extlinux/extlinux.conf with for example:
default Buildroot
label Buildroot kernel /boot/zImage append console=ttymxc1,115200 root=/dev/mmcblk0p1 rootwait rw fdtdir /boot
Signed-off-by: Fabien Lahoudere fabien.lahoudere@collabora.co.uk
...
diff --git a/include/configs/mx6_common.h b/include/configs/mx6_common.h index fb49322..75cbc84 100644 --- a/include/configs/mx6_common.h +++ b/include/configs/mx6_common.h +#define CONFIG_EXTRA_ENV_SETTINGS \
- "fdtfile=" CONFIG_FDTFILE "\0" \
- "fdt_addr_r=" __stringify(CONFIG_FDTADDR) "\0" \
- "fdt_addr=" __stringify(CONFIG_FDTADDR) "\0" \
- "kernel_addr_r=" __stringify(CONFIG_LOADADDR) "\0" \
- "pxefile_addr_r=" __stringify(CONFIG_LOADADDR) "\0" \
- "scriptaddr=" __stringify(CONFIG_LOADADDR) "\0" \
- "ramdisk_addr_r=" __stringify(CONFIG_RAMDISKADDR) "\0" \
- "ramdiskaddr=" __stringify(CONFIG_RAMDISKADDR) "\0" \
- BOOTENV
+#endif
This should probably be called something like CONFIG_EXTRA_DEFAULT_ENV_SETTINGS and the board files could contain
#define CONFIG_EXTRA_ENV_SETTINGS CONFIG_EXTRA_DEFAULT_ENV_SETTINGS \ "extra=more stuff\0" \
I would not remove any environment variables in this patch except for redundant things.