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/mach-omap2/omap5/fdt.c | |
| 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/mach-omap2/omap5/fdt.c')
| -rw-r--r-- | arch/arm/mach-omap2/omap5/fdt.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/arch/arm/mach-omap2/omap5/fdt.c b/arch/arm/mach-omap2/omap5/fdt.c index c4162420f3..a8c301c6c2 100644 --- a/arch/arm/mach-omap2/omap5/fdt.c +++ b/arch/arm/mach-omap2/omap5/fdt.c @@ -19,8 +19,8 @@ #ifndef TI_OMAP5_SECURE_BOOT_RESV_SRAM_SZ #define TI_OMAP5_SECURE_BOOT_RESV_SRAM_SZ (0) #endif -#ifndef CONFIG_SECURE_RUNTIME_RESV_SRAM_SZ -#define CONFIG_SECURE_RUNTIME_RESV_SRAM_SZ (0) +#ifndef CFG_SECURE_RUNTIME_RESV_SRAM_SZ +#define CFG_SECURE_RUNTIME_RESV_SRAM_SZ (0) #endif static u32 hs_irq_skip[] = { @@ -92,7 +92,7 @@ static int ft_hs_fixup_crossbar(void *fdt, struct bd_info *bd) } #if ((TI_OMAP5_SECURE_BOOT_RESV_SRAM_SZ != 0) || \ - (CONFIG_SECURE_RUNTIME_RESV_SRAM_SZ != 0)) + (CFG_SECURE_RUNTIME_RESV_SRAM_SZ != 0)) static int ft_hs_fixup_sram(void *fdt, struct bd_info *bd) { const char *path; @@ -116,7 +116,7 @@ static int ft_hs_fixup_sram(void *fdt, struct bd_info *bd) temp[0] = cpu_to_fdt32(0); /* reservation size */ temp[1] = cpu_to_fdt32(max(TI_OMAP5_SECURE_BOOT_RESV_SRAM_SZ, - CONFIG_SECURE_RUNTIME_RESV_SRAM_SZ)); + CFG_SECURE_RUNTIME_RESV_SRAM_SZ)); fdt_delprop(fdt, offs, "reg"); ret = fdt_setprop(fdt, offs, "reg", temp, 2 * sizeof(u32)); if (ret < 0) { |