move stout out of platform/experimental/
Stout is no longer experimental :-)
BRANCH=none
BUG=none
TEST=compiled and run on Stout
Change-Id: Ib01ffcbed51a6587073b7dacce1d73e9afcd368a
Reviewed-on: https://gerrit.chromium.org/gerrit/41855
Commit-Queue: David Hendricks <dhendrix@chromium.org>
Reviewed-by: David Hendricks <dhendrix@chromium.org>
Tested-by: David Hendricks <dhendrix@chromium.org>
diff --git a/configs/x86_defconfig b/configs/x86_defconfig
index d23c821..5144a91 100644
--- a/configs/x86_defconfig
+++ b/configs/x86_defconfig
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
# Mosys version: 1.2.03
-# Mon Nov 12 17:41:25 2012
+# Wed Jan 23 12:43:51 2013
#
#
@@ -43,6 +43,11 @@
CONFIG_PLATFORM_Z600=y
#
+# Lenovo Platform Support
+#
+CONFIG_PLATFORM_STOUT=y
+
+#
# Samsung Platform Support
#
CONFIG_PLATFORM_ALEX=y
@@ -56,7 +61,6 @@
CONFIG_EXPERIMENTAL_BUTTERFLY=y
CONFIG_EXPERIMENTAL_KIEV=y
CONFIG_EXPERIMENTAL_LINK=y
-CONFIG_EXPERIMENTAL_STOUT=y
#
# Device Drivers
diff --git a/platform/Kconfig b/platform/Kconfig
index c5bec5e..633a3ba 100644
--- a/platform/Kconfig
+++ b/platform/Kconfig
@@ -28,6 +28,7 @@
source "platform/acer/Kconfig"
source "platform/google/Kconfig"
source "platform/hp/Kconfig"
+source "platform/lenovo/Kconfig"
source "platform/samsung/Kconfig"
source "platform/experimental/Kconfig"
diff --git a/platform/Makefile b/platform/Makefile
index aeb8b21..d95dadd 100644
--- a/platform/Makefile
+++ b/platform/Makefile
@@ -4,6 +4,7 @@
obj-y += acer/
obj-y += hp/
obj-y += google/
+obj-y += lenovo/
obj-y += samsung/
obj-y += platform_list.o
diff --git a/platform/experimental/Kconfig b/platform/experimental/Kconfig
index 82f61f1..d50670d 100644
--- a/platform/experimental/Kconfig
+++ b/platform/experimental/Kconfig
@@ -54,11 +54,4 @@
bool "link"
default n
-config EXPERIMENTAL_STOUT
- depends on PLATFORM_ARCH_X86 && PLATFORM_EXPERIMENTAL
- select CHIPSET_INTEL_SERIES6
- select EC_ITE_IT8500
- bool "stout"
- default n
-
endmenu
diff --git a/platform/experimental/Makefile b/platform/experimental/Makefile
index b9d760d..910812c 100644
--- a/platform/experimental/Makefile
+++ b/platform/experimental/Makefile
@@ -5,4 +5,3 @@
obj-$(CONFIG_EXPERIMENTAL_KIEV) += kiev/
obj-$(CONFIG_EXPERIMENTAL_LINK) += link/
obj-$(CONFIG_EXPERIMENTAL_SEABOARD) += seaboard/
-obj-$(CONFIG_EXPERIMENTAL_STOUT) += stout/
diff --git a/platform/experimental/stout/Makefile b/platform/experimental/stout/Makefile
deleted file mode 100644
index f431e33..0000000
--- a/platform/experimental/stout/Makefile
+++ /dev/null
@@ -1,7 +0,0 @@
-obj-$(CONFIG_EXPERIMENTAL_STOUT) += battery.o
-obj-$(CONFIG_EXPERIMENTAL_STOUT) += ec.o
-obj-$(CONFIG_EXPERIMENTAL_STOUT) += eeprom.o
-obj-$(CONFIG_EXPERIMENTAL_STOUT) += memory.o
-obj-$(CONFIG_EXPERIMENTAL_STOUT) += nvram.o
-obj-$(CONFIG_EXPERIMENTAL_STOUT) += stout.o
-obj-$(CONFIG_EXPERIMENTAL_STOUT) += sys.o
diff --git a/platform/lenovo/Kconfig b/platform/lenovo/Kconfig
new file mode 100644
index 0000000..1a14b03
--- /dev/null
+++ b/platform/lenovo/Kconfig
@@ -0,0 +1,14 @@
+#
+# Lenovo platform configuration
+#
+
+menu "Lenovo Platform Support"
+
+config PLATFORM_STOUT
+ depends on PLATFORM_ARCH_X86 && PLATFORM_EXPERIMENTAL
+ select CHIPSET_INTEL_SERIES6
+ select EC_ITE_IT8500
+ bool "Thinkpad X131e Chromebook"
+ default n
+
+endmenu
diff --git a/platform/lenovo/Makefile b/platform/lenovo/Makefile
new file mode 100644
index 0000000..39018de
--- /dev/null
+++ b/platform/lenovo/Makefile
@@ -0,0 +1 @@
+obj-$(CONFIG_PLATFORM_STOUT) += stout/
diff --git a/platform/lenovo/stout/Makefile b/platform/lenovo/stout/Makefile
new file mode 100644
index 0000000..83ce3f8
--- /dev/null
+++ b/platform/lenovo/stout/Makefile
@@ -0,0 +1,7 @@
+obj-$(CONFIG_PLATFORM_STOUT) += battery.o
+obj-$(CONFIG_PLATFORM_STOUT) += ec.o
+obj-$(CONFIG_PLATFORM_STOUT) += eeprom.o
+obj-$(CONFIG_PLATFORM_STOUT) += memory.o
+obj-$(CONFIG_PLATFORM_STOUT) += nvram.o
+obj-$(CONFIG_PLATFORM_STOUT) += stout.o
+obj-$(CONFIG_PLATFORM_STOUT) += sys.o
diff --git a/platform/experimental/stout/battery.c b/platform/lenovo/stout/battery.c
similarity index 100%
rename from platform/experimental/stout/battery.c
rename to platform/lenovo/stout/battery.c
diff --git a/platform/experimental/stout/ec.c b/platform/lenovo/stout/ec.c
similarity index 100%
rename from platform/experimental/stout/ec.c
rename to platform/lenovo/stout/ec.c
diff --git a/platform/experimental/stout/eeprom.c b/platform/lenovo/stout/eeprom.c
similarity index 100%
rename from platform/experimental/stout/eeprom.c
rename to platform/lenovo/stout/eeprom.c
diff --git a/platform/experimental/stout/memory.c b/platform/lenovo/stout/memory.c
similarity index 100%
rename from platform/experimental/stout/memory.c
rename to platform/lenovo/stout/memory.c
diff --git a/platform/experimental/stout/nvram.c b/platform/lenovo/stout/nvram.c
similarity index 100%
rename from platform/experimental/stout/nvram.c
rename to platform/lenovo/stout/nvram.c
diff --git a/platform/experimental/stout/stout.c b/platform/lenovo/stout/stout.c
similarity index 100%
rename from platform/experimental/stout/stout.c
rename to platform/lenovo/stout/stout.c
diff --git a/platform/experimental/stout/stout.h b/platform/lenovo/stout/stout.h
similarity index 100%
rename from platform/experimental/stout/stout.h
rename to platform/lenovo/stout/stout.h
diff --git a/platform/experimental/stout/sys.c b/platform/lenovo/stout/sys.c
similarity index 100%
rename from platform/experimental/stout/sys.c
rename to platform/lenovo/stout/sys.c
diff --git a/platform/platform_list.c b/platform/platform_list.c
index bf5b144..c8b5e6e 100644
--- a/platform/platform_list.c
+++ b/platform/platform_list.c
@@ -44,7 +44,6 @@
extern struct platform_intf platform_kiev;
extern struct platform_intf platform_link;
extern struct platform_intf platform_seaboard_tegra2;
-extern struct platform_intf platform_stout;
/* production platforms */
extern struct platform_intf platform_alex;
@@ -52,6 +51,7 @@
extern struct platform_intf platform_lumpy;
extern struct platform_intf platform_mario;
extern struct platform_intf platform_parrot;
+extern struct platform_intf platform_stout;
extern struct platform_intf platform_stumpy;
extern struct platform_intf platform_z600;
extern struct platform_intf platform_zgb;
@@ -72,6 +72,9 @@
#ifdef CONFIG_PLATFORM_PARROT
&platform_parrot,
#endif
+#ifdef CONFIG_PLATFORM_STOUT
+ &platform_stout,
+#endif
#ifdef CONFIG_PLATFORM_STUMPY
&platform_stumpy,
#endif
@@ -104,9 +107,6 @@
#ifdef CONFIG_EXPERIMENTAL_SEABOARD
&platform_seaboard_tegra2,
#endif
-#ifdef CONFIG_EXPERIMENTAL_STOUT
- &platform_stout,
-#endif
/* place default platform last */
#ifdef CONFIG_DEFAULT_X86