Message ID | 20230314235955.973727-4-sjg@chromium.org |
---|---|
State | Accepted |
Commit | 1683336094cf8bbc9242df4912291f39ae8b2cae |
Delegated to: | Bin Meng |
Headers | show |
Series | [v3,1/5] x86: minnowmax: Fix up adjustment of CONFIG_TEXT_BASE | expand |
On Wed, Mar 15, 2023 at 8:00 AM Simon Glass <sjg@chromium.org> wrote: > > With recent CONFIG_TEXT_BASE changes, there are inconsistencies between > several settings. > > Adjust CONFIG_SYS_MONITOR_LEN to allow more code space. Move the MRC > cache out of the way too. > > Signed-off-by: Simon Glass <sjg@chromium.org> > Fixes: 5d1c8342aea ("x86: dfi-bt700: Adjust CONFIG_TEXT_BASE") > --- > > Changes in v3: > - Add new patch > > arch/x86/dts/dfi-bt700.dtsi | 2 +- > configs/dfi-bt700-q7x-151_defconfig | 1 + > configs/theadorable-x86-dfi-bt700_defconfig | 1 + > 3 files changed, 3 insertions(+), 1 deletion(-) > Reviewed-by: Bin Meng <bmeng.cn@gmail.com>
On 3/15/23 00:59, Simon Glass wrote: > With recent CONFIG_TEXT_BASE changes, there are inconsistencies between > several settings. > > Adjust CONFIG_SYS_MONITOR_LEN to allow more code space. Move the MRC > cache out of the way too. > > Signed-off-by: Simon Glass <sjg@chromium.org> > Fixes: 5d1c8342aea ("x86: dfi-bt700: Adjust CONFIG_TEXT_BASE") Reviewed-by: Stefan Roese <sr@denx.de> Thanks, Stefan > --- > > Changes in v3: > - Add new patch > > arch/x86/dts/dfi-bt700.dtsi | 2 +- > configs/dfi-bt700-q7x-151_defconfig | 1 + > configs/theadorable-x86-dfi-bt700_defconfig | 1 + > 3 files changed, 3 insertions(+), 1 deletion(-) > > diff --git a/arch/x86/dts/dfi-bt700.dtsi b/arch/x86/dts/dfi-bt700.dtsi > index dff2345d60d0..c077a84574f1 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/configs/dfi-bt700-q7x-151_defconfig b/configs/dfi-bt700-q7x-151_defconfig > index bd8b2e1155d4..a48f7c25134c 100644 > --- a/configs/dfi-bt700-q7x-151_defconfig > +++ b/configs/dfi-bt700-q7x-151_defconfig > @@ -13,6 +13,7 @@ CONFIG_GENERATE_PIRQ_TABLE=y > CONFIG_GENERATE_MP_TABLE=y > CONFIG_HAVE_ACPI_RESUME=y > CONFIG_SEABIOS=y > +CONFIG_SYS_MONITOR_LEN=2097152 > CONFIG_FIT=y > CONFIG_FIT_SIGNATURE=y > CONFIG_BOOTSTAGE=y > diff --git a/configs/theadorable-x86-dfi-bt700_defconfig b/configs/theadorable-x86-dfi-bt700_defconfig > index 39c8a87fbeea..82c348884559 100644 > --- a/configs/theadorable-x86-dfi-bt700_defconfig > +++ b/configs/theadorable-x86-dfi-bt700_defconfig > @@ -15,6 +15,7 @@ CONFIG_GENERATE_PIRQ_TABLE=y > CONFIG_GENERATE_MP_TABLE=y > CONFIG_HAVE_ACPI_RESUME=y > CONFIG_SEABIOS=y > +CONFIG_SYS_MONITOR_LEN=2097152 > CONFIG_FIT=y > CONFIG_FIT_SIGNATURE=y > CONFIG_BOOTSTAGE=y Viele Grüße, Stefan Roese
diff --git a/arch/x86/dts/dfi-bt700.dtsi b/arch/x86/dts/dfi-bt700.dtsi index dff2345d60d0..c077a84574f1 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/configs/dfi-bt700-q7x-151_defconfig b/configs/dfi-bt700-q7x-151_defconfig index bd8b2e1155d4..a48f7c25134c 100644 --- a/configs/dfi-bt700-q7x-151_defconfig +++ b/configs/dfi-bt700-q7x-151_defconfig @@ -13,6 +13,7 @@ CONFIG_GENERATE_PIRQ_TABLE=y CONFIG_GENERATE_MP_TABLE=y CONFIG_HAVE_ACPI_RESUME=y CONFIG_SEABIOS=y +CONFIG_SYS_MONITOR_LEN=2097152 CONFIG_FIT=y CONFIG_FIT_SIGNATURE=y CONFIG_BOOTSTAGE=y diff --git a/configs/theadorable-x86-dfi-bt700_defconfig b/configs/theadorable-x86-dfi-bt700_defconfig index 39c8a87fbeea..82c348884559 100644 --- a/configs/theadorable-x86-dfi-bt700_defconfig +++ b/configs/theadorable-x86-dfi-bt700_defconfig @@ -15,6 +15,7 @@ CONFIG_GENERATE_PIRQ_TABLE=y CONFIG_GENERATE_MP_TABLE=y CONFIG_HAVE_ACPI_RESUME=y CONFIG_SEABIOS=y +CONFIG_SYS_MONITOR_LEN=2097152 CONFIG_FIT=y CONFIG_FIT_SIGNATURE=y CONFIG_BOOTSTAGE=y
With recent CONFIG_TEXT_BASE changes, there are inconsistencies between several settings. Adjust CONFIG_SYS_MONITOR_LEN to allow more code space. Move the MRC cache out of the way too. Signed-off-by: Simon Glass <sjg@chromium.org> Fixes: 5d1c8342aea ("x86: dfi-bt700: Adjust CONFIG_TEXT_BASE") --- Changes in v3: - Add new patch arch/x86/dts/dfi-bt700.dtsi | 2 +- configs/dfi-bt700-q7x-151_defconfig | 1 + configs/theadorable-x86-dfi-bt700_defconfig | 1 + 3 files changed, 3 insertions(+), 1 deletion(-)