diff options
| author | Albert ARIBAUD <albert.u.boot@aribaud.net> | 2014-09-09 09:19:10 +0200 |
|---|---|---|
| committer | Albert ARIBAUD <albert.u.boot@aribaud.net> | 2014-09-09 09:19:10 +0200 |
| commit | a6bc0195dba895fa0e9facc718d17eb098695685 (patch) | |
| tree | b3e93d9948b17e4c924012684b0f2fecdf547176 /include | |
| parent | b653516769160a7ba5bb4318c014535e063fdc0b (diff) | |
| parent | b86d54b2c38a4beb97d580d7d9c8c6a5e57fc510 (diff) | |
| download | u-boot-imx-a6bc0195dba895fa0e9facc718d17eb098695685.zip u-boot-imx-a6bc0195dba895fa0e9facc718d17eb098695685.tar.gz u-boot-imx-a6bc0195dba895fa0e9facc718d17eb098695685.tar.bz2 | |
Merge branch 'u-boot-sunxi/master' into 'u-boot-arm/master'
Diffstat (limited to 'include')
| -rw-r--r-- | include/configs/sunxi-common.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/configs/sunxi-common.h b/include/configs/sunxi-common.h index e768921..1d947d7 100644 --- a/include/configs/sunxi-common.h +++ b/include/configs/sunxi-common.h @@ -244,7 +244,7 @@ #define CONFIG_EXTRA_ENV_SETTINGS \ MEM_LAYOUT_ENV_SETTINGS \ - "fdtfile=" CONFIG_FTDFILE "\0" \ + "fdtfile=" CONFIG_FDTFILE "\0" \ "console=ttyS0,115200\0" \ BOOTENV |