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 <gabeblack@google.com> Reviewed-on: https://chromium-review.googlesource.com/183553 Reviewed-by: David Hendricks <dhendrix@chromium.org> Commit-Queue: Gabe Black <gabeblack@chromium.org> Tested-by: Gabe Black <gabeblack@chromium.org>
This commit is contained in:
parent
cbbe1e9f04
commit
13f24d9672
11 changed files with 38 additions and 38 deletions
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
@ -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
|
||||
|
|
@ -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;
|
||||
Loading…
Add table
Add a link
Reference in a new issue