On 4/24/23 03:15, Ralph Siemsen wrote:
[...]
diff --git a/arch/arm/mach-rmobile/cpu_info.c b/arch/arm/mach-rmobile/cpu_info.c index 7e7465a2c8..15be32af31 100644 --- a/arch/arm/mach-rmobile/cpu_info.c +++ b/arch/arm/mach-rmobile/cpu_info.c @@ -31,6 +31,7 @@ void enable_caches(void)
#ifdef CONFIG_DISPLAY_CPUINFO #ifndef CONFIG_RZA1 +#ifndef CONFIG_RZN1
Use:
#if !defined(CONFIG_RZA1) && !defined(CONFIG_RZN1)
__weak const u8 *rzg_get_cpu_name(void) { return 0; @@ -128,6 +129,13 @@ int print_cpuinfo(void) } #else
#elif defined(CONFIG_RZA1) ... the RZA1 stuff ... #else /* CONFIG_RZN1 */ ... the RZN1 stuff ... #endif
That should make the ifdeffery easier.
int print_cpuinfo(void) +{
- printf("CPU: Renesas Electronics RZ/N1\n");
- return 0;
+} +#endif +#else +int print_cpuinfo(void) { printf("CPU: Renesas Electronics RZ/A1\n"); return 0;