From 767df6a27d5395851859e56b4c97413ab9443c0e Mon Sep 17 00:00:00 2001 From: Alistair Delva Date: Mon, 26 Sep 2022 22:23:26 +0000 Subject: [PATCH 1/7] x86: Fix i8259 ifdef include guard When building U-Boot with clang, it notices that the i8259.h include guard does not work correctly due to a typo. Fix it. Signed-off-by: Alistair Delva Cc: Simon Glass Cc: Bin Meng Cc: Nick Desaulniers Reviewed-by: Simon Glass Reviewed-by: Bin Meng --- arch/x86/include/asm/i8259.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/arch/x86/include/asm/i8259.h b/arch/x86/include/asm/i8259.h index b73052a6d2..90f2d3866c 100644 --- a/arch/x86/include/asm/i8259.h +++ b/arch/x86/include/asm/i8259.h @@ -7,7 +7,7 @@ /* i8259.h i8259 PIC Registers */ #ifndef _ASMI386_I8259_H_ -#define _ASMI386_I8959_H_ +#define _ASMI386_I8259_H_ /* PIC I/O mapped registers */ #define IRR 0x0 /* Interrupt Request Register */ @@ -73,4 +73,4 @@ int i8259_init(void); -#endif /* _ASMI386_I8959_H_ */ +#endif /* _ASMI386_I8259_H_ */ From f38be3086837e3637fe588f6571c2d245261e5fb Mon Sep 17 00:00:00 2001 From: Bin Meng Date: Thu, 24 Nov 2022 11:24:37 +0800 Subject: [PATCH 2/7] x86: bayleybay: Adjust CONFIG_TEXT_BASE 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: fffa2150 0002a000 u-boot-ucode fffb0000 00010000 intel-vga fffc0000 00038000 intel-fsp fffcc150 00000539 fdtmap Let's adjust CONFIG_TEXT_BASE to allow more space for U-Boot codes. Signed-off-by: Bin Meng --- 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 From 66e2c665f3b60d726e1c26ad44ac97aa76ead6f5 Mon Sep 17 00:00:00 2001 From: Bin Meng Date: Thu, 24 Nov 2022 11:07:13 +0800 Subject: [PATCH 3/7] x86: minnowmax: Adjust CONFIG_TEXT_BASE 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: fffa1390 00019800 u-boot-ucode fffb0000 00010000 intel-vga fffbab90 00000539 fdtmap Let's adjust CONFIG_TEXT_BASE to allow more space for U-Boot codes. Signed-off-by: Bin Meng Reviewed-by: Simon Glass --- 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 From 388f93f963546b49821e0142628f70203bc99c18 Mon Sep 17 00:00:00 2001 From: Bin Meng Date: Thu, 24 Nov 2022 15:33:09 +0800 Subject: [PATCH 4/7] x86: conga-qeval20-qa3-e3845: Adjust CONFIG_TEXT_BASE 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: fff00000 000a7cb0 u-boot-with-ucode-ptr fffa0000 00010000 intel-vga fffa7cb0 00001c1a u-boot-dtb-with-ucode fffa98d0 00019800 u-boot-ucode Let's adjust CONFIG_TEXT_BASE to allow more space for U-Boot codes. Signed-off-by: Bin Meng --- 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 From 5d1c8342aeaaa13a32e86571ec054ed3582c0d67 Mon Sep 17 00:00:00 2001 From: Bin Meng Date: Thu, 24 Nov 2022 15:58:17 +0800 Subject: [PATCH 5/7] x86: dfi-bt700: Adjust CONFIG_TEXT_BASE 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: fff00000 000aac90 u-boot-with-ucode-ptr fffa0000 00010000 intel-vga fffaac90 00001df0 u-boot-dtb-with-ucode fffaca80 00019800 u-boot-ucode Let's adjust CONFIG_TEXT_BASE to allow more space for U-Boot codes. Signed-off-by: Bin Meng Reviewed-by: Stefan Roese --- 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 From e23cae30801fab679e98029e0d3079592e1d3915 Mon Sep 17 00:00:00 2001 From: Bin Meng Date: Thu, 24 Nov 2022 16:19:54 +0800 Subject: [PATCH 6/7] x86: som-db5800-som-6867: Adjust CONFIG_TEXT_BASE 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: fff00000 0009f7c8 u-boot-with-ucode-ptr fff90000 00010000 intel-vga 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 --- 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 From 58e2a35f2e81b0114cf05bfd6e96e4d70e47b22c Mon Sep 17 00:00:00 2001 From: Bin Meng Date: Thu, 24 Nov 2022 11:39:23 +0800 Subject: [PATCH 7/7] x86: cosmetic: Fix a typo in the reserve_arch() comments It should be fsp_continue(). Signed-off-by: Bin Meng Reviewed-by: Simon Glass --- arch/x86/cpu/cpu.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/x86/cpu/cpu.c b/arch/x86/cpu/cpu.c index 86f53e78d2..6fe6eaf6c8 100644 --- a/arch/x86/cpu/cpu.c +++ b/arch/x86/cpu/cpu.c @@ -315,7 +315,7 @@ int reserve_arch(void) if (IS_ENABLED(CONFIG_HAVE_FSP)) { /* * Save stack address to CMOS so that at next S3 boot, - * we can use it as the stack address for fsp_contiue() + * we can use it as the stack address for fsp_continue() */ fsp_save_s3_stack(); }