瀏覽代碼

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

Signed-off-by: Felix Fietkau <[email protected]>
Felix Fietkau 9 年之前
父節點
當前提交
2b4d21a3e6
共有 2 個文件被更改,包括 4 次插入18 次删除
  1. 4 17
      target/linux/mxs/image/Makefile
  2. 0 1
      target/linux/mxs/profiles/01-duckbill.mk

+ 4 - 17
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

+ 0 - 1
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 \