Hi Marc
> In the git world, don't copy files, you can cherry-pick patches: it
> works this way:
Well i guess you are right.
> should be solved with the above cherry pick.
Thanks for taking me by the hand through this wonderful (but somehow daunting)
walk through the git forrest. It works without any warnings. Just for reference
i have
attached the resulting patch.
Best regards
Tim
diff --git a/platforms/kernel.in b/platforms/kernel.in
index 5e20a67..2455337 100644
--- a/platforms/kernel.in
+++ b/platforms/kernel.in
@@ -140,8 +140,38 @@ choice
help
This is the target to get the kernel image as an raw
uncompressed
binary file.
+ config KERNEL_IMAGE_SIMPLE
+ bool
+ prompt "simpleImage"
+ help
+ Create a simple Image with embedded DTB
endchoice
+if KERNEL_IMAGE_SIMPLE
+
+config KERNEL_IMAGE_SIMPLE_TARGET
+ prompt "name of simple image"
+ string
+ default "xilinx-xup"
+ help
+ Name of created simple kernel image e.g.
+ the "xilinx-xup" of "simpleImage.xilinx-xup.elf"
+
+config KERNEL_IMAGE_SIMPLE_DTS
+ prompt "path to DTS file"
+ string
+ default "${PTXDIST_PLATFORMCONFIGDIR}/simpleImage.dts"
+ help
+ This specifies the "dts" file used to create your simple
+ image.
+
+ The default is "${PTXDIST_PLATFORMCONFIGDIR}/simpleImage.dts"
+
+ The path "${PTXDIST_PLATFORMCONFIGDIR}" is the directory
+ where your platformconfig file is located.
+
+endif
+
config KERNEL_IMAGE
string
default "bzImage" if KERNEL_IMAGE_BZ
@@ -150,7 +180,7 @@ config KERNEL_IMAGE
default "vmImage" if KERNEL_IMAGE_VM
default "vmlinux" if KERNEL_IMAGE_VMLINUX
default "Image" if KERNEL_IMAGE_RAW
-
+ default "simpleImage.${PTXCONF_KERNEL_IMAGE_SIMPLE_TARGET}.elf" if
KERNEL_IMAGE_SIMPLE
config KERNEL_XZ
prompt "build xz-utils hosttool"
diff --git a/rules/kernel.make b/rules/kernel.make
index b341b24..190a272 100644
--- a/rules/kernel.make
+++ b/rules/kernel.make
@@ -105,6 +105,10 @@ $(STATEDIR)/kernel.prepare: $(KERNEL_CONFIG)
@echo "Using kernel config file: $(<)"
@install -m 644 "$(<)" "$(KERNEL_DIR)/.config"
+ifdef PTXCONF_KERNEL_IMAGE_SIMPLE
+ cp $(PTXCONF_KERNEL_IMAGE_SIMPLE_DTS) \
+
$(KERNEL_DIR)/arch/$(PTXCONF_KERNEL_ARCH_STRING)/boot/dts/$(PTXCONF_KERNEL_IMAGE_S
+endif
ifdef PTXCONF_KLIBC
# tell the kernel where our spec file for initramfs is
--
ptxdist mailing list
[email protected]
