summaryrefslogtreecommitdiff
path: root/src/northbridge
diff options
context:
space:
mode:
Diffstat (limited to 'src/northbridge')
-rw-r--r--src/northbridge/via/vx800/Kconfig8
-rw-r--r--src/northbridge/via/vx800/Makefile.inc1
-rw-r--r--src/northbridge/via/vx800/romstrap.S (renamed from src/northbridge/via/vx800/romstrap.inc)0
-rw-r--r--src/northbridge/via/vx900/Kconfig4
-rw-r--r--src/northbridge/via/vx900/Makefile.inc1
-rw-r--r--src/northbridge/via/vx900/romstrap.S (renamed from src/northbridge/via/vx900/romstrap.inc)0
6 files changed, 2 insertions, 12 deletions
diff --git a/src/northbridge/via/vx800/Kconfig b/src/northbridge/via/vx800/Kconfig
index d7d5349685..9eb84fb14e 100644
--- a/src/northbridge/via/vx800/Kconfig
+++ b/src/northbridge/via/vx800/Kconfig
@@ -3,11 +3,3 @@ config NORTHBRIDGE_VIA_VX800
select HAVE_DEBUG_RAM_SETUP
select HAVE_DEBUG_SMBUS
select LATE_CBMEM_INIT
-
-if NORTHBRIDGE_VIA_VX800
-
-config CHIPSET_BOOTBLOCK_INCLUDE
- string
- default "northbridge/via/vx800/romstrap.inc"
-
-endif
diff --git a/src/northbridge/via/vx800/Makefile.inc b/src/northbridge/via/vx800/Makefile.inc
index 069ea8e1b7..90574eda67 100644
--- a/src/northbridge/via/vx800/Makefile.inc
+++ b/src/northbridge/via/vx800/Makefile.inc
@@ -22,5 +22,6 @@ ramstage-y += lpc.c
ramstage-y += ide.c
bootblock-y += romstrap.ld
+bootblock-y += romstrap.S
endif
diff --git a/src/northbridge/via/vx800/romstrap.inc b/src/northbridge/via/vx800/romstrap.S
index 82b5b4b63b..82b5b4b63b 100644
--- a/src/northbridge/via/vx800/romstrap.inc
+++ b/src/northbridge/via/vx800/romstrap.S
diff --git a/src/northbridge/via/vx900/Kconfig b/src/northbridge/via/vx900/Kconfig
index c7641d14ce..2d2dffaa69 100644
--- a/src/northbridge/via/vx900/Kconfig
+++ b/src/northbridge/via/vx900/Kconfig
@@ -39,8 +39,4 @@ config VGA_BIOS_ID
string
default "1106,7122"
-config CHIPSET_BOOTBLOCK_INCLUDE
- string
- default "northbridge/via/vx900/romstrap.inc"
-
endif
diff --git a/src/northbridge/via/vx900/Makefile.inc b/src/northbridge/via/vx900/Makefile.inc
index 4cac1e7d1f..44f0ae01ce 100644
--- a/src/northbridge/via/vx900/Makefile.inc
+++ b/src/northbridge/via/vx900/Makefile.inc
@@ -44,5 +44,6 @@ ramstage-y += ./../../../drivers/pc80/vga/vga_io.c
bootblock-y += romstrap.ld
+bootblock-y += romstrap.S
endif
diff --git a/src/northbridge/via/vx900/romstrap.inc b/src/northbridge/via/vx900/romstrap.S
index 26c1ee694a..26c1ee694a 100644
--- a/src/northbridge/via/vx900/romstrap.inc
+++ b/src/northbridge/via/vx900/romstrap.S