Looks good to me, I'll approve it in my linux-next tree. On Sat, Apr 17, 2021 at 6:46 AM Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> wrote: > > From: Randy Dunlap <rdunlap@xxxxxxxxxxxxx> > Subject: csky: change a Kconfig symbol name to fix e1000 build error > > e1000's #define of CONFIG_RAM_BASE conflicts with a Kconfig symbol in > arch/csky/Kconfig. > > The symbol in e1000 has been around longer, so change arch/csky/ to use > DRAM_BASE instead of RAM_BASE to remove the conflict. (although e1000 is > also a 2-line change) > > Link: https://lkml.kernel.org/r/20210411055335.7111-1-rdunlap@xxxxxxxxxxxxx > Signed-off-by: Randy Dunlap <rdunlap@xxxxxxxxxxxxx> > Reported-by: kernel test robot <lkp@xxxxxxxxx> > Acked-by: Guo Ren <guoren@xxxxxxxxxx> > Cc: Jesse Brandeburg <jesse.brandeburg@xxxxxxxxx> > Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> > --- > > arch/csky/Kconfig | 2 +- > arch/csky/include/asm/page.h | 2 +- > 2 files changed, 2 insertions(+), 2 deletions(-) > > --- a/arch/csky/include/asm/page.h~csky-change-a-kconfig-symbol-name-to-fix-e1000-build-error > +++ a/arch/csky/include/asm/page.h > @@ -28,7 +28,7 @@ > #define SSEG_SIZE 0x20000000 > #define LOWMEM_LIMIT (SSEG_SIZE * 2) > > -#define PHYS_OFFSET_OFFSET (CONFIG_RAM_BASE & (SSEG_SIZE - 1)) > +#define PHYS_OFFSET_OFFSET (CONFIG_DRAM_BASE & (SSEG_SIZE - 1)) > > #ifndef __ASSEMBLY__ > > --- a/arch/csky/Kconfig~csky-change-a-kconfig-symbol-name-to-fix-e1000-build-error > +++ a/arch/csky/Kconfig > @@ -314,7 +314,7 @@ config FORCE_MAX_ZONEORDER > int "Maximum zone order" > default "11" > > -config RAM_BASE > +config DRAM_BASE > hex "DRAM start addr (the same with memory-section in dts)" > default 0x0 > > _ -- Best Regards Guo Ren ML: https://lore.kernel.org/linux-csky/
