x86: dfi: Add option to select different config headers for baseboards
PATCH v5 1/6 x86: dfi: Add option to select different config headers for baseboards
This patch adds the infrastructure to define different config headers with different configurations and default environment for the baseboards that can now be selected via Kconfig. The new configuration for the theadorable-x86-dfi-bt700 is also added.
---
v5:
- Added imply for some SPI NOR chips to the board Kconfig file
v3:
- Rebased on latest master
- Removed unused macros from config headers
v2:
- Added Bin's reviewed-by
board/dfi/Kconfig | 18 +++++++++-- board/dfi/dfi-bt700/Kconfig | 9 +++--- board/dfi/dfi-bt700/MAINTAINERS | 1 + configs/dfi-bt700-q7x-151_defconfig | 6 ++-- configs/theadorable-x86-dfi-bt700_defconfig | 3 +- include/configs/theadorable-x86-dfi-bt700.h | 47 +++++++++++++++++++++++++++++ 6 files changed, 71 insertions(+), 13 deletions(-) create mode 100644 include/configs/theadorable-x86-dfi-bt700.h
board/dfi/Kconfig +15 -3
@@ -8,10 +8,9 @@ if VENDOR_DFI choice prompt "Mainboard model" - optional -config TARGET_DFI_BT700 - bool "DFI BT700 BayTrail" +config TARGET_Q7X_151_DFI_BT700 + bool "DFI BT700 BayTrail on DFI Q7X-151 baseboard" imply SCSI help This is the DFI Q7X-151 baseboard equipped with the
@@ -23,6 +22,19 @@ config TARGET_DFI_BT700 Note that PCIE_ECAM_BASE is set up by the FSP so the value used by U-Boot matches that value. +config TARGET_THEADORABLE_X86_DFI_BT700 + bool "DFI BT700 BayTrail on theadorable-x86 baseboard" + imply SCSI + help + This is the theadorable-x86 baseboard equipped with the + DFI BayTrail Bt700 SoM. It contains an Atom E3845 with + Ethernet (in non-PCIe-x4 configuration), micro-SD, USB 2, + USB 3, SATA, serial console and DisplayPort video out. + It requires some binary blobs - see README.x86 for details. + + Note that PCIE_ECAM_BASE is set up by the FSP so the value used + by U-Boot matches that value. + endchoice source "board/dfi/dfi-bt700/Kconfig"
board/dfi/dfi-bt700/Kconfig +4 -5
@@ -1,5 +1,3 @@ -if TARGET_DFI_BT700 - config SYS_BOARD default "dfi-bt700"
@@ -10,7 +8,8 @@ config SYS_SOC default "baytrail" config SYS_CONFIG_NAME - default "dfi-bt700" + default "dfi-bt700" if TARGET_Q7X_151_DFI_BT700 + default "theadorable-x86-dfi-bt700" if TARGET_THEADORABLE_X86_DFI_BT700 config SYS_TEXT_BASE default 0xfff00000 if !EFI_STUB
@@ -24,8 +23,8 @@ config BOARD_SPECIFIC_OPTIONS # dummy select BOARD_EARLY_INIT_F select BOARD_LATE_INIT select SPI_FLASH_STMICRO + imply SPI_FLASH_SPANSION + imply SPI_FLASH_WINBOND config PCIE_ECAM_BASE default 0xe0000000 - -endif
board/dfi/dfi-bt700/MAINTAINERS +1 -0
@@ -3,6 +3,7 @@ M: Stefan Roese <[email protected]> S: Maintained F: board/dfi/dfi-bt700 F: include/configs/dfi-bt700.h +F: include/configs/theadorable-x86-dfi-bt700.h F: configs/dfi-bt700-q7x-151_defconfig F: configs/theadorable-x86-dfi-bt700_defconfig F: arch/x86/dts/dfi-bt700.dtsi
configs/dfi-bt700-q7x-151_defconfig +2 -4
@@ -1,13 +1,13 @@ CONFIG_X86=y CONFIG_VENDOR_DFI=y CONFIG_DEFAULT_DEVICE_TREE="dfi-bt700-q7x-151" -CONFIG_TARGET_DFI_BT700=y -CONFIG_DEBUG_UART=y CONFIG_SMP=y CONFIG_HAVE_VGA_BIOS=y +CONFIG_VGA_BIOS_ADDR=0xfffa0000 CONFIG_GENERATE_PIRQ_TABLE=y CONFIG_GENERATE_MP_TABLE=y CONFIG_GENERATE_ACPI_TABLE=y +CONFIG_HAVE_ACPI_RESUME=y CONFIG_SEABIOS=y CONFIG_FIT=y CONFIG_FIT_SIGNATURE=y
@@ -44,8 +44,6 @@ CONFIG_CPU=y CONFIG_DM_I2C=y CONFIG_NUVOTON_NCT6102D=y CONFIG_E1000=y -CONFIG_DEBUG_UART_BASE=0x3f8 -CONFIG_DEBUG_UART_CLOCK=1843200 CONFIG_USB_STORAGE=y CONFIG_USB_KEYBOARD=y CONFIG_FRAMEBUFFER_SET_VESA_MODE=y
configs/theadorable-x86-dfi-bt700_defconfig +2 -1
@@ -1,13 +1,14 @@ CONFIG_X86=y CONFIG_VENDOR_DFI=y CONFIG_DEFAULT_DEVICE_TREE="theadorable-x86-dfi-bt700" -CONFIG_TARGET_DFI_BT700=y +CONFIG_TARGET_THEADORABLE_X86_DFI_BT700=y CONFIG_SMP=y CONFIG_HAVE_VGA_BIOS=y CONFIG_VGA_BIOS_ADDR=0xfffa0000 CONFIG_GENERATE_PIRQ_TABLE=y CONFIG_GENERATE_MP_TABLE=y CONFIG_GENERATE_ACPI_TABLE=y +CONFIG_HAVE_ACPI_RESUME=y CONFIG_SEABIOS=y CONFIG_FIT=y CONFIG_FIT_SIGNATURE=y
include/configs/theadorable-x86-dfi-bt700.h new file +47 -0
47 lines not on this page · raw message
Signature · 1 line
2.14.0
PATCH v5 2/6 x86: conga: Add option to select different config headers for baseboards
This patch adds the infrastructure to define different config headers with different configurations and default environment for the baseboards that can now be selected via Kconfig. The new configuration for the theadorable-x86-conga-qa3-e3845 is also added. Also the new defconfig file for this new target is added.
---
v5:
- Added imply for some SPI NOR chips to the board Kconfig file
v4:
- Remove Gigadevice and Macronix flash support
v3:
- Rebased on latest master
- Removed unused macros from config headers
v2:
- Added Bin's reviewed-by
board/congatec/Kconfig | 11 +++++ board/congatec/conga-qeval20-qa3-e3845/Kconfig | 9 ++-- board/congatec/conga-qeval20-qa3-e3845/MAINTAINERS | 2 + configs/theadorable-x86-conga-qa3-e3845_defconfig | 54 ++++++++++++++++++++++ include/configs/theadorable-x86-conga-qa3-e3845.h | 38 +++++++++++++++ 5 files changed, 109 insertions(+), 5 deletions(-) create mode 100644 configs/theadorable-x86-conga-qa3-e3845_defconfig create mode 100644 include/configs/theadorable-x86-conga-qa3-e3845.h
board/congatec/Kconfig +11 -0
@@ -24,6 +24,17 @@ config TARGET_CONGA_QEVAL20_QA3_E3845 Note that PCIE_ECAM_BASE is set up by the FSP so the value used by U-Boot matches that value. +config TARGET_THEADORABLE_X86_CONGA_QA3_E3845 + bool "theadorable-x86 baseboard & conga-QA3/E3845" + help + This is the theadorable-x86 baseboard board equipped with the + conga-QA3/E3845-4G SoM. It contains an Atom E3845 with Ethernet, + micro-SD, USB 2, USB 3, SATA, serial console and HDMI 1.3 video + out. It requires some binary blobs - see README.x86 for details. + + Note that PCIE_ECAM_BASE is set up by the FSP so the value used + by U-Boot matches that value. + endchoice source "board/congatec/conga-qeval20-qa3-e3845/Kconfig"
board/congatec/conga-qeval20-qa3-e3845/Kconfig +4 -5
@@ -1,5 +1,3 @@ -if TARGET_CONGA_QEVAL20_QA3_E3845 - config SYS_BOARD default "conga-qeval20-qa3-e3845"
@@ -10,7 +8,8 @@ config SYS_SOC default "baytrail" config SYS_CONFIG_NAME - default "conga-qeval20-qa3-e3845" + default "conga-qeval20-qa3-e3845" if TARGET_CONGA_QEVAL20_QA3_E3845 + default "theadorable-x86-conga-qa3-e3845" if TARGET_THEADORABLE_X86_CONGA_QA3_E3845 config SYS_TEXT_BASE default 0xfff00000 if !EFI_STUB
@@ -24,8 +23,8 @@ config BOARD_SPECIFIC_OPTIONS # dummy select BOARD_EARLY_INIT_F select BOARD_LATE_INIT select SPI_FLASH_STMICRO + imply SPI_FLASH_SPANSION + imply SPI_FLASH_WINBOND config PCIE_ECAM_BASE default 0xe0000000 - -endif
board/congatec/conga-qeval20-qa3-e3845/MAINTAINERS +2 -0
@@ -3,6 +3,8 @@ M: Stefan Roese <[email protected]> S: Maintained F: board/congatec/conga-qeval20-qa3-e3845 F: include/configs/conga-qeval20-qa3-e3845.h +F: include/configs/theadorable-x86-conga-qa3-e3845.h F: configs/conga-qeval20-qa3-e3845_defconfig F: configs/conga-qeval20-qa3-e3845-internal-uart_defconfig +F: configs/theadorable-x86-conga-qa3-e3845_defconfig F: arch/x86/dts/conga-qeval20-qa3-e3845.dts
configs/theadorable-x86-conga-qa3-e3845_defconfig new file +54 -0
54 lines not on this page · raw message
include/configs/theadorable-x86-conga-qa3-e3845.h new file +38 -0
@@ -0,0 +1,38 @@ +/* +* Copyright (C) 2016 Stefan Roese <[email protected]> +* +* SPDX-License-Identifier: GPL-2.0+ +*/ + +/* +* board/config.h - configuration options, board specific +*/ + +#ifndef __CONFIG_H +#define __CONFIG_H + +#include <configs/x86-common.h> + +#define CONFIG_SYS_MONITOR_LEN (1 << 20) + +#define CONFIG_PREBOOT + +#define CONFIG_STD_DEVICES_SETTINGS "stdin=serial\0" \ + "stdout=serial\0" \ + "stderr=serial\0" + +#define VIDEO_IO_OFFSET 0 +#define CONFIG_X86EMU_RAW_IO +#define CONFIG_CMD_BMP +#define CONFIG_BMP_16BPP + +/* Environment settings */ +#define CONFIG_SYS_REDUNDAND_ENVIRONMENT +#undef CONFIG_ENV_SIZE +#define CONFIG_ENV_SIZE 0x2000 +#define CONFIG_ENV_SECT_SIZE 0x1000 +#define CONFIG_ENV_OFFSET 0x006ec000 +#define CONFIG_ENV_OFFSET_REDUND \ + (CONFIG_ENV_OFFSET + CONFIG_ENV_SIZE) + +#endif /* __CONFIG_H */
Signature · 1 line
2.14.0
PATCH v5 2/6 x86: conga: Add option to select different config headers for baseboards
Quoted 23 lines · Stefan Roese
This patch adds the infrastructure to define different config headers with different configurations and default environment for the baseboards that can now be selected via
Kconfig. The new configuration for the theadorable-x86-conga-qa3-e3845 is also added. Also the new defconfig file for this new target is added.Signed-off-by Stefan Roese <[email protected]>Cc Simon Glass <[email protected]>Cc Bin Meng <[email protected]>---
v5:
- Added imply for some SPI NOR chips to the boardKconfigfilev4:
- Remove Gigadevice and Macronix flash supportv3:
- Rebased on latest master
- Removed unused macros from config headersv2:
- Added Bin's reviewed-by
Quoted 9 lines
board/congatec/Kconfig | 11 +++++ board/congatec/conga-qeval20-qa3-e3845/Kconfig | 9 ++-- board/congatec/conga-qeval20-qa3-e3845/MAINTAINERS | 2 + configs/theadorable-x86-conga-qa3-e3845_defconfig | 54 ++++++++++++++++++++++ include/configs/theadorable-x86-conga-qa3-e3845.h | 38 +++++++++++++++ 5 files changed, 109 insertions(+), 5 deletions(-) create mode 100644 configs/theadorable-x86-conga-qa3-e3845_defconfig create mode 100644 include/configs/theadorable-x86-conga-qa3-e3845.h
PATCH v5 2/6 x86: conga: Add option to select different config headers for baseboards
Hi Stefan,
Quoted 34 lines · Bin Meng
Quoted 23 lines · Stefan Roese
This patch adds the infrastructure to define different config headers with different configurations and default environment for the baseboards that can now be selected via
Kconfig. The new configuration for the theadorable-x86-conga-qa3-e3845 is also added. Also the new defconfig file for this new target is added.Signed-off-by Stefan Roese <[email protected]>Cc Simon Glass <[email protected]>Cc Bin Meng <[email protected]>---
v5:
- Added imply for some SPI NOR chips to the boardKconfigfilev4:
- Remove Gigadevice and Macronix flash supportv3:
- Rebased on latest master
- Removed unused macros from config headersv2:
- Added Bin's reviewed-byQuoted 9 lines
board/congatec/Kconfig | 11 +++++ board/congatec/conga-qeval20-qa3-e3845/Kconfig | 9 ++-- board/congatec/conga-qeval20-qa3-e3845/MAINTAINERS | 2 + configs/theadorable-x86-conga-qa3-e3845_defconfig | 54 ++++++++++++++++++++++ include/configs/theadorable-x86-conga-qa3-e3845.h | 38 +++++++++++++++ 5 files changed, 109 insertions(+), 5 deletions(-) create mode 100644 configs/theadorable-x86-conga-qa3-e3845_defconfig create mode 100644 include/configs/theadorable-x86-conga-qa3-e3845.h
Quoted 1 line
Reviewed-by Bin Meng <[email protected]>
For some reason, this patch fails in buildman testing:
02: x86: conga: Add option to select different config headers for baseboards -make[2]: *** [theadorable-x86-conga-qa3-e3845_defconfig] Error 1 -make[1]: *** [theadorable-x86-conga-qa3-e3845_defconfig] Error 2 +../arch/x86/lib/acpi_s3.c:14:25: error: expected declaration specifiers or '...' before '*' token
+ static void asmlinkage (*acpi_do_wakeup)(void *vector) = (void *)WAKEUP_BASE;
+ ^
+ acpi_do_wakeup(vector);
+ ^
+make[2]: *** [arch/x86/lib/acpi_s3.o] Error 1
+make[1]: *** [arch/x86/lib] Error 2w+../arch/x86/lib/acpi_s3.c: In function 'acpi_jump_to_wakeup':w+../arch/x86/lib/acpi_s3.c:22:2: warning: implicit declaration of function 'acpi_do_wakeup' [-Wimplicit-function-declaration]
But this failure disappears in patch [05/06]:
05: x86: conga: theadorable-x86-conga-qa3-e3845_defconfig: Misc defconfig updates
x86: theadorable-x86-conga-qa3-e3845
-../arch/x86/lib/acpi_s3.c:14:25: error: expected declaration specifiers or '...' before '*' token
- static void asmlinkage (*acpi_do_wakeup)(void *vector) = (void *)WAKEUP_BASE;
- ^
- acpi_do_wakeup(vector);
- ^
-make[2]: *** [arch/x86/lib/acpi_s3.o] Error 1
-make[1]: *** [arch/x86/lib] Error 2w-../arch/x86/lib/acpi_s3.c: In function 'acpi_jump_to_wakeup':w-../arch/x86/lib/acpi_s3.c:22:2: warning: implicit declaration of function 'acpi_do_wakeup' [-Wimplicit-function-declaration]
Could you please have a look at this? Thanks!
Regards,
Bin
PATCH v5 2/6 x86: conga: Add option to select different config headers for baseboards
Hi Bin,
Quoted 71 lines · Bin Meng
Quoted 34 lines · Bin Meng
Quoted 23 lines · Stefan Roese
This patch adds the infrastructure to define different config headers with different configurations and default environment for the baseboards that can now be selected via
Kconfig. The new configuration for the theadorable-x86-conga-qa3-e3845 is also added. Also the new defconfig file for this new target is added.Signed-off-by Stefan Roese <[email protected]>Cc Simon Glass <[email protected]>Cc Bin Meng <[email protected]>---
v5:
- Added imply for some SPI NOR chips to the boardKconfigfilev4:
- Remove Gigadevice and Macronix flash supportv3:
- Rebased on latest master
- Removed unused macros from config headersv2:
- Added Bin's reviewed-byQuoted 9 lines
board/congatec/Kconfig | 11 +++++ board/congatec/conga-qeval20-qa3-e3845/Kconfig | 9 ++-- board/congatec/conga-qeval20-qa3-e3845/MAINTAINERS | 2 + configs/theadorable-x86-conga-qa3-e3845_defconfig | 54 ++++++++++++++++++++++ include/configs/theadorable-x86-conga-qa3-e3845.h | 38 +++++++++++++++ 5 files changed, 109 insertions(+), 5 deletions(-)create mode 100644 configs/theadorable-x86-conga-qa3-e3845_defconfig create mode 100644
include/configs/theadorable-x86-conga-qa3-e3845.hQuoted 1 line
Reviewed-by Bin Meng <[email protected]>For some reason, this patch fails in buildman testing:
02: x86: conga: Add option to select different config headers for baseboards
(quoted diff) +1
-2-make[2]: *** [theadorable-x86-conga-qa3-e3845_defconfig] Error 1 -make[1]: *** [theadorable-x86-conga-qa3-e3845_defconfig] Error 2 +../arch/x86/lib/acpi_s3.c:14:25: error: expected declarationspecifiers or '...' before '*' token
+ static void asmlinkage (*acpi_do_wakeup)(void *vector) = (void *)WAKEUP_BASE;(quoted diff) +5
-0+ ^ + acpi_do_wakeup(vector); + ^ +make[2]: *** [arch/x86/lib/acpi_s3.o] Error 1 +make[1]: *** [arch/x86/lib] Error 2
w+../arch/x86/lib/acpi_s3.c: In function 'acpi_jump_to_wakeup':w+../arch/x86/lib/acpi_s3.c:22:2: warning: implicit declaration of function 'acpi_do_wakeup' [-Wimplicit-function-declaration]But this failure disappears in patch [05/06]:
05: x86: conga: theadorable-x86-conga-qa3-e3845_defconfig: Misc defconfig updates
x86: theadorable-x86-conga-qa3-e3845
-../arch/x86/lib/acpi_s3.c:14:25: error: expected declaration specifiers or '...' before '*' token
- static void asmlinkage (*acpi_do_wakeup)(void *vector) = (void *)WAKEUP_BASE;(quoted diff) +0
-5- ^ - acpi_do_wakeup(vector); - ^ -make[2]: *** [arch/x86/lib/acpi_s3.o] Error 1 -make[1]: *** [arch/x86/lib] Error 2
w-../arch/x86/lib/acpi_s3.c: In function 'acpi_jump_to_wakeup':w-../arch/x86/lib/acpi_s3.c:22:2: warning: implicit declaration of function 'acpi_do_wakeup' [-Wimplicit-function-declaration]
Quoted 1 line
Could you please have a look at this? Thanks!
I've seen this issue as well and am unable to tell, why this fails in this configuration and in others not.
With patch 5/6 applied, the problem is gone though. Do you have an idea, where this issue might come from?
Thanks,
Stefan
PATCH v5 2/6 x86: conga: Add option to select different config headers for baseboards
Hi Stefan,
Quoted 84 lines · Stefan Roese
Hi Bin,
Quoted 80 lines · Bin Meng
Quoted 38 lines · Bin Meng
Quoted 32 lines · Stefan Roese
This patch adds the infrastructure to define different config headers with different configurations and default environment for the baseboards that can now be selected via
Kconfig. The new configuration for the theadorable-x86-conga-qa3-e3845 is also added. Also the new defconfig file for this new target is added.Signed-off-by Stefan Roese <[email protected]>Cc Simon Glass <[email protected]>Cc Bin Meng <[email protected]>---
v5:
- Added imply for some SPI NOR chips to the boardKconfigfilev4:
- Remove Gigadevice and Macronix flash supportv3:
- Rebased on latest master
- Removed unused macros from config headersv2:
- Added Bin's reviewed-byboard/congatec/Kconfig | 11 +++++ board/congatec/conga-qeval20-qa3-e3845/Kconfig | 9 ++-- board/congatec/conga-qeval20-qa3-e3845/MAINTAINERS | 2 + configs/theadorable-x86-conga-qa3-e3845_defconfig | 54 ++++++++++++++++++++++ include/configs/theadorable-x86-conga-qa3-e3845.h | 38 +++++++++++++++ 5 files changed, 109 insertions(+), 5 deletions(-)Quoted 3 lines
create mode 100644 configs/theadorable-x86-conga-qa3-e3845_defconfig create mode 100644
include/configs/theadorable-x86-conga-qa3-e3845.hQuoted 1 line
Reviewed-by Bin Meng <[email protected]>For some reason, this patch fails in buildman testing:
02: x86: conga: Add option to select different config headers for baseboards
(quoted diff) +1
-2-make[2]: *** [theadorable-x86-conga-qa3-e3845_defconfig] Error 1 -make[1]: *** [theadorable-x86-conga-qa3-e3845_defconfig] Error 2 +../arch/x86/lib/acpi_s3.c:14:25: error: expected declarationspecifiers or '...' before '*' token
+ static void asmlinkage (*acpi_do_wakeup)(void *vector) = (void *)WAKEUP_BASE;(quoted diff) +5
-0+ ^ + acpi_do_wakeup(vector); + ^ +make[2]: *** [arch/x86/lib/acpi_s3.o] Error 1 +make[1]: *** [arch/x86/lib] Error 2
w+../arch/x86/lib/acpi_s3.c: In function 'acpi_jump_to_wakeup':w+../arch/x86/lib/acpi_s3.c:22:2: warning: implicit declaration of function 'acpi_do_wakeup' [-Wimplicit-function-declaration]But this failure disappears in patch [05/06]:
05: x86: conga: theadorable-x86-conga-qa3-e3845_defconfig: Misc defconfig updates
x86: theadorable-x86-conga-qa3-e3845
-../arch/x86/lib/acpi_s3.c:14:25: error: expected declaration specifiers or '...' before '*' token
- static void asmlinkage (*acpi_do_wakeup)(void *vector) = (void *)WAKEUP_BASE;(quoted diff) +0
-5- ^ - acpi_do_wakeup(vector); - ^ -make[2]: *** [arch/x86/lib/acpi_s3.o] Error 1 -make[1]: *** [arch/x86/lib] Error 2
w-../arch/x86/lib/acpi_s3.c: In function 'acpi_jump_to_wakeup':w-../arch/x86/lib/acpi_s3.c:22:2: warning: implicit declaration of function 'acpi_do_wakeup' [-Wimplicit-function-declaration]
Quoted 9 lines
Quoted 1 line
Could you please have a look at this? Thanks!
I've seen this issue as well and am unable to tell, why this fails in this configuration and in others not.
With patch 5/6 applied, the problem is gone though. Do you have an idea, where this issue might come from?
A patch was just sent out. Please check
http://patchwork.ozlabs.org/patch/799115/
Regards,
Bin
PATCH v5 2/6 x86: conga: Add option to select different config headers for baseboards
Hi Bin,
Quoted 93 lines · Bin Meng
Hi Stefan,
Quoted 90 lines · Stefan Roese
Hi Bin,
Quoted 80 lines · Bin Meng
Quoted 38 lines · Bin Meng
Quoted 32 lines · Stefan Roese
This patch adds the infrastructure to define different config headers with different configurations and default environment for the baseboards that can now be selected via
Kconfig. The new configuration for the theadorable-x86-conga-qa3-e3845 is also added. Also the new defconfig file for this new target is added.Signed-off-by Stefan Roese <[email protected]>Cc Simon Glass <[email protected]>Cc Bin Meng <[email protected]>---
v5:
- Added imply for some SPI NOR chips to the boardKconfigfilev4:
- Remove Gigadevice and Macronix flash supportv3:
- Rebased on latest master
- Removed unused macros from config headersv2:
- Added Bin's reviewed-byboard/congatec/Kconfig | 11 +++++ board/congatec/conga-qeval20-qa3-e3845/Kconfig | 9 ++-- board/congatec/conga-qeval20-qa3-e3845/MAINTAINERS | 2 + configs/theadorable-x86-conga-qa3-e3845_defconfig | 54 ++++++++++++++++++++++ include/configs/theadorable-x86-conga-qa3-e3845.h | 38 +++++++++++++++ 5 files changed, 109 insertions(+), 5 deletions(-)Quoted 3 lines
create mode 100644 configs/theadorable-x86-conga-qa3-e3845_defconfig create mode 100644
include/configs/theadorable-x86-conga-qa3-e3845.hQuoted 1 line
Reviewed-by Bin Meng <[email protected]>For some reason, this patch fails in buildman testing:
02: x86: conga: Add option to select different config headers for baseboards
(quoted diff) +1
-2-make[2]: *** [theadorable-x86-conga-qa3-e3845_defconfig] Error 1 -make[1]: *** [theadorable-x86-conga-qa3-e3845_defconfig] Error 2 +../arch/x86/lib/acpi_s3.c:14:25: error: expected declarationspecifiers or '...' before '*' token
+ static void asmlinkage (*acpi_do_wakeup)(void *vector) = (void *)WAKEUP_BASE;(quoted diff) +5
-0+ ^ + acpi_do_wakeup(vector); + ^ +make[2]: *** [arch/x86/lib/acpi_s3.o] Error 1 +make[1]: *** [arch/x86/lib] Error 2
w+../arch/x86/lib/acpi_s3.c: In function 'acpi_jump_to_wakeup':w+../arch/x86/lib/acpi_s3.c:22:2: warning: implicit declaration of function 'acpi_do_wakeup' [-Wimplicit-function-declaration]But this failure disappears in patch [05/06]:
05: x86: conga: theadorable-x86-conga-qa3-e3845_defconfig: Misc defconfig updates
x86: theadorable-x86-conga-qa3-e3845
-../arch/x86/lib/acpi_s3.c:14:25: error: expected declaration specifiers or '...' before '*' token
- static void asmlinkage (*acpi_do_wakeup)(void *vector) = (void *)WAKEUP_BASE;(quoted diff) +0
-5- ^ - acpi_do_wakeup(vector); - ^ -make[2]: *** [arch/x86/lib/acpi_s3.o] Error 1 -make[1]: *** [arch/x86/lib] Error 2
w-../arch/x86/lib/acpi_s3.c: In function 'acpi_jump_to_wakeup':w-../arch/x86/lib/acpi_s3.c:22:2: warning: implicit declaration of function 'acpi_do_wakeup' [-Wimplicit-function-declaration]Quoted 1 line
Could you please have a look at this? Thanks!
I've seen this issue as well and am unable to tell, why this fails in this configuration and in others not.
Quoted 6 lines
Quoted 3 lines
With patch 5/6 applied, the problem is gone though. Do you have an idea, where this issue might come from?
A patch was just sent out. Please check
http://patchwork.ozlabs.org/patch/799115/
Great, thank you very much.
Thanks,
Stefan
PATCH v5 2/6 x86: conga: Add option to select different config headers for baseboards
In reply to Bin MengQuoted 34 lines · Bin Meng
Quoted 23 lines · Stefan Roese
This patch adds the infrastructure to define different config headers with different configurations and default environment for the baseboards that can now be selected via
Kconfig. The new configuration for the theadorable-x86-conga-qa3-e3845 is also added. Also the new defconfig file for this new target is added.Signed-off-by Stefan Roese <[email protected]>Cc Simon Glass <[email protected]>Cc Bin Meng <[email protected]>---
v5:
- Added imply for some SPI NOR chips to the boardKconfigfilev4:
- Remove Gigadevice and Macronix flash supportv3:
- Rebased on latest master
- Removed unused macros from config headersv2:
- Added Bin's reviewed-byQuoted 9 lines
board/congatec/Kconfig | 11 +++++ board/congatec/conga-qeval20-qa3-e3845/Kconfig | 9 ++-- board/congatec/conga-qeval20-qa3-e3845/MAINTAINERS | 2 + configs/theadorable-x86-conga-qa3-e3845_defconfig | 54 ++++++++++++++++++++++ include/configs/theadorable-x86-conga-qa3-e3845.h | 38 +++++++++++++++ 5 files changed, 109 insertions(+), 5 deletions(-) create mode 100644 configs/theadorable-x86-conga-qa3-e3845_defconfig create mode 100644 include/configs/theadorable-x86-conga-qa3-e3845.h
Quoted 1 line
Reviewed-by Bin Meng <[email protected]>
applied to u-boot-x86, thanks!
PATCH v5 3/6 x86: theadorable-x86: Add header file for common defines and env
In reply to Stefan RoeseThis patch adds the common header include file theadorable-x86-common.h for the theadorable-x86 targets to define all common options and the default environment.
---
v5:
- No change
v3:
- Rebased on latest master
include/configs/theadorable-x86-common.h | 155 ++++++++++++++++++++++ include/configs/theadorable-x86-conga-qa3-e3845.h | 32 ++--- include/configs/theadorable-x86-dfi-bt700.h | 38 ++---- 3 files changed, 179 insertions(+), 46 deletions(-) create mode 100644 include/configs/theadorable-x86-common.h
include/configs/theadorable-x86-common.h new file +155 -0
@@ -0,0 +1,155 @@ +/* +* Copyright (C) 2016 Stefan Roese <[email protected]> +* +* SPDX-License-Identifier: GPL-2.0+ +*/ + +/* +* Common options, macros and default environment for all +* theadorable x86 based boards +*/ + +#ifndef __THEADORABLE_X86_COMMON_H +#define __THEADORABLE_X86_COMMON_H + +#define CONFIG_SYS_MONITOR_LEN (1 << 20) + +#define CONFIG_PREBOOT + +#define CONFIG_STD_DEVICES_SETTINGS "stdin=serial\0" \ + "stdout=serial\0" \ + "stderr=serial\0" + +#define CONFIG_USB_HOST_ETHER +#define CONFIG_USB_ETHER_ASIX +#define CONFIG_USB_ETHER_SMSC95XX +#define CONFIG_USB_ETHER_MCS7830 +#define CONFIG_USB_ETHER_RTL8152 + +#define VIDEO_IO_OFFSET 0 +#define CONFIG_X86EMU_RAW_IO +#define CONFIG_CMD_BMP +#define CONFIG_BMP_16BPP + +/* Environment settings */ +#define CONFIG_SYS_REDUNDAND_ENVIRONMENT +#undef CONFIG_ENV_SIZE +#define CONFIG_ENV_SIZE 0x2000 +#define CONFIG_ENV_SECT_SIZE 0x1000 +#define CONFIG_ENV_OFFSET 0x006ec000 +#define CONFIG_ENV_OFFSET_REDUND \ + (CONFIG_ENV_OFFSET + CONFIG_ENV_SIZE) + +#undef CONFIG_BOOTARGS +#undef CONFIG_BOOTCOMMAND +#undef CONFIG_EXTRA_ENV_SETTINGS + +#define CONFIG_EXTRA_ENV_SETTINGS \ + "tftpdir=" DEF_ENV_TFTPDIR "\0" \ + "eth_init=" DEF_ENV_ETH_INIT "\0" \ + "ubuntu_part=" __stringify(DEF_ENV_UBUNTU_PART) "\0" \ + "yocto_part=" __stringify(DEF_ENV_YOCTO_PART) "\0" \ + "ubuntu_tty=" __stringify(DEF_ENV_UBUNTU_TTY) "\0" \ + "yocto_tty=" __stringify(DEF_ENV_YOCTO_TTY) "\0" \ + "start_eth=if test -n \"${eth_init}\";" \ + "then run eth_init;else sleep 0;fi\0" \ + "kernel-ver=4.8.0-54\0" \ + "boot=zboot 03000000 0 04000000 ${filesize}\0" \ + "mtdparts=mtdparts=intel-spi:4k(descriptor),7084k(me)," \ + "8k(env1),8k(env2),64k(mrc),640k(u-boot)," \ + "64k(vga),-(fsp)\0" \ + "addtty_ubuntu=setenv bootargs ${bootargs} " \ + "console=ttyS${ubuntu_tty},${baudrate}\0" \ + "addtty_yocto=setenv bootargs ${bootargs} " \ + "console=ttyS${yocto_tty},${baudrate}\0" \ + "addmtd=setenv bootargs ${bootargs} ${mtdparts}\0" \ + "addmisc=setenv bootargs ${bootargs} " \ + "intel-spi.writeable=1 vmalloc=300M " \ + "pci=realloc=on,hpmemsize=0x12000000\0" \ + "bootcmd=if env exists recovery_status;" \ + "then run swupdate;" \ + "else run yocto_boot;run swupdate;" \ + "fi\0" \ + "ubuntu_args=setenv bootargs " \ + "root=/dev/sda${ubuntu_part} ro\0" \ + "ubuntu_args_quiet=setenv bootargs " \ + "root=/dev/sda${ubuntu_part} ro quiet\0" \ + "ubuntu_load=load scsi 0:${ubuntu_part} 03000000 " \ + "/boot/vmlinuz-${kernel-ver}-generic;" \ + "load scsi 0:${ubuntu_part} 04000000 " \ + "/boot/initrd.img-${kernel-ver}-generic\0" \ + "ubuntu_boot=run ubuntu_args_quiet addmtd addmisc " \ + "ubuntu_load boot\0" \ + "ubuntu_boot_console=run ubuntu_args addtty_ubuntu " \ + "addmtd addmisc ubuntu_load boot\0" \ + "net_args=setenv bootargs root=/dev/sda${ubuntu_part} ro\0" \ + "net_boot=run start_eth net_args addtty_yocto addmtd addmisc;" \ + "tftp 03000000 ${tftpdir}/bzImage;" \ + "load scsi 0:${ubuntu_part} 04000000 " \ + "/boot/initrd.img-${kernel-ver}-generic;" \ + "run boot\0" \ + "yocto_args=setenv bootargs root=/dev/sda${yocto_part} " \ + "ip=dhcp panic=1\0" \ + "yocto_args_fast=setenv bootargs root=/dev/sda${yocto_part} " \ + "quiet panic=1\0" \ + "yocto_boot=run yocto_args addmtd addmisc addtty_yocto;" \ + "if run yocto_load;then zboot 03000000;fi\0" \ + "yocto_boot_fast=run yocto_args_fast addmtd addmisc " \ + "addtty_yocto yocto_load;zboot 03000000\0" \ + "yocto_boot_tftp=run yocto_args addmtd addmisc addtty_yocto " \ + "start_eth yocto_load_tftp;zboot 03000000\0" \ + "yocto_kernel=bzImage\0" \ + "yocto_load=load scsi 0:${yocto_part} 03000000 " \ + "/boot/${yocto_kernel}\0" \ + "yocto_load_tftp=tftp 03000000 dfi/bzImage\0" \ + "swupdate=if env exists swupdate_factory;" \ + "then run swupdate_usb;run swupdate_run;" \ + "else setenv swupdate_part 2;run swupdate_mmc;" \ + "run swupdate_run;setenv swupdate_part 1;" \ + "run swupdate_mmc;run swupdate_usb;" \ + "run swupdate_run;" \ + "fi\0" \ + "swupdate-initrd=/boot/swupdate-image-theadorable.ext4.gz\0" \ + "swupdate-kernel=/boot/bzImage\0" \ + "swupdate_args=setenv bootargs root=/dev/ram rw ip=dhcp panic=1\0" \ + "swupdate_dev=0\0" \ + "swupdate_factory=0\0" \ + "swupdate_interface=usb\0" \ + "swupdate_kernel=vmlinuz-4.4.0-28-generic\0" \ + "swupdate_load=load ${swupdate_interface} ${swupdate_dev}:" \ + "${swupdate_part} 03000000 ${swupdate-kernel}" \ + " && load ${swupdate_interface} ${swupdate_dev}:" \ + "${swupdate_part} 04000000 ${swupdate-initrd}\0" \ + "swupdate_mmc=setenv swupdate_interface mmc;" \ + "setenv swupdate_dev ${swupdate_mmcdev};" \ + "setenv swupdate_part 1;" \ + "mmc dev ${swupdate_dev};mmc rescan\0" \ + "swupdate_mmcdev=0\0" \ + "swupdate_part=1\0" \ + "swupdate_run=run swupdate_args addtty_yocto addmtd addmisc;" \ + "if run swupdate_load;then run boot;" \ + "else echo SWUpdate cannot be started from " \ + "${swupdate_interface};" \ + "fi\0" \ + "swupdate_usb=setenv swupdate_interface usb;" \ + "setenv swupdate_dev 0;setenv swupdate_part 1;" \ + "usb start\0" \ + "logo_tftp=tftp ${loadaddr} ${tftpdir}/logo.bmp;" \ + "bmp display ${loadaddr}\0" \ + "preboot=scsi scan;load scsi 0:${ubuntu_part} ${loadaddr} " \ + "/boot/logo/logo.bmp;bmp display ${loadaddr}\0" \ + "rootpath=/tftpboot/theadorable-x86-conga/work/" \ + "rootfs-yocto-swupdate-2017-03-29\0" \ + "addip=setenv bootargs ${bootargs} ip=${ipaddr}:${serverip}:" \ + "${gatewayip}:${netmask}:${hostname}:eth0:off\0" \ + "set_bootargs_nfs=setenv bootargs root=/dev/nfs rw " \ + "nfsroot=${serverip}:${rootpath},tcp,nfsvers=3\0" \ + "net_nfs=run start_eth set_bootargs_nfs addtty_yocto addip " \ + "addmtd addmisc;tftp 03000000 ${tftpdir}/bzImage;" \ + "zboot 03000000\0" \ + "load_uboot=tftp ${loadaddr} ${tftpdir}/u-boot.rom\0" \ + "update_uboot=sf probe;" \ + "sf update ${loadaddr} 0 800000;saveenv\0" \ + "upd_uboot=run start_eth load_uboot update_uboot\0" + +#endif /* __THEADORABLE_X86_COMMON_H */
include/configs/theadorable-x86-conga-qa3-e3845.h +12 -20
@@ -13,26 +13,18 @@#include <configs/x86-common.h> -#define CONFIG_SYS_MONITOR_LEN (1 << 20) +/* Set the board specific parameters */ +#define DEF_ENV_TFTPDIR "theadorable-x86-conga" +#define DEF_ENV_ETH_INIT "" +#define DEF_ENV_UBUNTU_PART 2 +#define DEF_ENV_UBUNTU_TTY 0/* Use ttyS0 */ +#define DEF_ENV_YOCTO_PART 3 +#define DEF_ENV_YOCTO_TTY 0/* Use ttyS0 */ -#define CONFIG_PREBOOT - -#define CONFIG_STD_DEVICES_SETTINGS "stdin=serial\0" \ - "stdout=serial\0" \ - "stderr=serial\0" - -#define VIDEO_IO_OFFSET 0 -#define CONFIG_X86EMU_RAW_IO -#define CONFIG_CMD_BMP -#define CONFIG_BMP_16BPP - -/* Environment settings */ -#define CONFIG_SYS_REDUNDAND_ENVIRONMENT -#undef CONFIG_ENV_SIZE -#define CONFIG_ENV_SIZE 0x2000 -#define CONFIG_ENV_SECT_SIZE 0x1000 -#define CONFIG_ENV_OFFSET 0x006ec000 -#define CONFIG_ENV_OFFSET_REDUND \ - (CONFIG_ENV_OFFSET + CONFIG_ENV_SIZE) +/* +* Include the theadorable-x86 common options, macros and default +* environment +*/ +#include <configs/theadorable-x86-common.h> #endif /* __CONFIG_H */
include/configs/theadorable-x86-dfi-bt700.h +12 -26
@@ -13,35 +13,21 @@#include <configs/x86-common.h> -#define CONFIG_SYS_MONITOR_LEN (1 << 20) - -#define CONFIG_PREBOOT -/* Use BayTrail internal HS UART which is memory-mapped */ #undef CONFIG_SYS_NS16550_PORT_MAPPED -#define CONFIG_STD_DEVICES_SETTINGS "stdin=serial\0" \ - "stdout=serial\0" \ - "stderr=serial\0" - -#define CONFIG_USB_HOST_ETHER -#define CONFIG_USB_ETHER_ASIX -#define CONFIG_USB_ETHER_SMSC95XX -#define CONFIG_USB_ETHER_MCS7830 -#define CONFIG_USB_ETHER_RTL8152 +/* Set the board specific parameters */ +#define DEF_ENV_TFTPDIR "theadorable-x86-dfi" +#define DEF_ENV_ETH_INIT "usb reset" +#define DEF_ENV_UBUNTU_PART 1 +#define DEF_ENV_UBUNTU_TTY 4/* Use ttyS4 */ +#define DEF_ENV_YOCTO_PART 2 +#define DEF_ENV_YOCTO_TTY 1/* Use ttyS1 */ -#define VIDEO_IO_OFFSET 0 -#define CONFIG_X86EMU_RAW_IO -#define CONFIG_CMD_BMP -#define CONFIG_BMP_16BPP - -/* Environment settings */ -#define CONFIG_SYS_REDUNDAND_ENVIRONMENT -#undef CONFIG_ENV_SIZE -#define CONFIG_ENV_SIZE 0x2000 -#define CONFIG_ENV_SECT_SIZE 0x1000 -#define CONFIG_ENV_OFFSET 0x006ec000 -#define CONFIG_ENV_OFFSET_REDUND \ - (CONFIG_ENV_OFFSET + CONFIG_ENV_SIZE) +/* +* Include the theadorable-x86 common options, macros and default +* environment +*/ +#include <configs/theadorable-x86-common.h> #endif /* __CONFIG_H */
Signature · 1 line
2.14.0
PATCH v5 3/6 x86: theadorable-x86: Add header file for common defines and env
Quoted 11 lines · Stefan Roese
This patch adds the common header include file
theadorable-x86-common.hfor the theadorable-x86 targets to define all common options and the default environment.Signed-off-by Stefan Roese <[email protected]>Cc Simon Glass <[email protected]>Cc Bin Meng <[email protected]>---
v5:
- No change
Quoted 9 lines
v3:
- Rebased on latest masterinclude/configs/theadorable-x86-common.h | 155 ++++++++++++++++++++++ include/configs/theadorable-x86-conga-qa3-e3845.h | 32 ++--- include/configs/theadorable-x86-dfi-bt700.h | 38 ++---- 3 files changed, 179 insertions(+), 46 deletions(-) create mode 100644 include/configs/theadorable-x86-common.h
PATCH v5 3/6 x86: theadorable-x86: Add header file for common defines and env
Quoted 15 lines · Bin Meng
Quoted 14 lines · Stefan Roese
This patch adds the common header include file
theadorable-x86-common.hfor the theadorable-x86 targets to define all common options and the default environment.Signed-off-by Stefan Roese <[email protected]>Cc Simon Glass <[email protected]>Cc Bin Meng <[email protected]>---
v5:
- No changev3:
- Rebased on latest master
Quoted 8 lines
Quoted 6 lines
include/configs/theadorable-x86-common.h | 155 ++++++++++++++++++++++ include/configs/theadorable-x86-conga-qa3-e3845.h | 32 ++--- include/configs/theadorable-x86-dfi-bt700.h | 38 ++---- 3 files changed, 179 insertions(+), 46 deletions(-) create mode 100644 include/configs/theadorable-x86-common.hReviewed-by Bin Meng <[email protected]>
applied to u-boot-x86, thanks!
PATCH v5 4/6 x86: conga: conga-qeval20-qa3-e3845_defconfig: Misc defconfig updates
In reply to Stefan Roese- Enable ACPI resume support
- Disable debug UART
- Enable Spansion and Winbond SPI flash support
- Move VGA BIOS binary address to enable bigger U-Boot images
---
v5:
- Move VGA BIOS address
- SPI NOR chips removed because of imply in board Kconfig
configs/conga-qeval20-qa3-e3845_defconfig | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-)
configs/conga-qeval20-qa3-e3845_defconfig +2 -3
@@ -2,12 +2,13 @@ CONFIG_X86=y CONFIG_VENDOR_CONGATEC=y CONFIG_TARGET_CONGA_QEVAL20_QA3_E3845=y CONFIG_DEFAULT_DEVICE_TREE="conga-qeval20-qa3-e3845" -CONFIG_DEBUG_UART=y CONFIG_SMP=y CONFIG_HAVE_VGA_BIOS=y +CONFIG_VGA_BIOS_ADDR=0xfffa0000 CONFIG_GENERATE_PIRQ_TABLE=y CONFIG_GENERATE_MP_TABLE=y CONFIG_GENERATE_ACPI_TABLE=y +CONFIG_HAVE_ACPI_RESUME=y CONFIG_SEABIOS=y CONFIG_FIT=y CONFIG_FIT_SIGNATURE=y
@@ -46,8 +47,6 @@ CONFIG_DM_I2C=y CONFIG_SYS_I2C_INTEL=y CONFIG_WINBOND_W83627=y CONFIG_E1000=y -CONFIG_DEBUG_UART_BASE=0x3f8 -CONFIG_DEBUG_UART_CLOCK=1843200 CONFIG_USB_STORAGE=y CONFIG_USB_KEYBOARD=y CONFIG_FRAMEBUFFER_SET_VESA_MODE=y
Signature · 1 line
2.14.0
PATCH v5 4/6 x86: conga: conga-qeval20-qa3-e3845_defconfig: Misc defconfig updates
Quoted 8 lines · Stefan Roese
- Enable ACPI resume support
- Disable debug UART
- Enable Spansion and Winbond SPI flash support
- Move VGA BIOS binary address to enable bigger U-Boot imagesSigned-off-by Stefan Roese <[email protected]>Cc Simon Glass <[email protected]>Cc Bin Meng <[email protected]>
Quoted 8 lines
---
v5:
- Move VGA BIOS address
- SPI NOR chips removed because of imply in boardKconfigconfigs/conga-qeval20-qa3-e3845_defconfig | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-)
PATCH v5 4/6 x86: conga: conga-qeval20-qa3-e3845_defconfig: Misc defconfig updates
Quoted 14 lines · Bin Meng
Quoted 13 lines · Stefan Roese
- Enable ACPI resume support
- Disable debug UART
- Enable Spansion and Winbond SPI flash support
- Move VGA BIOS binary address to enable bigger U-Boot imagesSigned-off-by Stefan Roese <[email protected]>Cc Simon Glass <[email protected]>Cc Bin Meng <[email protected]>---
v5:
- Move VGA BIOS address
- SPI NOR chips removed because of imply in boardKconfig
Quoted 5 lines
Quoted 3 lines
configs/conga-qeval20-qa3-e3845_defconfig | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-)Reviewed-by Bin Meng <[email protected]>
applied to u-boot-x86, thanks!
PATCH v5 5/6 x86: conga: theadorable-x86-conga-qa3-e3845_defconfig: Misc defconfig updates
In reply to Stefan Roese- Disable debug UART
- Enable more partition support
---
v5:
- SPI NOR chips removed because of imply in board Kconfig
configs/theadorable-x86-conga-qa3-e3845_defconfig | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
configs/theadorable-x86-conga-qa3-e3845_defconfig +3 -3
@@ -3,7 +3,6 @@ CONFIG_VENDOR_CONGATEC=y CONFIG_TARGET_THEADORABLE_X86_CONGA_QA3_E3845=y CONFIG_DEFAULT_DEVICE_TREE="conga-qeval20-qa3-e3845" CONFIG_INTERNAL_UART=y -CONFIG_DEBUG_UART=y CONFIG_SMP=y CONFIG_HAVE_VGA_BIOS=y CONFIG_VGA_BIOS_ADDR=0xfffa0000
@@ -38,6 +37,9 @@ CONFIG_CMD_EXT4=y CONFIG_CMD_EXT4_WRITE=y CONFIG_CMD_FAT=y CONFIG_CMD_FS_GENERIC=y +CONFIG_MAC_PARTITION=y +CONFIG_ISO_PARTITION=y +CONFIG_EFI_PARTITION=y CONFIG_REGMAP=y CONFIG_SYSCON=y CONFIG_CPU=y
@@ -45,8 +47,6 @@ CONFIG_DM_I2C=y CONFIG_SYS_I2C_INTEL=y CONFIG_WINBOND_W83627=y CONFIG_E1000=y -CONFIG_DEBUG_UART_BASE=0x3f8 -CONFIG_DEBUG_UART_CLOCK=1843200 CONFIG_USB_STORAGE=y CONFIG_USB_KEYBOARD=y CONFIG_FRAMEBUFFER_SET_VESA_MODE=y
Signature · 1 line
2.14.0
PATCH v5 5/6 x86: conga: theadorable-x86-conga-qa3-e3845_defconfig: Misc defconfig updates
Quoted 6 lines · Stefan Roese
- Disable debug UART
- Enable more partition supportSigned-off-by Stefan Roese <[email protected]>Cc Simon Glass <[email protected]>Cc Bin Meng <[email protected]>
Quoted 7 lines
---
v5:
- SPI NOR chips removed because of imply in boardKconfigconfigs/theadorable-x86-conga-qa3-e3845_defconfig | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
PATCH v5 5/6 x86: conga: theadorable-x86-conga-qa3-e3845_defconfig: Misc defconfig updates
Quoted 11 lines · Bin Meng
Quoted 10 lines · Stefan Roese
- Disable debug UART
- Enable more partition supportSigned-off-by Stefan Roese <[email protected]>Cc Simon Glass <[email protected]>Cc Bin Meng <[email protected]>---
v5:
- SPI NOR chips removed because of imply in boardKconfig
Quoted 5 lines
Quoted 3 lines
configs/theadorable-x86-conga-qa3-e3845_defconfig | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)Reviewed-by Bin Meng <[email protected]>
applied to u-boot-x86, thanks!
PATCH v5 6/6 x86: Add defconfig for theadorable-x86-conga with PCIe x4 blobs
In reply to Stefan RoeseThis defconfig uses the PCIe x4 binary blobs from the congatec BIOS.
---
v5:
- SPI NOR chips removed because of imply in board Kconfig
board/congatec/conga-qeval20-qa3-e3845/MAINTAINERS | 1 + ...eadorable-x86-conga-qa3-e3845-pcie-x4_defconfig | 55 ++++++++++++++++++++++ 2 files changed, 56 insertions(+) create mode 100644 configs/theadorable-x86-conga-qa3-e3845-pcie-x4_defconfig
board/congatec/conga-qeval20-qa3-e3845/MAINTAINERS +1 -0
@@ -7,4 +7,5 @@ F: include/configs/theadorable-x86-conga-qa3-e3845.h F: configs/conga-qeval20-qa3-e3845_defconfig F: configs/conga-qeval20-qa3-e3845-internal-uart_defconfig F: configs/theadorable-x86-conga-qa3-e3845_defconfig +F: configs/theadorable-x86-conga-qa3-e3845-pcie-x4_defconfig F: arch/x86/dts/conga-qeval20-qa3-e3845.dts
configs/theadorable-x86-conga-qa3-e3845-pcie-x4_defconfig new file +55 -0
55 lines not on this page · raw message
Signature · 1 line
2.14.0
PATCH v5 6/6 x86: Add defconfig for theadorable-x86-conga with PCIe x4 blobs
Quoted 5 lines · Stefan Roese
This defconfig uses the PCIe x4 binary blobs from the congatec BIOS.
Signed-off-by Stefan Roese <[email protected]>Cc Simon Glass <[email protected]>Cc Bin Meng <[email protected]>
Quoted 9 lines
---
v5:
- SPI NOR chips removed because of imply in boardKconfigboard/congatec/conga-qeval20-qa3-e3845/MAINTAINERS | 1 + ...eadorable-x86-conga-qa3-e3845-pcie-x4_defconfig | 55 ++++++++++++++++++++++ 2 files changed, 56 insertions(+) create mode 100644 configs/theadorable-x86-conga-qa3-e3845-pcie-x4_defconfig
PATCH v5 6/6 x86: Add defconfig for theadorable-x86-conga with PCIe x4 blobs
Quoted 10 lines · Bin Meng
Quoted 9 lines · Stefan Roese
This defconfig uses the PCIe x4 binary blobs from the congatec BIOS.
Signed-off-by Stefan Roese <[email protected]>Cc Simon Glass <[email protected]>Cc Bin Meng <[email protected]>---
v5:
- SPI NOR chips removed because of imply in boardKconfig
Quoted 7 lines
Quoted 5 lines
board/congatec/conga-qeval20-qa3-e3845/MAINTAINERS | 1 + ...eadorable-x86-conga-qa3-e3845-pcie-x4_defconfig | 55 ++++++++++++++++++++++ 2 files changed, 56 insertions(+) create mode 100644 configs/theadorable-x86-conga-qa3-e3845-pcie-x4_defconfigReviewed-by Bin Meng <[email protected]>
applied to u-boot-x86, thanks!
PATCH v5 1/6 x86: dfi: Add option to select different config headers for baseboards
In reply to Stefan RoeseQuoted 19 lines · Stefan Roese
This patch adds the infrastructure to define different config headers with different configurations and default environment for the baseboards that can now be selected via
Kconfig. The new configuration for the theadorable-x86-dfi-bt700 is also added.Signed-off-by Stefan Roese <[email protected]>Cc Simon Glass <[email protected]>Cc Bin Meng <[email protected]>---
v5:
- Added imply for some SPI NOR chips to the boardKconfigfilev3:
- Rebased on latest master
- Removed unused macros from config headersv2:
- Added Bin's reviewed-by
Quoted 9 lines
board/dfi/Kconfig | 18 +++++++++-- board/dfi/dfi-bt700/Kconfig | 9 +++--- board/dfi/dfi-bt700/MAINTAINERS | 1 + configs/dfi-bt700-q7x-151_defconfig | 6 ++-- configs/theadorable-x86-dfi-bt700_defconfig | 3 +- include/configs/theadorable-x86-dfi-bt700.h | 47 +++++++++++++++++++++++++++++ 6 files changed, 71 insertions(+), 13 deletions(-) create mode 100644 include/configs/theadorable-x86-dfi-bt700.h
PATCH v5 1/6 x86: dfi: Add option to select different config headers for baseboards
Quoted 30 lines · Bin Meng
Quoted 19 lines · Stefan Roese
This patch adds the infrastructure to define different config headers with different configurations and default environment for the baseboards that can now be selected via
Kconfig. The new configuration for the theadorable-x86-dfi-bt700 is also added.Signed-off-by Stefan Roese <[email protected]>Cc Simon Glass <[email protected]>Cc Bin Meng <[email protected]>---
v5:
- Added imply for some SPI NOR chips to the boardKconfigfilev3:
- Rebased on latest master
- Removed unused macros from config headersv2:
- Added Bin's reviewed-byQuoted 9 lines
board/dfi/Kconfig | 18 +++++++++-- board/dfi/dfi-bt700/Kconfig | 9 +++--- board/dfi/dfi-bt700/MAINTAINERS | 1 + configs/dfi-bt700-q7x-151_defconfig | 6 ++-- configs/theadorable-x86-dfi-bt700_defconfig | 3 +- include/configs/theadorable-x86-dfi-bt700.h | 47 +++++++++++++++++++++++++++++ 6 files changed, 71 insertions(+), 13 deletions(-) create mode 100644 include/configs/theadorable-x86-dfi-bt700.h
Quoted 1 line
Reviewed-by Bin Meng <[email protected]>
applied to u-boot-x86, thanks!