Align zImage data to 16 bytes

Kernels that carry xz compressed payload fail to decompress itself if the source address is not properly aligned.
zonque · Jul 13, 2018 · bf68ca7 · bf68ca7
1 parent 8942c45
commit bf68ca7
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/Makefile b/Makefile
@@ -56,7 +56,7 @@ version.h:
 
 zimage.o: $(APPEND_KERNEL)
 	cp $(APPEND_KERNEL) input/zImage
-	$(OBJCOPY) -I binary -O $(BINFMT) -B arm input/zImage $@
+	$(OBJCOPY) -I binary -O $(BINFMT) -B arm --prefix-sections zImage input/zImage $@
 	$(MAKE) -C libfdt
 
 dtbs-bin.o: $(APPEND_DTBS)

diff --git a/matcher.lds b/matcher.lds
@@ -4,7 +4,11 @@ PHDRS {
 
 SECTIONS {
 	.text : { * (.text_main); * (.text); }:text = 0
-	.data : { * (.data); }
 	.rodata : { * (.rodata); }
 	.bss : { * (.bss); }
+	.data : {
+		* (.data);
+		. = ALIGN(16);
+		* (zImage.data);
+	}
 }