[Intel-wired-lan] [PATCH RESEND] csky: change a Kconfig symbol name to fix e1000 build error

Randy Dunlap rdunlap at infradead.org
Sun Apr 11 05:53:35 UTC 2021

e1000's #define of CONFIG_RAM_BASE conflicts with a Kconfig symbol in
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 <rdunlap at infradead.org>
Reported-by: kernel test robot <lkp at intel.com>
Cc: Andrew Morton <akpm at linux-foundation.org>
Cc: Jesse Brandeburg <jesse.brandeburg at intel.com>
Cc: Tony Nguyen <anthony.l.nguyen at intel.com>
Cc: intel-wired-lan at lists.osuosl.org
Cc: Guo Ren <guoren at linux.alibaba.com>
Cc: Guo Ren <guoren at kernel.org>
Cc: linux-csky at vger.kernel.org
Acked-by: Guo Ren <guoren at 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
 #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

More information about the Intel-wired-lan mailing list