diff options
| author | Tom Rini <trini@konsulko.com> | 2023-03-27 15:19:57 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2023-03-27 15:19:57 -0400 |
| commit | 605bc145f91d2a28ba2e517cae4e53e255e34b6f (patch) | |
| tree | a8df36d6569d441bc013399ff7dafff07cd36657 /arch/x86 | |
| parent | fde439219ff53a46bdd5dff69e049ccd4be57310 (diff) | |
| parent | 41a88ad529b3943b1e465846eb24fe2c29203e35 (diff) | |
| download | u-boot-605bc145f91d2a28ba2e517cae4e53e255e34b6f.zip u-boot-605bc145f91d2a28ba2e517cae4e53e255e34b6f.tar.gz u-boot-605bc145f91d2a28ba2e517cae4e53e255e34b6f.tar.bz2 | |
Merge branch 'master' into next
Diffstat (limited to 'arch/x86')
| -rw-r--r-- | arch/x86/dts/bayleybay.dts | 2 | ||||
| -rw-r--r-- | arch/x86/dts/baytrail_som-db5800-som-6867.dts | 2 | ||||
| -rw-r--r-- | arch/x86/dts/conga-qeval20-qa3-e3845.dts | 2 | ||||
| -rw-r--r-- | arch/x86/dts/dfi-bt700.dtsi | 2 | ||||
| -rw-r--r-- | arch/x86/dts/minnowmax.dts | 2 |
5 files changed, 5 insertions, 5 deletions
diff --git a/arch/x86/dts/bayleybay.dts b/arch/x86/dts/bayleybay.dts index b197e4b..59403f4 100644 --- a/arch/x86/dts/bayleybay.dts +++ b/arch/x86/dts/bayleybay.dts @@ -182,7 +182,7 @@ memory-map = <0xff800000 0x00800000>; rw-mrc-cache { label = "rw-mrc-cache"; - reg = <0x006e0000 0x00010000>; + reg = <0x005e0000 0x00010000>; }; }; }; diff --git a/arch/x86/dts/baytrail_som-db5800-som-6867.dts b/arch/x86/dts/baytrail_som-db5800-som-6867.dts index 4380dde..4e12c4a 100644 --- a/arch/x86/dts/baytrail_som-db5800-som-6867.dts +++ b/arch/x86/dts/baytrail_som-db5800-som-6867.dts @@ -206,7 +206,7 @@ memory-map = <0xff800000 0x00800000>; rw-mrc-cache { label = "rw-mrc-cache"; - reg = <0x006f0000 0x00010000>; + reg = <0x005f0000 0x00010000>; }; }; }; diff --git a/arch/x86/dts/conga-qeval20-qa3-e3845.dts b/arch/x86/dts/conga-qeval20-qa3-e3845.dts index 8230639..c6577b3 100644 --- a/arch/x86/dts/conga-qeval20-qa3-e3845.dts +++ b/arch/x86/dts/conga-qeval20-qa3-e3845.dts @@ -193,7 +193,7 @@ memory-map = <0xff800000 0x00800000>; rw-mrc-cache { label = "rw-mrc-cache"; - reg = <0x006f0000 0x00010000>; + reg = <0x005f0000 0x00010000>; }; }; }; diff --git a/arch/x86/dts/dfi-bt700.dtsi b/arch/x86/dts/dfi-bt700.dtsi index 9193e51..868cea4 100644 --- a/arch/x86/dts/dfi-bt700.dtsi +++ b/arch/x86/dts/dfi-bt700.dtsi @@ -204,7 +204,7 @@ memory-map = <0xff800000 0x00800000>; rw-mrc-cache { label = "rw-mrc-cache"; - reg = <0x006f0000 0x00010000>; + reg = <0x005f0000 0x00010000>; }; }; }; diff --git a/arch/x86/dts/minnowmax.dts b/arch/x86/dts/minnowmax.dts index 1182b4b..f44b9bb 100644 --- a/arch/x86/dts/minnowmax.dts +++ b/arch/x86/dts/minnowmax.dts @@ -206,7 +206,7 @@ memory-map = <0xff800000 0x00800000>; rw-mrc-cache { label = "rw-mrc-cache"; - reg = <0x006f0000 0x00010000>; + reg = <0x005f0000 0x00010000>; }; }; }; |