aboot: remove default commandline
The default commandline of "mem=100M console=null" is useless
and can't possibly work in most cases. This especially breaks
when using device tree. So, remove default command line and
always use the boot image one.
Change-Id: Iffb9ec66427434b218ab8dcae170528134048fa2
Signed-off-by: Dima Zavin <dima@android.com>
Signed-off-by: Channagoud Kadabi <ckadabi@codeaurora.org>
diff --git a/app/aboot/aboot.c b/app/aboot/aboot.c
index 3e17f06..d50be73 100644
--- a/app/aboot/aboot.c
+++ b/app/aboot/aboot.c
@@ -77,7 +77,6 @@
#define EXPAND(NAME) #NAME
#define TARGET(NAME) EXPAND(NAME)
-#define DEFAULT_CMDLINE "mem=100M console=null";
#ifdef MEMBASE
#define EMMC_BOOT_IMG_HEADER_ADDR (0xFF000+(MEMBASE))
@@ -486,7 +485,6 @@
struct boot_img_hdr *uhdr;
unsigned offset = 0;
unsigned long long ptn = 0;
- const char *cmdline;
int index = INVALID_PTN;
unsigned char *image_addr = 0;
@@ -753,14 +751,8 @@
unified_boot:
- if(hdr->cmdline[0]) {
- cmdline = (char*) hdr->cmdline;
- } else {
- cmdline = DEFAULT_CMDLINE;
- }
-
boot_linux((void *)hdr->kernel_addr, (void *)hdr->tags_addr,
- (const char *)cmdline, board_machtype(),
+ (const char *)hdr->cmdline, board_machtype(),
(void *)hdr->ramdisk_addr, hdr->ramdisk_size);
return 0;
@@ -772,7 +764,6 @@
struct ptentry *ptn;
struct ptable *ptable;
unsigned offset = 0;
- const char *cmdline;
unsigned char *image_addr = 0;
unsigned kernel_actual;
@@ -989,17 +980,10 @@
}
continue_boot:
- if(hdr->cmdline[0]) {
- cmdline = (char*) hdr->cmdline;
- } else {
- cmdline = DEFAULT_CMDLINE;
- }
- dprintf(INFO, "cmdline = '%s'\n", cmdline);
-
/* TODO: create/pass atags to kernel */
boot_linux((void *)hdr->kernel_addr, (void *)hdr->tags_addr,
- (const char *)cmdline, board_machtype(),
+ (const char *)hdr->cmdline, board_machtype(),
(void *)hdr->ramdisk_addr, hdr->ramdisk_size);
return 0;