diff options
| author | Tom Rini <trini@konsulko.com> | 2020-11-09 23:00:06 -0500 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2020-11-09 23:00:06 -0500 |
| commit | f36603c7a823308f23d10d443d6cbf6b365c12bd (patch) | |
| tree | ffbb15770d82b9a6e61fe2a1f16a190f0aa5d311 | |
| parent | 1ae955e3a58f46918ef99b0b6c562967ba1bf39e (diff) | |
| parent | ca010674edb289b1f623e83b4529b6d9ae5e5c0d (diff) | |
Merge https://gitlab.denx.de/u-boot/custodians/u-boot-x86
- Avoid using hardcoded number of variable range MTRRs in mtrr_commit()
- coral: Correct max98357 file
- coral: Update smbios tables to latest definition
| -rw-r--r-- | arch/x86/cpu/mtrr.c | 2 | ||||
| -rw-r--r-- | arch/x86/dts/chromebook_coral.dts | 27 | ||||
| -rw-r--r-- | board/google/chromebook_coral/max98357-render-2ch-48khz-24b.dat | bin | 0 -> 116 bytes |
3 files changed, 22 insertions, 7 deletions
diff --git a/arch/x86/cpu/mtrr.c b/arch/x86/cpu/mtrr.c index 5180eb06fc..6f095c53a5 100644 --- a/arch/x86/cpu/mtrr.c +++ b/arch/x86/cpu/mtrr.c @@ -158,7 +158,7 @@ int mtrr_commit(bool do_caches) /* Clear the ones that are unused */ debug("clear\n"); - for (; i < MTRR_MAX_COUNT; i++) + for (; i < mtrr_get_var_count(); i++) wrmsrl(MTRR_PHYS_MASK_MSR(i), 0); debug("close\n"); mtrr_close(&state, do_caches); diff --git a/arch/x86/dts/chromebook_coral.dts b/arch/x86/dts/chromebook_coral.dts index 43f4b33da1..d66e128ae6 100644 --- a/arch/x86/dts/chromebook_coral.dts +++ b/arch/x86/dts/chromebook_coral.dts @@ -55,12 +55,27 @@ write-protect-gpios = <&gpio_nw GPIO_75 GPIO_ACTIVE_HIGH>; phase-enforce-gpios = <&gpio_n GPIO_10 GPIO_ACTIVE_HIGH>; smbios { - manufacturer = "Google"; - product = "Coral"; - version = "rev2"; - serial = "123456789"; - sku = "sku3"; - family = "Google_Coral"; + /* Type 1 table */ + system { + manufacturer = "Google"; + product = "Coral"; + version = "rev2"; + serial = "123456789"; + sku = "sku3"; + family = "Google_Coral"; + }; + + /* Type 2 table */ + baseboard { + manufacturer = "Google"; + product = "Coral"; + asset-tag = "ABC123"; + }; + + /* Type 3 table */ + chassis { + manufacturer = "Google"; + }; }; }; diff --git a/board/google/chromebook_coral/max98357-render-2ch-48khz-24b.dat b/board/google/chromebook_coral/max98357-render-2ch-48khz-24b.dat Binary files differindex e69de29bb2..b0b5b9ba64 100644 --- a/board/google/chromebook_coral/max98357-render-2ch-48khz-24b.dat +++ b/board/google/chromebook_coral/max98357-render-2ch-48khz-24b.dat |