diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2011-01-04 09:58:32 +0100 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2011-01-04 09:58:32 +0100 |
| commit | 16aae7e3e8e00b7ea39a6cbedaea94dcc75f160f (patch) | |
| tree | 2b2e96175e344106495c8a27a59055037549253b /target/mipsel | |
| parent | 9f4a419ecb31241d54b0f2b244b0d159a17285c6 (diff) | |
| parent | abbe4e3293c77bc5f6215a9eb4c1d20923bbf951 (diff) | |
Merge branch 'master' of git+ssh://openadk.org/git/openadk
Diffstat (limited to 'target/mipsel')
| -rw-r--r-- | target/mipsel/Makefile | 2 | ||||
| -rw-r--r-- | target/mipsel/kernel.config | 2 | ||||
| -rw-r--r-- | target/mipsel/sys-available/qemu-mipsel | 1 |
3 files changed, 3 insertions, 2 deletions
diff --git a/target/mipsel/Makefile b/target/mipsel/Makefile index ccce77c16..d0aa6e5c9 100644 --- a/target/mipsel/Makefile +++ b/target/mipsel/Makefile @@ -86,7 +86,7 @@ imageinstall: $(BIN_DIR)/$(ROOTFSTARBALL) @echo "sudo ./scripts/create-image.sh -f $(ADK_TARGET_ROOTFS) qemu-${CPU_ARCH}.img $(BIN_DIR)/$(ROOTFSTARBALL)" @echo "Be sure to change permissions after image creation." @echo "Start qemu with following options:" - @echo 'qemu-system-mipsel -nographic -M malta -kernel $(BIN_DIR)/$(TARGET_KERNEL) -hda qemu-${CPU_ARCH}.img -append "root=/dev/hda1"' + @echo 'qemu-system-mipsel -nographic -M malta -kernel $(BIN_DIR)/$(TARGET_KERNEL) qemu-${CPU_ARCH}.img' endif ifeq ($(ADK_TARGET_FS),initramfs) imageinstall: $(BIN_DIR)/$(INITRAMFS) diff --git a/target/mipsel/kernel.config b/target/mipsel/kernel.config index 4995e1207..cbb30047f 100644 --- a/target/mipsel/kernel.config +++ b/target/mipsel/kernel.config @@ -656,7 +656,7 @@ CONFIG_TRACING_SUPPORT=y CONFIG_HAVE_ARCH_KGDB=y CONFIG_EARLY_PRINTK=y CONFIG_CMDLINE_BOOL=y -CONFIG_CMDLINE="" +CONFIG_CMDLINE="init=/init" # CONFIG_CMDLINE_OVERRIDE is not set # diff --git a/target/mipsel/sys-available/qemu-mipsel b/target/mipsel/sys-available/qemu-mipsel index d29333c8d..6193adaa1 100644 --- a/target/mipsel/sys-available/qemu-mipsel +++ b/target/mipsel/sys-available/qemu-mipsel @@ -2,6 +2,7 @@ config ADK_TARGET_SYSTEM_QEMU_MIPSEL bool "Qemu Emulator" select ADK_mipsel select ADK_qemu_mipsel + select ADK_KERNEL_MIPS_MALTA select ADK_HARDWARE_QEMU select ADK_TARGET_WITH_VGA select ADK_TARGET_WITH_INPUT |