Showing with 16 additions and 2 deletions.
  1. +6 −1 CHANGELOG.md
  2. +4 −0 README.md
  3. +6 −1 sortbootorder.c
7 changes: 6 additions & 1 deletion CHANGELOG.md
Expand Up @@ -7,6 +7,10 @@ Releases 4.5.x and 4.6.x are based on mainline support submitted in
[this gerrit ref](https://review.coreboot.org/#/c/14138/).

## [Unreleased]
## [v4.6.20] - 2020-08-27
### Fixed
- minor build fix for mainline coreboot

## [v4.6.19] - 2020-07-29
### Added
- new option in menu to allow reverse PCI addressing order
Expand Down Expand Up @@ -196,7 +200,8 @@ initial commit based on [coreboot_140908](http://pcengines.ch/tmp/coreboot_14090
### Fixed
- used proper way to access extended SPI registers

[Unreleased]: https://github.com/pcengines/sortbootorder/compare/v4.6.19...master
[Unreleased]: https://github.com/pcengines/sortbootorder/compare/v4.6.20...master
[v4.6.20]: https://github.com/pcengines/sortbootorder/compare/v4.6.19...v4.6.20
[v4.6.19]: https://github.com/pcengines/sortbootorder/compare/v4.6.18...v4.6.19
[v4.6.18]: https://github.com/pcengines/sortbootorder/compare/v4.6.17...v4.6.18
[v4.6.17]: https://github.com/pcengines/sortbootorder/compare/v4.6.16...v4.6.17
Expand Down
4 changes: 4 additions & 0 deletions README.md
Expand Up @@ -90,6 +90,10 @@ key.
**watchdog later. Too low value may result in a reset loop!**
* `j SD 3.0 mode` - enable SD controller in 3.0 mode to allow achieving full
speeds with UHS-I SD cards
* `g Reverse order of PCI addresses` - When enabled, the PCIe devices are
ordered as follows: NICs, mPCIe1, mPCIe2. In such way the PCI enumeration is
permanent for NICs regardless of mPCIe WiFi module presence or faulty detection.
More information in [documentation](https://github.com/pcengines/apu2-documentation/blob/master/docs/order_of_PCI_addresses.md)
* `v IOMMU` - enables/disables input–output memory management unit
* `u PCIe power management features` - enables/disables PCI Express power
management features like: ASPM, Common Clock, Clock Power Management (if
Expand Down
7 changes: 6 additions & 1 deletion sortbootorder.c
Expand Up @@ -18,6 +18,7 @@

#include <libpayload.h>
#include <cbfs.h>
#include <coreboot_tables.h>
#include <curses.h>
#include <flash_access.h>
#include <sec_reg_menu.h>
Expand Down Expand Up @@ -148,9 +149,13 @@ int main(void) {
usb_initialize();
noecho(); /* don't echo keystrokes */
#endif

#ifndef COREBOOT_LEGACY
struct cb_mainboard* board = (struct cb_mainboard *)lib_sysinfo.cb_mainboard;
u8 *apu_id_string = board->strings + board->part_number_idx;
#else
u8 *apu_id_string = lib_sysinfo.mainboard->strings +
lib_sysinfo.mainboard->part_number_idx;
#endif
printf("\n### PC Engines %s setup %s ###\n", apu_id_string,
SORTBOOTORDER_VER);

Expand Down