Merge "Fix some promotion failures"
diff --git a/app/aboot/mdtp_ui.c b/app/aboot/mdtp_ui.c
index 1dc2d06..11303f3 100644
--- a/app/aboot/mdtp_ui.c
+++ b/app/aboot/mdtp_ui.c
@@ -1,4 +1,4 @@
-/* Copyright (c) 2015-2017, The Linux Foundation. All rights reserved.
+/* Copyright (c) 2015-2017, 2019 The Linux Foundation. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are
@@ -658,11 +658,11 @@
char* str2 = "\nError - mdtp image is corrupted\n";
fbcon_clear();
while(*str != 0) {
- fbcon_putc_factor(*str++, FBCON_COMMON_MSG, big_factor);
+ fbcon_putc_factor(*str++, FBCON_COMMON_MSG, big_factor, 0);
}
fbcon_draw_line(FBCON_COMMON_MSG);
while(*str2 != 0) {
- fbcon_putc_factor(*str2++, FBCON_COMMON_MSG, big_factor);
+ fbcon_putc_factor(*str2++, FBCON_COMMON_MSG, big_factor, 0);
}
fbcon_draw_line(FBCON_COMMON_MSG);
diff --git a/platform/msm_shared/debug.c b/platform/msm_shared/debug.c
index 8a28c4c..0138f11 100644
--- a/platform/msm_shared/debug.c
+++ b/platform/msm_shared/debug.c
@@ -1,7 +1,7 @@
/*
* Copyright (c) 2009, Google Inc.
* All rights reserved.
- * Copyright (c) 2009-2016, 2018, The Linux Foundation. All rights reserved.
+ * Copyright (c) 2009-2016, 2018-2019, The Linux Foundation. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
@@ -102,7 +102,7 @@
{
#if ENABLE_FBCON_LOGGING
while(*str != 0) {
- fbcon_putc(*str++);
+ fbcon_putc(*str++, 0);
}
#endif
}
@@ -122,7 +122,7 @@
uart_putc(0, c);
#endif
#if WITH_DEBUG_FBCON && WITH_DEV_FBCON
- fbcon_putc(c);
+ fbcon_putc(c, 0);
#endif
#if WITH_DEBUG_JTAG
jtag_dputc(c);