author | Xindong Xu <xindong.xu@amlogic.com> | 2018-08-09 10:42:20 (GMT) |
---|---|---|
committer | Xindong Xu <xindong.xu@amlogic.com> | 2018-08-16 07:22:20 (GMT) |
commit | 2d84c934490f654284f249c2d8211a2acda1c523 (patch) | |
tree | b9537a4e67acd624a1cf16479ee8ea39f5bd08be | |
parent | 954dbd2a9d7c6f5e7fcdb91537add7222a534b6f (diff) | |
download | uboot-ampere-20180821.zip uboot-ampere-20180821.tar.gz uboot-ampere-20180821.tar.bz2 |
p212: lock: set lock device default [1/4]
bug: 112388917
Problem:
device is unlock now
Solution:
set device lock default
Verify:
atom board
Change-Id: Ib240c079bfb4179fb1ab539f0f012216a07a1498
Signed-off-by: Xindong Xu <xindong.xu@amlogic.com>
-rw-r--r-- | board/amlogic/configs/gxl_beast_v1.h | 2 | ||||
-rw-r--r-- | board/amlogic/configs/gxl_p212_v1.h | 2 | ||||
-rw-r--r-- | board/amlogic/configs/txlx_t962e_r321_v1.h | 2 | ||||
-rw-r--r-- | board/amlogic/gxl_beast_v1/gxl_beast_v1.c | 1 | ||||
-rw-r--r-- | board/harman/atom_v1/atom_v1.c | 8 | ||||
-rw-r--r-- | board/harman/configs/atom_v1.h | 2 | ||||
-rw-r--r-- | drivers/usb/gadget/f_fastboot.c | 10 |
7 files changed, 18 insertions, 9 deletions
diff --git a/board/amlogic/configs/gxl_beast_v1.h b/board/amlogic/configs/gxl_beast_v1.h index ba5c765..15d4b99 100644 --- a/board/amlogic/configs/gxl_beast_v1.h +++ b/board/amlogic/configs/gxl_beast_v1.h @@ -109,7 +109,7 @@ "fb_height=1080\0" \ "usb_burning=update 1000\0" \ "fdt_high=0x20000000\0"\ - "lock=00000000\0"\ + "lock=10001000\0"\ "try_auto_burn=update 700 750;\0"\ "sdcburncfg=aml_sdc_burn.ini\0"\ "sdc_burning=sdc_burn ${sdcburncfg}\0"\ diff --git a/board/amlogic/configs/gxl_p212_v1.h b/board/amlogic/configs/gxl_p212_v1.h index f43d6d4..a580aa0 100644 --- a/board/amlogic/configs/gxl_p212_v1.h +++ b/board/amlogic/configs/gxl_p212_v1.h @@ -109,7 +109,7 @@ "fb_height=1080\0" \ "usb_burning=update 1000\0" \ "fdt_high=0x20000000\0"\ - "lock=00000000\0"\ + "lock=10001000\0"\ "try_auto_burn=update 700 750;\0"\ "sdcburncfg=aml_sdc_burn.ini\0"\ "sdc_burning=sdc_burn ${sdcburncfg}\0"\ diff --git a/board/amlogic/configs/txlx_t962e_r321_v1.h b/board/amlogic/configs/txlx_t962e_r321_v1.h index c437618..1b0b38a 100644 --- a/board/amlogic/configs/txlx_t962e_r321_v1.h +++ b/board/amlogic/configs/txlx_t962e_r321_v1.h @@ -114,7 +114,7 @@ "osd_reverse=0\0"\ "video_reverse=0\0"\ "active_slot=_a\0"\ - "lock=00000000\0"\ + "lock=10001000\0"\ "boot_part=boot\0"\ "model_name=t962e_r321_hdmitx\0" \ "initargs="\ diff --git a/board/amlogic/gxl_beast_v1/gxl_beast_v1.c b/board/amlogic/gxl_beast_v1/gxl_beast_v1.c index 8a37bba..c87c611 100644 --- a/board/amlogic/gxl_beast_v1/gxl_beast_v1.c +++ b/board/amlogic/gxl_beast_v1/gxl_beast_v1.c @@ -635,6 +635,7 @@ const char * const _env_args_reserve_[] = { "aml_dt", "firstboot", + "lock", NULL//Keep NULL be last to tell END }; diff --git a/board/harman/atom_v1/atom_v1.c b/board/harman/atom_v1/atom_v1.c index fcc00d6..a7533e1 100644 --- a/board/harman/atom_v1/atom_v1.c +++ b/board/harman/atom_v1/atom_v1.c @@ -534,3 +534,11 @@ int checkhw(char * name) } #endif +const char * const _env_args_reserve_[] = +{ + "aml_dt", + "firstboot", + "lock", + + NULL//Keep NULL be last to tell END +}; diff --git a/board/harman/configs/atom_v1.h b/board/harman/configs/atom_v1.h index f350455..1c4c0ff 100644 --- a/board/harman/configs/atom_v1.h +++ b/board/harman/configs/atom_v1.h @@ -114,7 +114,7 @@ "osd_reverse=0\0"\ "video_reverse=0\0"\ "active_slot=_a\0"\ - "lock=00000000\0"\ + "lock=10001000\0"\ "boot_part=boot\0"\ "initargs="\ "init=/init console=ttyS0,115200 no_console_suspend earlyprintk=aml-uart,0xff803000 ramoops.pstore_en=1 ramoops.record_size=0x8000 ramoops.console_size=0x4000 "\ diff --git a/drivers/usb/gadget/f_fastboot.c b/drivers/usb/gadget/f_fastboot.c index e127cef..2f3cdc0 100644 --- a/drivers/usb/gadget/f_fastboot.c +++ b/drivers/usb/gadget/f_fastboot.c @@ -467,8 +467,8 @@ static int check_lock(void) lock_s = getenv("lock"); if (!lock_s) { printf("lock state is NULL \n"); - lock_s = "00000000"; - setenv("lock", "00000000"); + lock_s = "10001000"; + setenv("lock", "10001000"); saveenv(); } printf("lock state: %s\n", lock_s); @@ -941,9 +941,9 @@ static void cb_flashing(struct usb_ep *ep, struct usb_request *req) lock_s = getenv("lock"); if (!lock_s) { printf("lock state is NULL \n"); - strcpy(lock_d, "00000000"); - lock_s = "00000000"; - setenv("lock", "00000000"); + strcpy(lock_d, "10001000"); + lock_s = "10001000"; + setenv("lock", "10001000"); saveenv(); } else { printf("lock state: %s\n", lock_s); |