summaryrefslogtreecommitdiff
path: root/src/mainboard/lenovo
diff options
context:
space:
mode:
Diffstat (limited to 'src/mainboard/lenovo')
-rw-r--r--src/mainboard/lenovo/l520/Makefile.inc3
-rw-r--r--src/mainboard/lenovo/l520/early_init.c (renamed from src/mainboard/lenovo/l520/romstage.c)4
-rw-r--r--src/mainboard/lenovo/s230u/Makefile.inc2
-rw-r--r--src/mainboard/lenovo/s230u/early_init.c (renamed from src/mainboard/lenovo/s230u/romstage.c)4
-rw-r--r--src/mainboard/lenovo/t420/Makefile.inc2
-rw-r--r--src/mainboard/lenovo/t420/early_init.c (renamed from src/mainboard/lenovo/t420/romstage.c)4
-rw-r--r--src/mainboard/lenovo/t420s/Makefile.inc2
-rw-r--r--src/mainboard/lenovo/t420s/early_init.c (renamed from src/mainboard/lenovo/t420s/romstage.c)4
-rw-r--r--src/mainboard/lenovo/t430/Makefile.inc3
-rw-r--r--src/mainboard/lenovo/t430/early_init.c (renamed from src/mainboard/lenovo/t430/romstage.c)4
-rw-r--r--src/mainboard/lenovo/t430s/Makefile.inc2
-rw-r--r--src/mainboard/lenovo/t430s/early_init.c (renamed from src/mainboard/lenovo/t430s/romstage.c)4
-rw-r--r--src/mainboard/lenovo/t520/Makefile.inc2
-rw-r--r--src/mainboard/lenovo/t520/early_init.c (renamed from src/mainboard/lenovo/t520/romstage.c)4
-rw-r--r--src/mainboard/lenovo/t530/Makefile.inc2
-rw-r--r--src/mainboard/lenovo/t530/early_init.c (renamed from src/mainboard/lenovo/t530/romstage.c)4
-rw-r--r--src/mainboard/lenovo/x131e/Makefile.inc2
-rw-r--r--src/mainboard/lenovo/x131e/early_init.c (renamed from src/mainboard/lenovo/x131e/romstage.c)4
-rw-r--r--src/mainboard/lenovo/x1_carbon_gen1/Makefile.inc2
-rw-r--r--src/mainboard/lenovo/x1_carbon_gen1/early_init.c (renamed from src/mainboard/lenovo/x1_carbon_gen1/romstage.c)4
-rw-r--r--src/mainboard/lenovo/x220/Makefile.inc2
-rw-r--r--src/mainboard/lenovo/x220/early_init.c (renamed from src/mainboard/lenovo/x220/romstage.c)4
-rw-r--r--src/mainboard/lenovo/x230/Makefile.inc2
-rw-r--r--src/mainboard/lenovo/x230/early_init.c (renamed from src/mainboard/lenovo/x230/romstage.c)4
24 files changed, 24 insertions, 50 deletions
diff --git a/src/mainboard/lenovo/l520/Makefile.inc b/src/mainboard/lenovo/l520/Makefile.inc
index 14cd059011..c03276795c 100644
--- a/src/mainboard/lenovo/l520/Makefile.inc
+++ b/src/mainboard/lenovo/l520/Makefile.inc
@@ -13,9 +13,10 @@
## GNU General Public License for more details.
##
-romstage-y += romstage.c
bootblock-y += gpio.c
romstage-y += gpio.c
smm-y += smihandler.c
ramstage-$(CONFIG_MAINBOARD_USE_LIBGFXINIT) += gma-mainboard.ads
+bootblock-y += early_init.c
+romstage-y += early_init.c
diff --git a/src/mainboard/lenovo/l520/romstage.c b/src/mainboard/lenovo/l520/early_init.c
index af73537f24..d63a667737 100644
--- a/src/mainboard/lenovo/l520/romstage.c
+++ b/src/mainboard/lenovo/l520/early_init.c
@@ -39,10 +39,6 @@ const struct southbridge_usb_port mainboard_usb_ports[] = {
{ 1, 0, -1 },
};
-void mainboard_config_superio(void)
-{
-}
-
void mainboard_get_spd(spd_raw_data *spd, bool id_only)
{
read_spd(&spd[0], 0x50, id_only);
diff --git a/src/mainboard/lenovo/s230u/Makefile.inc b/src/mainboard/lenovo/s230u/Makefile.inc
index aa4c4f879d..12e77097e4 100644
--- a/src/mainboard/lenovo/s230u/Makefile.inc
+++ b/src/mainboard/lenovo/s230u/Makefile.inc
@@ -16,3 +16,5 @@ SPD_SOURCES += samsung_2gb # 0b0111
SPD_SOURCES += hynix_2gb # 0b1000
ramstage-$(CONFIG_MAINBOARD_USE_LIBGFXINIT) += gma-mainboard.ads
+bootblock-y += early_init.c
+romstage-y += early_init.c
diff --git a/src/mainboard/lenovo/s230u/romstage.c b/src/mainboard/lenovo/s230u/early_init.c
index 0552170668..6bc92b2cac 100644
--- a/src/mainboard/lenovo/s230u/romstage.c
+++ b/src/mainboard/lenovo/s230u/early_init.c
@@ -64,10 +64,6 @@ const struct southbridge_usb_port mainboard_usb_ports[] = {
{ 1, 1, 6 },
};
-void mainboard_config_superio(void)
-{
-}
-
static const char *mainboard_spd_names[9] = {
"ELPIDA 4GB",
"SAMSUNG 4GB",
diff --git a/src/mainboard/lenovo/t420/Makefile.inc b/src/mainboard/lenovo/t420/Makefile.inc
index 3914f51561..080812e44a 100644
--- a/src/mainboard/lenovo/t420/Makefile.inc
+++ b/src/mainboard/lenovo/t420/Makefile.inc
@@ -18,3 +18,5 @@ bootblock-y += gpio.c
romstage-y += gpio.c
ramstage-$(CONFIG_MAINBOARD_USE_LIBGFXINIT) += gma-mainboard.ads
+bootblock-y += early_init.c
+romstage-y += early_init.c
diff --git a/src/mainboard/lenovo/t420/romstage.c b/src/mainboard/lenovo/t420/early_init.c
index e04803f165..50e62586a5 100644
--- a/src/mainboard/lenovo/t420/romstage.c
+++ b/src/mainboard/lenovo/t420/early_init.c
@@ -82,7 +82,3 @@ void mainboard_early_init(int s3resume)
{
hybrid_graphics_init();
}
-
-void mainboard_config_superio(void)
-{
-}
diff --git a/src/mainboard/lenovo/t420s/Makefile.inc b/src/mainboard/lenovo/t420s/Makefile.inc
index 3914f51561..080812e44a 100644
--- a/src/mainboard/lenovo/t420s/Makefile.inc
+++ b/src/mainboard/lenovo/t420s/Makefile.inc
@@ -18,3 +18,5 @@ bootblock-y += gpio.c
romstage-y += gpio.c
ramstage-$(CONFIG_MAINBOARD_USE_LIBGFXINIT) += gma-mainboard.ads
+bootblock-y += early_init.c
+romstage-y += early_init.c
diff --git a/src/mainboard/lenovo/t420s/romstage.c b/src/mainboard/lenovo/t420s/early_init.c
index 764997297e..1357a0ae52 100644
--- a/src/mainboard/lenovo/t420s/romstage.c
+++ b/src/mainboard/lenovo/t420s/early_init.c
@@ -81,7 +81,3 @@ void mainboard_early_init(int s3resume)
{
hybrid_graphics_init();
}
-
-void mainboard_config_superio(void)
-{
-}
diff --git a/src/mainboard/lenovo/t430/Makefile.inc b/src/mainboard/lenovo/t430/Makefile.inc
index 409d4842a9..0f49600c7d 100644
--- a/src/mainboard/lenovo/t430/Makefile.inc
+++ b/src/mainboard/lenovo/t430/Makefile.inc
@@ -1,6 +1,7 @@
-romstage-y += romstage.c
bootblock-y += gpio.c
romstage-y += gpio.c
smm-y += smihandler.c
ramstage-$(CONFIG_MAINBOARD_USE_LIBGFXINIT) += gma-mainboard.ads
+bootblock-y += early_init.c
+romstage-y += early_init.c
diff --git a/src/mainboard/lenovo/t430/romstage.c b/src/mainboard/lenovo/t430/early_init.c
index f1e724be47..74c8b60883 100644
--- a/src/mainboard/lenovo/t430/romstage.c
+++ b/src/mainboard/lenovo/t430/early_init.c
@@ -72,10 +72,6 @@ void mainboard_early_init(int s3resume)
hybrid_graphics_init();
}
-void mainboard_config_superio(void)
-{
-}
-
void mainboard_get_spd(spd_raw_data *spd, bool id_only)
{
read_spd(&spd[0], 0x50, id_only);
diff --git a/src/mainboard/lenovo/t430s/Makefile.inc b/src/mainboard/lenovo/t430s/Makefile.inc
index 425047fe44..d0e69a838f 100644
--- a/src/mainboard/lenovo/t430s/Makefile.inc
+++ b/src/mainboard/lenovo/t430s/Makefile.inc
@@ -20,3 +20,5 @@ romstage-y += variants/$(VARIANT_DIR)/romstage.c
ramstage-y += variants/$(VARIANT_DIR)/hda_verb.c
ramstage-$(CONFIG_MAINBOARD_USE_LIBGFXINIT) += gma-mainboard.ads
subdirs-$(CONFIG_BOARD_LENOVO_T431S) += variants/$(VARIANT_DIR)/spd
+bootblock-y += early_init.c
+romstage-y += early_init.c
diff --git a/src/mainboard/lenovo/t430s/romstage.c b/src/mainboard/lenovo/t430s/early_init.c
index 6503c9a920..0757c06fbd 100644
--- a/src/mainboard/lenovo/t430s/romstage.c
+++ b/src/mainboard/lenovo/t430s/early_init.c
@@ -23,7 +23,3 @@ void mainboard_pch_lpc_setup(void)
{
pci_write_config32(PCH_LPC_DEV, ETR3, 0x10000);
}
-
-void mainboard_config_superio(void)
-{
-}
diff --git a/src/mainboard/lenovo/t520/Makefile.inc b/src/mainboard/lenovo/t520/Makefile.inc
index 5310bbf530..8f3c154418 100644
--- a/src/mainboard/lenovo/t520/Makefile.inc
+++ b/src/mainboard/lenovo/t520/Makefile.inc
@@ -18,3 +18,5 @@ bootblock-y += variants/$(VARIANT_DIR)/gpio.c
romstage-y += variants/$(VARIANT_DIR)/gpio.c
romstage-y += variants/$(VARIANT_DIR)/romstage.c
ramstage-$(CONFIG_MAINBOARD_USE_LIBGFXINIT) += gma-mainboard.ads
+bootblock-y += early_init.c
+romstage-y += early_init.c
diff --git a/src/mainboard/lenovo/t520/romstage.c b/src/mainboard/lenovo/t520/early_init.c
index caf54bd5df..cfa69b7082 100644
--- a/src/mainboard/lenovo/t520/romstage.c
+++ b/src/mainboard/lenovo/t520/early_init.c
@@ -77,7 +77,3 @@ void mainboard_early_init(int s3resume)
{
hybrid_graphics_init();
}
-
-void mainboard_config_superio(void)
-{
-}
diff --git a/src/mainboard/lenovo/t530/Makefile.inc b/src/mainboard/lenovo/t530/Makefile.inc
index 5310bbf530..8f3c154418 100644
--- a/src/mainboard/lenovo/t530/Makefile.inc
+++ b/src/mainboard/lenovo/t530/Makefile.inc
@@ -18,3 +18,5 @@ bootblock-y += variants/$(VARIANT_DIR)/gpio.c
romstage-y += variants/$(VARIANT_DIR)/gpio.c
romstage-y += variants/$(VARIANT_DIR)/romstage.c
ramstage-$(CONFIG_MAINBOARD_USE_LIBGFXINIT) += gma-mainboard.ads
+bootblock-y += early_init.c
+romstage-y += early_init.c
diff --git a/src/mainboard/lenovo/t530/romstage.c b/src/mainboard/lenovo/t530/early_init.c
index 85c3090bb5..34c61e4e49 100644
--- a/src/mainboard/lenovo/t530/romstage.c
+++ b/src/mainboard/lenovo/t530/early_init.c
@@ -60,7 +60,3 @@ void mainboard_early_init(int s3resume)
{
hybrid_graphics_init();
}
-
-void mainboard_config_superio(void)
-{
-}
diff --git a/src/mainboard/lenovo/x131e/Makefile.inc b/src/mainboard/lenovo/x131e/Makefile.inc
index 4fbf73bbd3..1d258758be 100644
--- a/src/mainboard/lenovo/x131e/Makefile.inc
+++ b/src/mainboard/lenovo/x131e/Makefile.inc
@@ -17,3 +17,5 @@ bootblock-y += gpio.c
romstage-y += gpio.c
ramstage-$(CONFIG_MAINBOARD_USE_LIBGFXINIT) += gma-mainboard.ads
+bootblock-y += early_init.c
+romstage-y += early_init.c
diff --git a/src/mainboard/lenovo/x131e/romstage.c b/src/mainboard/lenovo/x131e/early_init.c
index 45d6b88099..fe9fec0cb6 100644
--- a/src/mainboard/lenovo/x131e/romstage.c
+++ b/src/mainboard/lenovo/x131e/early_init.c
@@ -42,7 +42,3 @@ void mainboard_get_spd(spd_raw_data *spd, bool id_only)
read_spd(&spd[0], 0x50, id_only);
read_spd(&spd[2], 0x52, id_only);
}
-
-void mainboard_config_superio(void)
-{
-}
diff --git a/src/mainboard/lenovo/x1_carbon_gen1/Makefile.inc b/src/mainboard/lenovo/x1_carbon_gen1/Makefile.inc
index 8ce77fc77d..f6331a61d1 100644
--- a/src/mainboard/lenovo/x1_carbon_gen1/Makefile.inc
+++ b/src/mainboard/lenovo/x1_carbon_gen1/Makefile.inc
@@ -20,3 +20,5 @@ bootblock-y += gpio.c
romstage-y += gpio.c
ramstage-$(CONFIG_MAINBOARD_USE_LIBGFXINIT) += gma-mainboard.ads
+bootblock-y += early_init.c
+romstage-y += early_init.c
diff --git a/src/mainboard/lenovo/x1_carbon_gen1/romstage.c b/src/mainboard/lenovo/x1_carbon_gen1/early_init.c
index 1f027ffab8..c70b21d36b 100644
--- a/src/mainboard/lenovo/x1_carbon_gen1/romstage.c
+++ b/src/mainboard/lenovo/x1_carbon_gen1/early_init.c
@@ -99,7 +99,3 @@ void mainboard_get_spd(spd_raw_data *spd, bool id_only)
memcpy(&spd[0], memory, 256);
memcpy(&spd[2], memory, 256);
}
-
-void mainboard_config_superio(void)
-{
-}
diff --git a/src/mainboard/lenovo/x220/Makefile.inc b/src/mainboard/lenovo/x220/Makefile.inc
index c0ba457c57..4363770d28 100644
--- a/src/mainboard/lenovo/x220/Makefile.inc
+++ b/src/mainboard/lenovo/x220/Makefile.inc
@@ -19,3 +19,5 @@ romstage-y += variants/$(VARIANT_DIR)/gpio.c
romstage-y += variants/$(VARIANT_DIR)/romstage.c
ramstage-$(CONFIG_MAINBOARD_USE_LIBGFXINIT) += gma-mainboard.ads
+bootblock-y += early_init.c
+romstage-y += early_init.c
diff --git a/src/mainboard/lenovo/x220/romstage.c b/src/mainboard/lenovo/x220/early_init.c
index 72dd8dddca..8ee807cb5d 100644
--- a/src/mainboard/lenovo/x220/romstage.c
+++ b/src/mainboard/lenovo/x220/early_init.c
@@ -87,10 +87,6 @@ void mainboard_get_spd(spd_raw_data *spd, bool id_only)
read_spd (&spd[2], 0x51, id_only);
}
-void mainboard_config_superio(void)
-{
-}
-
int mainboard_should_reset_usb(int s3resume)
{
return !s3resume;
diff --git a/src/mainboard/lenovo/x230/Makefile.inc b/src/mainboard/lenovo/x230/Makefile.inc
index 3914f51561..080812e44a 100644
--- a/src/mainboard/lenovo/x230/Makefile.inc
+++ b/src/mainboard/lenovo/x230/Makefile.inc
@@ -18,3 +18,5 @@ bootblock-y += gpio.c
romstage-y += gpio.c
ramstage-$(CONFIG_MAINBOARD_USE_LIBGFXINIT) += gma-mainboard.ads
+bootblock-y += early_init.c
+romstage-y += early_init.c
diff --git a/src/mainboard/lenovo/x230/romstage.c b/src/mainboard/lenovo/x230/early_init.c
index 56f5a90670..b737e7de83 100644
--- a/src/mainboard/lenovo/x230/romstage.c
+++ b/src/mainboard/lenovo/x230/early_init.c
@@ -51,7 +51,3 @@ void mainboard_get_spd(spd_raw_data *spd, bool id_only)
read_spd (&spd[0], 0x50, id_only);
read_spd (&spd[2], 0x51, id_only);
}
-
-void mainboard_config_superio(void)
-{
-}