The PowerPC architecture has the ability to embed the ramdisk located
at arch/powerpc/boot/ramdisk.image.gz into a bootable kernel image. If
the bootable kernel is in the Flattened Image Tree (FIT) format, the
ramdisk should be a node in the tree instead of being embedded directly
in the kernel executable.
A FIT uImage with a ram filesystem can be generated using the command:
"make uImage.fit.initrd.<boardname>" where <boardname> is one of
arch/powerpc/boot/dts/<boardname>.dts. The command will generate a FIT
uImage at arch/powerpc/boot/uImage.fit.initrd.<boardname> that contains
a kernel image, device tree blob, and a ram filesystem.
The ramdisk at arch/powerpc/boot/ramdisk.image.gz can either be an older
style "ramdisk" or a newer "ramfs" gzipped cpio archive.
Signed-off-by: Peter Tyser <pty...@xes-inc.com>
---
Changes since v1:
- Don't strip leading 0x from dts ramdisk address
arch/powerpc/boot/Makefile | 3 +++
arch/powerpc/boot/wrapper | 20 ++++++++++++++++----
scripts/mkits.sh | 34 ++++++++++++++++++++++++++++++++--
3 files changed, 51 insertions(+), 6 deletions(-)
diff --git a/arch/powerpc/boot/Makefile b/arch/powerpc/boot/Makefile
index e56ec21..c2a6591 100644
--- a/arch/powerpc/boot/Makefile
+++ b/arch/powerpc/boot/Makefile
@@ -313,6 +313,9 @@ $(obj)/uImage: vmlinux $(wrapperbits)
$(obj)/uImage.fit.%: vmlinux $(obj)/%.dtb $(wrapperbits)
$(call if_changed,wrap,uboot.fit,,$(obj)/$*.dtb)
+$(obj)/uImage.fit.initrd.%: vmlinux $(obj)/%.dtb $(wrapperbits)
+ $(call if_changed,wrap,uboot.fit,,$(obj)/$*.dtb,$(obj)/ramdisk.image.gz)
+
$(obj)/cuImage.initrd.%: vmlinux $(obj)/%.dtb $(wrapperbits)
$(call if_changed,wrap,cuboot-$*,,$(obj)/$*.dtb,$(obj)/ramdisk.image.gz)
diff --git a/arch/powerpc/boot/wrapper b/arch/powerpc/boot/wrapper
index 1f35b66..9ccaef7 100755
--- a/arch/powerpc/boot/wrapper
+++ b/arch/powerpc/boot/wrapper
@@ -270,6 +270,9 @@ fi
# physical offset of kernel image
membase=`${CROSS}objdump -p "$kernel" | grep -m 1 LOAD | awk '{print $7}'`
+# Size of uncompressed kernel is needed to calculate ramdisk location in RAM
+kernsize=`${CROSS}objdump -p "$kernel" | grep -m 1 rwx | awk '{print $4}'`
+
case "$platform" in
uboot)
rm -f "$ofile"
@@ -282,8 +285,14 @@ uboot)
;;
uboot.fit)
rm -f "$ofile"
- ${MKITS} -A ppc -C gzip -a $membase -e $membase -v $version \
- -d "$srctree/$dtb" -k "$srctree/$vmz" -o "$object/uImage.its"
+ if [ -n "$initrd" ]; then
+ ${MKITS} -A ppc -C gzip -a $membase -e $membase -v $version \
+ -d "$srctree/$dtb" -k "$srctree/$vmz" -r "$srctree/$initrd" \
+ -l $kernsize -o "$object/uImage.its"
+ else
+ ${MKITS} -A ppc -C gzip -a $membase -e $membase -v $version \
+ -d "$srctree/$dtb" -k "$srctree/$vmz" -o "$object/uImage.its"
+ fi
# mkimage calls dtc for FIT images so use kernel dtc if necessary
export PATH=$PATH:$srctree/scripts/dtc
@@ -308,8 +317,11 @@ if [ -z "$cacheit" ]; then
rm -f "$vmz"
fi
-if [ -n "$initrd" ]; then
- addsec $tmp "$initrd" $isection
+# FIT images have the initrd in the image tree structure
+if [ "$platform" != "uboot.fit" ]; then
+ if [ -n "$initrd" ]; then
+ addsec $tmp "$initrd" $isection
+ fi
fi
if [ -n "$dtb" ]; then
diff --git a/scripts/mkits.sh b/scripts/mkits.sh
index fae43dd..ffcf2c4 100755
--- a/scripts/mkits.sh
+++ b/scripts/mkits.sh
@@ -16,7 +16,8 @@
usage() {
echo "Usage: `basename $0` -A arch -C comp -a addr -e entry" \
- "-v version -k kernel [-d dtb] -o its_file"
+ "-v version -k kernel [-d dtb] [-r ramfs -l ramfs_addr]" \
+ "-o its_file"
echo -e "\t-A ==> set architecture to 'arch'"
echo -e "\t-C ==> set compression type 'comp'"
echo -e "\t-a ==> set load address to 'addr' (hex)"
@@ -24,11 +25,13 @@ usage() {
echo -e "\t-v ==> set kernel version to 'version'"
echo -e "\t-k ==> include kernel image 'kernel'"
echo -e "\t-d ==> include Device Tree Blob 'dtb'"
+ echo -e "\t-r ==> include initrd/initramfs 'ramfs'"
+ echo -e "\t-l ==> load initrd/initramfs at 'ramfs_addr'"
echo -e "\t-o ==> create output file 'its_file'"
exit 1
}
-while getopts ":A:C:a:d:e:k:o:v:" OPTION
+while getopts ":A:C:a:d:e:k:l:o:r:v:" OPTION
do
case $OPTION in
A ) ARCH=$OPTARG;;
@@ -37,7 +40,9 @@ do
d ) DTB=$OPTARG;;
e ) ENTRY_ADDR=$OPTARG;;
k ) KERNEL=$OPTARG;;
+ l ) RAMFS_ADDR=$OPTARG;;
o ) OUTPUT=$OPTARG;;
+ r ) RAMFS=$OPTARG;;
v ) VERSION=$OPTARG;;
* ) echo "Invalid option passed to '$0' (options:$@)"
usage;;
@@ -49,6 +54,8 @@ if [ -z "${ARCH}" ] || [ -z "${COMPRESS}" ] || [ -z
"${LOAD_ADDR}" ] || \
[ -z "${ENTRY_ADDR}" ] || [ -z "${VERSION}" ] || [ -z "${KERNEL}" ] || \
[ -z "${OUTPUT}" ]; then
usage
+elif [ -n "${RAMFS}" ] && [ -z "${RAMFS_ADDR}" ]; then
+ usage
fi
# Create a default, fully populated DTS file
@@ -90,6 +97,23 @@ DATA="/dts-v1/;
};
}; /* end fdt */
+ ramd...@1 { /* start ramdisk */
+ description = \"ramdisk\";
+ data = /incbin/(\"${RAMFS}\");
+ type = \"ramdisk\";
+ arch = \"${ARCH}\";
+ os = \"linux\";
+ load = <${RAMFS_ADDR}>;
+ compression = \"none\";
+ h...@1 {
+ algo = \"crc32\";
+ };
+ h...@2 {
+ algo = \"sha1\";
+ };
+ }; /* end ramdisk */
+ };
+
configurations {
default = \"con...@1\";
con...@1 {
@@ -101,6 +125,12 @@ DATA="/dts-v1/;
};
};"
+# Conditionally strip ramfs information out of tree
+if [ -z "${RAMFS}" ]; then
+ DATA=`echo "$DATA" | sed '/start ramdisk/,/end ramdisk/d'`
+ DATA=`echo "$DATA" | sed '/ramdisk/d'`
+fi
+
# Conditionally strip fdt information out of tree
if [ -z "${DTB}" ]; then
DATA=`echo "$DATA" | sed '/start fdt/,/end fdt/d'`
--
1.6.2.1
_______________________________________________
Linuxppc-dev mailing list
Linuxppc-dev@lists.ozlabs.org
https://lists.ozlabs.org/listinfo/linuxppc-dev
