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 <rdun...@infradead.org>
Reported-by: kernel test robot <l...@intel.com>
Cc: Andrew Morton <a...@linux-foundation.org>
Cc: Jesse Brandeburg <jesse.brandeb...@intel.com>
Cc: Tony Nguyen <anthony.l.ngu...@intel.com>
Cc: intel-wired-...@lists.osuosl.org
Cc: Guo Ren <guo...@linux.alibaba.com>
Cc: Guo Ren <guo...@kernel.org>
Cc: linux-c...@vger.kernel.org
Acked-by: Guo Ren <guo...@kernel.org>
---
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(-)
--- linux-next-20210409.orig/arch/csky/include/asm/page.h
+++ linux-next-20210409/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__
--- linux-next-20210409.orig/arch/csky/Kconfig
+++ linux-next-20210409/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
