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/powerpc/include/asm/fsl_secure_boot.h | |
| 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/powerpc/include/asm/fsl_secure_boot.h')
| -rw-r--r-- | arch/powerpc/include/asm/fsl_secure_boot.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/arch/powerpc/include/asm/fsl_secure_boot.h b/arch/powerpc/include/asm/fsl_secure_boot.h index 236098e718e..221f9d842a8 100644 --- a/arch/powerpc/include/asm/fsl_secure_boot.h +++ b/arch/powerpc/include/asm/fsl_secure_boot.h @@ -41,10 +41,10 @@ * PPAACT and SPAACT table for PAMU must be placed on DDR after DDR init * due to space crunch on CPC and thus malloc will not work. */ -#define CONFIG_SPL_PPAACT_ADDR 0x2e000000 -#define CONFIG_SPL_SPAACT_ADDR 0x2f000000 -#define CONFIG_SPL_JR0_LIODN_S 454 -#define CONFIG_SPL_JR0_LIODN_NS 458 +#define CFG_SPL_PPAACT_ADDR 0x2e000000 +#define CFG_SPL_SPAACT_ADDR 0x2f000000 +#define CFG_SPL_JR0_LIODN_S 454 +#define CFG_SPL_JR0_LIODN_NS 458 #endif /* ifdef CONFIG_SPL_BUILD */ #ifndef CONFIG_SPL_BUILD |