Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

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@infradead.org
Signed-off-by: Randy Dunlap <rdunlap@infradead.org>
Reported-by: kernel test robot <lkp@intel.com>
Acked-by: Guo Ren <guoren@kernel.org>
Cc: Jesse Brandeburg <jesse.brandeburg@intel.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

authored by

Randy Dunlap and committed by
Linus Torvalds
d1991616 02c58773

+2 -2
+1 -1
arch/csky/Kconfig
··· 314 314 int "Maximum zone order" 315 315 default "11" 316 316 317 - config RAM_BASE 317 + config DRAM_BASE 318 318 hex "DRAM start addr (the same with memory-section in dts)" 319 319 default 0x0 320 320
+1 -1
arch/csky/include/asm/page.h
··· 28 28 #define SSEG_SIZE 0x20000000 29 29 #define LOWMEM_LIMIT (SSEG_SIZE * 2) 30 30 31 - #define PHYS_OFFSET_OFFSET (CONFIG_RAM_BASE & (SSEG_SIZE - 1)) 31 + #define PHYS_OFFSET_OFFSET (CONFIG_DRAM_BASE & (SSEG_SIZE - 1)) 32 32 33 33 #ifndef __ASSEMBLY__ 34 34