[OpenWrt-Devel] mxs: Include the right kernel image in the rootfs
diff mbox

Message ID 1428235308-31968-1-git-send-email-harald@ccbib.org
State Accepted
Delegated to: Zoltan HERPAI
Headers show

Commit Message

Harald Geyer April 5, 2015, 12:01 p.m. UTC
Currently we always include the zImage if any image is selected for
inclusion in the root filesystem. This patch adds discrimination
between zImage and uImage.

Signed-off-by: Harald Geyer <harald@ccbib.org>
---
 target/linux/mxs/image/Makefile |    7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

Comments

Michael Heimpold April 5, 2015, 3:51 p.m. UTC | #1
Am Sonntag, 5. April 2015, 12:01:47 schrieb Harald Geyer:
> Currently we always include the zImage if any image is selected for
> inclusion in the root filesystem. This patch adds discrimination
> between zImage and uImage.
> 
> Signed-off-by: Harald Geyer <harald@ccbib.org>
> ---
>  target/linux/mxs/image/Makefile |    7 ++++++-
>  1 file changed, 6 insertions(+), 1 deletion(-)
> 
> diff --git a/target/linux/mxs/image/Makefile b/target/linux/mxs/image/Makefile
> index 55e88c2..9830a7d 100644
> --- a/target/linux/mxs/image/Makefile
> +++ b/target/linux/mxs/image/Makefile
> @@ -22,10 +22,15 @@ endef
>  
>  define Image/InstallKernel
>  
> -  ifneq ($(CONFIG_TARGET_ROOTFS_INCLUDE_KERNEL),)
> +  ifneq ($(CONFIG_TARGET_ROOTFS_INCLUDE_ZIMAGE),)
>  	mkdir -p $(TARGET_DIR)/boot
>  	$(CP) $(LINUX_DIR)/arch/arm/boot/zImage $(TARGET_DIR)/boot/
>    endif
> +
> +  ifneq ($(CONFIG_TARGET_ROOTFS_INCLUDE_UIMAGE),)
> +	mkdir -p $(TARGET_DIR)/boot
> +	cp $(KDIR)/uImage $(TARGET_DIR)/boot/
> +  endif
>    
>    ifneq ($(CONFIG_TARGET_ROOTFS_INCLUDE_DTB),)
>  	mkdir -p $(TARGET_DIR)/boot
> 

Acked-by: Michael Heimpold <mhei@heimpold.de>

Patch
diff mbox

diff --git a/target/linux/mxs/image/Makefile b/target/linux/mxs/image/Makefile
index 55e88c2..9830a7d 100644
--- a/target/linux/mxs/image/Makefile
+++ b/target/linux/mxs/image/Makefile
@@ -22,10 +22,15 @@  endef
 
 define Image/InstallKernel
 
-  ifneq ($(CONFIG_TARGET_ROOTFS_INCLUDE_KERNEL),)
+  ifneq ($(CONFIG_TARGET_ROOTFS_INCLUDE_ZIMAGE),)
 	mkdir -p $(TARGET_DIR)/boot
 	$(CP) $(LINUX_DIR)/arch/arm/boot/zImage $(TARGET_DIR)/boot/
   endif
+
+  ifneq ($(CONFIG_TARGET_ROOTFS_INCLUDE_UIMAGE),)
+	mkdir -p $(TARGET_DIR)/boot
+	cp $(KDIR)/uImage $(TARGET_DIR)/boot/
+  endif
   
   ifneq ($(CONFIG_TARGET_ROOTFS_INCLUDE_DTB),)
 	mkdir -p $(TARGET_DIR)/boot