diff options
| author | Tom Rini <trini@konsulko.com> | 2016-11-25 17:39:54 -0500 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2016-11-25 17:39:54 -0500 |
| commit | ed77ccd014b4073c4d282028cfb22f8d1742fec1 (patch) | |
| tree | 0d3cf0fd0e45bf10c7897a24f3560589f7740e20 /include/configs/ls1012a_common.h | |
| parent | 136179bec19f4bc84227cba138214ea392a723ea (diff) | |
| parent | 020198b0c7d251cf6bde76024ecf0ee711860534 (diff) | |
| download | u-boot-imx-ed77ccd014b4073c4d282028cfb22f8d1742fec1.zip u-boot-imx-ed77ccd014b4073c4d282028cfb22f8d1742fec1.tar.gz u-boot-imx-ed77ccd014b4073c4d282028cfb22f8d1742fec1.tar.bz2 | |
Merge git://git.denx.de/u-boot-fsl-qoriq
Signed-off-by: Tom Rini <trini@konsulko.com>
Conflicts:
arch/arm/Kconfig
Diffstat (limited to 'include/configs/ls1012a_common.h')
| -rw-r--r-- | include/configs/ls1012a_common.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/configs/ls1012a_common.h b/include/configs/ls1012a_common.h index 80603c9..20f0c61 100644 --- a/include/configs/ls1012a_common.h +++ b/include/configs/ls1012a_common.h @@ -110,7 +110,7 @@ "kernel_size=0x2800000\0" \ #define CONFIG_BOOTARGS "console=ttyS0,115200 root=/dev/ram0 " \ - "earlycon=uart8250,mmio,0x21c0500" + "earlycon=uart8250,mmio,0x21c0500 quiet lpj=250000" #define CONFIG_BOOTCOMMAND "sf probe 0:0; sf read $kernel_load "\ "$kernel_start $kernel_size && "\ "bootm $kernel_load" |