summaryrefslogtreecommitdiff
path: root/src/superio/winbond
diff options
context:
space:
mode:
authorArthur Heymans <arthur@aheymans.xyz>2019-01-04 16:11:50 +0100
committerNico Huber <nico.h@gmx.de>2019-01-06 14:02:58 +0000
commit085a2268083cfe1d22f696c9070726dcf2dc160f (patch)
tree7ee20eb15d7c6ad9dfa66f2895573af5e90d3fc5 /src/superio/winbond
parent89393d633d70b9393af5b1c74af95c5e24bd99b0 (diff)
superio/*: Link early initialization into bootblock
This allows to set up the SuperIO in the C_ENVIRONMENT_BOOTBLOCK bootblocks. It is likely unnecessary to do this in verstage. This also renames COMMON_ROMSTAGE to COMMON_PRE_RAM. Change-Id: I3d999611baa1e79c79fe6b1f01822ebaa5f85daf Signed-off-by: Arthur Heymans <arthur@aheymans.xyz> Reviewed-on: https://review.coreboot.org/c/30672 Tested-by: build bot (Jenkins) <no-reply@coreboot.org> Reviewed-by: Kyösti Mälkki <kyosti.malkki@gmail.com> Reviewed-by: Felix Held <felix-coreboot@felixheld.de>
Diffstat (limited to 'src/superio/winbond')
-rw-r--r--src/superio/winbond/Makefile.inc3
-rw-r--r--src/superio/winbond/common/Kconfig2
-rw-r--r--src/superio/winbond/common/winbond.h6
-rw-r--r--src/superio/winbond/w83627dhg/Kconfig2
-rw-r--r--src/superio/winbond/w83627dhg/Makefile.inc1
-rw-r--r--src/superio/winbond/w83627ehg/Kconfig2
-rw-r--r--src/superio/winbond/w83627hf/Kconfig2
-rw-r--r--src/superio/winbond/w83627thg/Kconfig2
-rw-r--r--src/superio/winbond/w83627uhg/Kconfig2
-rw-r--r--src/superio/winbond/w83667hg-a/Kconfig2
-rw-r--r--src/superio/winbond/w83697hf/Kconfig2
-rw-r--r--src/superio/winbond/w83977tf/Kconfig2
-rw-r--r--src/superio/winbond/wpcd376i/Kconfig2
-rw-r--r--src/superio/winbond/wpcd376i/Makefile.inc1
14 files changed, 17 insertions, 14 deletions
diff --git a/src/superio/winbond/Makefile.inc b/src/superio/winbond/Makefile.inc
index b0b7b8c520..49430815f1 100644
--- a/src/superio/winbond/Makefile.inc
+++ b/src/superio/winbond/Makefile.inc
@@ -14,7 +14,8 @@
##
## include generic winbond pre-ram stage driver
-romstage-$(CONFIG_SUPERIO_WINBOND_COMMON_ROMSTAGE) += common/early_init.c
+bootblock-$(CONFIG_SUPERIO_WINBOND_COMMON_PRE_RAM) += common/early_init.c
+romstage-$(CONFIG_SUPERIO_WINBOND_COMMON_PRE_RAM) += common/early_init.c
subdirs-y += w83627dhg
subdirs-y += w83627ehg
diff --git a/src/superio/winbond/common/Kconfig b/src/superio/winbond/common/Kconfig
index 2303547293..a2f7724dd3 100644
--- a/src/superio/winbond/common/Kconfig
+++ b/src/superio/winbond/common/Kconfig
@@ -16,5 +16,5 @@
# Generic Winbond romstage driver - Just enough UART initialisation code for
# romstage.
-config SUPERIO_WINBOND_COMMON_ROMSTAGE
+config SUPERIO_WINBOND_COMMON_PRE_RAM
bool
diff --git a/src/superio/winbond/common/winbond.h b/src/superio/winbond/common/winbond.h
index e472018bf1..e8b5c259d0 100644
--- a/src/superio/winbond/common/winbond.h
+++ b/src/superio/winbond/common/winbond.h
@@ -14,8 +14,8 @@
* GNU General Public License for more details.
*/
-#ifndef SUPERIO_WINBOND_COMMON_ROMSTAGE_H
-#define SUPERIO_WINBOND_COMMON_ROMSTAGE_H
+#ifndef SUPERIO_WINBOND_COMMON_PRE_RAM_H
+#define SUPERIO_WINBOND_COMMON_PRE_RAM_H
#include <arch/io.h>
#include <stdint.h>
@@ -27,4 +27,4 @@ void winbond_set_clksel_48(pnp_devfn_t dev);
void pnp_enter_conf_state(pnp_devfn_t dev);
void pnp_exit_conf_state(pnp_devfn_t dev);
-#endif /* SUPERIO_WINBOND_COMMON_ROMSTAGE_H */
+#endif /* SUPERIO_WINBOND_COMMON_PRE_RAM_H */
diff --git a/src/superio/winbond/w83627dhg/Kconfig b/src/superio/winbond/w83627dhg/Kconfig
index 46d710a497..9a51943ea9 100644
--- a/src/superio/winbond/w83627dhg/Kconfig
+++ b/src/superio/winbond/w83627dhg/Kconfig
@@ -16,4 +16,4 @@
config SUPERIO_WINBOND_W83627DHG
bool
- select SUPERIO_WINBOND_COMMON_ROMSTAGE
+ select SUPERIO_WINBOND_COMMON_PRE_RAM
diff --git a/src/superio/winbond/w83627dhg/Makefile.inc b/src/superio/winbond/w83627dhg/Makefile.inc
index 7d9dc97bca..4075a41dc7 100644
--- a/src/superio/winbond/w83627dhg/Makefile.inc
+++ b/src/superio/winbond/w83627dhg/Makefile.inc
@@ -15,5 +15,6 @@
## GNU General Public License for more details.
##
+bootblock-$(CONFIG_SUPERIO_WINBOND_W83627DHG) += early_serial.c
romstage-$(CONFIG_SUPERIO_WINBOND_W83627DHG) += early_serial.c
ramstage-$(CONFIG_SUPERIO_WINBOND_W83627DHG) += superio.c
diff --git a/src/superio/winbond/w83627ehg/Kconfig b/src/superio/winbond/w83627ehg/Kconfig
index bce73916b2..a00749164b 100644
--- a/src/superio/winbond/w83627ehg/Kconfig
+++ b/src/superio/winbond/w83627ehg/Kconfig
@@ -16,4 +16,4 @@
config SUPERIO_WINBOND_W83627EHG
bool
- select SUPERIO_WINBOND_COMMON_ROMSTAGE
+ select SUPERIO_WINBOND_COMMON_PRE_RAM
diff --git a/src/superio/winbond/w83627hf/Kconfig b/src/superio/winbond/w83627hf/Kconfig
index a50768a5e8..f0ebb82a63 100644
--- a/src/superio/winbond/w83627hf/Kconfig
+++ b/src/superio/winbond/w83627hf/Kconfig
@@ -16,4 +16,4 @@
config SUPERIO_WINBOND_W83627HF
bool
- select SUPERIO_WINBOND_COMMON_ROMSTAGE
+ select SUPERIO_WINBOND_COMMON_PRE_RAM
diff --git a/src/superio/winbond/w83627thg/Kconfig b/src/superio/winbond/w83627thg/Kconfig
index 163676a247..af54fb8157 100644
--- a/src/superio/winbond/w83627thg/Kconfig
+++ b/src/superio/winbond/w83627thg/Kconfig
@@ -16,4 +16,4 @@
config SUPERIO_WINBOND_W83627THG
bool
- select SUPERIO_WINBOND_COMMON_ROMSTAGE
+ select SUPERIO_WINBOND_COMMON_PRE_RAM
diff --git a/src/superio/winbond/w83627uhg/Kconfig b/src/superio/winbond/w83627uhg/Kconfig
index 45ef282d31..d42987a299 100644
--- a/src/superio/winbond/w83627uhg/Kconfig
+++ b/src/superio/winbond/w83627uhg/Kconfig
@@ -16,4 +16,4 @@
config SUPERIO_WINBOND_W83627UHG
bool
- select SUPERIO_WINBOND_COMMON_ROMSTAGE
+ select SUPERIO_WINBOND_COMMON_PRE_RAM
diff --git a/src/superio/winbond/w83667hg-a/Kconfig b/src/superio/winbond/w83667hg-a/Kconfig
index 74b78c2821..5614023764 100644
--- a/src/superio/winbond/w83667hg-a/Kconfig
+++ b/src/superio/winbond/w83667hg-a/Kconfig
@@ -16,4 +16,4 @@
config SUPERIO_WINBOND_W83667HG_A
bool
- select SUPERIO_WINBOND_COMMON_ROMSTAGE
+ select SUPERIO_WINBOND_COMMON_PRE_RAM
diff --git a/src/superio/winbond/w83697hf/Kconfig b/src/superio/winbond/w83697hf/Kconfig
index 2f1511b28a..6ca03fec59 100644
--- a/src/superio/winbond/w83697hf/Kconfig
+++ b/src/superio/winbond/w83697hf/Kconfig
@@ -16,4 +16,4 @@
config SUPERIO_WINBOND_W83697HF
bool
- select SUPERIO_WINBOND_COMMON_ROMSTAGE
+ select SUPERIO_WINBOND_COMMON_PRE_RAM
diff --git a/src/superio/winbond/w83977tf/Kconfig b/src/superio/winbond/w83977tf/Kconfig
index c814467760..92a24046cd 100644
--- a/src/superio/winbond/w83977tf/Kconfig
+++ b/src/superio/winbond/w83977tf/Kconfig
@@ -16,4 +16,4 @@
config SUPERIO_WINBOND_W83977TF
bool
- select SUPERIO_WINBOND_COMMON_ROMSTAGE
+ select SUPERIO_WINBOND_COMMON_PRE_RAM
diff --git a/src/superio/winbond/wpcd376i/Kconfig b/src/superio/winbond/wpcd376i/Kconfig
index d630836fcf..57cce7bbdc 100644
--- a/src/superio/winbond/wpcd376i/Kconfig
+++ b/src/superio/winbond/wpcd376i/Kconfig
@@ -16,4 +16,4 @@
config SUPERIO_WINBOND_WPCD376I
bool
- select SUPERIO_WINBOND_COMMON_ROMSTAGE
+ select SUPERIO_WINBOND_COMMON_PRE_RAM
diff --git a/src/superio/winbond/wpcd376i/Makefile.inc b/src/superio/winbond/wpcd376i/Makefile.inc
index 402aa32019..cebd175d80 100644
--- a/src/superio/winbond/wpcd376i/Makefile.inc
+++ b/src/superio/winbond/wpcd376i/Makefile.inc
@@ -15,5 +15,6 @@
## GNU General Public License for more details.
##
+bootblock-$(CONFIG_SUPERIO_WINBOND_WPCD376I) += early_serial.c
romstage-$(CONFIG_SUPERIO_WINBOND_WPCD376I) += early_serial.c
ramstage-$(CONFIG_SUPERIO_WINBOND_WPCD376I) += superio.c
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-23 21:32:24 +0000