CHROMIUM: config: Move the common configs of onestop and vboot into chromeos_seaboard_common.

Based on the feedback of the previous CL, we move the common configs of onestop
and vboot into chromeos_seaboard_common.

Previous CL: http://gerrit.chromium.org/gerrit/#change,3002

BUG=chromium-os:16542
TEST=build onestop and vboot configs without error:
$ emerge-tegra2_seaboard chromeos-u-boot-next
$ make ARCH=arm CROSS_COMPILE=armv7a-cros-linux-gnueabi- \
       USE_PRIVATE_LIBGCC=yes HOSTSTRIP=true VBOOT=/build/tegra2_seaboard/usr \
       DEV_TREE_SEPARATE=1 DEV_TREE_SRC=tegra2-seaboard \
       chromeos_seaboard_vboot_config
$ make ARCH=arm CROSS_COMPILE=armv7a-cros-linux-gnueabi- \
       USE_PRIVATE_LIBGCC=yes HOSTSTRIP=true VBOOT=/build/tegra2_seaboard/usr \
       DEV_TREE_SEPARATE=1 DEV_TREE_SRC=tegra2-seaboard \
       all

Change-Id: I9bcc6a66ace9246cf14c6035695ae5b3c279ec2b
Reviewed-on: http://gerrit.chromium.org/gerrit/3233
Reviewed-by: Che-Liang Chiou <clchiou@chromium.org>
Tested-by: Tom Wai-Hong Tam <waihong@chromium.org>

3 files changed, 134 insertions, 122 deletions

diff --git a/include/configs/chromeos_seaboard_common.h b/include/configs/chromeos_seaboard_common.h
new file mode 100644
index 00000000000..f82ab30755d
--- /dev/null
+++ b/include/configs/chromeos_seaboard_common.h
@@ -0,0 +1,132 @@
+/*
+ * Copyright (c) 2011 The Chromium OS Authors. All rights reserved.
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
+#ifndef __configs_chromeos_seaboard_common_h__
+#define __configs_chromeos_seaboard_common_h__
+
+#include <configs/seaboard.h>
+
+#define CONFIG_CHROMEOS
+
+/* for security reason, Chrome OS kernel must be loaded to specific location */
+#define CONFIG_CHROMEOS_KERNEL_LOADADDR	0x00100000
+#define CONFIG_CHROMEOS_KERNEL_BUFSIZE	0x00800000
+
+/* default hwid for seaboard */
+#define CONFIG_CHROMEOS_HWID		"ARM SEABOARD TEST 1176"
+
+/* graphics display */
+#define CONFIG_CHROMEOS_BMPBLK
+#define CONFIG_LCD_BMP_RLE8
+#define CONFIG_LZMA
+#define CONFIG_SPLASH_SCREEN
+
+/* lcd dimension; this is used when packing stuff in chromeos-bootimage */
+#define CONFIG_LCD_vl_col		1366
+#define CONFIG_LCD_vl_row		768
+
+/* TODO hard-coded mmc device number here */
+#define DEVICE_TYPE			"mmc"
+#define MMC_INTERNAL_DEVICE		0
+#define MMC_EXTERNAL_DEVICE		1
+
+/*
+ * Use a smaller firmware image layout for Seaboard because it has
+ * only 16MBit (=2MB) of SPI Flash.
+ */
+
+#define CONFIG_FIRMWARE_SIZE		0x00200000 /* 2 MB */
+
+/* -- Region: Read-only ----------------------------------------------------- */
+
+/* ---- Section: Read-only firmware ----------------------------------------- */
+
+#define CONFIG_OFFSET_RO_SECTION	0x00000000
+#define CONFIG_LENGTH_RO_SECTION	0x000f0000
+
+#define CONFIG_OFFSET_BOOT_STUB		0x00000000
+#define CONFIG_LENGTH_BOOT_STUB		0x00088000
+
+#define CONFIG_OFFSET_RECOVERY		0x00088000
+#define CONFIG_LENGTH_RECOVERY		0x00040000
+
+#define CONFIG_OFFSET_RO_DATA		0x000c8000
+#define CONFIG_LENGTH_RO_DATA		0x00008000
+
+#define CONFIG_OFFSET_FMAP		0x000c8000
+#define CONFIG_LENGTH_FMAP		0x00000400
+
+#define CONFIG_OFFSET_RO_FRID		0x000c8400
+#define CONFIG_LENGTH_RO_FRID		0x00000100
+
+#define CONFIG_OFFSET_GBB		0x000d0000
+#define CONFIG_LENGTH_GBB		0x00020000
+
+/* ---- Section: Vital-product data (VPD) ----------------------------------- */
+
+#define CONFIG_OFFSET_RO_VPD		0x000f0000
+#define CONFIG_LENGTH_RO_VPD		0x00010000
+
+/* -- Region: Writable ------------------------------------------------------ */
+
+/* ---- Section: Rewritable slot A ------------------------------------------ */
+
+#define CONFIG_OFFSET_RW_SECTION_A	0x00100000
+#define CONFIG_LENGTH_RW_SECTION_A	0x00078000
+
+#define CONFIG_OFFSET_VBLOCK_A		0x00100000
+#define CONFIG_LENGTH_VBLOCK_A		0x00010000
+
+#define CONFIG_OFFSET_FW_MAIN_A		0x00110000
+#define CONFIG_LENGTH_FW_MAIN_A		0x00067f00
+
+#define CONFIG_OFFSET_RW_FWID_A		0x00177f00
+#define CONFIG_LENGTH_RW_FWID_A		0x00000100
+
+#define CONFIG_OFFSET_DATA_A		0x00100000
+#define CONFIG_LENGTH_DATA_A		0x00000000
+
+/* ---- Section: Rewritable slot B ------------------------------------------ */
+
+#define CONFIG_OFFSET_RW_SECTION_B	0x00178000
+#define CONFIG_LENGTH_RW_SECTION_B	0x00078000
+
+#define CONFIG_OFFSET_VBLOCK_B		0x00178000
+#define CONFIG_LENGTH_VBLOCK_B		0x00010000
+
+#define CONFIG_OFFSET_FW_MAIN_B		0x00188000
+#define CONFIG_LENGTH_FW_MAIN_B		0x00067f00
+
+#define CONFIG_OFFSET_RW_FWID_B		0x001eff00
+#define CONFIG_LENGTH_RW_FWID_B		0x00000100
+
+#define CONFIG_OFFSET_DATA_B		0x00178000
+#define CONFIG_LENGTH_DATA_B		0x00000000
+
+/* ---- Section: Rewritable VPD --------------------------------------------- */
+
+#define CONFIG_OFFSET_RW_VPD		0x001f0000
+#define CONFIG_LENGTH_RW_VPD		0x00008000
+
+/* ---- Section: Rewritable shared ------------------------------------------ */
+
+#define CONFIG_OFFSET_RW_SHARED		0x001f8000
+#define CONFIG_LENGTH_RW_SHARED		0x00008000
+
+#define CONFIG_OFFSET_DEV_CFG		0x001f8000
+#define CONFIG_LENGTH_DEV_CFG		0x00004000
+
+#define CONFIG_OFFSET_SHARED_DATA	0x001fc000
+#define CONFIG_LENGTH_SHARED_DATA	0x00002000
+
+#define CONFIG_OFFSET_VBNVCONTEXT	0x001fe000
+#define CONFIG_LENGTH_VBNVCONTEXT	0x00001000
+
+/* where are the meanings of these documented? Add a comment/link here */
+#define CONFIG_OFFSET_ENV		0x001ff000
+#define CONFIG_LENGTH_ENV		0x00001000
+
+#endif /* __configs_chromeos_seaboard_common_h__ */
diff --git a/include/configs/chromeos_seaboard_onestop.h b/include/configs/chromeos_seaboard_onestop.h
index 835caf032a6..18b063c51f6 100644
--- a/include/configs/chromeos_seaboard_onestop.h
+++ b/include/configs/chromeos_seaboard_onestop.h
@@ -7,131 +7,11 @@
 #ifndef __configs_chromeos_seaboard_onestop_h__
 #define __configs_chromeos_seaboard_onestop_h__
 
-#include <configs/seaboard.h>
-
-#define CONFIG_CHROMEOS
-
-/* for security reason, Chrome OS kernel must be loaded to specific location */
-#define CONFIG_CHROMEOS_KERNEL_LOADADDR	0x00100000
-#define CONFIG_CHROMEOS_KERNEL_BUFSIZE	0x00800000
-
-/* default hwid for seaboard */
-#define CONFIG_CHROMEOS_HWID		"ARM SEABOARD TEST 1176"
-
-/* graphics display */
-#define CONFIG_CHROMEOS_BMPBLK
-#define CONFIG_LCD_BMP_RLE8
-#define CONFIG_LZMA
-#define CONFIG_SPLASH_SCREEN
-
-/* lcd dimension; this is used when packing stuff in chromeos-bootimage */
-#define CONFIG_LCD_vl_col      1366
-#define CONFIG_LCD_vl_row      768
-
-/* TODO hard-coded mmc device number here */
-#define DEVICE_TYPE             "mmc"
-#define MMC_INTERNAL_DEVICE     0
-#define MMC_EXTERNAL_DEVICE     1
+#include <configs/chromeos_seaboard_common.h>
 
 /* entry point of onestop firmware */
 #define CONFIG_CMD_CROS_ONESTOP_FIRMWARE
 #undef CONFIG_BOOTCOMMAND
 #define CONFIG_BOOTCOMMAND "run regen_all; cros_onestop_firmware"
 
-/*
- * Use a smaller firmware image layout for Seaboard because it has
- * only 16MBit (=2MB) of SPI Flash.
- */
-
-#define CONFIG_FIRMWARE_SIZE		0x00200000 /* 2 MB */
-
-/* -- Region: Read-only ----------------------------------------------------- */
-
-/* ---- Section: Read-only firmware ----------------------------------------- */
-
-#define CONFIG_OFFSET_RO_SECTION	0x00000000
-#define CONFIG_LENGTH_RO_SECTION	0x000f0000
-
-#define CONFIG_OFFSET_BOOT_STUB		0x00000000
-#define CONFIG_LENGTH_BOOT_STUB		0x00088000
-
-#define CONFIG_OFFSET_RECOVERY		0x00088000
-#define CONFIG_LENGTH_RECOVERY		0x00040000
-
-#define CONFIG_OFFSET_RO_DATA		0x000c8000
-#define CONFIG_LENGTH_RO_DATA		0x00008000
-
-#define CONFIG_OFFSET_FMAP		0x000c8000
-#define CONFIG_LENGTH_FMAP		0x00000400
-
-#define CONFIG_OFFSET_RO_FRID		0x000c8400
-#define CONFIG_LENGTH_RO_FRID		0x00000100
-
-#define CONFIG_OFFSET_GBB		0x000d0000
-#define CONFIG_LENGTH_GBB		0x00020000
-
-/* ---- Section: Vital-product data (VPD) ----------------------------------- */
-
-#define CONFIG_OFFSET_RO_VPD		0x000f0000
-#define CONFIG_LENGTH_RO_VPD		0x00010000
-
-/* -- Region: Writable ------------------------------------------------------ */
-
-/* ---- Section: Rewritable slot A ------------------------------------------ */
-
-#define CONFIG_OFFSET_RW_SECTION_A	0x00100000
-#define CONFIG_LENGTH_RW_SECTION_A	0x00078000
-
-#define CONFIG_OFFSET_VBLOCK_A		0x00100000
-#define CONFIG_LENGTH_VBLOCK_A		0x00010000
-
-#define CONFIG_OFFSET_FW_MAIN_A		0x00110000
-#define CONFIG_LENGTH_FW_MAIN_A		0x00067f00
-
-#define CONFIG_OFFSET_RW_FWID_A		0x00177f00
-#define CONFIG_LENGTH_RW_FWID_A		0x00000100
-
-#define CONFIG_OFFSET_DATA_A		0x00100000
-#define CONFIG_LENGTH_DATA_A		0x00000000
-
-/* ---- Section: Rewritable slot B ------------------------------------------ */
-
-#define CONFIG_OFFSET_RW_SECTION_B	0x00178000
-#define CONFIG_LENGTH_RW_SECTION_B	0x00078000
-
-#define CONFIG_OFFSET_VBLOCK_B		0x00178000
-#define CONFIG_LENGTH_VBLOCK_B		0x00010000
-
-#define CONFIG_OFFSET_FW_MAIN_B		0x00188000
-#define CONFIG_LENGTH_FW_MAIN_B		0x00067f00
-
-#define CONFIG_OFFSET_RW_FWID_B		0x001eff00
-#define CONFIG_LENGTH_RW_FWID_B		0x00000100
-
-#define CONFIG_OFFSET_DATA_B		0x00178000
-#define CONFIG_LENGTH_DATA_B		0x00000000
-
-/* ---- Section: Rewritable VPD --------------------------------------------- */
-
-#define CONFIG_OFFSET_RW_VPD		0x001f0000
-#define CONFIG_LENGTH_RW_VPD		0x00008000
-
-/* ---- Section: Rewritable shared ------------------------------------------ */
-
-#define CONFIG_OFFSET_RW_SHARED		0x001f8000
-#define CONFIG_LENGTH_RW_SHARED		0x00008000
-
-#define CONFIG_OFFSET_DEV_CFG		0x001f8000
-#define CONFIG_LENGTH_DEV_CFG		0x00004000
-
-#define CONFIG_OFFSET_SHARED_DATA	0x001fc000
-#define CONFIG_LENGTH_SHARED_DATA	0x00002000
-
-#define CONFIG_OFFSET_VBNVCONTEXT	0x001fe000
-#define CONFIG_LENGTH_VBNVCONTEXT	0x00001000
-
-/* where are the meanings of these documented? Add a comment/link here */
-#define CONFIG_OFFSET_ENV		0x001ff000
-#define CONFIG_LENGTH_ENV		0x00001000
-
 #endif /* __configs_chromeos_seaboard_onestop_h__ */
diff --git a/include/configs/chromeos_seaboard_vboot.h b/include/configs/chromeos_seaboard_vboot.h
index fe435c7a537..4820dcd74d1 100644
--- a/include/configs/chromeos_seaboard_vboot.h
+++ b/include/configs/chromeos_seaboard_vboot.h
@@ -7,7 +7,7 @@
 #ifndef __configs_chromeos_seaboard_vboot_h__
 #define __configs_chromeos_seaboard_vboot_h__
 
-#include <configs/seaboard.h>
+#include <configs/chromeos_seaboard_common.h>
 
 #define CONFIG_VBOOT_WRAPPER