diff options
author | Tom Rini <trini@konsulko.com> | 2022-07-07 14:12:07 -0400 |
---|---|---|
committer | Tom Rini <trini@konsulko.com> | 2022-07-07 14:29:37 -0400 |
commit | ea92f95d630cba9c3a324d250258ad2e35d9c997 (patch) | |
tree | 68ad93bb452ccf3873a9b457a8cca9ea7e3c1916 /arch/powerpc/include/asm | |
parent | cb9843bda3e500eb4add1927be4ed72077a69774 (diff) | |
parent | c45568cc4e51b7bbe2f3ce28d8f2566048aeebf3 (diff) |
Merge branch '2022-07-07-Kconfig-migrations-dead-code-removal' into next
- Migrate more CONFIG options to Kconfig and remove some unused code
while we're at it.
Diffstat (limited to 'arch/powerpc/include/asm')
-rw-r--r-- | arch/powerpc/include/asm/config.h | 2 | ||||
-rw-r--r-- | arch/powerpc/include/asm/fsl_secure_boot.h | 3 |
2 files changed, 0 insertions, 5 deletions
diff --git a/arch/powerpc/include/asm/config.h b/arch/powerpc/include/asm/config.h index 059ffe1fd4..79fe567b58 100644 --- a/arch/powerpc/include/asm/config.h +++ b/arch/powerpc/include/asm/config.h @@ -14,8 +14,6 @@ #define HWCONFIG_BUFFER_SIZE 256 #endif -#define CONFIG_SYS_BOOT_RAMDISK_HIGH - #ifndef CONFIG_MAX_MEM_MAPPED #if defined(CONFIG_E500) || \ defined(CONFIG_MPC86xx) || \ diff --git a/arch/powerpc/include/asm/fsl_secure_boot.h b/arch/powerpc/include/asm/fsl_secure_boot.h index a96a1ac5d7..3e707600f2 100644 --- a/arch/powerpc/include/asm/fsl_secure_boot.h +++ b/arch/powerpc/include/asm/fsl_secure_boot.h @@ -21,9 +21,6 @@ defined(CONFIG_TARGET_T1042D4RDB) || \ defined(CONFIG_TARGET_T1042RDB_PI) || \ defined(CONFIG_ARCH_T1024) -#ifndef CONFIG_SYS_RAMBOOT -#define CONFIG_SYS_CPC_REINIT_F -#endif #undef CONFIG_SYS_INIT_L3_ADDR #define CONFIG_SYS_INIT_L3_ADDR 0xbff00000 #endif |