[U-Boot] [PATCH 1/6 v5] 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.
Signed-off-by: Stefan Roese sr@denx.de Cc: Simon Glass sjg@chromium.org Cc: Bin Meng bmeng.cn@gmail.com --- 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
diff --git a/board/dfi/Kconfig b/board/dfi/Kconfig index d2a1d78783..5488f68ed2 100644 --- a/board/dfi/Kconfig +++ b/board/dfi/Kconfig @@ -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" diff --git a/board/dfi/dfi-bt700/Kconfig b/board/dfi/dfi-bt700/Kconfig index 81a2575d11..4b6c3fc56c 100644 --- a/board/dfi/dfi-bt700/Kconfig +++ b/board/dfi/dfi-bt700/Kconfig @@ -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 diff --git a/board/dfi/dfi-bt700/MAINTAINERS b/board/dfi/dfi-bt700/MAINTAINERS index 6639787814..a99a7250b8 100644 --- a/board/dfi/dfi-bt700/MAINTAINERS +++ b/board/dfi/dfi-bt700/MAINTAINERS @@ -3,6 +3,7 @@ M: Stefan Roese sr@denx.de 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 diff --git a/configs/dfi-bt700-q7x-151_defconfig b/configs/dfi-bt700-q7x-151_defconfig index 13d911c78c..bcc830a3b7 100644 --- a/configs/dfi-bt700-q7x-151_defconfig +++ b/configs/dfi-bt700-q7x-151_defconfig @@ -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 diff --git a/configs/theadorable-x86-dfi-bt700_defconfig b/configs/theadorable-x86-dfi-bt700_defconfig index 29d48b6c53..c49d06b4a0 100644 --- a/configs/theadorable-x86-dfi-bt700_defconfig +++ b/configs/theadorable-x86-dfi-bt700_defconfig @@ -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 diff --git a/include/configs/theadorable-x86-dfi-bt700.h b/include/configs/theadorable-x86-dfi-bt700.h new file mode 100644 index 0000000000..9f5919152e --- /dev/null +++ b/include/configs/theadorable-x86-dfi-bt700.h @@ -0,0 +1,47 @@ +/* + * Copyright (C) 2016 Stefan Roese sr@denx.de + * + * 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 + +/* 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 + +#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 */
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 sr@denx.de Cc: Simon Glass sjg@chromium.org Cc: Bin Meng bmeng.cn@gmail.com --- 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
diff --git a/board/congatec/Kconfig b/board/congatec/Kconfig index ff5a1d84a1..fb341bf24c 100644 --- a/board/congatec/Kconfig +++ b/board/congatec/Kconfig @@ -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" diff --git a/board/congatec/conga-qeval20-qa3-e3845/Kconfig b/board/congatec/conga-qeval20-qa3-e3845/Kconfig index c2649d299f..e1fae737ac 100644 --- a/board/congatec/conga-qeval20-qa3-e3845/Kconfig +++ b/board/congatec/conga-qeval20-qa3-e3845/Kconfig @@ -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 diff --git a/board/congatec/conga-qeval20-qa3-e3845/MAINTAINERS b/board/congatec/conga-qeval20-qa3-e3845/MAINTAINERS index 3d7e8e2d61..6e065590ab 100644 --- a/board/congatec/conga-qeval20-qa3-e3845/MAINTAINERS +++ b/board/congatec/conga-qeval20-qa3-e3845/MAINTAINERS @@ -3,6 +3,8 @@ M: Stefan Roese sr@denx.de 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 diff --git a/configs/theadorable-x86-conga-qa3-e3845_defconfig b/configs/theadorable-x86-conga-qa3-e3845_defconfig new file mode 100644 index 0000000000..32127fc087 --- /dev/null +++ b/configs/theadorable-x86-conga-qa3-e3845_defconfig @@ -0,0 +1,54 @@ +CONFIG_X86=y +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 +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 +CONFIG_BOOTSTAGE=y +CONFIG_BOOTSTAGE_REPORT=y +CONFIG_SYS_CONSOLE_INFO_QUIET=y +CONFIG_HUSH_PARSER=y +CONFIG_CMD_CPU=y +# CONFIG_CMD_IMLS is not set +# CONFIG_CMD_FLASH is not set +CONFIG_CMD_MMC=y +CONFIG_CMD_SF=y +CONFIG_CMD_SPI=y +CONFIG_CMD_I2C=y +CONFIG_CMD_USB=y +CONFIG_CMD_GPIO=y +# CONFIG_CMD_SETEXPR is not set +CONFIG_CMD_DHCP=y +# CONFIG_CMD_NFS is not set +CONFIG_CMD_PING=y +CONFIG_CMD_TIME=y +CONFIG_CMD_BOOTSTAGE=y +CONFIG_CMD_EXT2=y +CONFIG_CMD_EXT4=y +CONFIG_CMD_EXT4_WRITE=y +CONFIG_CMD_FAT=y +CONFIG_CMD_FS_GENERIC=y +CONFIG_REGMAP=y +CONFIG_SYSCON=y +CONFIG_CPU=y +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 +CONFIG_FRAMEBUFFER_VESA_MODE_114=y +CONFIG_CONSOLE_SCROLL_LINES=5 diff --git a/include/configs/theadorable-x86-conga-qa3-e3845.h b/include/configs/theadorable-x86-conga-qa3-e3845.h new file mode 100644 index 0000000000..17aee1a0d2 --- /dev/null +++ b/include/configs/theadorable-x86-conga-qa3-e3845.h @@ -0,0 +1,38 @@ +/* + * Copyright (C) 2016 Stefan Roese sr@denx.de + * + * 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 */
On Tue, Aug 8, 2017 at 5:52 PM, Stefan Roese sr@denx.de wrote:
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 sr@denx.de Cc: Simon Glass sjg@chromium.org Cc: Bin Meng bmeng.cn@gmail.com
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
Reviewed-by: Bin Meng bmeng.cn@gmail.com
Hi Stefan,
On Tue, Aug 8, 2017 at 6:06 PM, Bin Meng bmeng.cn@gmail.com wrote:
On Tue, Aug 8, 2017 at 5:52 PM, Stefan Roese sr@denx.de wrote:
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 sr@denx.de Cc: Simon Glass sjg@chromium.org Cc: Bin Meng bmeng.cn@gmail.com
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
Reviewed-by: Bin Meng bmeng.cn@gmail.com
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 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; - ^ - 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]
Could you please have a look at this? Thanks!
Regards, Bin
Hi Bin,
On 08.08.2017 12:29, Bin Meng wrote:
On Tue, Aug 8, 2017 at 6:06 PM, Bin Meng bmeng.cn@gmail.com wrote:
On Tue, Aug 8, 2017 at 5:52 PM, Stefan Roese sr@denx.de wrote:
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 sr@denx.de Cc: Simon Glass sjg@chromium.org Cc: Bin Meng bmeng.cn@gmail.com
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
Reviewed-by: Bin Meng bmeng.cn@gmail.com
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 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;
^- 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]
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
Hi Stefan,
On Tue, Aug 8, 2017 at 6:37 PM, Stefan Roese sr@denx.de wrote:
Hi Bin,
On 08.08.2017 12:29, Bin Meng wrote:
On Tue, Aug 8, 2017 at 6:06 PM, Bin Meng bmeng.cn@gmail.com wrote:
On Tue, Aug 8, 2017 at 5:52 PM, Stefan Roese sr@denx.de wrote:
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 sr@denx.de Cc: Simon Glass sjg@chromium.org Cc: Bin Meng bmeng.cn@gmail.com
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
Reviewed-by: Bin Meng bmeng.cn@gmail.com
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 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;
^- 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]
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
Hi Bin,
On 08.08.2017 13:32, Bin Meng wrote:
Hi Stefan,
On Tue, Aug 8, 2017 at 6:37 PM, Stefan Roese sr@denx.de wrote:
Hi Bin,
On 08.08.2017 12:29, Bin Meng wrote:
On Tue, Aug 8, 2017 at 6:06 PM, Bin Meng bmeng.cn@gmail.com wrote:
On Tue, Aug 8, 2017 at 5:52 PM, Stefan Roese sr@denx.de wrote:
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 sr@denx.de Cc: Simon Glass sjg@chromium.org Cc: Bin Meng bmeng.cn@gmail.com
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
Reviewed-by: Bin Meng bmeng.cn@gmail.com
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 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;
^- 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]
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/
Great, thank you very much.
Thanks, Stefan
On Tue, Aug 8, 2017 at 6:06 PM, Bin Meng bmeng.cn@gmail.com wrote:
On Tue, Aug 8, 2017 at 5:52 PM, Stefan Roese sr@denx.de wrote:
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 sr@denx.de Cc: Simon Glass sjg@chromium.org Cc: Bin Meng bmeng.cn@gmail.com
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
Reviewed-by: Bin Meng bmeng.cn@gmail.com
applied to u-boot-x86, thanks!
This 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.
Signed-off-by: Stefan Roese sr@denx.de Cc: Simon Glass sjg@chromium.org Cc: Bin Meng bmeng.cn@gmail.com --- 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
diff --git a/include/configs/theadorable-x86-common.h b/include/configs/theadorable-x86-common.h new file mode 100644 index 0000000000..9655238951 --- /dev/null +++ b/include/configs/theadorable-x86-common.h @@ -0,0 +1,155 @@ +/* + * Copyright (C) 2016 Stefan Roese sr@denx.de + * + * 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 */ diff --git a/include/configs/theadorable-x86-conga-qa3-e3845.h b/include/configs/theadorable-x86-conga-qa3-e3845.h index 17aee1a0d2..bc0e078cff 100644 --- a/include/configs/theadorable-x86-conga-qa3-e3845.h +++ b/include/configs/theadorable-x86-conga-qa3-e3845.h @@ -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 */ diff --git a/include/configs/theadorable-x86-dfi-bt700.h b/include/configs/theadorable-x86-dfi-bt700.h index 9f5919152e..2e15d74ced 100644 --- a/include/configs/theadorable-x86-dfi-bt700.h +++ b/include/configs/theadorable-x86-dfi-bt700.h @@ -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 */
On Tue, Aug 8, 2017 at 5:52 PM, Stefan Roese sr@denx.de wrote:
This 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.
Signed-off-by: Stefan Roese sr@denx.de Cc: Simon Glass sjg@chromium.org Cc: Bin Meng bmeng.cn@gmail.com
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
Reviewed-by: Bin Meng bmeng.cn@gmail.com
On Tue, Aug 8, 2017 at 6:06 PM, Bin Meng bmeng.cn@gmail.com wrote:
On Tue, Aug 8, 2017 at 5:52 PM, Stefan Roese sr@denx.de wrote:
This 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.
Signed-off-by: Stefan Roese sr@denx.de Cc: Simon Glass sjg@chromium.org Cc: Bin Meng bmeng.cn@gmail.com
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
Reviewed-by: Bin Meng bmeng.cn@gmail.com
applied to u-boot-x86, thanks!
- 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
Signed-off-by: Stefan Roese sr@denx.de Cc: Simon Glass sjg@chromium.org Cc: Bin Meng bmeng.cn@gmail.com --- 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(-)
diff --git a/configs/conga-qeval20-qa3-e3845_defconfig b/configs/conga-qeval20-qa3-e3845_defconfig index e4f97130fc..5903edb363 100644 --- a/configs/conga-qeval20-qa3-e3845_defconfig +++ b/configs/conga-qeval20-qa3-e3845_defconfig @@ -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
On Tue, Aug 8, 2017 at 5:52 PM, Stefan Roese sr@denx.de wrote:
- 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
Signed-off-by: Stefan Roese sr@denx.de Cc: Simon Glass sjg@chromium.org Cc: Bin Meng bmeng.cn@gmail.com
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(-)
Reviewed-by: Bin Meng bmeng.cn@gmail.com
On Tue, Aug 8, 2017 at 6:06 PM, Bin Meng bmeng.cn@gmail.com wrote:
On Tue, Aug 8, 2017 at 5:52 PM, Stefan Roese sr@denx.de wrote:
- 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
Signed-off-by: Stefan Roese sr@denx.de Cc: Simon Glass sjg@chromium.org Cc: Bin Meng bmeng.cn@gmail.com
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(-)
Reviewed-by: Bin Meng bmeng.cn@gmail.com
applied to u-boot-x86, thanks!
- Disable debug UART - Enable more partition support
Signed-off-by: Stefan Roese sr@denx.de Cc: Simon Glass sjg@chromium.org Cc: Bin Meng bmeng.cn@gmail.com --- 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(-)
diff --git a/configs/theadorable-x86-conga-qa3-e3845_defconfig b/configs/theadorable-x86-conga-qa3-e3845_defconfig index 32127fc087..12d5a6f420 100644 --- a/configs/theadorable-x86-conga-qa3-e3845_defconfig +++ b/configs/theadorable-x86-conga-qa3-e3845_defconfig @@ -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
On Tue, Aug 8, 2017 at 5:52 PM, Stefan Roese sr@denx.de wrote:
- Disable debug UART
- Enable more partition support
Signed-off-by: Stefan Roese sr@denx.de Cc: Simon Glass sjg@chromium.org Cc: Bin Meng bmeng.cn@gmail.com
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(-)
Reviewed-by: Bin Meng bmeng.cn@gmail.com
On Tue, Aug 8, 2017 at 6:06 PM, Bin Meng bmeng.cn@gmail.com wrote:
On Tue, Aug 8, 2017 at 5:52 PM, Stefan Roese sr@denx.de wrote:
- Disable debug UART
- Enable more partition support
Signed-off-by: Stefan Roese sr@denx.de Cc: Simon Glass sjg@chromium.org Cc: Bin Meng bmeng.cn@gmail.com
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(-)
Reviewed-by: Bin Meng bmeng.cn@gmail.com
applied to u-boot-x86, thanks!
This defconfig uses the PCIe x4 binary blobs from the congatec BIOS.
Signed-off-by: Stefan Roese sr@denx.de Cc: Simon Glass sjg@chromium.org Cc: Bin Meng bmeng.cn@gmail.com --- 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
diff --git a/board/congatec/conga-qeval20-qa3-e3845/MAINTAINERS b/board/congatec/conga-qeval20-qa3-e3845/MAINTAINERS index 6e065590ab..cceda4f49f 100644 --- a/board/congatec/conga-qeval20-qa3-e3845/MAINTAINERS +++ b/board/congatec/conga-qeval20-qa3-e3845/MAINTAINERS @@ -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 diff --git a/configs/theadorable-x86-conga-qa3-e3845-pcie-x4_defconfig b/configs/theadorable-x86-conga-qa3-e3845-pcie-x4_defconfig new file mode 100644 index 0000000000..c51a72c386 --- /dev/null +++ b/configs/theadorable-x86-conga-qa3-e3845-pcie-x4_defconfig @@ -0,0 +1,55 @@ +CONFIG_X86=y +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_FLASH_DESCRIPTOR_FILE="descriptor-pcie-x4.bin" +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 +CONFIG_BOOTSTAGE=y +CONFIG_BOOTSTAGE_REPORT=y +CONFIG_SYS_CONSOLE_INFO_QUIET=y +CONFIG_HUSH_PARSER=y +CONFIG_CMD_CPU=y +# CONFIG_CMD_IMLS is not set +# CONFIG_CMD_FLASH is not set +CONFIG_CMD_MMC=y +CONFIG_CMD_SF=y +CONFIG_CMD_SPI=y +CONFIG_CMD_I2C=y +CONFIG_CMD_USB=y +CONFIG_CMD_GPIO=y +# CONFIG_CMD_SETEXPR is not set +CONFIG_CMD_DHCP=y +# CONFIG_CMD_NFS is not set +CONFIG_CMD_PING=y +CONFIG_CMD_TIME=y +CONFIG_CMD_BOOTSTAGE=y +CONFIG_CMD_EXT2=y +CONFIG_CMD_EXT4=y +CONFIG_CMD_EXT4_WRITE=y +CONFIG_CMD_FAT=y +CONFIG_CMD_FS_GENERIC=y +CONFIG_ISO_PARTITION=y +CONFIG_AMIGA_PARTITION=y +CONFIG_EFI_PARTITION=y +CONFIG_REGMAP=y +CONFIG_SYSCON=y +CONFIG_CPU=y +CONFIG_DM_I2C=y +CONFIG_SYS_I2C_INTEL=y +CONFIG_WINBOND_W83627=y +CONFIG_E1000=y +CONFIG_USB_STORAGE=y +CONFIG_USB_KEYBOARD=y +CONFIG_FRAMEBUFFER_SET_VESA_MODE=y +CONFIG_FRAMEBUFFER_VESA_MODE_114=y +CONFIG_CONSOLE_SCROLL_LINES=5
On Tue, Aug 8, 2017 at 5:52 PM, Stefan Roese sr@denx.de wrote:
This defconfig uses the PCIe x4 binary blobs from the congatec BIOS.
Signed-off-by: Stefan Roese sr@denx.de Cc: Simon Glass sjg@chromium.org Cc: Bin Meng bmeng.cn@gmail.com
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
Reviewed-by: Bin Meng bmeng.cn@gmail.com
On Tue, Aug 8, 2017 at 6:06 PM, Bin Meng bmeng.cn@gmail.com wrote:
On Tue, Aug 8, 2017 at 5:52 PM, Stefan Roese sr@denx.de wrote:
This defconfig uses the PCIe x4 binary blobs from the congatec BIOS.
Signed-off-by: Stefan Roese sr@denx.de Cc: Simon Glass sjg@chromium.org Cc: Bin Meng bmeng.cn@gmail.com
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
Reviewed-by: Bin Meng bmeng.cn@gmail.com
applied to u-boot-x86, thanks!
On Tue, Aug 8, 2017 at 5:52 PM, Stefan Roese sr@denx.de wrote:
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 sr@denx.de Cc: Simon Glass sjg@chromium.org Cc: Bin Meng bmeng.cn@gmail.com
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
Reviewed-by: Bin Meng bmeng.cn@gmail.com
On Tue, Aug 8, 2017 at 6:06 PM, Bin Meng bmeng.cn@gmail.com wrote:
On Tue, Aug 8, 2017 at 5:52 PM, Stefan Roese sr@denx.de wrote:
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 sr@denx.de Cc: Simon Glass sjg@chromium.org Cc: Bin Meng bmeng.cn@gmail.com
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
Reviewed-by: Bin Meng bmeng.cn@gmail.com
applied to u-boot-x86, thanks!
participants (2)
-
Bin Meng -
Stefan Roese