| Message ID | 20230314235955.973727-3-sjg@chromium.org |
|---|---|
| State | Accepted |
| Commit | 0086d4e5f1d4a20fc721de9b74a9668d265ac931 |
| 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: 388f93f9635 ("x86: conga-qeval20-qa3-e3845: Adjust CONFIG_TEXT_BASE") > --- > > Changes in v3: > - Add new patch > > arch/x86/dts/conga-qeval20-qa3-e3845.dts | 2 +- > configs/conga-qeval20-qa3-e3845-internal-uart_defconfig | 1 + > configs/conga-qeval20-qa3-e3845_defconfig | 1 + > configs/theadorable-x86-conga-qa3-e3845-pcie-x4_defconfig | 1 + > configs/theadorable-x86-conga-qa3-e3845_defconfig | 1 + > 5 files changed, 5 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: 388f93f9635 ("x86: conga-qeval20-qa3-e3845: Adjust CONFIG_TEXT_BASE") Reviewed-by: Stefan Roese <sr@denx.de> Thanks, Stefan > --- > > Changes in v3: > - Add new patch > > arch/x86/dts/conga-qeval20-qa3-e3845.dts | 2 +- > configs/conga-qeval20-qa3-e3845-internal-uart_defconfig | 1 + > configs/conga-qeval20-qa3-e3845_defconfig | 1 + > configs/theadorable-x86-conga-qa3-e3845-pcie-x4_defconfig | 1 + > configs/theadorable-x86-conga-qa3-e3845_defconfig | 1 + > 5 files changed, 5 insertions(+), 1 deletion(-) > > diff --git a/arch/x86/dts/conga-qeval20-qa3-e3845.dts b/arch/x86/dts/conga-qeval20-qa3-e3845.dts > index 705157ceaa33..d11e789945ac 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/configs/conga-qeval20-qa3-e3845-internal-uart_defconfig b/configs/conga-qeval20-qa3-e3845-internal-uart_defconfig > index 3a84190bbfdc..f1bfc9653ca7 100644 > --- a/configs/conga-qeval20-qa3-e3845-internal-uart_defconfig > +++ b/configs/conga-qeval20-qa3-e3845-internal-uart_defconfig > @@ -18,6 +18,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/conga-qeval20-qa3-e3845_defconfig b/configs/conga-qeval20-qa3-e3845_defconfig > index bb8b9ef312a6..09d08a842f09 100644 > --- a/configs/conga-qeval20-qa3-e3845_defconfig > +++ b/configs/conga-qeval20-qa3-e3845_defconfig > @@ -14,6 +14,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-conga-qa3-e3845-pcie-x4_defconfig b/configs/theadorable-x86-conga-qa3-e3845-pcie-x4_defconfig > index 74c4a4967d0f..00fa3544bd10 100644 > --- a/configs/theadorable-x86-conga-qa3-e3845-pcie-x4_defconfig > +++ b/configs/theadorable-x86-conga-qa3-e3845-pcie-x4_defconfig > @@ -17,6 +17,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-conga-qa3-e3845_defconfig b/configs/theadorable-x86-conga-qa3-e3845_defconfig > index 194b0519ea22..7cf8c551451e 100644 > --- a/configs/theadorable-x86-conga-qa3-e3845_defconfig > +++ b/configs/theadorable-x86-conga-qa3-e3845_defconfig > @@ -16,6 +16,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/conga-qeval20-qa3-e3845.dts b/arch/x86/dts/conga-qeval20-qa3-e3845.dts index 705157ceaa33..d11e789945ac 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/configs/conga-qeval20-qa3-e3845-internal-uart_defconfig b/configs/conga-qeval20-qa3-e3845-internal-uart_defconfig index 3a84190bbfdc..f1bfc9653ca7 100644 --- a/configs/conga-qeval20-qa3-e3845-internal-uart_defconfig +++ b/configs/conga-qeval20-qa3-e3845-internal-uart_defconfig @@ -18,6 +18,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/conga-qeval20-qa3-e3845_defconfig b/configs/conga-qeval20-qa3-e3845_defconfig index bb8b9ef312a6..09d08a842f09 100644 --- a/configs/conga-qeval20-qa3-e3845_defconfig +++ b/configs/conga-qeval20-qa3-e3845_defconfig @@ -14,6 +14,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-conga-qa3-e3845-pcie-x4_defconfig b/configs/theadorable-x86-conga-qa3-e3845-pcie-x4_defconfig index 74c4a4967d0f..00fa3544bd10 100644 --- a/configs/theadorable-x86-conga-qa3-e3845-pcie-x4_defconfig +++ b/configs/theadorable-x86-conga-qa3-e3845-pcie-x4_defconfig @@ -17,6 +17,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-conga-qa3-e3845_defconfig b/configs/theadorable-x86-conga-qa3-e3845_defconfig index 194b0519ea22..7cf8c551451e 100644 --- a/configs/theadorable-x86-conga-qa3-e3845_defconfig +++ b/configs/theadorable-x86-conga-qa3-e3845_defconfig @@ -16,6 +16,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: 388f93f9635 ("x86: conga-qeval20-qa3-e3845: Adjust CONFIG_TEXT_BASE") --- Changes in v3: - Add new patch arch/x86/dts/conga-qeval20-qa3-e3845.dts | 2 +- configs/conga-qeval20-qa3-e3845-internal-uart_defconfig | 1 + configs/conga-qeval20-qa3-e3845_defconfig | 1 + configs/theadorable-x86-conga-qa3-e3845-pcie-x4_defconfig | 1 + configs/theadorable-x86-conga-qa3-e3845_defconfig | 1 + 5 files changed, 5 insertions(+), 1 deletion(-)