Skip to content

Commit d199161

Browse files
rddunlaptorvalds
authored andcommitted
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/[email protected] Signed-off-by: Randy Dunlap <[email protected]> Reported-by: kernel test robot <[email protected]> Acked-by: Guo Ren <[email protected]> Cc: Jesse Brandeburg <[email protected]> Signed-off-by: Andrew Morton <[email protected]> Signed-off-by: Linus Torvalds <[email protected]>
1 parent 02c5877 commit d199161

2 files changed

Lines changed: 2 additions & 2 deletions

File tree

arch/csky/Kconfig

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -314,7 +314,7 @@ config FORCE_MAX_ZONEORDER
314314
int "Maximum zone order"
315315
default "11"
316316

317-
config RAM_BASE
317+
config DRAM_BASE
318318
hex "DRAM start addr (the same with memory-section in dts)"
319319
default 0x0
320320

arch/csky/include/asm/page.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
#define SSEG_SIZE 0x20000000
2929
#define LOWMEM_LIMIT (SSEG_SIZE * 2)
3030

31-
#define PHYS_OFFSET_OFFSET (CONFIG_RAM_BASE & (SSEG_SIZE - 1))
31+
#define PHYS_OFFSET_OFFSET (CONFIG_DRAM_BASE & (SSEG_SIZE - 1))
3232

3333
#ifndef __ASSEMBLY__
3434

0 commit comments

Comments
 (0)