Eric Lee / smarc-uboot

Download as
Browse Code ยป

Commit d8da8298ad9b5a379d6fb7f079a3a1a591147a5e

Authored by Masahiro Yamada
Committed by Tom Rini
1 parent 2fbb8462b0
Exists in v2017.01-smarct4x and in 28 other branches 8qm-imx_v2020.04_5.4.70_2.3.0, emb_lf-6.6.52-2.2.0, emb_lf_v2022.04, emb_lf_v2023.04, emb_lf_v2024.04, pitx_8mp_lf_v2020.04, smarc-8m-android-10.0.0_2.6.0, smarc-8m-android-11.0.0_2.0.0, smarc-8mp-android-11.0.0_2.0.0, smarc-imx6_v2018.03_4.14.98_2.0.0_ga, smarc-imx7_v2017.03_4.9.11_1.0.0_ga, smarc-imx7_v2018.03_4.14.98_2.0.0_ga, smarc-imx_v2017.03_4.9.11_1.0.0_ga, smarc-imx_v2017.03_4.9.88_2.0.0_ga, smarc-imx_v2017.03_o8.1.0_1.3.0_8m, smarc-imx_v2018.03_4.14.78_1.0.0_ga, smarc-n7.1.2_2.0.0-ga, smarc_8m-imx_v2018.03_4.14.98_2.0.0_ga, smarc_8m-imx_v2019.04_4.19.35_1.1.0, smarc_8m_00d0-imx_v2018.03_4.14.98_2.0.0_ga, smarc_8mm-imx_v2018.03_4.14.98_2.0.0_ga, smarc_8mm-imx_v2019.04_4.19.35_1.1.0, smarc_8mm-imx_v2020.04_5.4.24_2.1.0, smarc_8mp_lf_v2020.04, smarc_8mq-imx_v2020.04_5.4.24_2.1.0, smarc_8mq_lf_v2020.04, v2017.01-smarct3x, v2017.01-smarct3x-emmc

autoboot: rename abortboot_{keyed, normal} to __abortboot 

Because abortboot_keyed() and abortboot_normal() are not compiled
at the same time, we can rename both of them to __abortboot().
This allows to drop #ifdef from the caller.

Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
Reviewed-by: Stefan Roese <sr@denx.de>
Reviewed-by: Simon Glass <sjg@chromium.org>
Reviewed-by: Heiko Schocher <hs@denx.de>

Showing 1 changed file with 3 additions and 7 deletions Side-by-side Diff

... ... @@ -182,7 +182,7 @@
182 182 * Watch for 'delay' seconds for autoboot stop or autoboot delay string.
183 183 * returns: 0 - no key string, allow autoboot 1 - got key string, abort
184 184 */
185   -static int abortboot_keyed(int bootdelay)
  185 +static int __abortboot(int bootdelay)
186 186 {
187 187 int abort;
188 188 uint64_t etime = endtick(bootdelay);
... ... @@ -216,7 +216,7 @@
216 216 static int menukey;
217 217 #endif
218 218  
219   -static int abortboot_normal(int bootdelay)
  219 +static int __abortboot(int bootdelay)
220 220 {
221 221 int abort = 0;
222 222 unsigned long ts;
... ... @@ -274,11 +274,7 @@
274 274  
275 275 static int abortboot(int bootdelay)
276 276 {
277   -#ifdef CONFIG_AUTOBOOT_KEYED
278   - return abortboot_keyed(bootdelay);
279   -#else
280   - return abortboot_normal(bootdelay);
281   -#endif
  277 + return __abortboot(bootdelay);
282 278 }
283 279  
284 280 static void process_fdt_options(const void *blob)