move butterfly out of experimental
It's no longer experimental :-)
BRANCH=none
BUG=none
TEST=compiled and ran on butterfly (platform identified correctly)
Change-Id: Ic2f689bb935ff1d570258cc200f00e1edfd76282
Reviewed-on: https://gerrit.chromium.org/gerrit/43132
Reviewed-by: Duncan Laurie <dlaurie@chromium.org>
Commit-Queue: David Hendricks <dhendrix@chromium.org>
Tested-by: David Hendricks <dhendrix@chromium.org>
diff --git a/configs/x86_defconfig b/configs/x86_defconfig
index 5144a91..b79e0ee 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
-# Wed Jan 23 12:43:51 2013
+# Tue Feb 12 14:22:24 2013
#
#
@@ -40,6 +40,7 @@
#
# HP Platform Support
#
+CONFIG_PLATFORM_BUTTERFLY=y
CONFIG_PLATFORM_Z600=y
#
@@ -58,7 +59,6 @@
# Experimental Platform Support
#
CONFIG_PLATFORM_EXPERIMENTAL=y
-CONFIG_EXPERIMENTAL_BUTTERFLY=y
CONFIG_EXPERIMENTAL_KIEV=y
CONFIG_EXPERIMENTAL_LINK=y
diff --git a/platform/experimental/Kconfig b/platform/experimental/Kconfig
index 8ca8eba..ef0717c 100644
--- a/platform/experimental/Kconfig
+++ b/platform/experimental/Kconfig
@@ -20,13 +20,6 @@
bool "asymptote tegra2"
default n
-config EXPERIMENTAL_BUTTERFLY
- depends on PLATFORM_ARCH_X86 && PLATFORM_EXPERIMENTAL
- select CHIPSET_INTEL_SERIES6
- select EC_ENE_KB932
- bool "butterfly"
- default n
-
config EXPERIMENTAL_KAEN
depends on PLATFORM_ARCH_ARMEL && PLATFORM_EXPERIMENTAL
select SOC_NVIDIA_TEGRA2
diff --git a/platform/experimental/butterfly/Makefile b/platform/experimental/butterfly/Makefile
deleted file mode 100644
index 9d14d8a..0000000
--- a/platform/experimental/butterfly/Makefile
+++ /dev/null
@@ -1,6 +0,0 @@
-obj-$(CONFIG_EXPERIMENTAL_BUTTERFLY) += ec.o
-obj-$(CONFIG_EXPERIMENTAL_BUTTERFLY) += eeprom.o
-obj-$(CONFIG_EXPERIMENTAL_BUTTERFLY) += memory.o
-obj-$(CONFIG_EXPERIMENTAL_BUTTERFLY) += nvram.o
-obj-$(CONFIG_EXPERIMENTAL_BUTTERFLY) += butterfly.o
-obj-$(CONFIG_EXPERIMENTAL_BUTTERFLY) += sys.o
diff --git a/platform/hp/Kconfig b/platform/hp/Kconfig
index 08d7784..132dd1e 100644
--- a/platform/hp/Kconfig
+++ b/platform/hp/Kconfig
@@ -4,6 +4,13 @@
menu "HP Platform Support"
+config PLATFORM_BUTTERFLY
+ depends on PLATFORM_ARCH_X86
+ select CHIPSET_INTEL_SERIES6
+ select EC_ENE_KB932
+ bool "HP Pavilion 14-c010us Chromebook"
+ default n
+
config PLATFORM_Z600
depends on PLATFORM_ARCH_X86
bool "z600 workstation"
diff --git a/platform/hp/Makefile b/platform/hp/Makefile
index 501dea4..3f2dfd0 100644
--- a/platform/hp/Makefile
+++ b/platform/hp/Makefile
@@ -1 +1,2 @@
-obj-$(CONFIG_PLATFORM_Z600) += z600/
+obj-$(CONFIG_PLATFORM_BUTTERFLY) += butterfly/
+obj-$(CONFIG_PLATFORM_Z600) += z600/
diff --git a/platform/hp/butterfly/Makefile b/platform/hp/butterfly/Makefile
new file mode 100644
index 0000000..5a5d8aa
--- /dev/null
+++ b/platform/hp/butterfly/Makefile
@@ -0,0 +1,6 @@
+obj-$(CONFIG_PLATFORM_BUTTERFLY) += ec.o
+obj-$(CONFIG_PLATFORM_BUTTERFLY) += eeprom.o
+obj-$(CONFIG_PLATFORM_BUTTERFLY) += memory.o
+obj-$(CONFIG_PLATFORM_BUTTERFLY) += nvram.o
+obj-$(CONFIG_PLATFORM_BUTTERFLY) += butterfly.o
+obj-$(CONFIG_PLATFORM_BUTTERFLY) += sys.o
diff --git a/platform/experimental/butterfly/butterfly.c b/platform/hp/butterfly/butterfly.c
similarity index 100%
rename from platform/experimental/butterfly/butterfly.c
rename to platform/hp/butterfly/butterfly.c
diff --git a/platform/experimental/butterfly/butterfly.h b/platform/hp/butterfly/butterfly.h
similarity index 94%
rename from platform/experimental/butterfly/butterfly.h
rename to platform/hp/butterfly/butterfly.h
index 87d7ed4..d49ab55 100644
--- a/platform/experimental/butterfly/butterfly.h
+++ b/platform/hp/butterfly/butterfly.h
@@ -29,8 +29,8 @@
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#ifndef EXPERIMENTAL_BUTTERFLY_H__
-#define EXPERIMENTAL_BUTTERFLY_H__
+#ifndef PLATFORM_BUTTERFLY_H__
+#define PLATFORM_BUTTERFLY_H__
#include <inttypes.h>
#include "mosys/platform.h"
@@ -48,4 +48,4 @@
extern int butterfly_ec_setup(struct platform_intf *intf);
extern int butterfly_eeprom_setup(struct platform_intf *intf);
-#endif /* EXPERIMENTAL_BUTTERFLY_H_ */
+#endif /* PLATFORM_BUTTERFLY_H_ */
diff --git a/platform/experimental/butterfly/ec.c b/platform/hp/butterfly/ec.c
similarity index 100%
rename from platform/experimental/butterfly/ec.c
rename to platform/hp/butterfly/ec.c
diff --git a/platform/experimental/butterfly/eeprom.c b/platform/hp/butterfly/eeprom.c
similarity index 100%
rename from platform/experimental/butterfly/eeprom.c
rename to platform/hp/butterfly/eeprom.c
diff --git a/platform/experimental/butterfly/memory.c b/platform/hp/butterfly/memory.c
similarity index 100%
rename from platform/experimental/butterfly/memory.c
rename to platform/hp/butterfly/memory.c
diff --git a/platform/experimental/butterfly/nvram.c b/platform/hp/butterfly/nvram.c
similarity index 100%
rename from platform/experimental/butterfly/nvram.c
rename to platform/hp/butterfly/nvram.c
diff --git a/platform/experimental/butterfly/sys.c b/platform/hp/butterfly/sys.c
similarity index 100%
rename from platform/experimental/butterfly/sys.c
rename to platform/hp/butterfly/sys.c
diff --git a/platform/platform_list.c b/platform/platform_list.c
index aeb704b..cd62397 100644
--- a/platform/platform_list.c
+++ b/platform/platform_list.c
@@ -39,7 +39,6 @@
/* experimental */
extern struct platform_intf platform_aebl_tegra2;
extern struct platform_intf platform_asymptote_tegra2;
-extern struct platform_intf platform_butterfly;
extern struct platform_intf platform_kaen_tegra2;
extern struct platform_intf platform_kiev;
extern struct platform_intf platform_link;
@@ -48,6 +47,7 @@
/* production platforms */
extern struct platform_intf platform_alex;
+extern struct platform_intf platform_butterfly;
extern struct platform_intf platform_daisy;
extern struct platform_intf platform_lumpy;
extern struct platform_intf platform_mario;
@@ -61,6 +61,9 @@
#ifdef CONFIG_PLATFORM_ALEX
&platform_alex,
#endif
+#ifdef CONFIG_PLATFORM_BUTTERFLY
+ &platform_butterfly,
+#endif
#ifdef CONFIG_PLATFORM_DAISY
&platform_daisy,
#endif
@@ -93,9 +96,6 @@
#ifdef CONFIG_EXPERIMENTAL_ASYMPTOTE
&platform_asymptote_tegra2,
#endif
-#ifdef CONFIG_EXPERIMENTAL_BUTTERFLY
- &platform_butterfly,
-#endif
#ifdef CONFIG_EXPERIMENTAL_KAEN
&platform_kaen_tegra2,
#endif
