diff options
| author | zhang sanshan <b51434@freescale.com> | 2015-07-28 18:40:53 +0800 |
|---|---|---|
| committer | zhang sanshan <b51434@freescale.com> | 2015-07-28 19:07:59 +0800 |
| commit | d44c3b3e1f4db81b573482df0b3ec3770e831bce (patch) | |
| tree | 7e07a457c1ccd64702894efefa389c88f35288a4 /drivers | |
| parent | 748f2dbf8ff222465dfdd1db4884bafbcd8c6ffd (diff) | |
| download | u-boot-imx-d44c3b3e1f4db81b573482df0b3ec3770e831bce.zip u-boot-imx-d44c3b3e1f4db81b573482df0b3ec3770e831bce.tar.gz u-boot-imx-d44c3b3e1f4db81b573482df0b3ec3770e831bce.tar.bz2 | |
MA-6928 Bootargs cannot be set
The bootargs is not set correctly.
The final bootargs consist of uboot's bootargs and bootimg's bootargs.
This patch set bootimg's bootargs as final bootargs if uboot's bootargs is not set.
And take uboot's bootargs as final bootargs if uboot's bootargs is set.
Signed-off-by: zhang sanshan <b51434@freescale.com>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/usb/gadget/f_fastboot.c | 20 |
1 files changed, 0 insertions, 20 deletions
diff --git a/drivers/usb/gadget/f_fastboot.c b/drivers/usb/gadget/f_fastboot.c index 4f3d0f8..519a9d3 100644 --- a/drivers/usb/gadget/f_fastboot.c +++ b/drivers/usb/gadget/f_fastboot.c @@ -1762,26 +1762,6 @@ int do_boota(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) printf("fdt @ %08x (%d)\n", hdr->second_addr, hdr->second_size); #endif /*CONFIG_OF_LIBFDT*/ -#ifdef CONFIG_SERIAL_TAG - struct tag_serialnr serialnr; - char bootargs[ANDR_BOOT_ARGS_SIZE]; - char *commandline = getenv("bootargs"); - get_board_serial(&serialnr); - - if (commandline) { - sprintf(bootargs, - "%s androidboot.serialno=%08x%08x", - commandline, - serialnr.high, - serialnr.low); - } else { - sprintf(bootargs, - "androidboot.serialno=%08x%08x", - serialnr.high, - serialnr.low); - } - setenv("bootargs", bootargs); -#endif char boot_addr_start[12]; char ramdisk_addr[25]; |