Skip to content

Commit 3dce9c4

Browse files
rddunlapgregkh
authored andcommitted
csky: change a Kconfig symbol name to fix e1000 build error
[ Upstream commit d199161 ] 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> Signed-off-by: Sasha Levin <sashal@kernel.org>
1 parent 892f6bc commit 3dce9c4

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
@@ -220,7 +220,7 @@ config FORCE_MAX_ZONEORDER
220220
int "Maximum zone order"
221221
default "11"
222222

223-
config RAM_BASE
223+
config DRAM_BASE
224224
hex "DRAM start addr (the same with memory-section in dts)"
225225
default 0x0
226226

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)