[nelson] 11.20230306.3.112014 u-boot source

GitOrigin-RevId: ef639ed399c6dc8938d0bc31669a7b43f034b1f2
Change-Id: I5171e4138e0ab9009fef0c9250219382a38be552
Reviewed-on: https://turquoise-internal-review.googlesource.com/c/third_party/u-boot/+/731031
Reviewed-by: David Pursell <dpursell@google.com>

board/amlogic/sm1_elaine_common/zircon.c

diff --git a/board/amlogic/sm1_elaine_common/zircon.c b/board/amlogic/sm1_elaine_common/zircon.c
index f3a46f2..2e45b00 100644
--- a/board/amlogic/sm1_elaine_common/zircon.c
+++ b/board/amlogic/sm1_elaine_common/zircon.c
@@ -566,12 +566,16 @@
 	"locale_list.txt",
 	"mac_addr",
 	"serial.txt",
+	"rgb_b_led_cal.txt",
 	"rgb_b_off_cal.txt",
 	"rgb_b_on_cal.txt",
+	"rgb_c_led_cal.txt",
 	"rgb_c_off_cal.txt",
 	"rgb_c_on_cal.txt",
+	"rgb_g_led_cal.txt",
 	"rgb_g_off_cal.txt",
 	"rgb_g_on_cal.txt",
+	"rgb_r_led_cal.txt",
 	"rgb_r_off_cal.txt",
 	"rgb_r_on_cal.txt",
 	"sounds/unmute.opus",

drivers/usb/gadget/f_fastboot.c

diff --git a/drivers/usb/gadget/f_fastboot.c b/drivers/usb/gadget/f_fastboot.c
index 85f3605..3b811bb 100644
--- a/drivers/usb/gadget/f_fastboot.c
+++ b/drivers/usb/gadget/f_fastboot.c
@@ -846,8 +846,8 @@
 static const char *get_bootloader_min_versions(const char *arg)
 {
 	snprintf(getvar_response_buffer, GETVAR_RESPONSE_BUFFER_LEN, "%d",
-		 antirollback_get_mvn_fip());
-	append_bl_version(antirollback_get_mvn_bl2());
+		 antirollback_get_mvn_bl2());
+	append_bl_version(antirollback_get_mvn_fip());
 	append_bl_version(antirollback_get_mvn_bl30());
 	append_bl_version(antirollback_get_mvn_bl31());
 	append_bl_version(antirollback_get_mvn_bl32());