From cbbe1e9f04e34436a1bbae28628e0b5630d41054 Mon Sep 17 00:00:00 2001 From: Gabe Black Date: Wed, 22 Jan 2014 20:50:27 -0800 Subject: [PATCH] pit: Rename pit to peach_pit. The name pit goes by in many places in chromeos is peach_pit, where peach is the base name and pit is the name of this particular variant. To make it easier to work with within chromeos and to make the board names a little less ambiguous, this change renames the pit board to peach_pit, and from Pit to Peach Pit. BUG=None TEST=Built for peach_pit. BRANCH=None Change-Id: I51c89ba3785cf4cb9769a989b1cac71bcd1b0a05 Signed-off-by: Gabe Black Reviewed-on: https://chromium-review.googlesource.com/183552 Reviewed-by: David Hendricks Commit-Queue: Gabe Black Tested-by: Gabe Black --- configs/config.peach_pit | 2 +- src/mainboard/google/Kconfig | 6 +++--- src/mainboard/google/{pit => peach_pit}/Kconfig | 8 ++++---- src/mainboard/google/{pit => peach_pit}/Makefile.inc | 0 src/mainboard/google/{pit => peach_pit}/chromeos.c | 0 src/mainboard/google/{pit => peach_pit}/devicetree.cb | 0 src/mainboard/google/{pit => peach_pit}/mainboard.c | 2 +- src/mainboard/google/{pit => peach_pit}/memory.c | 0 src/mainboard/google/{pit => peach_pit}/romstage.c | 0 src/mainboard/google/{pit => peach_pit}/wakeup.c | 0 10 files changed, 9 insertions(+), 9 deletions(-) rename src/mainboard/google/{pit => peach_pit}/Kconfig (92%) rename src/mainboard/google/{pit => peach_pit}/Makefile.inc (100%) rename src/mainboard/google/{pit => peach_pit}/chromeos.c (100%) rename src/mainboard/google/{pit => peach_pit}/devicetree.cb (100%) rename src/mainboard/google/{pit => peach_pit}/mainboard.c (99%) rename src/mainboard/google/{pit => peach_pit}/memory.c (100%) rename src/mainboard/google/{pit => peach_pit}/romstage.c (100%) rename src/mainboard/google/{pit => peach_pit}/wakeup.c (100%) diff --git a/configs/config.peach_pit b/configs/config.peach_pit index 5d77948191..f33d362c73 100644 --- a/configs/config.peach_pit +++ b/configs/config.peach_pit @@ -1,5 +1,5 @@ CONFIG_VENDOR_GOOGLE=y -CONFIG_BOARD_GOOGLE_PIT=y +CONFIG_BOARD_GOOGLE_PEACH_PIT=y CONFIG_COREBOOT_ROMSIZE_KB_1024=y # CONFIG_CONSOLE_SERIAL is not set CONFIG_COLLECT_TIMESTAMPS=y diff --git a/src/mainboard/google/Kconfig b/src/mainboard/google/Kconfig index eef8844f76..8252e2d996 100644 --- a/src/mainboard/google/Kconfig +++ b/src/mainboard/google/Kconfig @@ -44,10 +44,10 @@ config BOARD_GOOGLE_PANTHER bool "Panther" config BOARD_GOOGLE_PARROT bool "Parrot" +config BOARD_GOOGLE_PEACH_PIT + bool "Peach Pit" config BOARD_GOOGLE_PEPPY bool "Peppy" -config BOARD_GOOGLE_PIT - bool "Pit" config BOARD_GOOGLE_RAMBI bool "Rambi" config BOARD_GOOGLE_SAMUS @@ -70,8 +70,8 @@ source "src/mainboard/google/nyan/Kconfig" source "src/mainboard/google/nyan_big/Kconfig" source "src/mainboard/google/panther/Kconfig" source "src/mainboard/google/parrot/Kconfig" +source "src/mainboard/google/peach_pit/Kconfig" source "src/mainboard/google/peppy/Kconfig" -source "src/mainboard/google/pit/Kconfig" source "src/mainboard/google/rambi/Kconfig" source "src/mainboard/google/samus/Kconfig" source "src/mainboard/google/slippy/Kconfig" diff --git a/src/mainboard/google/pit/Kconfig b/src/mainboard/google/peach_pit/Kconfig similarity index 92% rename from src/mainboard/google/pit/Kconfig rename to src/mainboard/google/peach_pit/Kconfig index 668d8e6c77..fbb395924e 100644 --- a/src/mainboard/google/pit/Kconfig +++ b/src/mainboard/google/peach_pit/Kconfig @@ -17,7 +17,7 @@ ## Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA ## -if BOARD_GOOGLE_PIT +if BOARD_GOOGLE_PEACH_PIT config BOARD_SPECIFIC_OPTIONS # dummy def_bool y @@ -35,11 +35,11 @@ config BOARD_SPECIFIC_OPTIONS # dummy config MAINBOARD_DIR string - default google/pit + default google/peach_pit config MAINBOARD_PART_NUMBER string - default "Pit" + default "Peach Pit" config DRAM_SIZE_MB int @@ -49,4 +49,4 @@ config EC_GOOGLE_CHROMEEC_SPI_BUS hex default 2 -endif # BOARD_GOOGLE_PIT +endif # BOARD_GOOGLE_PEACH_PIT diff --git a/src/mainboard/google/pit/Makefile.inc b/src/mainboard/google/peach_pit/Makefile.inc similarity index 100% rename from src/mainboard/google/pit/Makefile.inc rename to src/mainboard/google/peach_pit/Makefile.inc diff --git a/src/mainboard/google/pit/chromeos.c b/src/mainboard/google/peach_pit/chromeos.c similarity index 100% rename from src/mainboard/google/pit/chromeos.c rename to src/mainboard/google/peach_pit/chromeos.c diff --git a/src/mainboard/google/pit/devicetree.cb b/src/mainboard/google/peach_pit/devicetree.cb similarity index 100% rename from src/mainboard/google/pit/devicetree.cb rename to src/mainboard/google/peach_pit/devicetree.cb diff --git a/src/mainboard/google/pit/mainboard.c b/src/mainboard/google/peach_pit/mainboard.c similarity index 99% rename from src/mainboard/google/pit/mainboard.c rename to src/mainboard/google/peach_pit/mainboard.c index c07db7b85f..1fb441d1ca 100644 --- a/src/mainboard/google/pit/mainboard.c +++ b/src/mainboard/google/peach_pit/mainboard.c @@ -448,7 +448,7 @@ static void mainboard_init(device_t dev) /* this might get more dynamic in future ... */ memset(&device_info, 0, sizeof(device_info)); - device_info.disp_info.name = (char *)"Pit display"; + device_info.disp_info.name = (char *)"Peach Pit display"; device_info.disp_info.h_total = 1366; device_info.disp_info.v_total = 768; device_info.video_info = dp_video_info; diff --git a/src/mainboard/google/pit/memory.c b/src/mainboard/google/peach_pit/memory.c similarity index 100% rename from src/mainboard/google/pit/memory.c rename to src/mainboard/google/peach_pit/memory.c diff --git a/src/mainboard/google/pit/romstage.c b/src/mainboard/google/peach_pit/romstage.c similarity index 100% rename from src/mainboard/google/pit/romstage.c rename to src/mainboard/google/peach_pit/romstage.c diff --git a/src/mainboard/google/pit/wakeup.c b/src/mainboard/google/peach_pit/wakeup.c similarity index 100% rename from src/mainboard/google/pit/wakeup.c rename to src/mainboard/google/peach_pit/wakeup.c