[nelson] 12.20230611.1.67 u-boot source GitOrigin-RevId: 307bca3a6e1a677793dbc26f22da899b3e6574c8 Change-Id: Ic3cbffba53b7da957c24e45af5bdea78e3f456da Reviewed-on: https://turquoise-internal-review.googlesource.com/c/third_party/u-boot/+/788111 Reviewed-by: David Pursell <dpursell@google.com>
diff --git a/board/amlogic/sm1_elaine_bx/sm1_elaine_bx.c b/board/amlogic/sm1_elaine_bx/sm1_elaine_bx.c index 4461977..543c885 100755 --- a/board/amlogic/sm1_elaine_bx/sm1_elaine_bx.c +++ b/board/amlogic/sm1_elaine_bx/sm1_elaine_bx.c
@@ -447,12 +447,13 @@ * [6]: VBOOST_MAX = 25 V, JUMP_EN = 0 * [7]: STEP_UP = 105 mV, STEP_DN = 105 mV, LED_FAULT_TH = 3V, * LED_COMP_HYST = DRIVER_HEADROOM + 750 mV - * [8-9]: 12-bit brightness (default: 100%) + * [8-9]: 12-bit brightness (default: 23% [b/280662770]) + * 50% perceptual brightness ~= 23% linear brightness ~= 0x3AE. * Important: Write brightness last to apply current calibration */ const __u8 addrs[] = {0x01, 0xa0, 0xa1, 0xa2, 0xa5, 0xa7, 0xa9, 0xae, 0x10, 0x11}; - __u8 values[] = {0x85, 0xff, 0x37, 0x30, 0x54, 0xf4, 0x60, 0x09, 0xff, - 0x0f}; + __u8 values[] = {0x85, 0xff, 0x37, 0x30, 0x54, 0xf4, 0x60, 0x09, 0xae, + 0x03}; const int n_bytes = sizeof(values)/sizeof(values[0]); struct udevice *bl_devp = NULL;
diff --git a/drivers/usb/gadget/f_fastboot.c b/drivers/usb/gadget/f_fastboot.c index 3b811bb..cfaaa92 100644 --- a/drivers/usb/gadget/f_fastboot.c +++ b/drivers/usb/gadget/f_fastboot.c
@@ -1403,6 +1403,9 @@ static void do_bootm_on_complete(struct usb_ep *ep, struct usb_request *req) { + // Performs a full USB reset to remove the fastboot interface descriptor. + run_command("usb reset", 0); + puts("RAM-booting kernel..\n"); run_command("run ramboot", 0); @@ -1482,6 +1485,9 @@ static void do_exit_on_complete(struct usb_ep *ep, struct usb_request *req) { + // Performs a full USB reset to remove the fastboot interface descriptor. + run_command("usb reset", 0); + run_command(CONFIG_BOOTCOMMAND, 0); /* This only happens if image is somehow faulty so we start over */