Revert "peach: Move out of platform/experimental/"
This reverts commit bd84fb4337e9be4bf3761e8bd1f80d6c7e9cec10.
Some local changes weren't uploaded and stuff broke.
BUG=chromium:396006
CQ-DEPEND=CL:209459
Change-Id: I0661144c51f6fd5a046f00a02a92a59f558f9a17
Reviewed-on: https://chromium-review.googlesource.com/209192
Reviewed-by: David Hendricks <dhendrix@chromium.org>
Tested-by: David Hendricks <dhendrix@chromium.org>
Reviewed-on: https://chromium-review.googlesource.com/209500
Reviewed-by: Dharani Govindan <dharani@chromium.org>
Commit-Queue: David Hendricks <dhendrix@chromium.org>
diff --git a/configs/arm_defconfig b/configs/arm_defconfig
index 0378bf8..cb5a487 100644
--- a/configs/arm_defconfig
+++ b/configs/arm_defconfig
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
# Mosys version: 1.2.03
-# Wed Jul 2 11:52:56 2014
+# Wed Jul 2 11:55:57 2014
#
#
@@ -40,12 +40,12 @@
# Samsung Platform Support
#
CONFIG_PLATFORM_DAISY=y
-CONFIG_PLATFORM_PEACH=y
#
# Experimental Platform Support
#
CONFIG_PLATFORM_EXPERIMENTAL=y
+CONFIG_PLATFORM_PEACH=y
CONFIG_EXPERIMENTAL_NYAN=y
CONFIG_PLATFORM_SPRING=y
CONFIG_PLATFORM_SKATE=y
diff --git a/platform/experimental/Kconfig b/platform/experimental/Kconfig
index 95324f5..04cbdeb 100644
--- a/platform/experimental/Kconfig
+++ b/platform/experimental/Kconfig
@@ -21,6 +21,13 @@
bool "kiev"
default n
+config PLATFORM_PEACH
+ depends on PLATFORM_ARCH_ARMEL && PLATFORM_EXPERIMENTAL
+ select CROS_EC_SPI
+ select SOC_SAMSUNG_EXYNOS5420
+ bool "peach"
+ default n
+
config EXPERIMENTAL_RAMBI
depends on PLATFORM_ARCH_X86 && PLATFORM_EXPERIMENTAL
select CROS_EC_LPC
diff --git a/platform/experimental/Makefile b/platform/experimental/Makefile
index f47d30d..5a4bdab 100644
--- a/platform/experimental/Makefile
+++ b/platform/experimental/Makefile
@@ -1,6 +1,7 @@
obj-$(CONFIG_EXPERIMENTAL_BELTINO) += beltino/
obj-$(CONFIG_EXPERIMENTAL_KIEV) += kiev/
obj-$(CONFIG_EXPERIMENTAL_NYAN) += nyan/
+obj-$(CONFIG_PLATFORM_PEACH) += peach/
obj-$(CONFIG_EXPERIMENTAL_RAMBI) += rambi/
obj-$(CONFIG_EXPERIMENTAL_SLIPPY) += slippy/
obj-$(CONFIG_PLATFORM_SPRING) += spring/
diff --git a/platform/samsung/peach/Makefile b/platform/experimental/peach/Makefile
similarity index 100%
rename from platform/samsung/peach/Makefile
rename to platform/experimental/peach/Makefile
diff --git a/platform/samsung/peach/ec.c b/platform/experimental/peach/ec.c
similarity index 100%
rename from platform/samsung/peach/ec.c
rename to platform/experimental/peach/ec.c
diff --git a/platform/samsung/peach/eeprom.c b/platform/experimental/peach/eeprom.c
similarity index 100%
rename from platform/samsung/peach/eeprom.c
rename to platform/experimental/peach/eeprom.c
diff --git a/platform/samsung/peach/gpio.c b/platform/experimental/peach/gpio.c
similarity index 100%
rename from platform/samsung/peach/gpio.c
rename to platform/experimental/peach/gpio.c
diff --git a/platform/samsung/peach/memory.c b/platform/experimental/peach/memory.c
similarity index 100%
rename from platform/samsung/peach/memory.c
rename to platform/experimental/peach/memory.c
diff --git a/platform/samsung/peach/peach.c b/platform/experimental/peach/peach.c
similarity index 100%
rename from platform/samsung/peach/peach.c
rename to platform/experimental/peach/peach.c
diff --git a/platform/samsung/peach/peach.h b/platform/experimental/peach/peach.h
similarity index 100%
rename from platform/samsung/peach/peach.h
rename to platform/experimental/peach/peach.h
diff --git a/platform/samsung/peach/sys.c b/platform/experimental/peach/sys.c
similarity index 100%
rename from platform/samsung/peach/sys.c
rename to platform/experimental/peach/sys.c
diff --git a/platform/samsung/Kconfig b/platform/samsung/Kconfig
index 36cea5f..0a2517a 100644
--- a/platform/samsung/Kconfig
+++ b/platform/samsung/Kconfig
@@ -24,13 +24,6 @@
bool "Samsung XE550 Chromebook"
default n
-config PLATFORM_PEACH
- depends on PLATFORM_ARCH_ARMEL
- select CROS_EC_SPI
- select SOC_SAMSUNG_EXYNOS5420
- bool "Samsung Chromebook 2 (XE50312)"
- default n
-
config PLATFORM_STUMPY
depends on PLATFORM_ARCH_X86
select CHIPSET_INTEL_SERIES6
diff --git a/platform/samsung/Makefile b/platform/samsung/Makefile
index b796991..e546e4f 100644
--- a/platform/samsung/Makefile
+++ b/platform/samsung/Makefile
@@ -1,5 +1,4 @@
obj-$(CONFIG_PLATFORM_ALEX) += alex/
obj-$(CONFIG_PLATFORM_DAISY) += daisy/
obj-$(CONFIG_PLATFORM_LUMPY) += lumpy/
-obj-$(CONFIG_PLATFORM_PEACH) += peach/
obj-$(CONFIG_PLATFORM_STUMPY) += stumpy/
