Merge git://git.denx.de/u-boot-fsl-qoriq

6 years ago · 3b1c0d89b9
parent 7bf07cf872 4b5892c480
commit 3b1c0d89b9
3 changed files with 3 additions and 1 deletions
--- a/arch/arm/cpu/armv8/fsl-layerscape/doc/README.falcon
+++ b/arch/arm/cpu/armv8/fsl-layerscape/doc/README.falcon
@ -110,7 +110,7 @@ Example:
 			type = "ramdisk";
 			arch = "arm64";
 			os = "linux";
-			compression = "gzip";
+			compression = "none";
 			load = <0xa0000000>;
 		};
 	};
--- a/include/configs/ls1088a_common.h
+++ b/include/configs/ls1088a_common.h
@ -222,6 +222,7 @@ unsigned long long get_qixis_addr(void);
 #define CONFIG_SPL_LDSCRIPT "arch/arm/cpu/armv8/u-boot-spl.lds"
 #define CONFIG_SPL_MAX_SIZE            0x16000
 #define CONFIG_SPL_STACK               (CONFIG_SYS_FSL_OCRAM_BASE + 0x9ff0)
+#define CONFIG_SPL_TARGET              "u-boot-with-spl.bin"
 #define CONFIG_SPL_TEXT_BASE           0x1800a000

 #define CONFIG_SYS_SPL_MALLOC_SIZE     0x00100000
--- a/include/configs/ls2080a_common.h
+++ b/include/configs/ls2080a_common.h
@ -204,6 +204,7 @@ unsigned long long get_qixis_addr(void);
 #define CONFIG_SPL_BSS_MAX_SIZE		0x00100000
 #define CONFIG_SPL_MAX_SIZE		0x16000
 #define CONFIG_SPL_STACK		(CONFIG_SYS_FSL_OCRAM_BASE + 0x9ff0)
+#define CONFIG_SPL_TARGET		"u-boot-with-spl.bin"
 #define CONFIG_SPL_TEXT_BASE		0x1800a000

 #ifdef CONFIG_NAND_BOOT