From 13f24d967251c18dce2a00bcea915f448c4c6aa7 Mon Sep 17 00:00:00 2001 From: Gabe Black Date: Wed, 22 Jan 2014 21:06:32 -0800 Subject: [PATCH] snow: Rename snow to daisy. The name snow goes by in many places in chromeos is daisy. Snow is technically a variant of daisy and should really be called daisy_snow, but for historical reasons the daisy board with no variant was used instead. To make it easier to work with within chromeos, this change renames the snow board to daisy. BUG=None TEST=Built for daisy. BRANCH=None Change-Id: I569b31bf417db55be91832f15271bea4bc30f163 Signed-off-by: Gabe Black Reviewed-on: https://chromium-review.googlesource.com/183553 Reviewed-by: David Hendricks Commit-Queue: Gabe Black Tested-by: Gabe Black --- configs/config.daisy | 2 +- src/mainboard/google/Kconfig | 6 +- src/mainboard/google/{snow => daisy}/Kconfig | 8 +-- .../google/{snow => daisy}/Makefile.inc | 0 .../google/{snow => daisy}/chromeos.c | 0 .../google/{snow => daisy}/devicetree.cb | 0 .../google/{snow => daisy}/exynos5250.h | 0 .../google/{snow => daisy}/mainboard.c | 2 +- src/mainboard/google/{snow => daisy}/memory.c | 58 +++++++++---------- .../google/{snow => daisy}/romstage.c | 0 src/mainboard/google/{snow => daisy}/wakeup.c | 0 11 files changed, 38 insertions(+), 38 deletions(-) rename src/mainboard/google/{snow => daisy}/Kconfig (93%) rename src/mainboard/google/{snow => daisy}/Makefile.inc (100%) rename src/mainboard/google/{snow => daisy}/chromeos.c (100%) rename src/mainboard/google/{snow => daisy}/devicetree.cb (100%) rename src/mainboard/google/{snow => daisy}/exynos5250.h (100%) rename src/mainboard/google/{snow => daisy}/mainboard.c (99%) rename src/mainboard/google/{snow => daisy}/memory.c (92%) rename src/mainboard/google/{snow => daisy}/romstage.c (100%) rename src/mainboard/google/{snow => daisy}/wakeup.c (100%) diff --git a/configs/config.daisy b/configs/config.daisy index cc2077db61..80e705a099 100644 --- a/configs/config.daisy +++ b/configs/config.daisy @@ -1,5 +1,5 @@ CONFIG_VENDOR_GOOGLE=y -CONFIG_BOARD_GOOGLE_SNOW=y +CONFIG_BOARD_GOOGLE_DAISY=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 8252e2d996..981356c3d8 100644 --- a/src/mainboard/google/Kconfig +++ b/src/mainboard/google/Kconfig @@ -32,6 +32,8 @@ config BOARD_GOOGLE_BOLT bool "Bolt" config BOARD_GOOGLE_BUTTERFLY bool "Butterfly" +config BOARD_GOOGLE_DAISY + bool "Daisy" config BOARD_GOOGLE_FALCO bool "Falco" config BOARD_GOOGLE_LINK @@ -54,8 +56,6 @@ config BOARD_GOOGLE_SAMUS bool "Samus" config BOARD_GOOGLE_SLIPPY bool "Slippy" -config BOARD_GOOGLE_SNOW - bool "Snow" config BOARD_GOOGLE_STOUT bool "Stout" @@ -64,6 +64,7 @@ endchoice source "src/mainboard/google/beltino/Kconfig" source "src/mainboard/google/bolt/Kconfig" source "src/mainboard/google/butterfly/Kconfig" +source "src/mainboard/google/daisy/Kconfig" source "src/mainboard/google/falco/Kconfig" source "src/mainboard/google/link/Kconfig" source "src/mainboard/google/nyan/Kconfig" @@ -75,7 +76,6 @@ source "src/mainboard/google/peppy/Kconfig" source "src/mainboard/google/rambi/Kconfig" source "src/mainboard/google/samus/Kconfig" source "src/mainboard/google/slippy/Kconfig" -source "src/mainboard/google/snow/Kconfig" source "src/mainboard/google/stout/Kconfig" config MAINBOARD_VENDOR diff --git a/src/mainboard/google/snow/Kconfig b/src/mainboard/google/daisy/Kconfig similarity index 93% rename from src/mainboard/google/snow/Kconfig rename to src/mainboard/google/daisy/Kconfig index 90a6cc06a3..423d606d30 100644 --- a/src/mainboard/google/snow/Kconfig +++ b/src/mainboard/google/daisy/Kconfig @@ -17,7 +17,7 @@ ## Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA ## -if BOARD_GOOGLE_SNOW +if BOARD_GOOGLE_DAISY config BOARD_SPECIFIC_OPTIONS # dummy def_bool y @@ -35,11 +35,11 @@ config BOARD_SPECIFIC_OPTIONS # dummy config MAINBOARD_DIR string - default google/snow + default google/daisy config MAINBOARD_PART_NUMBER string - default "Snow" + default "Daisy" config MAX_CPUS int @@ -53,4 +53,4 @@ config EC_GOOGLE_CHROMEEC_I2C_BUS hex default 4 -endif # BOARD_GOOGLE_SNOW +endif # BOARD_GOOGLE_DAISY diff --git a/src/mainboard/google/snow/Makefile.inc b/src/mainboard/google/daisy/Makefile.inc similarity index 100% rename from src/mainboard/google/snow/Makefile.inc rename to src/mainboard/google/daisy/Makefile.inc diff --git a/src/mainboard/google/snow/chromeos.c b/src/mainboard/google/daisy/chromeos.c similarity index 100% rename from src/mainboard/google/snow/chromeos.c rename to src/mainboard/google/daisy/chromeos.c diff --git a/src/mainboard/google/snow/devicetree.cb b/src/mainboard/google/daisy/devicetree.cb similarity index 100% rename from src/mainboard/google/snow/devicetree.cb rename to src/mainboard/google/daisy/devicetree.cb diff --git a/src/mainboard/google/snow/exynos5250.h b/src/mainboard/google/daisy/exynos5250.h similarity index 100% rename from src/mainboard/google/snow/exynos5250.h rename to src/mainboard/google/daisy/exynos5250.h diff --git a/src/mainboard/google/snow/mainboard.c b/src/mainboard/google/daisy/mainboard.c similarity index 99% rename from src/mainboard/google/snow/mainboard.c rename to src/mainboard/google/daisy/mainboard.c index 0b6cf4ae83..0adadb6649 100644 --- a/src/mainboard/google/snow/mainboard.c +++ b/src/mainboard/google/daisy/mainboard.c @@ -135,7 +135,7 @@ static void backlight_en(void) gpio_direction_output(GPIO_X30, 1); } -#define TPS65090_BUS 4 /* Snow-specific */ +#define TPS65090_BUS 4 /* Daisy-specific */ #define FET1_CTRL 0x0f #define FET4_CTRL 0x12 diff --git a/src/mainboard/google/snow/memory.c b/src/mainboard/google/daisy/memory.c similarity index 92% rename from src/mainboard/google/snow/memory.c rename to src/mainboard/google/daisy/memory.c index dc97eac188..5640f313e0 100644 --- a/src/mainboard/google/snow/memory.c +++ b/src/mainboard/google/daisy/memory.c @@ -452,16 +452,16 @@ const struct mem_timings mem_timings[] = { #define BOARD_ID1_GPIO 89 /* GPD0, pin 1 */ enum board_config { - SNOW_CONFIG_UNKNOWN = -1, - SNOW_CONFIG_SAMSUNG_EVT, - SNOW_CONFIG_ELPIDA_EVT, - SNOW_CONFIG_SAMSUNG_DVT, - SNOW_CONFIG_ELPIDA_DVT, - SNOW_CONFIG_SAMSUNG_PVT, - SNOW_CONFIG_ELPIDA_PVT, - SNOW_CONFIG_SAMSUNG_MP, - SNOW_CONFIG_ELPIDA_MP, - SNOW_CONFIG_RSVD, + DAISY_CONFIG_UNKNOWN = -1, + DAISY_CONFIG_SAMSUNG_EVT, + DAISY_CONFIG_ELPIDA_EVT, + DAISY_CONFIG_SAMSUNG_DVT, + DAISY_CONFIG_ELPIDA_DVT, + DAISY_CONFIG_SAMSUNG_PVT, + DAISY_CONFIG_ELPIDA_PVT, + DAISY_CONFIG_SAMSUNG_MP, + DAISY_CONFIG_ELPIDA_MP, + DAISY_CONFIG_RSVD, }; struct { @@ -469,22 +469,22 @@ struct { enum board_config config; } id_map[] = { /* ID0 ID1 config */ - { LOGIC_0, LOGIC_0, SNOW_CONFIG_SAMSUNG_MP }, - { LOGIC_0, LOGIC_1, SNOW_CONFIG_ELPIDA_MP }, - { LOGIC_1, LOGIC_0, SNOW_CONFIG_SAMSUNG_DVT }, - { LOGIC_1, LOGIC_1, SNOW_CONFIG_ELPIDA_DVT }, - { LOGIC_0, LOGIC_Z, SNOW_CONFIG_SAMSUNG_PVT }, - { LOGIC_1, LOGIC_Z, SNOW_CONFIG_ELPIDA_PVT }, - { LOGIC_Z, LOGIC_0, SNOW_CONFIG_SAMSUNG_MP }, - { LOGIC_Z, LOGIC_Z, SNOW_CONFIG_ELPIDA_MP }, - { LOGIC_Z, LOGIC_1, SNOW_CONFIG_RSVD }, + { LOGIC_0, LOGIC_0, DAISY_CONFIG_SAMSUNG_MP }, + { LOGIC_0, LOGIC_1, DAISY_CONFIG_ELPIDA_MP }, + { LOGIC_1, LOGIC_0, DAISY_CONFIG_SAMSUNG_DVT }, + { LOGIC_1, LOGIC_1, DAISY_CONFIG_ELPIDA_DVT }, + { LOGIC_0, LOGIC_Z, DAISY_CONFIG_SAMSUNG_PVT }, + { LOGIC_1, LOGIC_Z, DAISY_CONFIG_ELPIDA_PVT }, + { LOGIC_Z, LOGIC_0, DAISY_CONFIG_SAMSUNG_MP }, + { LOGIC_Z, LOGIC_Z, DAISY_CONFIG_ELPIDA_MP }, + { LOGIC_Z, LOGIC_1, DAISY_CONFIG_RSVD }, }; static int board_get_config(void) { int i; int id0, id1; - enum board_config config = SNOW_CONFIG_UNKNOWN; + enum board_config config = DAISY_CONFIG_UNKNOWN; id0 = gpio_read_mvl3(BOARD_ID0_GPIO); id1 = gpio_read_mvl3(BOARD_ID1_GPIO); @@ -509,21 +509,21 @@ struct mem_timings *get_mem_timings(void) unsigned int frequency_mhz; enum mem_manuf mem_manuf; const struct mem_timings *mem; - + config = board_get_config(); switch (config) { - case SNOW_CONFIG_ELPIDA_EVT: - case SNOW_CONFIG_ELPIDA_DVT: - case SNOW_CONFIG_ELPIDA_PVT: - case SNOW_CONFIG_ELPIDA_MP: + case DAISY_CONFIG_ELPIDA_EVT: + case DAISY_CONFIG_ELPIDA_DVT: + case DAISY_CONFIG_ELPIDA_PVT: + case DAISY_CONFIG_ELPIDA_MP: mem_manuf = MEM_MANUF_ELPIDA; mem_type = DDR_MODE_DDR3; frequency_mhz = 800; break; - case SNOW_CONFIG_SAMSUNG_EVT: - case SNOW_CONFIG_SAMSUNG_DVT: - case SNOW_CONFIG_SAMSUNG_PVT: - case SNOW_CONFIG_SAMSUNG_MP: + case DAISY_CONFIG_SAMSUNG_EVT: + case DAISY_CONFIG_SAMSUNG_DVT: + case DAISY_CONFIG_SAMSUNG_PVT: + case DAISY_CONFIG_SAMSUNG_MP: mem_manuf = MEM_MANUF_SAMSUNG; mem_type = DDR_MODE_DDR3; frequency_mhz = 800; diff --git a/src/mainboard/google/snow/romstage.c b/src/mainboard/google/daisy/romstage.c similarity index 100% rename from src/mainboard/google/snow/romstage.c rename to src/mainboard/google/daisy/romstage.c diff --git a/src/mainboard/google/snow/wakeup.c b/src/mainboard/google/daisy/wakeup.c similarity index 100% rename from src/mainboard/google/snow/wakeup.c rename to src/mainboard/google/daisy/wakeup.c