diff options
| author | Tom Rini <trini@ti.com> | 2014-11-14 13:53:49 -0500 |
|---|---|---|
| committer | Tom Rini <trini@ti.com> | 2014-11-14 13:53:49 -0500 |
| commit | 45043cf804763d4cf93fec93d8294e385f87622a (patch) | |
| tree | 6f8153477648689f4143c317449891818b78b5e6 /arch/arm/cpu/armv7 | |
| parent | 0d485b9095328cdc81b2ee94ff59b988c69b9127 (diff) | |
| parent | 05d492a3235df397da6200294ea2a802749372a8 (diff) | |
| download | talos-obmc-uboot-45043cf804763d4cf93fec93d8294e385f87622a.tar.gz talos-obmc-uboot-45043cf804763d4cf93fec93d8294e385f87622a.zip | |
Merge branch 'master' of git://www.denx.de/git/u-boot-imx
Diffstat (limited to 'arch/arm/cpu/armv7')
| -rw-r--r-- | arch/arm/cpu/armv7/mx6/soc.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/cpu/armv7/mx6/soc.c b/arch/arm/cpu/armv7/mx6/soc.c index affbf7f702..5fd2a63a1d 100644 --- a/arch/arm/cpu/armv7/mx6/soc.c +++ b/arch/arm/cpu/armv7/mx6/soc.c @@ -350,8 +350,8 @@ void boot_mode_apply(unsigned cfg_val) /* * cfg_val will be used for * Boot_cfg4[7:0]:Boot_cfg3[7:0]:Boot_cfg2[7:0]:Boot_cfg1[7:0] - * After reset, if GPR10[28] is 1, ROM will copy GPR9[25:0] - * to SBMR1, which will determine the boot device. + * After reset, if GPR10[28] is 1, ROM will use GPR9[25:0] + * instead of SBMR1 to determine the boot device. */ const struct boot_mode soc_boot_modes[] = { {"normal", MAKE_CFGVAL(0x00, 0x00, 0x00, 0x00)}, |
