-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Signed-off-by: Piotr Król <[email protected]>
- Loading branch information
1 parent
f287934
commit 19dc27a
Showing
6 changed files
with
30 additions
and
30 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -8,41 +8,41 @@ Content-Transfer-Encoding: 8bit | |
|
||
Signed-off-by: Piotr Król <[email protected]> | ||
diff --git a/configs/config.pcengines_seabios_apu2 b/configs/config.pcengines_seabios_apu2 | ||
index 5157ec1194e5..eb8735ef36fe 100644 | ||
index 7058b2c7cc5e..a572756d69ca 100644 | ||
--- a/configs/config.pcengines_seabios_apu2 | ||
+++ b/configs/config.pcengines_seabios_apu2 | ||
@@ -17,6 +17,8 @@ CONFIG_POST_IO_PORT=0x80 | ||
CONFIG_PXE=y | ||
CONFIG_PXE_ROM_ID="8086,157b" | ||
CONFIG_SEABIOS_DEBUG_LEVEL=0 | ||
+CONFIG_SEABIOS_REVISION=y | ||
+CONFIG_SEABIOS_REVISION_ID="5b5fd6ff90bea3a2b766bdda9ae91d28b86b1abf" | ||
+CONFIG_SEABIOS_REVISION_ID="8217fc68664a04ff4a86745ab0e9aa50aea06341" | ||
CONFIG_SEABIOS_SERCON_PORT_ADDR=0x3f8 | ||
CONFIG_SUBSYSTEM_DEVICE_ID=0x0000 | ||
CONFIG_SUBSYSTEM_VENDOR_ID=0x0000 | ||
diff --git a/configs/config.pcengines_seabios_apu3 b/configs/config.pcengines_seabios_apu3 | ||
index b5c533e7c162..6452e1d71bd6 100644 | ||
index 91758066ac02..ba2770cff231 100644 | ||
--- a/configs/config.pcengines_seabios_apu3 | ||
+++ b/configs/config.pcengines_seabios_apu3 | ||
@@ -18,6 +18,8 @@ CONFIG_POST_IO_PORT=0x80 | ||
CONFIG_PXE=y | ||
CONFIG_PXE_ROM_ID="8086,1539" | ||
CONFIG_SEABIOS_DEBUG_LEVEL=0 | ||
+CONFIG_SEABIOS_REVISION=y | ||
+CONFIG_SEABIOS_REVISION_ID="5b5fd6ff90bea3a2b766bdda9ae91d28b86b1abf" | ||
+CONFIG_SEABIOS_REVISION_ID="8217fc68664a04ff4a86745ab0e9aa50aea06341" | ||
CONFIG_SEABIOS_SERCON_PORT_ADDR=0x3f8 | ||
CONFIG_SUBSYSTEM_DEVICE_ID=0x0000 | ||
CONFIG_SUBSYSTEM_VENDOR_ID=0x0000 | ||
diff --git a/configs/config.pcengines_seabios_apu4 b/configs/config.pcengines_seabios_apu4 | ||
index ae119658be3e..bcd6e89cc628 100644 | ||
index c1ad2636f14e..105d3d47cf8d 100644 | ||
--- a/configs/config.pcengines_seabios_apu4 | ||
+++ b/configs/config.pcengines_seabios_apu4 | ||
@@ -18,6 +18,8 @@ CONFIG_POST_IO_PORT=0x80 | ||
CONFIG_PXE=y | ||
CONFIG_PXE_ROM_ID="8086,1539" | ||
CONFIG_SEABIOS_DEBUG_LEVEL=0 | ||
+CONFIG_SEABIOS_REVISION=y | ||
+CONFIG_SEABIOS_REVISION_ID="5b5fd6ff90bea3a2b766bdda9ae91d28b86b1abf" | ||
+CONFIG_SEABIOS_REVISION_ID="8217fc68664a04ff4a86745ab0e9aa50aea06341" | ||
CONFIG_SEABIOS_SERCON_PORT_ADDR=0x3f8 | ||
CONFIG_SUBSYSTEM_DEVICE_ID=0x0000 | ||
CONFIG_SUBSYSTEM_VENDOR_ID=0x0000 | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -8,12 +8,12 @@ Content-Transfer-Encoding: 8bit | |
|
||
Signed-off-by: Piotr Król <[email protected]> | ||
diff --git a/configs/config.pcengines_seabios_apu2 b/configs/config.pcengines_seabios_apu2 | ||
index eb8735ef36fe..cf5caa88d8b0 100644 | ||
index a572756d69ca..1f7461d6080f 100644 | ||
--- a/configs/config.pcengines_seabios_apu2 | ||
+++ b/configs/config.pcengines_seabios_apu2 | ||
@@ -20,6 +20,9 @@ CONFIG_SEABIOS_DEBUG_LEVEL=0 | ||
CONFIG_SEABIOS_REVISION=y | ||
CONFIG_SEABIOS_REVISION_ID="5b5fd6ff90bea3a2b766bdda9ae91d28b86b1abf" | ||
CONFIG_SEABIOS_REVISION_ID="8217fc68664a04ff4a86745ab0e9aa50aea06341" | ||
CONFIG_SEABIOS_SERCON_PORT_ADDR=0x3f8 | ||
+CONFIG_SORTBOOTORDER_REVISION=y | ||
+CONFIG_SORTBOOTORDER_REVISION_ID="95692853947e0b36e4d7fb57bf6a951baa9f78c5" | ||
|
@@ -22,26 +22,26 @@ index eb8735ef36fe..cf5caa88d8b0 100644 | |
CONFIG_SUBSYSTEM_VENDOR_ID=0x0000 | ||
CONFIG_TPM2=y | ||
diff --git a/configs/config.pcengines_seabios_apu3 b/configs/config.pcengines_seabios_apu3 | ||
index 6452e1d71bd6..cf623de92bec 100644 | ||
index ba2770cff231..da16cf86a77b 100644 | ||
--- a/configs/config.pcengines_seabios_apu3 | ||
+++ b/configs/config.pcengines_seabios_apu3 | ||
@@ -20,6 +20,9 @@ CONFIG_PXE_ROM_ID="8086,1539" | ||
CONFIG_SEABIOS_DEBUG_LEVEL=0 | ||
CONFIG_SEABIOS_REVISION=y | ||
CONFIG_SEABIOS_REVISION_ID="5b5fd6ff90bea3a2b766bdda9ae91d28b86b1abf" | ||
CONFIG_SEABIOS_REVISION_ID="8217fc68664a04ff4a86745ab0e9aa50aea06341" | ||
+CONFIG_SORTBOOTORDER_REVISION=y | ||
+CONFIG_SORTBOOTORDER_REVISION_ID="95692853947e0b36e4d7fb57bf6a951baa9f78c5" | ||
+CONFIG_SORTBOOTORDER_SECONDARY_PAYLOAD=y | ||
CONFIG_SEABIOS_SERCON_PORT_ADDR=0x3f8 | ||
CONFIG_SUBSYSTEM_DEVICE_ID=0x0000 | ||
CONFIG_SUBSYSTEM_VENDOR_ID=0x0000 | ||
diff --git a/configs/config.pcengines_seabios_apu4 b/configs/config.pcengines_seabios_apu4 | ||
index bcd6e89cc628..e7966f223a51 100644 | ||
index 105d3d47cf8d..64a8c2968c6a 100644 | ||
--- a/configs/config.pcengines_seabios_apu4 | ||
+++ b/configs/config.pcengines_seabios_apu4 | ||
@@ -21,6 +21,9 @@ CONFIG_SEABIOS_DEBUG_LEVEL=0 | ||
CONFIG_SEABIOS_REVISION=y | ||
CONFIG_SEABIOS_REVISION_ID="5b5fd6ff90bea3a2b766bdda9ae91d28b86b1abf" | ||
CONFIG_SEABIOS_REVISION_ID="8217fc68664a04ff4a86745ab0e9aa50aea06341" | ||
CONFIG_SEABIOS_SERCON_PORT_ADDR=0x3f8 | ||
+CONFIG_SORTBOOTORDER_REVISION=y | ||
+CONFIG_SORTBOOTORDER_REVISION_ID="95692853947e0b36e4d7fb57bf6a951baa9f78c5" | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -8,7 +8,7 @@ Content-Transfer-Encoding: 8bit | |
|
||
Signed-off-by: Piotr Król <[email protected]> | ||
diff --git a/configs/config.pcengines_seabios_apu2 b/configs/config.pcengines_seabios_apu2 | ||
index b0a584ebc8e8..6f76ada5c6df 100644 | ||
index 1f7461d6080f..8ef64b02e93b 100644 | ||
--- a/configs/config.pcengines_seabios_apu2 | ||
+++ b/configs/config.pcengines_seabios_apu2 | ||
@@ -16,6 +16,7 @@ CONFIG_NO_GFX_INIT=y | ||
|
@@ -18,9 +18,9 @@ index b0a584ebc8e8..6f76ada5c6df 100644 | |
+CONFIG_SEABIOS_BOOTORDER_FILE="$(top)/src/mainboard/$(MAINBOARDDIR)/variants/$(CONFIG_VARIANT_DIR)/bootorder" | ||
CONFIG_SEABIOS_DEBUG_LEVEL=0 | ||
CONFIG_SEABIOS_REVISION=y | ||
CONFIG_SEABIOS_REVISION_ID="5b5fd6ff90bea3a2b766bdda9ae91d28b86b1abf" | ||
CONFIG_SEABIOS_REVISION_ID="8217fc68664a04ff4a86745ab0e9aa50aea06341" | ||
diff --git a/configs/config.pcengines_seabios_apu3 b/configs/config.pcengines_seabios_apu3 | ||
index 70bad236fd81..3ddebc871cde 100644 | ||
index da16cf86a77b..5e2e5df663ba 100644 | ||
--- a/configs/config.pcengines_seabios_apu3 | ||
+++ b/configs/config.pcengines_seabios_apu3 | ||
@@ -17,6 +17,7 @@ CONFIG_NO_GFX_INIT=y | ||
|
@@ -30,9 +30,9 @@ index 70bad236fd81..3ddebc871cde 100644 | |
+CONFIG_SEABIOS_BOOTORDER_FILE="$(top)/src/mainboard/$(MAINBOARDDIR)/variants/$(CONFIG_VARIANT_DIR)/bootorder" | ||
CONFIG_SEABIOS_DEBUG_LEVEL=0 | ||
CONFIG_SEABIOS_REVISION=y | ||
CONFIG_SEABIOS_REVISION_ID="5b5fd6ff90bea3a2b766bdda9ae91d28b86b1abf" | ||
CONFIG_SEABIOS_REVISION_ID="8217fc68664a04ff4a86745ab0e9aa50aea06341" | ||
diff --git a/configs/config.pcengines_seabios_apu4 b/configs/config.pcengines_seabios_apu4 | ||
index 102e7e581864..371353ff2e25 100644 | ||
index 64a8c2968c6a..835fa3e50efc 100644 | ||
--- a/configs/config.pcengines_seabios_apu4 | ||
+++ b/configs/config.pcengines_seabios_apu4 | ||
@@ -17,6 +17,7 @@ CONFIG_NO_GFX_INIT=y | ||
|
@@ -42,7 +42,7 @@ index 102e7e581864..371353ff2e25 100644 | |
+CONFIG_SEABIOS_BOOTORDER_FILE="$(top)/src/mainboard/$(MAINBOARDDIR)/variants/$(CONFIG_VARIANT_DIR)/bootorder" | ||
CONFIG_SEABIOS_DEBUG_LEVEL=0 | ||
CONFIG_SEABIOS_REVISION=y | ||
CONFIG_SEABIOS_REVISION_ID="5b5fd6ff90bea3a2b766bdda9ae91d28b86b1abf" | ||
CONFIG_SEABIOS_REVISION_ID="8217fc68664a04ff4a86745ab0e9aa50aea06341" | ||
diff --git a/src/mainboard/pcengines/apu2/variants/apu3/bootorder b/src/mainboard/pcengines/apu2/variants/apu3/bootorder | ||
new file mode 100644 | ||
index 0000000000000000000000000000000000000000..51b0fea1741238d986b4b47ac678fb344312d04b | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -9,7 +9,7 @@ Content-Transfer-Encoding: 8bit | |
Signed-off-by: Michał Żygowski <[email protected]> | ||
diff --git a/configs/config.pcengines_seabios_apu6 b/configs/config.pcengines_seabios_apu6 | ||
new file mode 100644 | ||
index 000000000000..81fd105965be | ||
index 000000000000..8796bebf4685 | ||
--- /dev/null | ||
+++ b/configs/config.pcengines_seabios_apu6 | ||
@@ -0,0 +1,34 @@ | ||
|
@@ -38,7 +38,7 @@ index 000000000000..81fd105965be | |
+CONFIG_SEABIOS_BOOTORDER_FILE="$(top)/src/mainboard/$(MAINBOARDDIR)/variants/$(CONFIG_VARIANT_DIR)/bootorder" | ||
+CONFIG_SEABIOS_DEBUG_LEVEL=0 | ||
+CONFIG_SEABIOS_REVISION=y | ||
+CONFIG_SEABIOS_REVISION_ID="5b5fd6ff90bea3a2b766bdda9ae91d28b86b1abf" | ||
+CONFIG_SEABIOS_REVISION_ID="8217fc68664a04ff4a86745ab0e9aa50aea06341" | ||
+CONFIG_SEABIOS_SERCON_PORT_ADDR=0x3f8 | ||
+CONFIG_SORTBOOTORDER_REVISION=y | ||
+CONFIG_SORTBOOTORDER_REVISION_ID="95692853947e0b36e4d7fb57bf6a951baa9f78c5" | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -14,7 +14,7 @@ pcengines_apu4, pcengines_apu5, and pcengines_apu6. A new file | |
|
||
Signed-off-by: Michał Żygowski <[email protected]> | ||
diff --git a/configs/config.pcengines_seabios_apu2 b/configs/config.pcengines_seabios_apu2 | ||
index c097cc39a55b..0f11793d88f6 100644 | ||
index fe3a9b3c2f6f..09bd18855197 100644 | ||
--- a/configs/config.pcengines_seabios_apu2 | ||
+++ b/configs/config.pcengines_seabios_apu2 | ||
@@ -20,6 +20,7 @@ CONFIG_POST_IO_PORT=0x80 | ||
|
@@ -24,9 +24,9 @@ index c097cc39a55b..0f11793d88f6 100644 | |
+CONFIG_SEABIOS_BOOTORDER_IN_FMAP=y | ||
CONFIG_SEABIOS_DEBUG_LEVEL=0 | ||
CONFIG_SEABIOS_REVISION=y | ||
CONFIG_SEABIOS_REVISION_ID="5b5fd6ff90bea3a2b766bdda9ae91d28b86b1abf" | ||
CONFIG_SEABIOS_REVISION_ID="8217fc68664a04ff4a86745ab0e9aa50aea06341" | ||
diff --git a/configs/config.pcengines_seabios_apu3 b/configs/config.pcengines_seabios_apu3 | ||
index 2b6b3e84448a..c39a1998f549 100644 | ||
index 8dc30fd9574c..0faaa445bb15 100644 | ||
--- a/configs/config.pcengines_seabios_apu3 | ||
+++ b/configs/config.pcengines_seabios_apu3 | ||
@@ -21,6 +21,7 @@ CONFIG_POST_IO_PORT=0x80 | ||
|
@@ -36,9 +36,9 @@ index 2b6b3e84448a..c39a1998f549 100644 | |
+CONFIG_SEABIOS_BOOTORDER_IN_FMAP=y | ||
CONFIG_SEABIOS_DEBUG_LEVEL=0 | ||
CONFIG_SEABIOS_REVISION=y | ||
CONFIG_SEABIOS_REVISION_ID="5b5fd6ff90bea3a2b766bdda9ae91d28b86b1abf" | ||
CONFIG_SEABIOS_REVISION_ID="8217fc68664a04ff4a86745ab0e9aa50aea06341" | ||
diff --git a/configs/config.pcengines_seabios_apu4 b/configs/config.pcengines_seabios_apu4 | ||
index 681018898c54..791db54094f7 100644 | ||
index 5960e6416835..7ac364122d3d 100644 | ||
--- a/configs/config.pcengines_seabios_apu4 | ||
+++ b/configs/config.pcengines_seabios_apu4 | ||
@@ -21,6 +21,7 @@ CONFIG_POST_IO_PORT=0x80 | ||
|
@@ -48,9 +48,9 @@ index 681018898c54..791db54094f7 100644 | |
+CONFIG_SEABIOS_BOOTORDER_IN_FMAP=y | ||
CONFIG_SEABIOS_DEBUG_LEVEL=0 | ||
CONFIG_SEABIOS_REVISION=y | ||
CONFIG_SEABIOS_REVISION_ID="5b5fd6ff90bea3a2b766bdda9ae91d28b86b1abf" | ||
CONFIG_SEABIOS_REVISION_ID="8217fc68664a04ff4a86745ab0e9aa50aea06341" | ||
diff --git a/configs/config.pcengines_seabios_apu6 b/configs/config.pcengines_seabios_apu6 | ||
index 81fd105965be..fcd611e30ebb 100644 | ||
index 8796bebf4685..387b68b62d11 100644 | ||
--- a/configs/config.pcengines_seabios_apu6 | ||
+++ b/configs/config.pcengines_seabios_apu6 | ||
@@ -21,6 +21,7 @@ CONFIG_POST_IO_PORT=0x80 | ||
|
@@ -60,7 +60,7 @@ index 81fd105965be..fcd611e30ebb 100644 | |
+CONFIG_SEABIOS_BOOTORDER_IN_FMAP=y | ||
CONFIG_SEABIOS_DEBUG_LEVEL=0 | ||
CONFIG_SEABIOS_REVISION=y | ||
CONFIG_SEABIOS_REVISION_ID="5b5fd6ff90bea3a2b766bdda9ae91d28b86b1abf" | ||
CONFIG_SEABIOS_REVISION_ID="8217fc68664a04ff4a86745ab0e9aa50aea06341" | ||
diff --git a/src/mainboard/pcengines/apu2/Kconfig b/src/mainboard/pcengines/apu2/Kconfig | ||
index fbf29a452d8f..0561dcdfa90c 100644 | ||
--- a/src/mainboard/pcengines/apu2/Kconfig | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters