diff options
| author | Tom Rini <trini@konsulko.com> | 2016-02-02 06:51:05 -0500 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2016-02-02 06:51:05 -0500 |
| commit | 008e61f5120e7d3acb937953b1322e3aee3160d4 (patch) | |
| tree | f5d4b4e4c96f2c12bf25d9dd8fdb05cbb9c7f5b5 /include | |
| parent | 73c5c399977d55bd32fc718a6a4a5922d282fea2 (diff) | |
| parent | 7711cc0a0648e215571b1d1768381963d92a1d97 (diff) | |
| download | blackbird-obmc-uboot-008e61f5120e7d3acb937953b1322e3aee3160d4.tar.gz blackbird-obmc-uboot-008e61f5120e7d3acb937953b1322e3aee3160d4.zip | |
Merge branch 'master' of git://git.denx.de/u-boot-fsl-qoriq
Diffstat (limited to 'include')
| -rw-r--r-- | include/configs/ls1021aqds.h | 1 | ||||
| -rw-r--r-- | include/configs/ls1021atwr.h | 1 | ||||
| -rw-r--r-- | include/configs/ls2080a_common.h | 3 | ||||
| -rw-r--r-- | include/configs/ls2080aqds.h | 2 |
4 files changed, 3 insertions, 4 deletions
diff --git a/include/configs/ls1021aqds.h b/include/configs/ls1021aqds.h index c90f5315fd..f6efc55059 100644 --- a/include/configs/ls1021aqds.h +++ b/include/configs/ls1021aqds.h @@ -665,5 +665,6 @@ unsigned long get_board_ddr_clk(void); #endif #include <asm/fsl_secure_boot.h> +#define CONFIG_SYS_BOOTM_LEN (64 << 20) /* Increase max gunzip size */ #endif diff --git a/include/configs/ls1021atwr.h b/include/configs/ls1021atwr.h index f820de3b09..ae58646d5e 100644 --- a/include/configs/ls1021atwr.h +++ b/include/configs/ls1021atwr.h @@ -523,5 +523,6 @@ #endif #include <asm/fsl_secure_boot.h> +#define CONFIG_SYS_BOOTM_LEN (64 << 20) /* Increase max gunzip size */ #endif diff --git a/include/configs/ls2080a_common.h b/include/configs/ls2080a_common.h index 7323e10731..def0a6f3f0 100644 --- a/include/configs/ls2080a_common.h +++ b/include/configs/ls2080a_common.h @@ -15,9 +15,6 @@ #define CONFIG_GICV3 #define CONFIG_FSL_TZPC_BP147 -/* Errata fixes */ -#define CONFIG_ARM_ERRATA_828024 -#define CONFIG_ARM_ERRATA_826974 #include <asm/arch/ls2080a_stream_id.h> #include <asm/arch/config.h> diff --git a/include/configs/ls2080aqds.h b/include/configs/ls2080aqds.h index ba84248081..a402c06a3b 100644 --- a/include/configs/ls2080aqds.h +++ b/include/configs/ls2080aqds.h @@ -346,7 +346,7 @@ unsigned long get_board_ddr_clk(void); "initrd_high=0xffffffffffffffff\0" \ "kernel_start=0x581100000\0" \ "kernel_load=0xa0000000\0" \ - "kernel_size=0x28000000\0" + "kernel_size=0x2800000\0" #ifdef CONFIG_FSL_MC_ENET #define CONFIG_FSL_MEMAC |
