Marc Kleine-Budde wrote: > Hello, > > Tim Sander wrote: >>> Please try to use "git send-email" or push your patches on a public >>> repo. Somehow your patches has gathered trailing whitespace. >> Will try attaching. What public repos are there? > > attaching works but reviewing is more complicated. > Jon Ringle uses github.com, I'm just using his remote branch, works fine > for me. > >> Signed-off-by: Tim Sander <[email protected]> > >> Hopefully i didn't miss anything > > See comments inline. > > However meanwhile I've pushed some kernel changes to mainline, so the > patch doesn't apply, but I'll port it to current mainline and fix the > problems. > > After applying I'll push it to my repo for testing. (I'll write a mail > if it's ready) > > cheers, Marc > >> diff --git a/platforms/kernel.in b/platforms/kernel.in >> index 5e20a67..d9ddcf9 100644 >> --- a/platforms/kernel.in >> +++ b/platforms/kernel.in >> @@ -140,6 +140,11 @@ choice >> help >> This is the target to get the kernel image as an raw >> uncompressed >> binary file. > > please add a newline here. > >> + config KERNEL_IMAGE_SIMPLE >> + bool >> + prompt "simpleImage" >> + help >> + Create a simple Image with embedded DTB >> endchoice >> >> config KERNEL_IMAGE >> @@ -150,6 +155,7 @@ config KERNEL_IMAGE >> default "vmImage" if KERNEL_IMAGE_VM >> default "vmlinux" if KERNEL_IMAGE_VMLINUX >> default "Image" if KERNEL_IMAGE_RAW >> + default "simpleImage" if KERNEL_IMAGE_SIMPLE >> >> >> config KERNEL_XZ >> @@ -163,6 +169,21 @@ config KERNEL_XZ >> Select this if you're unsure, as it won't hurt. It just >> increases the build time. >> >> +config KERNEL_IMAGE_SIMPLE_TARGET >> + depends on KERNEL > ^^^^^^^^^^^^^^^^^ > > please remove, there's a big "if KERNEL...endif" around these options. > >> + depends on KERNEL_IMAGE_SIMPLE > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ > > please convert this into a if "KERNEL_IMAGE_SIMPLE...endif". > >> + prompt "name of simple image" >> + string >> + default "xilinx-xup" >> + help >> + Name of created simple kernel image e.g. simpleImage.xilinx-xup >> + >> +config KERNEL_IMAGE_SIMPLE_DTS >> + depends on KERNEL >> + depends on KERNEL_IMAGE_SIMPLE >> + prompt "path to DTS file" >> + string >> + default "${PTXDIST_PLATFORMCONFIGDIR}/simpleImage.dts" >> >> menu "patching & configuration " >> >> diff --git a/rules/kernel.make b/rules/kernel.make >> index 6c1be8a..cf8b441 100644 >> --- a/rules/kernel.make >> +++ b/rules/kernel.make >> @@ -48,12 +48,18 @@ endif >> # >> # support the different kernel image formats >> # >> +ifndef PTXCONF_KERNEL_IMAGE_SIMPLE >> + KERNEL_IMAGE := $(PTXCONF_KERNEL_IMAGE) >> +else >> + KERNEL_IMAGE := simpleImage.$(PTXCONF_KERNEL_IMAGE_SIMPLE_TARGET) > > please use the remove_quotes here...please add the .elf >> +endif > > maybe this can be written without ifdefs > >> KERNEL_IMAGE_PATH-$(PTXCONF_KERNEL_IMAGE_BZ) += >> $(KERNEL_DIR)/arch/$(PTXCONF_KERNEL_ARCH_STRING)/boot/bzImage >> KERNEL_IMAGE_PATH-$(PTXCONF_KERNEL_IMAGE_U) += >> $(KERNEL_DIR)/arch/$(PTXCONF_KERNEL_ARCH_STRING)/boot/uImage >> KERNEL_IMAGE_PATH-$(PTXCONF_KERNEL_IMAGE_VM) += >> $(KERNEL_DIR)/arch/$(PTXCONF_KERNEL_ARCH_STRING)/boot/vmImage >> KERNEL_IMAGE_PATH-$(PTXCONF_KERNEL_IMAGE_Z) += >> $(KERNEL_DIR)/arch/$(PTXCONF_KERNEL_ARCH_STRING)/boot/zImage >> KERNEL_IMAGE_PATH-$(PTXCONF_KERNEL_IMAGE_VMLINUX) += $(KERNEL_DIR)/vmlinux >> KERNEL_IMAGE_PATH-$(PTXCONF_KERNEL_IMAGE_RAW) += >> $(KERNEL_DIR)/arch/$(PTXCONF_KERNEL_ARCH_STRING)/boot/Image >> +KERNEL_IMAGE_PATH-$(PTXCONF_KERNEL_IMAGE_SIMPLE) += $(call >> remove_quotes,$(KERNEL_DIR)/arch/$(PTXCONF_KERNEL_ARCH_STRING)/boot/$(KERNEL_IMAGE).elf) >> >> # >> ---------------------------------------------------------------------------- >> # Get >> @@ -84,8 +90,6 @@ KERNEL_MAKEVARS += \ >> DEPMOD=$(PTXCONF_SYSROOT_CROSS)/sbin/$(PTXCONF_GNU_TARGET)-depmod >> endif >> >> -KERNEL_IMAGE := $(PTXCONF_KERNEL_IMAGE) >> - >> ifndef PTXCONF_PROJECT_USE_PRODUCTION >> >> ifdef PTXCONF_KERNEL >> @@ -104,6 +108,9 @@ $(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_SIMPLE_TARGET).dts >> +endif ^
please don't add trailing whitespace >> >> ifdef PTXCONF_KLIBC >> # tell the kernel where our spec file for initramfs is > Marc -- Pengutronix e.K. | Marc Kleine-Budde | Industrial Linux Solutions | Phone: +49-231-2826-924 | Vertretung West/Dortmund | Fax: +49-5121-206917-5555 | Amtsgericht Hildesheim, HRA 2686 | http://www.pengutronix.de |
signature.asc
Description: OpenPGP digital signature
-- ptxdist mailing list [email protected]
