Browse Source

ar71xx: enable nand-utils in the mikrotik subtarget to ensure it makes it to initramfs

Without it, sysupgrade from initramfs to nand fails

Signed-off-by: Felix Fietkau <[email protected]>
Felix Fietkau 8 years ago
parent
commit
c536c50171
2 changed files with 4 additions and 2 deletions
  1. 2 2
      target/linux/ar71xx/image/mikrotik.mk
  2. 2 0
      target/linux/ar71xx/mikrotik/target.mk

+ 2 - 2
target/linux/ar71xx/image/mikrotik.mk

@@ -1,6 +1,6 @@
 define Device/mikrotik
 define Device/mikrotik
   PROFILES := Default
   PROFILES := Default
-  DEVICE_PACKAGES := kmod-usb-core kmod-usb-ohci kmod-usb2 kmod-usb-ledtrig-usbport nand-utils
+  DEVICE_PACKAGES := kmod-usb-core kmod-usb-ohci kmod-usb2 kmod-usb-ledtrig-usbport
   BOARD_NAME := routerboard
   BOARD_NAME := routerboard
   KERNEL_INITRAMFS :=
   KERNEL_INITRAMFS :=
   KERNEL_NAME := loader-generic.elf
   KERNEL_NAME := loader-generic.elf
@@ -26,7 +26,7 @@ TARGET_DEVICES += nand-64m nand-large
 
 
 define Device/rb-nor-flash-16M
 define Device/rb-nor-flash-16M
   DEVICE_TITLE := MikroTik RouterBoard with 16 MB SPI NOR flash
   DEVICE_TITLE := MikroTik RouterBoard with 16 MB SPI NOR flash
-  DEVICE_PACKAGES := rbcfg rssileds
+  DEVICE_PACKAGES := rbcfg rssileds -nand-utils
   IMAGE_SIZE := 16000k
   IMAGE_SIZE := 16000k
   LOADER_TYPE := elf
   LOADER_TYPE := elf
   KERNEL_INSTALL := 1
   KERNEL_INSTALL := 1

+ 2 - 0
target/linux/ar71xx/mikrotik/target.mk

@@ -1,6 +1,8 @@
 BOARDNAME:=Mikrotik devices with NAND/NOR flash
 BOARDNAME:=Mikrotik devices with NAND/NOR flash
 FEATURES += squashfs ramdisk minor nand
 FEATURES += squashfs ramdisk minor nand
 
 
+DEFAULT_PACKAGES += nand-utils
+
 define Target/Description
 define Target/Description
 	Build firmware images for Atheros AR71xx/AR913x based Mikrotik boards.
 	Build firmware images for Atheros AR71xx/AR913x based Mikrotik boards.
 	e.g. MikroTik RB-4xx or RB-750
 	e.g. MikroTik RB-4xx or RB-750