summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJean-Baptiste Queru <jbq@google.com>2010-05-14 15:47:56 -0700
committerAndroid Code Review <code-review@android.com>2010-05-14 15:47:56 -0700
commit4dccdd640123fa60daad1b575b01012521585428 (patch)
tree1dd19c037580c4bb9f71214f1e1724ea4d2e14a3
parentf81d75ed476c00ee481390d0e139aaac917720c6 (diff)
parent9d4c5b1c20cfa196e2be026fe9f862663d7a3972 (diff)
downloadbuild-4dccdd640123fa60daad1b575b01012521585428.zip
build-4dccdd640123fa60daad1b575b01012521585428.tar.gz
build-4dccdd640123fa60daad1b575b01012521585428.tar.bz2
Merge "Use a different kernel boot line for the disk installer."
-rw-r--r--target/board/generic_x86/BoardConfig.mk4
1 files changed, 3 insertions, 1 deletions
diff --git a/target/board/generic_x86/BoardConfig.mk b/target/board/generic_x86/BoardConfig.mk
index be8aeb7..608aee1 100644
--- a/target/board/generic_x86/BoardConfig.mk
+++ b/target/board/generic_x86/BoardConfig.mk
@@ -10,7 +10,9 @@ TARGET_CPU_ABI := x86
TARGET_USERIMAGES_USE_EXT2 := true
TARGET_BOOTIMAGE_USE_EXT2 := true
-BOARD_KERNEL_CMDLINE := init=/init console=tty0 androidboot.hardware=generic_x86 vga=788
+# For VirtualBox and likely other emulators
+BOARD_INSTALLER_CMDLINE := init=/init console=ttyS0 console=tty0 androidboot.hardware=generic_x86 vga=788 verbose
+BOARD_KERNEL_CMDLINE := init=/init console=tty0 console=ttyS0 androidboot.hardware=generic_x86 vga=788
TARGET_USE_DISKINSTALLER := true
TARGET_DISK_LAYOUT_CONFIG := build/target/board/generic_x86/disk_layout.conf
BOARD_BOOTIMAGE_MAX_SIZE := 8388608