Selaa lähdekoodia

Merge branch 'master' of git+ssh://openadk.org/git/openadk

Waldemar Brodkorb 11 vuotta sitten
vanhempi
commit
4bc4c070ee
4 muutettua tiedostoa jossa 5 lisäystä ja 3 poistoa
  1. 1 1
      package/mtd/Makefile
  2. 0 1
      package/mtd/src/mtd.c
  3. 0 1
      target/config/Config.in
  4. 4 0
      target/microblaze/Makefile

+ 1 - 1
package/mtd/Makefile

@@ -5,7 +5,7 @@ include ${TOPDIR}/rules.mk
 
 PKG_NAME:=		mtd
 PKG_VERSION:=		1.0
-PKG_RELEASE:=		1
+PKG_RELEASE:=		2
 PKG_DESCR:=		MTD utility
 PKG_SECTION:=		fs
 

+ 0 - 1
package/mtd/src/mtd.c

@@ -37,7 +37,6 @@
 #include <stdint.h>
 #include <fcntl.h>
 #include <errno.h>
-#include <error.h>
 #include <err.h>
 #include <time.h>
 #include <string.h>

+ 0 - 1
target/config/Config.in

@@ -895,7 +895,6 @@ config ADK_TARGET_ROOTFS_ARCHIVE
 	bool "Archive usable for different filesystems"
 	select ADK_HOST_NEED_GENEXT2FS if ADK_HARDWARE_QEMU
 	select ADK_KERNEL_EXT2_FS if ADK_HARDWARE_QEMU
-	depends on !ADK_LINUX_MICROBLAZE
 	help
 	  Use this option if your root filesystem is ext2/ext3/ext4/xfs.
 

+ 4 - 0
target/microblaze/Makefile

@@ -55,3 +55,7 @@ ifneq ($(ADK_HARDWARE_QEMU),)
 	@echo 'qemu-system-${CPU_ARCH} -M $(MODEL) -nographic -kernel $(FW_DIR)/$(TARGET_KERNEL) $(DTB)'
 endif
 endif
+ifeq ($(ADK_TARGET_FS),archive)
+imageinstall: $(FW_DIR)/$(ROOTFSTARBALL)
+	@echo "The RootFS tarball is: $(FW_DIR)/$(ROOTFSTARBALL)"
+endif