diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2014-03-19 08:54:59 +0100 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2014-03-19 08:54:59 +0100 |
| commit | 97089cda799d75fc8515f4e9d78c92cb32432e0e (patch) | |
| tree | 5139205e4baa1b98ab2aab9134fb1b08bccdfba9 /target/mips | |
| parent | e9908f5a7a00fc48f7c9dddf7c234ba689b6d759 (diff) | |
| parent | 95813e9c0009a0fff2e5e30a39e1ea45b061cbc0 (diff) | |
Merge branch 'master' of git+ssh://openadk.org/git/openadk
Diffstat (limited to 'target/mips')
| -rw-r--r-- | target/mips/Makefile | 4 | ||||
| -rw-r--r-- | target/mips/kernel/qemu-mips64 | 1 | ||||
| -rw-r--r-- | target/mips/kernel/qemu-mips64el | 1 |
3 files changed, 2 insertions, 4 deletions
diff --git a/target/mips/Makefile b/target/mips/Makefile index 9fd479d5d..436b570e3 100644 --- a/target/mips/Makefile +++ b/target/mips/Makefile @@ -113,10 +113,10 @@ ifeq ($(ADK_TARGET_SYSTEM_LEMOTE_YEELONG),y) endif endif ifeq ($(ADK_TARGET_FS),initramfsarchive) -imageinstall: $(FW_DIR)/$(ROOTFSTARBALL) +imageinstall: $(FW_DIR)/$(ROOTFSUSERTARBALL) @cp $(KERNEL) $(FW_DIR)/$(TARGET_KERNEL) @echo 'The kernel file is: $(FW_DIR)/${TARGET_KERNEL}' - @echo "The RootFS tarball is: $(FW_DIR)/$(ROOTFSTARBALL)" + @echo "The RootFS tarball is: $(FW_DIR)/$(ROOTFSUSERTARBALL)" endif ifeq ($(ADK_TARGET_FS),initramfs) imageinstall: $(FW_DIR)/$(INITRAMFS) diff --git a/target/mips/kernel/qemu-mips64 b/target/mips/kernel/qemu-mips64 index d4ef42c15..5ceba460c 100644 --- a/target/mips/kernel/qemu-mips64 +++ b/target/mips/kernel/qemu-mips64 @@ -2,7 +2,6 @@ CONFIG_MIPS=y CONFIG_MIPS_MALTA=y CONFIG_CPU_BIG_ENDIAN=y CONFIG_CPU_MIPS64_R1=y -CONFIG_64BIT=y CONFIG_PAGE_SIZE_4KB=y CONFIG_PCI=y CONFIG_PCI_DOMAINS=y diff --git a/target/mips/kernel/qemu-mips64el b/target/mips/kernel/qemu-mips64el index 684b187be..383b7f160 100644 --- a/target/mips/kernel/qemu-mips64el +++ b/target/mips/kernel/qemu-mips64el @@ -2,7 +2,6 @@ CONFIG_MIPS=y CONFIG_MIPS_MALTA=y CONFIG_CPU_LITTLE_ENDIAN=y CONFIG_CPU_MIPS64_R1=y -CONFIG_64BIT=y CONFIG_PAGE_SIZE_4KB=y CONFIG_PCI=y CONFIG_PCI_DOMAINS=y |