diff options
Diffstat (limited to 'board/congatec')
| -rw-r--r-- | board/congatec/Kconfig | 11 | ||||
| -rw-r--r-- | board/congatec/cgtqmx6eval/cgtqmx6eval.c | 8 | ||||
| -rw-r--r-- | board/congatec/conga-qeval20-qa3-e3845/Kconfig | 9 | ||||
| -rw-r--r-- | board/congatec/conga-qeval20-qa3-e3845/MAINTAINERS | 3 |
4 files changed, 22 insertions, 9 deletions
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/cgtqmx6eval/cgtqmx6eval.c b/board/congatec/cgtqmx6eval/cgtqmx6eval.c index 5cb97b4778..8cd0090887 100644 --- a/board/congatec/cgtqmx6eval/cgtqmx6eval.c +++ b/board/congatec/cgtqmx6eval/cgtqmx6eval.c @@ -235,7 +235,7 @@ int power_init_board(void) return 0; /* set level of MIPI if specified */ - lv_mipi = getenv("lv_mipi"); + lv_mipi = env_get("lv_mipi"); if (lv_mipi) return 0; @@ -583,7 +583,7 @@ int board_video_skip(void) { int i; int ret; - char const *panel = getenv("panel"); + char const *panel = env_get("panel"); if (!panel) { for (i = 0; i < ARRAY_SIZE(displays); i++) { struct display_info_t const *dev = displays + i; @@ -755,9 +755,9 @@ int board_late_init(void) { #ifdef CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG if (is_mx6dq()) - setenv("board_rev", "MX6Q"); + env_set("board_rev", "MX6Q"); else - setenv("board_rev", "MX6DL"); + env_set("board_rev", "MX6DL"); #endif return 0; 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..cceda4f49f 100644 --- a/board/congatec/conga-qeval20-qa3-e3845/MAINTAINERS +++ b/board/congatec/conga-qeval20-qa3-e3845/MAINTAINERS @@ -3,6 +3,9 @@ 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: configs/theadorable-x86-conga-qa3-e3845-pcie-x4_defconfig F: arch/x86/dts/conga-qeval20-qa3-e3845.dts |