diff options
| author | Tom Rini <trini@konsulko.com> | 2022-12-22 10:33:04 -0500 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2022-12-22 10:33:04 -0500 |
| commit | 52d91e1c20b399ddab276e2c03e5788ed5e5fdd2 (patch) | |
| tree | 3da0b0377b27eedd5d702c77fbb63a0d905a3f77 /arch/arm/mach-omap2/boot-common.c | |
| parent | 14f43797d0a696248c09d298e2f2809dded345ba (diff) | |
| parent | 8214b772cf213f1f02e5e33f4a5158f52d9d2c23 (diff) | |
Merge branch '2022-12-21-CONFIG-migration-work' into next
- Bring in the second to last big batch of CONFIG migrations and
renames. Of note here we fix a few inconsistencies around the baudrate
tables on some SoCs and now are consistent in hostname/etc handling in
the environment.
Diffstat (limited to 'arch/arm/mach-omap2/boot-common.c')
| -rw-r--r-- | arch/arm/mach-omap2/boot-common.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-omap2/boot-common.c b/arch/arm/mach-omap2/boot-common.c index f955d494718..d104f23b3e2 100644 --- a/arch/arm/mach-omap2/boot-common.c +++ b/arch/arm/mach-omap2/boot-common.c @@ -183,7 +183,7 @@ void save_omap_boot_params(void) gd->arch.omap_boot_mode = boot_mode; -#if !defined(CONFIG_TI814X) && !defined(CONFIG_TI816X) && \ +#if !defined(CONFIG_TI816X) && \ !defined(CONFIG_AM33XX) && !defined(CONFIG_AM43XX) /* CH flags */ |