diff options
| author | Tom Rini <trini@konsulko.com> | 2023-01-20 14:21:38 -0500 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2023-01-20 14:21:38 -0500 |
| commit | 0b9b01517f0b1398ec27dbb47faf3645b719e02c (patch) | |
| tree | fac11441ba4056e75d3b59811da3b0a91d1cfcf5 /arch/arm/lib/lib1funcs.S | |
| parent | 8bd3c0a7e17ee17c771cabc0e548a1a436ac021d (diff) | |
| parent | 6333acb961b6fcaa60c6e5b623d676b332481cfa (diff) | |
Merge branch '2023-01-20-finish-CONFIG-migration-work'
- Merge in the final batch of CONFIG to Kconfig/CFG migration work. This
includes a fix for a number of ns16550 or similar UARTs due to a
migration bug. We also pull in a revert for enabling CONFIG_VIDEO on
tools-only_defconfig.
Diffstat (limited to 'arch/arm/lib/lib1funcs.S')
| -rw-r--r-- | arch/arm/lib/lib1funcs.S | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/arch/arm/lib/lib1funcs.S b/arch/arm/lib/lib1funcs.S index 7ff4446dd64..de15d09e360 100644 --- a/arch/arm/lib/lib1funcs.S +++ b/arch/arm/lib/lib1funcs.S @@ -15,12 +15,11 @@ /* * U-Boot compatibility bit, define empty UNWIND() macro as, since we - * do not support stack unwinding and define CONFIG_AEABI to make all - * of the functions available without diverging from Linux code. + * do not support stack unwinding to make all of the functions available + * without diverging from Linux code. */ #ifdef __UBOOT__ #define UNWIND(x...) -#define CONFIG_AEABI #endif .macro ARM_DIV_BODY dividend, divisor, result, curbit @@ -314,8 +313,6 @@ UNWIND(.fnend) ENDPROC(__modsi3) .popsection -#ifdef CONFIG_AEABI - .pushsection .text.__aeabi_uidivmod, "ax" ENTRY(__aeabi_uidivmod) UNWIND(.fnstart) @@ -348,8 +345,6 @@ UNWIND(.fnend) ENDPROC(__aeabi_idivmod) .popsection -#endif - .pushsection .text.Ldiv0, "ax" Ldiv0: UNWIND(.fnstart) |