diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2011-04-27 15:13:43 +0200 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2011-04-27 15:13:43 +0200 |
| commit | 80e12557d5fbe312887fe8fbb7056ff764e9a736 (patch) | |
| tree | 873a386a81e685f464dfdc3822e95a93950d7a32 /target | |
| parent | 732f97744f333f3c80b68cdcc4b067722547cf06 (diff) | |
| parent | 8f4b5ed938071262638928deaf18552040360f4a (diff) | |
Merge branch 'master' of git+ssh://openadk.org/git/openadk
Diffstat (limited to 'target')
| -rw-r--r-- | target/arm/Makefile | 2 | ||||
| -rw-r--r-- | target/config/Config.in | 1 |
2 files changed, 1 insertions, 2 deletions
diff --git a/target/arm/Makefile b/target/arm/Makefile index 141d2c279..dbf955a81 100644 --- a/target/arm/Makefile +++ b/target/arm/Makefile @@ -7,7 +7,7 @@ include $(TOPDIR)/mk/modules.mk include $(TOPDIR)/mk/kernel-build.mk include $(TOPDIR)/mk/image.mk -KERNEL:=$(LINUX_DIR)/kernel-adk +KERNEL:=$(LINUX_DIR)/vmlinux LOADADDR:=0x20008000 tools-compile: diff --git a/target/config/Config.in b/target/config/Config.in index 3a2524547..453c894a3 100644 --- a/target/config/Config.in +++ b/target/config/Config.in @@ -476,7 +476,6 @@ config ADK_TARGET_ROOTFS_MMC config ADK_TARGET_ROOTFS_ARCHIVE bool "Archive usable for different filesystems" - depends on ADK_HARDWARE_QEMU help Use this option if your root filesystem is ext2/ext3/ext4/xfs. |