[PATCH 1/5] x86: bayleybay: Adjust CONFIG_TEXT_BASE

[PATCH 1/5] x86: bayleybay: Adjust CONFIG_TEXT_BASE

[Bin Meng]

At present U-Boot no longer builds as a complete rom for bayleybay.

    BINMAN  .binman_stamp
  Wrote map file './rom.map' to show errors
  binman: Section '/binman/rom': contents size 0x814706 (8472326) exceeds section size 0x800000 (8388608)

Checking rom.map we see 'fdtmap' section is overlapped with
'intel-vga' and 'intel-fsp' sections:

  <none>     fffa2150  0002a000  u-boot-ucode
  <none>     fffb0000  00010000  intel-vga
  <none>     fffc0000  00038000  intel-fsp
  <none>     fffcc150  00000539  fdtmap

Let's adjust CONFIG_TEXT_BASE to allow more space for U-Boot codes.

Signed-off-by: Bin Meng <bmeng.cn@gmail.com>
---

 configs/bayleybay_defconfig | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/configs/bayleybay_defconfig b/configs/bayleybay_defconfig
index 5f43f4c0ee..3556fe6b12 100644
--- a/configs/bayleybay_defconfig
+++ b/configs/bayleybay_defconfig
@@ -1,5 +1,5 @@
 CONFIG_X86=y
-CONFIG_TEXT_BASE=0xFFF00000
+CONFIG_TEXT_BASE=0xFFE00000
 CONFIG_NR_DRAM_BANKS=8
 CONFIG_ENV_SIZE=0x1000
 CONFIG_ENV_OFFSET=0x6FF000
-- 
2.34.1

[PATCH 2/5] x86: minnowmax: Adjust CONFIG_TEXT_BASE

[Bin Meng]

At present U-Boot no longer builds as a complete rom for minnowmax.

    BINMAN  .binman_stamp
  Wrote map file './rom.map' to show errors
  binman: Section '/binman/rom': contents size 0x803146 (8401222) exceeds section size 0x800000 (8388608)

Checking rom.map we see 'fdtmap' section is overlapped with
'intel-vga' section:

  <none>     fffa1390  00019800  u-boot-ucode
  <none>     fffb0000  00010000  intel-vga
  <none>     fffbab90  00000539  fdtmap

Let's adjust CONFIG_TEXT_BASE to allow more space for U-Boot codes.

Signed-off-by: Bin Meng <bmeng.cn@gmail.com>
---

 configs/minnowmax_defconfig | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/configs/minnowmax_defconfig b/configs/minnowmax_defconfig
index 66f3036313..e501cc55fb 100644
--- a/configs/minnowmax_defconfig
+++ b/configs/minnowmax_defconfig
@@ -1,5 +1,5 @@
 CONFIG_X86=y
-CONFIG_TEXT_BASE=0xFFF00000
+CONFIG_TEXT_BASE=0xFFE00000
 CONFIG_NR_DRAM_BANKS=8
 CONFIG_ENV_SIZE=0x1000
 CONFIG_ENV_OFFSET=0x6EF000
-- 
2.34.1

[PATCH 3/5] x86: conga-qeval20-qa3-e3845: Adjust CONFIG_TEXT_BASE

[Bin Meng]

At present U-Boot no longer builds as a complete rom for all the
configs of conga-qeval20-qa3-e3845.

    BINMAN  .binman_stamp
  Wrote map file './rom.map' to show errors
  binman: Section '/binman/rom': contents size 0x80b680 (8435328) exceeds section size 0x800000 (8388608)

Checking rom.map we see 'intel-vga' section is overlapped with
other sections:

  <none>     fff00000  000a7cb0  u-boot-with-ucode-ptr
  <none>     fffa0000  00010000  intel-vga
  <none>     fffa7cb0  00001c1a  u-boot-dtb-with-ucode
  <none>     fffa98d0  00019800  u-boot-ucode

Let's adjust CONFIG_TEXT_BASE to allow more space for U-Boot codes.

Signed-off-by: Bin Meng <bmeng.cn@gmail.com>
---

 configs/conga-qeval20-qa3-e3845-internal-uart_defconfig   | 2 +-
 configs/conga-qeval20-qa3-e3845_defconfig                 | 2 +-
 configs/theadorable-x86-conga-qa3-e3845-pcie-x4_defconfig | 2 +-
 configs/theadorable-x86-conga-qa3-e3845_defconfig         | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/configs/conga-qeval20-qa3-e3845-internal-uart_defconfig b/configs/conga-qeval20-qa3-e3845-internal-uart_defconfig
index 0d904675f7..54189b916a 100644
--- a/configs/conga-qeval20-qa3-e3845-internal-uart_defconfig
+++ b/configs/conga-qeval20-qa3-e3845-internal-uart_defconfig
@@ -1,5 +1,5 @@
 CONFIG_X86=y
-CONFIG_TEXT_BASE=0xFFF00000
+CONFIG_TEXT_BASE=0xFFE00000
 CONFIG_NR_DRAM_BANKS=8
 CONFIG_ENV_SIZE=0x1000
 CONFIG_ENV_OFFSET=0x6EF000
diff --git a/configs/conga-qeval20-qa3-e3845_defconfig b/configs/conga-qeval20-qa3-e3845_defconfig
index 6fed3f2ecd..b5b1416cff 100644
--- a/configs/conga-qeval20-qa3-e3845_defconfig
+++ b/configs/conga-qeval20-qa3-e3845_defconfig
@@ -1,5 +1,5 @@
 CONFIG_X86=y
-CONFIG_TEXT_BASE=0xFFF00000
+CONFIG_TEXT_BASE=0xFFE00000
 CONFIG_NR_DRAM_BANKS=8
 CONFIG_ENV_SIZE=0x1000
 CONFIG_ENV_OFFSET=0x6EF000
diff --git a/configs/theadorable-x86-conga-qa3-e3845-pcie-x4_defconfig b/configs/theadorable-x86-conga-qa3-e3845-pcie-x4_defconfig
index 22544c0913..6752d110b1 100644
--- a/configs/theadorable-x86-conga-qa3-e3845-pcie-x4_defconfig
+++ b/configs/theadorable-x86-conga-qa3-e3845-pcie-x4_defconfig
@@ -1,5 +1,5 @@
 CONFIG_X86=y
-CONFIG_TEXT_BASE=0xFFF00000
+CONFIG_TEXT_BASE=0xFFE00000
 CONFIG_NR_DRAM_BANKS=8
 CONFIG_ENV_SIZE=0x2000
 CONFIG_ENV_OFFSET=0x6EC000
diff --git a/configs/theadorable-x86-conga-qa3-e3845_defconfig b/configs/theadorable-x86-conga-qa3-e3845_defconfig
index 8741ecbb2d..336ba4605c 100644
--- a/configs/theadorable-x86-conga-qa3-e3845_defconfig
+++ b/configs/theadorable-x86-conga-qa3-e3845_defconfig
@@ -1,5 +1,5 @@
 CONFIG_X86=y
-CONFIG_TEXT_BASE=0xFFF00000
+CONFIG_TEXT_BASE=0xFFE00000
 CONFIG_NR_DRAM_BANKS=8
 CONFIG_ENV_SIZE=0x2000
 CONFIG_ENV_OFFSET=0x6EC000
-- 
2.34.1

[PATCH 4/5] x86: dfi-bt700: Adjust CONFIG_TEXT_BASE

[Bin Meng]

At present U-Boot no longer builds as a complete rom for all the
configs of dfi-bt700.

    BINMAN  .binman_stamp
  Wrote map file './rom.map' to show errors
  binman: Section '/binman/rom': contents size 0x80e836 (8448054) exceeds section size 0x800000 (8388608)

Checking rom.map we see 'intel-vga' section is overlapped with
other sections:

  <none>     fff00000  000aac90  u-boot-with-ucode-ptr
  <none>     fffa0000  00010000  intel-vga
  <none>     fffaac90  00001df0  u-boot-dtb-with-ucode
  <none>     fffaca80  00019800  u-boot-ucode

Let's adjust CONFIG_TEXT_BASE to allow more space for U-Boot codes.

Signed-off-by: Bin Meng <bmeng.cn@gmail.com>
---

 configs/dfi-bt700-q7x-151_defconfig         | 2 +-
 configs/theadorable-x86-dfi-bt700_defconfig | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/configs/dfi-bt700-q7x-151_defconfig b/configs/dfi-bt700-q7x-151_defconfig
index f9b1bae413..63b8c8f92d 100644
--- a/configs/dfi-bt700-q7x-151_defconfig
+++ b/configs/dfi-bt700-q7x-151_defconfig
@@ -1,5 +1,5 @@
 CONFIG_X86=y
-CONFIG_TEXT_BASE=0xFFF00000
+CONFIG_TEXT_BASE=0xFFE00000
 CONFIG_NR_DRAM_BANKS=8
 CONFIG_ENV_SIZE=0x1000
 CONFIG_ENV_OFFSET=0x6EF000
diff --git a/configs/theadorable-x86-dfi-bt700_defconfig b/configs/theadorable-x86-dfi-bt700_defconfig
index 4755b4754f..fea35cd915 100644
--- a/configs/theadorable-x86-dfi-bt700_defconfig
+++ b/configs/theadorable-x86-dfi-bt700_defconfig
@@ -1,5 +1,5 @@
 CONFIG_X86=y
-CONFIG_TEXT_BASE=0xFFF00000
+CONFIG_TEXT_BASE=0xFFE00000
 CONFIG_NR_DRAM_BANKS=8
 CONFIG_ENV_SIZE=0x2000
 CONFIG_ENV_OFFSET=0x6EC000
-- 
2.34.1

[PATCH 5/5] x86: som-db5800-som-6867: Adjust CONFIG_TEXT_BASE

[Bin Meng]

At present U-Boot no longer builds as a complete rom for som-db5800-som-6867.

    BINMAN  .binman_stamp
  Wrote map file './rom.map' to show errors
  binman: Section '/binman/rom': contents size 0x80302c (8400940) exceeds section size 0x800000 (8388608)

Checking rom.map we see 'intel-vga' section is overlapped with
other sections:

  <none>     fff00000  0009f7c8  u-boot-with-ucode-ptr
  <none>     fff90000  00010000  intel-vga
  <none>     fff9f7c8  00001aae  u-boot-dtb-with-ucode

Let's adjust CONFIG_TEXT_BASE to allow more space for U-Boot codes.

Signed-off-by: Bin Meng <bmeng.cn@gmail.com>

---

 configs/som-db5800-som-6867_defconfig | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/configs/som-db5800-som-6867_defconfig b/configs/som-db5800-som-6867_defconfig
index 5d401e6c2d..f6b2109e2b 100644
--- a/configs/som-db5800-som-6867_defconfig
+++ b/configs/som-db5800-som-6867_defconfig
@@ -1,5 +1,5 @@
 CONFIG_X86=y
-CONFIG_TEXT_BASE=0xFFF00000
+CONFIG_TEXT_BASE=0xFFE00000
 CONFIG_NR_DRAM_BANKS=8
 CONFIG_ENV_SIZE=0x1000
 CONFIG_ENV_OFFSET=0x6EF000
-- 
2.34.1

Re: [PATCH 4/5] x86: dfi-bt700: Adjust CONFIG_TEXT_BASE

[Stefan Roese]

On 2022-11-24 12:33, Bin Meng wrote:
> At present U-Boot no longer builds as a complete rom for all the
> configs of dfi-bt700.
> 
>      BINMAN  .binman_stamp
>    Wrote map file './rom.map' to show errors
>    binman: Section '/binman/rom': contents size 0x80e836 (8448054) exceeds section size 0x800000 (8388608)
> 
> Checking rom.map we see 'intel-vga' section is overlapped with
> other sections:
> 
>    <none>     fff00000  000aac90  u-boot-with-ucode-ptr
>    <none>     fffa0000  00010000  intel-vga
>    <none>     fffaac90  00001df0  u-boot-dtb-with-ucode
>    <none>     fffaca80  00019800  u-boot-ucode
> 
> Let's adjust CONFIG_TEXT_BASE to allow more space for U-Boot codes.
> 
> Signed-off-by: Bin Meng <bmeng.cn@gmail.com>

Reviewed-by: Stefan Roese <sr@denx.de>

Thanks,
Stefan

> ---
> 
>   configs/dfi-bt700-q7x-151_defconfig         | 2 +-
>   configs/theadorable-x86-dfi-bt700_defconfig | 2 +-
>   2 files changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/configs/dfi-bt700-q7x-151_defconfig b/configs/dfi-bt700-q7x-151_defconfig
> index f9b1bae413..63b8c8f92d 100644
> --- a/configs/dfi-bt700-q7x-151_defconfig
> +++ b/configs/dfi-bt700-q7x-151_defconfig
> @@ -1,5 +1,5 @@
>   CONFIG_X86=y
> -CONFIG_TEXT_BASE=0xFFF00000
> +CONFIG_TEXT_BASE=0xFFE00000
>   CONFIG_NR_DRAM_BANKS=8
>   CONFIG_ENV_SIZE=0x1000
>   CONFIG_ENV_OFFSET=0x6EF000
> diff --git a/configs/theadorable-x86-dfi-bt700_defconfig b/configs/theadorable-x86-dfi-bt700_defconfig
> index 4755b4754f..fea35cd915 100644
> --- a/configs/theadorable-x86-dfi-bt700_defconfig
> +++ b/configs/theadorable-x86-dfi-bt700_defconfig
> @@ -1,5 +1,5 @@
>   CONFIG_X86=y
> -CONFIG_TEXT_BASE=0xFFF00000
> +CONFIG_TEXT_BASE=0xFFE00000
>   CONFIG_NR_DRAM_BANKS=8
>   CONFIG_ENV_SIZE=0x2000
>   CONFIG_ENV_OFFSET=0x6EC000

Viele Grüße,
Stefan Roese

-- 
DENX Software Engineering GmbH,      Managing Director: Erika Unter
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: (+49)-8142-66989-51 Fax: (+49)-8142-66989-80 Email: sr@denx.de

Re: [PATCH 2/5] x86: minnowmax: Adjust CONFIG_TEXT_BASE

[Simon Glass]

On Thu, 24 Nov 2022 at 04:33, Bin Meng <bmeng.cn@gmail.com> wrote:
>
> At present U-Boot no longer builds as a complete rom for minnowmax.
>
>     BINMAN  .binman_stamp
>   Wrote map file './rom.map' to show errors
>   binman: Section '/binman/rom': contents size 0x803146 (8401222) exceeds section size 0x800000 (8388608)
>
> Checking rom.map we see 'fdtmap' section is overlapped with
> 'intel-vga' section:
>
>   <none>     fffa1390  00019800  u-boot-ucode
>   <none>     fffb0000  00010000  intel-vga
>   <none>     fffbab90  00000539  fdtmap
>
> Let's adjust CONFIG_TEXT_BASE to allow more space for U-Boot codes.
>
> Signed-off-by: Bin Meng <bmeng.cn@gmail.com>
> ---
>
>  configs/minnowmax_defconfig | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)

Reviewed-by: Simon Glass <sjg@chromium.org>

I cannot test this though since things seem to be broken since:

915047048f0 lib: sha256: Add support for hardware specific sha256_process

Regards,
Simon

Re: [PATCH 2/5] x86: minnowmax: Adjust CONFIG_TEXT_BASE

[Bin Meng]

Hi Simon,

On Sat, Nov 26, 2022 at 10:47 AM Simon Glass <sjg@chromium.org> wrote:
>
> On Thu, 24 Nov 2022 at 04:33, Bin Meng <bmeng.cn@gmail.com> wrote:
> >
> > At present U-Boot no longer builds as a complete rom for minnowmax.
> >
> >     BINMAN  .binman_stamp
> >   Wrote map file './rom.map' to show errors
> >   binman: Section '/binman/rom': contents size 0x803146 (8401222) exceeds section size 0x800000 (8388608)
> >
> > Checking rom.map we see 'fdtmap' section is overlapped with
> > 'intel-vga' section:
> >
> >   <none>     fffa1390  00019800  u-boot-ucode
> >   <none>     fffb0000  00010000  intel-vga
> >   <none>     fffbab90  00000539  fdtmap
> >
> > Let's adjust CONFIG_TEXT_BASE to allow more space for U-Boot codes.
> >
> > Signed-off-by: Bin Meng <bmeng.cn@gmail.com>
> > ---
> >
> >  configs/minnowmax_defconfig | 2 +-
> >  1 file changed, 1 insertion(+), 1 deletion(-)
>
> Reviewed-by: Simon Glass <sjg@chromium.org>
>
> I cannot test this though since things seem to be broken since:
>
> 915047048f0 lib: sha256: Add support for hardware specific sha256_process
>

Did you mean boot testing on minnowmax?

Regards,
Bin

Re: [PATCH 2/5] x86: minnowmax: Adjust CONFIG_TEXT_BASE

[Simon Glass]

Hi Bin,

On Sat, 26 Nov 2022 at 20:43, Bin Meng <bmeng.cn@gmail.com> wrote:
>
> Hi Simon,
>
> On Sat, Nov 26, 2022 at 10:47 AM Simon Glass <sjg@chromium.org> wrote:
> >
> > On Thu, 24 Nov 2022 at 04:33, Bin Meng <bmeng.cn@gmail.com> wrote:
> > >
> > > At present U-Boot no longer builds as a complete rom for minnowmax.
> > >
> > >     BINMAN  .binman_stamp
> > >   Wrote map file './rom.map' to show errors
> > >   binman: Section '/binman/rom': contents size 0x803146 (8401222) exceeds section size 0x800000 (8388608)
> > >
> > > Checking rom.map we see 'fdtmap' section is overlapped with
> > > 'intel-vga' section:
> > >
> > >   <none>     fffa1390  00019800  u-boot-ucode
> > >   <none>     fffb0000  00010000  intel-vga
> > >   <none>     fffbab90  00000539  fdtmap
> > >
> > > Let's adjust CONFIG_TEXT_BASE to allow more space for U-Boot codes.
> > >
> > > Signed-off-by: Bin Meng <bmeng.cn@gmail.com>
> > > ---
> > >
> > >  configs/minnowmax_defconfig | 2 +-
> > >  1 file changed, 1 insertion(+), 1 deletion(-)
> >
> > Reviewed-by: Simon Glass <sjg@chromium.org>
> >
> > I cannot test this though since things seem to be broken since:
> >
> > 915047048f0 lib: sha256: Add support for hardware specific sha256_process
> >
>
> Did you mean boot testing on minnowmax?

Yes that's right. I have a problem with coral too. I will try another
bisect but that is what it hit the first time.

Regards,
Simon

>
> Regards,
> Bin

Re: [PATCH 1/5] x86: bayleybay: Adjust CONFIG_TEXT_BASE

[Bin Meng]

On Thu, Nov 24, 2022 at 7:33 PM Bin Meng <bmeng.cn@gmail.com> wrote:
>
> At present U-Boot no longer builds as a complete rom for bayleybay.
>
>     BINMAN  .binman_stamp
>   Wrote map file './rom.map' to show errors
>   binman: Section '/binman/rom': contents size 0x814706 (8472326) exceeds section size 0x800000 (8388608)
>
> Checking rom.map we see 'fdtmap' section is overlapped with
> 'intel-vga' and 'intel-fsp' sections:
>
>   <none>     fffa2150  0002a000  u-boot-ucode
>   <none>     fffb0000  00010000  intel-vga
>   <none>     fffc0000  00038000  intel-fsp
>   <none>     fffcc150  00000539  fdtmap
>
> Let's adjust CONFIG_TEXT_BASE to allow more space for U-Boot codes.
>
> Signed-off-by: Bin Meng <bmeng.cn@gmail.com>
> ---
>
>  configs/bayleybay_defconfig | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
>

series applied to u-boot-x86, thanks!