diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2014-03-06 17:16:58 +0100 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2014-03-06 17:16:58 +0100 |
| commit | 4bc4c070ee5e2e229357aca9e8e799bb9c02498d (patch) | |
| tree | 1addc6f5549c0a8574fb5a70ebaaa59caa9110d5 | |
| parent | 55f281db11492d5bb26d6d9cef9ec7d544a2ba4e (diff) | |
| parent | 710c7e13df471fe6b5366d4a284d02cd30479cc0 (diff) | |
Merge branch 'master' of git+ssh://openadk.org/git/openadk
| -rw-r--r-- | package/mtd/Makefile | 2 | ||||
| -rw-r--r-- | package/mtd/src/mtd.c | 1 | ||||
| -rw-r--r-- | target/config/Config.in | 1 | ||||
| -rw-r--r-- | target/microblaze/Makefile | 4 |
4 files changed, 5 insertions, 3 deletions
diff --git a/package/mtd/Makefile b/package/mtd/Makefile index d3db1d12f..3ec068036 100644 --- a/package/mtd/Makefile +++ b/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 diff --git a/package/mtd/src/mtd.c b/package/mtd/src/mtd.c index bd5b50dab..bf1c343cb 100644 --- a/package/mtd/src/mtd.c +++ b/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> diff --git a/target/config/Config.in b/target/config/Config.in index 0eab0aecf..6c6f83249 100644 --- a/target/config/Config.in +++ b/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. diff --git a/target/microblaze/Makefile b/target/microblaze/Makefile index e9a4a517d..de528f91e 100644 --- a/target/microblaze/Makefile +++ b/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 |