From: Vagrant Cascadian Date: Fri, 24 Apr 2015 16:47:12 -0700 Subject: [U-Boot] [U-Boot, v3, 5/5] mx6cuboxi: Load the correct 'fdt_file' variable In-Reply-To: <1429876015-22540-5-git-send-email-festevam@gmail.com> References: <1429876015-22540-5-git-send-email-festevam@gmail.com> Message-ID: <87zj5xozr3.fsf@aikidev.net> List-Id: MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit To: u-boot@lists.denx.de On 2015-04-24, Fabio Estevam wrote: > Instead of hardcoding the 'fdt_file' variable, let's detect the SoC and > board variant on the fly and change the dtb name. ... > diff --git a/include/configs/mx6cuboxi.h b/include/configs/mx6cuboxi.h > index 5d58b16..c3cf633 100644 > --- a/include/configs/mx6cuboxi.h > +++ b/include/configs/mx6cuboxi.h ... > #define CONFIG_EXTRA_ENV_SETTINGS \ > "script=boot.scr\0" \ > "image=zImage\0" \ > - "fdt_file=" CONFIG_DEFAULT_FDT_FILE "\0" \ > + "check_suffix=" \ > + "if is_hummingboard; then " \ > + "setenv dts_suffix -hummingboard.dtb;" \ > + "else " \ > + "setenv dts_suffix -cubox-i.dtb;" \ > + "fi; "\ > + "setenv fdt_file ${dts_prefix}${dts_suffix};" \ > "fdt_addr=0x18000000\0" \ The setenv fdt_file line needs to terminate with "\0", and maybe should be indented to line up with the if statement: + "setenv fdt_file ${dts_prefix}${dts_suffix}\0" \ 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: