diff options
| author | Tom Rini <trini@konsulko.com> | 2016-05-23 18:32:47 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2016-05-23 18:32:47 -0400 |
| commit | 6d54868eeb2697c9a905c4d3521efbacc44c5258 (patch) | |
| tree | 6ad3ae03a0083d1a50a6152bd6dcad5630ce7823 /configs | |
| parent | d7d000311285e4b8d11e089ca13ea456a01be3b8 (diff) | |
| parent | 8216b11cdd50515fbc423a4b2709a00865b8621d (diff) | |
Merge branch 'master' of git://git.denx.de/u-boot-x86
Diffstat (limited to 'configs')
| -rw-r--r-- | configs/bayleybay_defconfig | 2 | ||||
| -rw-r--r-- | configs/conga-qeval20-qa3-e3845_defconfig | 2 | ||||
| -rw-r--r-- | configs/crownbay_defconfig | 3 | ||||
| -rw-r--r-- | configs/galileo_defconfig | 3 | ||||
| -rw-r--r-- | configs/minnowmax_defconfig | 2 | ||||
| -rw-r--r-- | configs/qemu-x86_defconfig | 1 | ||||
| -rw-r--r-- | configs/sandbox_defconfig | 1 |
7 files changed, 11 insertions, 3 deletions
diff --git a/configs/bayleybay_defconfig b/configs/bayleybay_defconfig index ce1f5198ff..9f1d7fbca9 100644 --- a/configs/bayleybay_defconfig +++ b/configs/bayleybay_defconfig @@ -9,6 +9,8 @@ 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_SEABIOS=y CONFIG_FIT=y CONFIG_BOOTSTAGE=y CONFIG_BOOTSTAGE_REPORT=y diff --git a/configs/conga-qeval20-qa3-e3845_defconfig b/configs/conga-qeval20-qa3-e3845_defconfig index 5186345fde..64fd7c9cff 100644 --- a/configs/conga-qeval20-qa3-e3845_defconfig +++ b/configs/conga-qeval20-qa3-e3845_defconfig @@ -8,6 +8,8 @@ CONFIG_SMP=y CONFIG_HAVE_VGA_BIOS=y CONFIG_GENERATE_PIRQ_TABLE=y CONFIG_GENERATE_MP_TABLE=y +CONFIG_GENERATE_ACPI_TABLE=y +CONFIG_SEABIOS=y CONFIG_FIT=y CONFIG_FIT_SIGNATURE=y CONFIG_BOOTSTAGE=y diff --git a/configs/crownbay_defconfig b/configs/crownbay_defconfig index 7c6b692c6b..8e086c512a 100644 --- a/configs/crownbay_defconfig +++ b/configs/crownbay_defconfig @@ -8,8 +8,6 @@ CONFIG_HAVE_VGA_BIOS=y CONFIG_GENERATE_PIRQ_TABLE=y CONFIG_GENERATE_MP_TABLE=y CONFIG_FIT=y -CONFIG_BOOTSTAGE=y -CONFIG_BOOTSTAGE_REPORT=y CONFIG_HUSH_PARSER=y CONFIG_CMD_CPU=y # CONFIG_CMD_IMLS is not set @@ -24,7 +22,6 @@ 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 diff --git a/configs/galileo_defconfig b/configs/galileo_defconfig index 17b14589cc..f8d3c3b8ab 100644 --- a/configs/galileo_defconfig +++ b/configs/galileo_defconfig @@ -4,10 +4,12 @@ CONFIG_DEFAULT_DEVICE_TREE="galileo" CONFIG_TARGET_GALILEO=y CONFIG_ENABLE_MRC_CACHE=y CONFIG_GENERATE_PIRQ_TABLE=y +CONFIG_GENERATE_MP_TABLE=y CONFIG_FIT=y CONFIG_BOOTSTAGE=y CONFIG_BOOTSTAGE_REPORT=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 @@ -30,6 +32,7 @@ CONFIG_OF_CONTROL=y CONFIG_NET_RANDOM_ETHADDR=y CONFIG_REGMAP=y CONFIG_SYSCON=y +CONFIG_CPU=y CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH_GIGADEVICE=y CONFIG_SPI_FLASH_MACRONIX=y diff --git a/configs/minnowmax_defconfig b/configs/minnowmax_defconfig index 9930d56a6b..28b837daab 100644 --- a/configs/minnowmax_defconfig +++ b/configs/minnowmax_defconfig @@ -8,6 +8,8 @@ CONFIG_SMP=y CONFIG_HAVE_VGA_BIOS=y CONFIG_GENERATE_PIRQ_TABLE=y CONFIG_GENERATE_MP_TABLE=y +CONFIG_GENERATE_ACPI_TABLE=y +CONFIG_SEABIOS=y CONFIG_FIT=y CONFIG_FIT_SIGNATURE=y CONFIG_BOOTSTAGE=y diff --git a/configs/qemu-x86_defconfig b/configs/qemu-x86_defconfig index 53b1ff65af..45bb3ec0e9 100644 --- a/configs/qemu-x86_defconfig +++ b/configs/qemu-x86_defconfig @@ -20,6 +20,7 @@ CONFIG_CMD_DHCP=y # CONFIG_CMD_NFS is not set CONFIG_CMD_PING=y CONFIG_CMD_TIME=y +CONFIG_CMD_QFW=y CONFIG_CMD_BOOTSTAGE=y CONFIG_CMD_EXT2=y CONFIG_CMD_EXT4=y diff --git a/configs/sandbox_defconfig b/configs/sandbox_defconfig index aec2e538a1..9e4a92dd6c 100644 --- a/configs/sandbox_defconfig +++ b/configs/sandbox_defconfig @@ -48,6 +48,7 @@ CONFIG_CMD_LINK_LOCAL=y CONFIG_CMD_TIME=y CONFIG_CMD_TIMER=y CONFIG_CMD_SOUND=y +CONFIG_CMD_QFW=y CONFIG_CMD_BOOTSTAGE=y CONFIG_CMD_PMIC=y CONFIG_CMD_REGULATOR=y |