From 2b4d21a3e635264eb61ea4111a419917123774c8 Mon Sep 17 00:00:00 2001 From: Felix Fietkau Date: Tue, 19 Jul 2016 17:00:24 +0200 Subject: [PATCH] mxs: unconditionally install kernel images/dtb files into rootfs (needed by boards) Signed-off-by: Felix Fietkau --- 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 94fed8215c..3898c6e1f3 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 85a1237fd9..6b1dc187a2 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:=+@TARGET_ROOTFS_INCLUDE_KERNEL +@TARGET_ROOTFS_INCLUDE_DTB FEATURES+=usbgadget PACKAGES+= \ -dnsmasq -firewall -ppp -ip6tables -iptables -6relayd -mtd uboot-envtools \ -- 2.30.2