csky: change a Kconfig symbol name to fix e1000 build error
PATCH RESEND 1/1 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)
Now build-tested.
Signed-off-by Randy Dunlap <[email protected]>
Reported-by kernel test robot <[email protected]>
Cc Andrew Morton <[email protected]>
Cc Jesse Brandeburg <[email protected]>
Cc Tony Nguyen <[email protected]>
Cc intel-wired-lan at lists.osuosl.org
Cc Guo Ren <[email protected]>
Cc Guo Ren <[email protected]>
Cc linux-csky at vger.kernel.org
Acked-by Guo Ren <[email protected]>
---
Andrew, please merge.
v2: Add Acked-by: Guo Ren
Has now been build-tested.
IMO "CONFIG_" namespace should belong to Kconfig files, not individual drivers, but e1000 isn't the only driver that uses CONFIG_ symbols.
arch/csky/Kconfig | 2 +- arch/csky/include/asm/page.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)
arch/csky/include/asm/page.h +1 -1
@@ -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__
arch/csky/Kconfig +1 -1
@@ -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