x86: Move CONFIG_SYS_CAR_xxx to Kconfig

Move CONFIG_SYS_CAR_ADDR and CONFIG_SYS_CAR_SIZE to Kconfig so that
we don't need them in the board configuration file thus the same
board configuratoin file can be used to build both coreboot version
and bare version.

Signed-off-by: Bin Meng <bmeng.cn@gmail.com>
Acked-by: Simon Glass <sjg@chromium.org>

diff --git a/board/coreboot/coreboot/Kconfig b/board/coreboot/coreboot/Kconfig
index e5ccf5848f2985e95b6b4f3317334752e89fabed..f2cd75409e41e331c13eedb43c5d344e8d204c8e 100644 (file)
--- a/board/coreboot/coreboot/Kconfig
+++ b/board/coreboot/coreboot/Kconfig
@@ -25,4 +25,16 @@ config DEFAULT_DEVICE_TREE
          This option selects the board Device Tree Source (dts) file in
          arch/x86/dts/ directory to be used to build U-Boot for coreboot.
 
+config SYS_CAR_ADDR
+       hex "Board specific Cache-As-RAM (CAR) address"
+       default 0x19200000
+       help
+         This option specifies the board specific Cache-As-RAM (CAR) address.
+
+config SYS_CAR_SIZE
+       hex "Board specific Cache-As-RAM (CAR) size"
+       default 0x4000
+       help
+         This option specifies the board specific Cache-As-RAM (CAR) size.
+
 endif

diff --git a/board/google/chromebook_link/Kconfig b/board/google/chromebook_link/Kconfig
index a9a55e8d8308de478a0189a96859c31cf03a1e3a..33a31f311fcff9e145901cd172f412563519f638 100644 (file)
--- a/board/google/chromebook_link/Kconfig
+++ b/board/google/chromebook_link/Kconfig
@@ -30,4 +30,12 @@ config EARLY_POST_CROS_EC
        bool "Enable early post to Chrome OS EC"
        default y
 
+config SYS_CAR_ADDR
+       hex
+       default 0xff7e0000
+
+config SYS_CAR_SIZE
+       hex
+       default 0x20000
+
 endif

diff --git a/include/configs/chromebook_link.h b/include/configs/chromebook_link.h
index 449f0c2ce37a93b820fe470478cd37b090d62477..318f1a8fe767e53536a291bb2796f89de13d136f 100644 (file)
--- a/include/configs/chromebook_link.h
+++ b/include/configs/chromebook_link.h
@@ -15,9 +15,9 @@
 
 #include <configs/x86-common.h>
 
-#define CONFIG_SYS_CAR_ADDR                    0xff7e0000
-#define CONFIG_SYS_CAR_SIZE                    (128 * 1024)
+
 #define CONFIG_SYS_MONITOR_LEN                 (1 << 20)
+
 #define CONFIG_DCACHE_RAM_MRC_VAR_SIZE         0x4000
 #define CONFIG_BOARD_EARLY_INIT_F
 #define CONFIG_DISPLAY_CPUINFO