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

Signed-off-by: Felix Fietkau <nbd@nbd.name>

diff --git a/target/linux/mxs/image/Makefile b/target/linux/mxs/image/Makefile
index 94fed8215c3ea9eb8cf01c909372c0154d58d2e7..3898c6e1f3b1e9863a58d03aa85205f643169b1e 100644 (file)
--- 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 85a1237fd929b260a4cc2ca0b70124fb90d8aca5..6b1dc187a285fb26525a5c7592a4e55eb6067912 100644 (file)
--- 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 \