diff options
| author | Tien Fong Chee <tfchee@altera.com> | 2016-06-17 11:06:33 +0800 |
|---|---|---|
| committer | Tien Fong Chee <tfchee@altera.com> | 2016-06-17 11:06:33 +0800 |
| commit | 01e2c2231ba59b7f941e200d500cd5a37fd0a257 (patch) | |
| tree | 3bec21ed78a1399b4b114d0259ee290f02318c81 | |
| parent | 58b73db33892a34fb36efee407a38cc1e351b153 (diff) | |
| download | u-boot-socfpga-01e2c2231ba59b7f941e200d500cd5a37fd0a257.tar.gz | |
FogBugz #361813-1: Removed the space between \0 and " of env valuerel_socfpga_v2014.10_arria10_bringup_16.07.01_pr
This patch removes the space between \0 and " in the values of
environment variables. Having the \0 can cause functions like
getenv() to misinterpret the environment. Some code clean up is
also included.
Signed-off-by: Tien Fong Chee <tfchee@altera.com>
| -rwxr-xr-x | include/configs/socfpga_arria10.h | 28 |
1 files changed, 16 insertions, 12 deletions
diff --git a/include/configs/socfpga_arria10.h b/include/configs/socfpga_arria10.h index bb7e1d8138..12052c2ae1 100755 --- a/include/configs/socfpga_arria10.h +++ b/include/configs/socfpga_arria10.h @@ -255,8 +255,10 @@ "nandrbfcoreimage=0x820000\0" \ "nandroot=/dev/mtdblock1\0" \ "nandrootfstype=jffs2\0" \ - "nandrbfcore_rbf_prog=fpga loadfs 0 nand 0:0 ${nandrbfcoreimage} core\0 "\ - "ramboot=setenv bootargs " CONFIG_BOOTARGS " printk.time=1 debug mem=${fdt_high} " \ + "nandrbfcore_rbf_prog=" \ + "fpga loadfs 0 nand 0:0 ${nandrbfcoreimage} core\0" \ + "ramboot=setenv bootargs " CONFIG_BOOTARGS \ + " printk.time=1 debug mem=${fdt_high} " \ "lpj=3977216;fpgabr 1; bootz ${loadaddr} - ${fdtaddr}\0" \ "mmcload=mmc rescan;" \ "${mmcloadcmd} mmc 0:${mmcloadpart} ${loadaddr} ${bootimage};" \ @@ -265,19 +267,20 @@ " root=${mmcroot} rw rootwait;" \ "fpgabr 1;" \ "bootz ${loadaddr} - ${fdtaddr}\0" \ - "netboot=dhcp ${bootimage} ; " \ + "netboot=dhcp ${bootimage};" \ "tftp ${fdtaddr} ${fdtimage} ; run ramboot\0" \ "qspiload=sf probe ${qspiloadcs};" \ "sf read ${loadaddr} ${qspibootimageaddr} ${bootimagesize};" \ "sf read ${fdtaddr} ${qspifdtaddr} ${fdtimagesize};\0" \ "qspiboot=setenv bootargs " CONFIG_BOOTARGS \ - " root=${qspiroot} rw rootfstype=${qspirootfstype};"\ + " root=${qspiroot} rw rootfstype=${qspirootfstype};" \ "fpgabr 1;" \ "bootz ${loadaddr} - ${fdtaddr}\0" \ - "nandload=nand read ${loadaddr} ${nandbootimageaddr} ${bootimagesize};"\ + "nandload=" \ + "nand read ${loadaddr} ${nandbootimageaddr} ${bootimagesize};" \ "nand read ${fdtaddr} ${nandfdtaddr} ${fdtimagesize}\0" \ "nandboot=setenv bootargs " CONFIG_BOOTARGS \ - " root=${nandroot} rw rootfstype=${nandrootfstype};"\ + " root=${nandroot} rw rootfstype=${nandrootfstype};" \ "fpgabr 1;" \ "bootz ${loadaddr} - ${fdtaddr}\0" \ "bootcmd=" CONFIG_BOOTCOMMAND "\0" \ @@ -295,18 +298,19 @@ "rbftosdramaddr=0x40\0" \ "rbfcoreimage=ghrd_10as066n2.core.rbf\0" \ "qspirbfcoreimage=0x820000\0" \ - "qspirbfcore_rbf_prog=fpga loadfs 0 qspi 0:0 ${qspirbfcoreimage} core\0 "\ - "core_rbf_prog=fpga loadfs 0 mmc 0:1 ${rbfcoreimage} core\0 "\ + "qspirbfcore_rbf_prog=" \ + "fpga loadfs 0 qspi 0:0 ${qspirbfcoreimage} core\0" \ + "core_rbf_prog=fpga loadfs 0 mmc 0:1 ${rbfcoreimage} core\0" \ CONFIG_KSZ9021_CLK_SKEW_ENV "=" \ __stringify(CONFIG_KSZ9021_CLK_SKEW_VAL) "\0" \ CONFIG_KSZ9021_DATA_SKEW_ENV "=" \ __stringify(CONFIG_KSZ9021_DATA_SKEW_VAL) "\0" \ "scriptfile=u-boot.scr\0" \ "callscript=if fatload mmc 0:1 $fpgadata $scriptfile;" \ - "then source $fpgadata; " \ - "else " \ - "echo Optional boot script not found. " \ - "Continuing to boot normally; " \ + "then source $fpgadata;" \ + "else" \ + "echo Optional boot script not found." \ + "Continuing to boot normally;" \ "fi;\0" /* |