diff options
| -rw-r--r-- | src/mainboard/google/Kconfig | 6 | ||||
| -rw-r--r-- | src/mainboard/google/daisy/Kconfig (renamed from src/mainboard/google/snow/Kconfig) | 8 | ||||
| -rw-r--r-- | src/mainboard/google/daisy/Makefile.inc (renamed from src/mainboard/google/snow/Makefile.inc) | 0 | ||||
| -rw-r--r-- | src/mainboard/google/daisy/chromeos.c (renamed from src/mainboard/google/snow/chromeos.c) | 0 | ||||
| -rw-r--r-- | src/mainboard/google/daisy/devicetree.cb (renamed from src/mainboard/google/snow/devicetree.cb) | 0 | ||||
| -rw-r--r-- | src/mainboard/google/daisy/exynos5250.h (renamed from src/mainboard/google/snow/exynos5250.h) | 0 | ||||
| -rw-r--r-- | src/mainboard/google/daisy/mainboard.c (renamed from src/mainboard/google/snow/mainboard.c) | 2 | ||||
| -rw-r--r-- | src/mainboard/google/daisy/memory.c (renamed from src/mainboard/google/snow/memory.c) | 56 | ||||
| -rw-r--r-- | src/mainboard/google/daisy/romstage.c (renamed from src/mainboard/google/snow/romstage.c) | 0 | ||||
| -rw-r--r-- | src/mainboard/google/daisy/wakeup.c (renamed from src/mainboard/google/snow/wakeup.c) | 0 |
10 files changed, 36 insertions, 36 deletions
diff --git a/src/mainboard/google/Kconfig b/src/mainboard/google/Kconfig index 415b04f071..95420fc3d2 100644 --- a/src/mainboard/google/Kconfig +++ b/src/mainboard/google/Kconfig @@ -25,6 +25,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 @@ -47,8 +49,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" @@ -56,6 +56,7 @@ endchoice 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" @@ -67,7 +68,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 index e636df95ba..41b37b3497 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 @@ -33,11 +33,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 @@ -55,4 +55,4 @@ config UART_FOR_CONSOLE int default 3 -endif # BOARD_GOOGLE_SNOW +endif # BOARD_GOOGLE_DAISY diff --git a/src/mainboard/google/snow/Makefile.inc b/src/mainboard/google/daisy/Makefile.inc index df9b797367..df9b797367 100644 --- a/src/mainboard/google/snow/Makefile.inc +++ b/src/mainboard/google/daisy/Makefile.inc diff --git a/src/mainboard/google/snow/chromeos.c b/src/mainboard/google/daisy/chromeos.c index f7443becc7..f7443becc7 100644 --- a/src/mainboard/google/snow/chromeos.c +++ b/src/mainboard/google/daisy/chromeos.c diff --git a/src/mainboard/google/snow/devicetree.cb b/src/mainboard/google/daisy/devicetree.cb index 2552e070e0..2552e070e0 100644 --- a/src/mainboard/google/snow/devicetree.cb +++ b/src/mainboard/google/daisy/devicetree.cb diff --git a/src/mainboard/google/snow/exynos5250.h b/src/mainboard/google/daisy/exynos5250.h index 0f71a3647d..0f71a3647d 100644 --- a/src/mainboard/google/snow/exynos5250.h +++ b/src/mainboard/google/daisy/exynos5250.h diff --git a/src/mainboard/google/snow/mainboard.c b/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 index 1cb87d4107..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); @@ -512,18 +512,18 @@ struct mem_timings *get_mem_timings(void) 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 index 9b35c4a6d4..9b35c4a6d4 100644 --- a/src/mainboard/google/snow/romstage.c +++ b/src/mainboard/google/daisy/romstage.c diff --git a/src/mainboard/google/snow/wakeup.c b/src/mainboard/google/daisy/wakeup.c index 8b7fc4b9d2..8b7fc4b9d2 100644 --- a/src/mainboard/google/snow/wakeup.c +++ b/src/mainboard/google/daisy/wakeup.c |