From 3d5a3c35c5609d9c8933a7529c4d1e29d3fe941f Mon Sep 17 00:00:00 2001 From: Paul Menzel Date: Mon, 7 Nov 2016 22:23:34 +0100 Subject: [PATCH] UPSTREAM: asus/m2v,m2v-mx_se: Unify Kconfig Reorder the items to minimize the differences. BUG=none BRANCH=none TEST=none Change-Id: I56a151e717f7ca3f8a3f9ca4106dfc73ea2be963 Signed-off-by: Patrick Georgi Original-Commit-Id: 7328cf948ec0c56750e433dc6db73b118a480836 Original-Change-Id: I745ec70a990f997d87c2a0b6164ae127eb694ddf Original-Signed-off-by: Paul Menzel Original-Reviewed-on: https://review.coreboot.org/17438 Original-Tested-by: build bot (Jenkins) Original-Reviewed-by: Stefan Reinauer Original-Reviewed-by: Tobias Diedrich Original-Reviewed-by: Patrick Georgi Reviewed-on: https://chromium-review.googlesource.com/435401 --- src/mainboard/asus/m2v-mx_se/Kconfig | 2 +- src/mainboard/asus/m2v/Kconfig | 12 ++++++------ 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/mainboard/asus/m2v-mx_se/Kconfig b/src/mainboard/asus/m2v-mx_se/Kconfig index de1ef4505d..60ed865fad 100644 --- a/src/mainboard/asus/m2v-mx_se/Kconfig +++ b/src/mainboard/asus/m2v-mx_se/Kconfig @@ -18,6 +18,7 @@ config BOARD_SPECIFIC_OPTIONS # dummy def_bool y select CPU_AMD_SOCKET_AM2 select DIMM_DDR2 + select QRANK_DIMM_SUPPORT select NORTHBRIDGE_AMD_AMDK8 select SOUTHBRIDGE_VIA_VT8237R select SOUTHBRIDGE_VIA_K8T890 @@ -28,7 +29,6 @@ config BOARD_SPECIFIC_OPTIONS # dummy select BOARD_ROMSIZE_KB_512 select VGA select HAVE_ACPI_RESUME - select QRANK_DIMM_SUPPORT select SET_FIDVID config MAINBOARD_DIR diff --git a/src/mainboard/asus/m2v/Kconfig b/src/mainboard/asus/m2v/Kconfig index 20c2689dd8..26bfeef26f 100644 --- a/src/mainboard/asus/m2v/Kconfig +++ b/src/mainboard/asus/m2v/Kconfig @@ -5,18 +5,18 @@ config BOARD_SPECIFIC_OPTIONS # dummy select CPU_AMD_SOCKET_AM2 select DIMM_DDR2 select QRANK_DIMM_SUPPORT - select HAVE_OPTION_TABLE select K8_HT_FREQ_1G_SUPPORT select NORTHBRIDGE_AMD_AMDK8 select SOUTHBRIDGE_VIA_VT8237R select SOUTHBRIDGE_VIA_K8T890 select SOUTHBRIDGE_VIA_SUBTYPE_K8T890 select SUPERIO_ITE_IT8712F + select HAVE_OPTION_TABLE + select HAVE_ACPI_TABLES select BOARD_ROMSIZE_KB_512 select HAVE_ACPI_RESUME select HAVE_PIRQ_TABLE select PIRQ_ROUTE - select HAVE_ACPI_TABLES select HAVE_MP_TABLE select SET_FIDVID @@ -52,14 +52,14 @@ config MAX_PHYSICAL_CPUS int default 1 -config HT_CHAIN_END_UNITID_BASE - hex - default 0x20 - config HT_CHAIN_UNITID_BASE hex default 0x0 +config HT_CHAIN_END_UNITID_BASE + hex + default 0x20 + config IRQ_SLOT_COUNT int default 14