[U-Boot] [PATCH 02/11 v2] x86: dfi: Add option to select different config headers for baseboards
Bin Meng
bmeng.cn at gmail.com
Sat Jul 22 11:04:08 UTC 2017
Hi Stefan,
On Tue, Jul 18, 2017 at 8:10 PM, Stefan Roese <sr at 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 at denx.de>
> Cc: Simon Glass <sjg at chromium.org>
> Reviewed-by: Bin Meng <bmeng.cn at gmail.com>
> ---
> - Added Bin's reviewed-by
>
> board/dfi/Kconfig | 17 ++++++--
> board/dfi/dfi-bt700/Kconfig | 7 +---
> board/dfi/dfi-bt700/MAINTAINERS | 1 +
> configs/dfi-bt700-q7x-151_defconfig | 2 +-
> configs/theadorable-x86-dfi-bt700_defconfig | 2 +-
> include/configs/theadorable-x86-dfi-bt700.h | 60 +++++++++++++++++++++++++++++
> 6 files changed, 79 insertions(+), 10 deletions(-)
> create mode 100644 include/configs/theadorable-x86-dfi-bt700.h
>
Unfortunately this does not apply on top of u-boot-x86/master. Can you
please rebase and resend? Thanks!
More comments below:
> diff --git a/board/dfi/Kconfig b/board/dfi/Kconfig
> index 25d0a11ce1..ed9966adf6 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"
> help
> This is the DFI Q7X-151 baseboard equipped with the
> DFI BayTrail Bt700 SoM. It contains an Atom E3845 with
> @@ -22,6 +21,18 @@ 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"
> + 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 3f0acb39f7..88c4ddeee9 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,5 +23,3 @@ config BOARD_SPECIFIC_OPTIONS # dummy
>
> 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 at 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 c86e0a9e4f..8397d13951 100644
> --- a/configs/dfi-bt700-q7x-151_defconfig
> +++ b/configs/dfi-bt700-q7x-151_defconfig
> @@ -1,7 +1,7 @@
> CONFIG_X86=y
> CONFIG_VENDOR_DFI=y
> CONFIG_DEFAULT_DEVICE_TREE="dfi-bt700-q7x-151"
> -CONFIG_TARGET_DFI_BT700=y
> +CONFIG_TARGET_Q7X_151_DFI_BT700=y
> CONFIG_DEBUG_UART=y
> CONFIG_HAVE_INTEL_ME=y
> CONFIG_ENABLE_MRC_CACHE=y
> diff --git a/configs/theadorable-x86-dfi-bt700_defconfig b/configs/theadorable-x86-dfi-bt700_defconfig
> index 30a40e3b16..e00e3801bc 100644
> --- a/configs/theadorable-x86-dfi-bt700_defconfig
> +++ b/configs/theadorable-x86-dfi-bt700_defconfig
> @@ -1,7 +1,7 @@
> 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_HAVE_INTEL_ME=y
> CONFIG_ENABLE_MRC_CACHE=y
> CONFIG_SMP=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..e4a5d5765b
> --- /dev/null
> +++ b/include/configs/theadorable-x86-dfi-bt700.h
> @@ -0,0 +1,60 @@
> +/*
> + * Copyright (C) 2016 Stefan Roese <sr at 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_BOARD_EARLY_INIT_F
> +
> +#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_SCSI_DEV_LIST \
> + {PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_VALLEYVIEW_SATA}, \
> + {PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_VALLEYVIEW_SATA_ALT}
> +
> +#define CONFIG_MMC
> +#define CONFIG_SDHCI
> +#define CONFIG_GENERIC_MMC
> +#define CONFIG_MMC_SDMA
> +
> +#undef CONFIG_USB_MAX_CONTROLLER_COUNT
> +#define CONFIG_USB_MAX_CONTROLLER_COUNT 1
This should be removed. Please see http://patchwork.ozlabs.org/patch/776750/
> +
> +#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 */
Regards,
Bin
More information about the U-Boot
mailing list