[source] mxs: unconditionally install kernel images/dtb files into rootfs (needed by boards)

LEDE Commits lede-commits at lists.infradead.org
Wed Jul 20 01:18:26 PDT 2016


nbd pushed a commit to source.git, branch master:
https://git.lede-project.org/?p=source.git;a=commitdiff;h=2b4d21a3e635264eb61ea4111a419917123774c8

commit 2b4d21a3e635264eb61ea4111a419917123774c8
Author: Felix Fietkau <nbd at nbd.name>
AuthorDate: Tue Jul 19 17:00:24 2016 +0200

    mxs: unconditionally install kernel images/dtb files into rootfs (needed by boards)
    
    Signed-off-by: Felix Fietkau <nbd at nbd.name>
---
 target/linux/mxs/image/Makefile          | 21 ++++-----------------
 target/linux/mxs/profiles/01-duckbill.mk |  1 -
 2 files changed, 4 insertions(+), 18 deletions(-)

diff --git a/target/linux/mxs/image/Makefile b/target/linux/mxs/image/Makefile
index 94fed82..3898c6e 100644
--- a/target/linux/mxs/image/Makefile
+++ b/target/linux/mxs/image/Makefile
@@ -24,24 +24,11 @@ define Image/BuildKernel
 endef
 
 define Image/InstallKernel
-
-  ifneq ($(CONFIG_TARGET_ROOTFS_INCLUDE_ZIMAGE),)
-	mkdir -p $(TARGET_DIR)/boot
-	cp $(KDIR)/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
-	$(foreach board,$(BOARDS),
-		$(CP) $(DTS_DIR)/$(board).dtb $(TARGET_DIR)/boot/
-	)
-  endif
-
+	cp \
+		$(KDIR)/zImage $(KDIR)/uImage \
+		$(foreach board,$(BOARDS),$(DTS_DIR)/$(board).dtb) \
+		$(TARGET_DIR)/boot/
 endef
 
 define Image/Build/SDCard-vfat-ext4
diff --git a/target/linux/mxs/profiles/01-duckbill.mk b/target/linux/mxs/profiles/01-duckbill.mk
index 85a1237..6b1dc18 100644
--- a/target/linux/mxs/profiles/01-duckbill.mk
+++ b/target/linux/mxs/profiles/01-duckbill.mk
@@ -7,7 +7,6 @@
 
 define Profile/duckbill
   NAME:=I2SE Duckbill boards
-  DEPENDS:=+ at TARGET_ROOTFS_INCLUDE_KERNEL + at TARGET_ROOTFS_INCLUDE_DTB
   FEATURES+=usbgadget
   PACKAGES+= \
 	-dnsmasq -firewall -ppp -ip6tables -iptables -6relayd -mtd uboot-envtools \



More information about the lede-commits mailing list