diff options
| author | yang.tian <yang.tian@nxp.com> | 2019-07-05 17:48:33 +0800 |
|---|---|---|
| committer | Ji Luo <ji.luo@nxp.com> | 2020-05-15 17:34:27 +0800 |
| commit | 927afdff9612a892c13bb3acbf3d7848e91155d8 (patch) | |
| tree | 6e68ae094bdb2668eb9b2d1743ec67a5b30c36c9 /common | |
| parent | 2cd37804fd0ce1d19303645ab227157c1e8ef896 (diff) | |
MA-15082 Do not pass btmacaddr from uboot if serial is all zero
Do not pass BDADDR from uboot cmdline when
serial is all zero, and instead btmacaddr
will be set from persist.service.bdroid.bdaddr
which is set in device's init.freescale.rc
Change-Id: I429c6f369d0b7aaca643443fe505d943a3901215
Signed-off-by: yang.tian <yang.tian@nxp.com>
(cherry picked from c23398fb379131ad3c5c17c3d762c582796698fb)
Diffstat (limited to 'common')
| -rw-r--r-- | common/image-android.c | 22 |
1 files changed, 12 insertions, 10 deletions
diff --git a/common/image-android.c b/common/image-android.c index 2a6425f799..3335a7afb7 100644 --- a/common/image-android.c +++ b/common/image-android.c @@ -131,16 +131,18 @@ int android_image_get_kernel(const struct andr_img_hdr *hdr, int verify, serialnr.low); strncat(commandline, newbootargs, sizeof(commandline) - strlen(commandline)); - char bd_addr[16]={0}; - sprintf(bd_addr, - "%08x%08x", - serialnr.high, - serialnr.low); - sprintf(newbootargs, - " androidboot.btmacaddr=%c%c:%c%c:%c%c:%c%c:%c%c:%c%c", - bd_addr[0],bd_addr[1],bd_addr[2],bd_addr[3],bd_addr[4],bd_addr[5], - bd_addr[6],bd_addr[7],bd_addr[8],bd_addr[9],bd_addr[10],bd_addr[11]); - strncat(commandline, newbootargs, sizeof(commandline) - strlen(commandline)); + if (serialnr.high + serialnr.low != 0) { + char bd_addr[16]={0}; + sprintf(bd_addr, + "%08x%08x", + serialnr.high, + serialnr.low); + sprintf(newbootargs, + " androidboot.btmacaddr=%c%c:%c%c:%c%c:%c%c:%c%c:%c%c", + bd_addr[0],bd_addr[1],bd_addr[2],bd_addr[3],bd_addr[4],bd_addr[5], + bd_addr[6],bd_addr[7],bd_addr[8],bd_addr[9],bd_addr[10],bd_addr[11]); + strncat(commandline, newbootargs, sizeof(commandline) - strlen(commandline)); + } #endif /* append soc type into bootargs */ |