mxs: unconditionally install kernel images/dtb files into rootfs (needed by boards)
authorFelix Fietkau <nbd@nbd.name>
Tue, 19 Jul 2016 15:00:24 +0000 (17:00 +0200)
committerFelix Fietkau <nbd@nbd.name>
Wed, 20 Jul 2016 08:13:50 +0000 (10:13 +0200)
Signed-off-by: Felix Fietkau <nbd@nbd.name>
target/linux/mxs/image/Makefile
target/linux/mxs/profiles/01-duckbill.mk

index 94fed82..3898c6e 100644 (file)
@@ -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
index 85a1237..6b1dc18 100644 (file)
@@ -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 \