Drop CONFIG_HAVE_BUS_CONFIG, clean up Kconfig

This patch is the beginning of a Kconfig cleanup series
- drop CONFIG_HAVE_BUS_CONFIG and add get_bus_conf.c if it
  exists in the mainboard directory
- drop duplicate ACPI_SSDTX_NUM from mainboard Kconfig
  if it only defines the defaul value of 0
- Add mptable.c, fadt.c, reset.c and ssdtX.asl when they
  exist, not based on some Kconfig magic

Signed-off-by: Stefan Reinauer <reinauer@google.com>

Change-Id: Ia14a7116dad6a724af7e531920fee9a51fd0b200
Reviewed-on: http://review.coreboot.org/1832
Tested-by: build bot (Jenkins)
Reviewed-by: Stefan Reinauer <stefan.reinauer@coreboot.org>

src/Kconfig.deprecated_options

@@ -24,16 +24,6 @@ config BOARD_HAS_FADT
 	  FADT in fadt.c. Long-term, those should be moved to appropriate
 	  chipset components (eg. southbridge).
 
-# There ought to be a better place to put data than code. Also, make this
-# (or a similar) framework more universally usable, so all boards benefit
-# from sharing data between the various tables.
-config HAVE_BUS_CONFIG
-	bool
-	default n
-	help
-	  This variable specifies whether a given board has a get_bus_conf.c
-	  file containing information about bus routing.
-
 # Will be removed (alongside with the PS/2 init code) once payloads
 # reliably support PS/2 init themselves.
 config DRIVERS_PS2_KEYBOARD

src/arch/x86/Makefile.inc

@@ -235,34 +235,37 @@ endif
 romstage-srcs += $(objgenerated)/crt0.s
 ramstage-srcs += src/mainboard/$(MAINBOARDDIR)/mainboard.c
 ifeq ($(CONFIG_GENERATE_MP_TABLE),y)
-ifeq ($(CONFIG_HAVE_MP_TABLE),y)
+ifneq ($(wildcard src/mainboard/$(MAINBOARDDIR)/mptable.c),)
 ramstage-srcs += src/mainboard/$(MAINBOARDDIR)/mptable.c
 endif
 endif
 ifeq ($(CONFIG_GENERATE_PIRQ_TABLE),y)
 ramstage-srcs += src/mainboard/$(MAINBOARDDIR)/irq_tables.c
 endif
-ifeq ($(CONFIG_BOARD_HAS_HARD_RESET),y)
+ifneq ($(wildcard src/mainboard/$(MAINBOARDDIR)/reset.c),)
 ramstage-srcs += src/mainboard/$(MAINBOARDDIR)/reset.c
 endif
 ifeq ($(CONFIG_GENERATE_ACPI_TABLES),y)
 ramstage-srcs += src/mainboard/$(MAINBOARDDIR)/acpi_tables.c
 ramstage-srcs += src/mainboard/$(MAINBOARDDIR)/dsdt.asl
-# make doesn't have arithmetic operators or greater-than comparisons
+ifneq ($(wildcard src/mainboard/$(MAINBOARDDIR)/ssdt2.asl),)
-ifeq ($(subst 5,4,$(CONFIG_ACPI_SSDTX_NUM)),4)
 ramstage-srcs += src/mainboard/$(MAINBOARDDIR)/ssdt2.asl
+endif
+ifneq ($(wildcard src/mainboard/$(MAINBOARDDIR)/ssdt3.asl),)
 ramstage-srcs += src/mainboard/$(MAINBOARDDIR)/ssdt3.asl
+endif
+ifneq ($(wildcard src/mainboard/$(MAINBOARDDIR)/ssdt4.asl),)
 ramstage-srcs += src/mainboard/$(MAINBOARDDIR)/ssdt4.asl
 endif
-ifeq ($(CONFIG_ACPI_SSDTX_NUM),5)
+ifneq ($(wildcard src/mainboard/$(MAINBOARDDIR)/ssdt5.asl),)
 ramstage-srcs += src/mainboard/$(MAINBOARDDIR)/ssdt5.asl
 endif
-ifeq ($(CONFIG_BOARD_HAS_FADT),y)
+ifneq ($(wildcard src/mainboard/$(MAINBOARDDIR)/fadt.c),)
 ramstage-srcs += src/mainboard/$(MAINBOARDDIR)/fadt.c
 endif
 endif
 
-ifeq ($(CONFIG_HAVE_BUS_CONFIG),y)
+ifneq ($(wildcard src/mainboard/$(MAINBOARDDIR)/get_bus_conf.c),)
 ramstage-srcs += src/mainboard/$(MAINBOARDDIR)/get_bus_conf.c
 endif
 

src/mainboard/advansus/a785e-i/Kconfig

@@ -13,7 +13,6 @@ config BOARD_SPECIFIC_OPTIONS # dummy
 	select SUPERIO_WINBOND_W83627HF #COM1, COM2
 	#select SUPERIO_FINTEK_F81216AD #COM3, COM4
 	select SB_SUPERIO_HWM
-	select HAVE_BUS_CONFIG
 	select HAVE_OPTION_TABLE
 	select HAVE_PIRQ_TABLE
 	select HAVE_HARD_RESET

src/mainboard/amd/bimini_fam10/Kconfig

@@ -13,7 +13,6 @@ config BOARD_SPECIFIC_OPTIONS # dummy
 	select SOUTHBRIDGE_AMD_RS780
 	select SOUTHBRIDGE_AMD_SB800
 	select SUPERIO_ITE_IT8718F
-	select HAVE_BUS_CONFIG
 	select HAVE_OPTION_TABLE
 	select HAVE_PIRQ_TABLE
 	select GENERATE_MP_TABLE

src/mainboard/amd/dbm690t/Kconfig

@@ -14,7 +14,6 @@ config BOARD_SPECIFIC_OPTIONS # dummy
 	select HAVE_MP_TABLE
 	select HAVE_PIRQ_TABLE
 	select HAVE_OPTION_TABLE
-	select HAVE_BUS_CONFIG
 	select SB_HT_CHAIN_UNITID_OFFSET_ONLY
 	select BOARD_ROMSIZE_KB_1024
 	select RAMINIT_SYSINFO

src/mainboard/amd/dinar/Kconfig

@@ -34,7 +34,6 @@ config BOARD_SPECIFIC_OPTIONS # dummy
 	select SERIAL_CPU_INIT
 	select BOARD_ROMSIZE_KB_2048
 	select BOARD_HAS_FADT
-	select HAVE_BUS_CONFIG
 	select HAVE_OPTION_TABLE
 	select HAVE_PIRQ_TABLE
 	select HAVE_MP_TABLE
@@ -88,10 +87,6 @@ config STACK_SIZE
 	hex
 	default 0x10000
 
-config ACPI_SSDTX_NUM
-	int
-	default 0
-
 config RAMBASE
 	hex
 	default 0x200000

src/mainboard/amd/inagua/Kconfig

@@ -27,7 +27,6 @@ config BOARD_SPECIFIC_OPTIONS # dummy
 	select NORTHBRIDGE_AMD_AGESA_FAMILY14
 	select SOUTHBRIDGE_AMD_CIMX_SB800
 	select SUPERIO_SMSC_KBC1100
-	select HAVE_BUS_CONFIG
 	select HAVE_OPTION_TABLE
 	select HAVE_PIRQ_TABLE
 	select HAVE_MP_TABLE
@@ -89,10 +88,6 @@ config STACK_SIZE
 	hex
 	default 0x10000
 
-config ACPI_SSDTX_NUM
-	int
-	default 0
-
 config RAMBASE
 	hex
 	default 0x200000

src/mainboard/amd/mahogany/Kconfig

@@ -14,7 +14,6 @@ config BOARD_SPECIFIC_OPTIONS # dummy
 	select HAVE_MP_TABLE
 	select HAVE_PIRQ_TABLE
 	select HAVE_OPTION_TABLE
-	select HAVE_BUS_CONFIG
 	select LIFT_BSP_APIC_ID
 	select SB_HT_CHAIN_UNITID_OFFSET_ONLY
 	select BOARD_ROMSIZE_KB_1024

src/mainboard/amd/mahogany_fam10/Kconfig

@@ -10,7 +10,6 @@ config BOARD_SPECIFIC_OPTIONS # dummy
 	select SOUTHBRIDGE_AMD_RS780
 	select SOUTHBRIDGE_AMD_SB700
 	select SUPERIO_ITE_IT8718F
-	select HAVE_BUS_CONFIG
 	select HAVE_OPTION_TABLE
 	select HAVE_PIRQ_TABLE
 	select HAVE_MP_TABLE

src/mainboard/amd/parmer/Kconfig

@@ -26,7 +26,6 @@ config BOARD_SPECIFIC_OPTIONS # dummy
 	select NORTHBRIDGE_AMD_AGESA_FAMILY15_TN_ROOT_COMPLEX
 	select NORTHBRIDGE_AMD_AGESA_FAMILY15_TN
 	select SOUTHBRIDGE_AMD_AGESA_HUDSON
-	select HAVE_BUS_CONFIG
 	select HAVE_OPTION_TABLE
 	select HAVE_PIRQ_TABLE
 	select HAVE_MP_TABLE
@@ -90,10 +89,6 @@ config STACK_SIZE
 	hex
 	default 0x10000
 
-config ACPI_SSDTX_NUM
-	int
-	default 0
-
 config RAMBASE
 	hex
 	default 0x200000

src/mainboard/amd/persimmon/Kconfig

@@ -27,7 +27,6 @@ config BOARD_SPECIFIC_OPTIONS # dummy
 	select NORTHBRIDGE_AMD_AGESA_FAMILY14
 	select SOUTHBRIDGE_AMD_CIMX_SB800
 	select SUPERIO_FINTEK_F81865F
-	select HAVE_BUS_CONFIG
 	select HAVE_OPTION_TABLE
 	select HAVE_PIRQ_TABLE
 	select HAVE_MP_TABLE
@@ -89,10 +88,6 @@ config STACK_SIZE
 	hex
 	default 0x10000
 
-config ACPI_SSDTX_NUM
-	int
-	default 0
-
 config RAMBASE
 	hex
 	default 0x200000

src/mainboard/amd/pistachio/Kconfig

@@ -10,7 +10,6 @@ config BOARD_SPECIFIC_OPTIONS # dummy
 	select SOUTHBRIDGE_AMD_RS690
 	select SOUTHBRIDGE_AMD_SB600
 	select BOARD_HAS_FADT
-	select HAVE_BUS_CONFIG
 	select HAVE_OPTION_TABLE
 	select HAVE_PIRQ_TABLE
 	select HAVE_MP_TABLE

src/mainboard/amd/serengeti_cheetah/Kconfig

@@ -14,7 +14,6 @@ config BOARD_SPECIFIC_OPTIONS # dummy
 	select SOUTHBRIDGE_AMD_AMD8131
 	select SUPERIO_WINBOND_W83627HF
 	select BOARD_HAS_FADT
-	select HAVE_BUS_CONFIG
 	select HAVE_OPTION_TABLE
 	select HAVE_PIRQ_TABLE
 	select HAVE_MP_TABLE

src/mainboard/amd/serengeti_cheetah_fam10/Kconfig

@@ -11,7 +11,6 @@ config BOARD_SPECIFIC_OPTIONS # dummy
 	select SOUTHBRIDGE_AMD_AMD8132
 	select SUPERIO_WINBOND_W83627HF
 	select BOARD_HAS_FADT
-	select HAVE_BUS_CONFIG
 	select HAVE_OPTION_TABLE
 	select HAVE_PIRQ_TABLE
 	select HAVE_MP_TABLE

src/mainboard/amd/south_station/Kconfig

@@ -27,7 +27,6 @@ config BOARD_SPECIFIC_OPTIONS # dummy
 	select NORTHBRIDGE_AMD_AGESA_FAMILY14
 	select SOUTHBRIDGE_AMD_CIMX_SB800
 	select SUPERIO_FINTEK_F81865F
-	select HAVE_BUS_CONFIG
 	select HAVE_OPTION_TABLE
 	select HAVE_PIRQ_TABLE
 	select HAVE_MP_TABLE
@@ -89,10 +88,6 @@ config STACK_SIZE
 	hex
 	default 0x10000
 
-config ACPI_SSDTX_NUM
-	int
-	default 0
-
 config RAMBASE
 	hex
 	default 0x200000

src/mainboard/amd/thatcher/Kconfig

@@ -26,7 +26,6 @@ config BOARD_SPECIFIC_OPTIONS # dummy
 	select NORTHBRIDGE_AMD_AGESA_FAMILY15_TN_ROOT_COMPLEX
 	select NORTHBRIDGE_AMD_AGESA_FAMILY15_TN
 	select SOUTHBRIDGE_AMD_AGESA_HUDSON
-	select HAVE_BUS_CONFIG
 	select HAVE_OPTION_TABLE
 	select HAVE_PIRQ_TABLE
 	select HAVE_MP_TABLE
@@ -91,10 +90,6 @@ config STACK_SIZE
 	hex
 	default 0x10000
 
-config ACPI_SSDTX_NUM
-	int
-	default 0
-
 config RAMBASE
 	hex
 	default 0x200000

src/mainboard/amd/tilapia_fam10/Kconfig

@@ -10,7 +10,6 @@ config BOARD_SPECIFIC_OPTIONS # dummy
 	select SOUTHBRIDGE_AMD_RS780
 	select SOUTHBRIDGE_AMD_SB700
 	select SUPERIO_ITE_IT8718F
-	select HAVE_BUS_CONFIG
 	select HAVE_OPTION_TABLE
 	select HAVE_PIRQ_TABLE
 	select HAVE_MP_TABLE

src/mainboard/amd/torpedo/Kconfig

@@ -30,7 +30,6 @@ config BOARD_SPECIFIC_OPTIONS # dummy
   select SOUTHBRIDGE_AMD_CIMX_SB900
   select SUPERIO_SMSC_KBC1100
   select BOARD_HAS_FADT
-        select HAVE_BUS_CONFIG
         select HAVE_OPTION_TABLE
         select HAVE_PIRQ_TABLE
         select HAVE_MP_TABLE
@@ -104,10 +103,6 @@ config STACK_SIZE
         hex
         default 0x10000
 
-config ACPI_SSDTX_NUM
-        int
-        default 0
-
 config RAMBASE
         hex
         default 0x200000

src/mainboard/amd/union_station/Kconfig

@@ -26,7 +26,6 @@ config BOARD_SPECIFIC_OPTIONS # dummy
 	select NORTHBRIDGE_AMD_AGESA_FAMILY14_ROOT_COMPLEX
 	select NORTHBRIDGE_AMD_AGESA_FAMILY14
 	select SOUTHBRIDGE_AMD_CIMX_SB800
-	select HAVE_BUS_CONFIG
 	select HAVE_OPTION_TABLE
 	select HAVE_PIRQ_TABLE
 	select HAVE_MP_TABLE
@@ -88,10 +87,6 @@ config STACK_SIZE
 	hex
 	default 0x10000
 
-config ACPI_SSDTX_NUM
-	int
-	default 0
-
 config RAMBASE
 	hex
 	default 0x200000

src/mainboard/asrock/939a785gmh/Kconfig

@@ -15,7 +15,6 @@ config BOARD_SPECIFIC_OPTIONS # dummy
 	select HAVE_MP_TABLE
 	select HAVE_PIRQ_TABLE
 	select HAVE_OPTION_TABLE
-	select HAVE_BUS_CONFIG
 	select LIFT_BSP_APIC_ID
 	select SB_HT_CHAIN_UNITID_OFFSET_ONLY
 	select BOARD_ROMSIZE_KB_1024

src/mainboard/asrock/e350m1/Kconfig

@@ -28,7 +28,6 @@ config BOARD_SPECIFIC_OPTIONS # dummy
   select SOUTHBRIDGE_AMD_CIMX_SB800
 	select SUPERIO_WINBOND_W83627HF
 	select SB_SUPERIO_HWM
-        select HAVE_BUS_CONFIG
         select HAVE_OPTION_TABLE
         select HAVE_PIRQ_TABLE
         select HAVE_MP_TABLE
@@ -89,10 +88,6 @@ config STACK_SIZE
         hex
         default 0x10000
 
-config ACPI_SSDTX_NUM
-        int
-        default 0
-
 config RAMBASE
         hex
         default 0x200000

src/mainboard/asus/a8n_e/Kconfig

@@ -8,7 +8,6 @@ config BOARD_SPECIFIC_OPTIONS # dummy
 	select NORTHBRIDGE_AMD_AMDK8_ROOT_COMPLEX
 	select SOUTHBRIDGE_NVIDIA_CK804
 	select SUPERIO_ITE_IT8712F
-	select HAVE_BUS_CONFIG
 	select HAVE_OPTION_TABLE
 	select HAVE_PIRQ_TABLE
 	select HAVE_MP_TABLE

src/mainboard/asus/m2n-e/Kconfig

@@ -32,7 +32,6 @@ config BOARD_SPECIFIC_OPTIONS # dummy
 	select MCP55_USE_AZA
 	select SUPERIO_ITE_IT8716F
 	select SUPERIO_ITE_IT8716F_OVERRIDE_FANCTL
-	select HAVE_BUS_CONFIG
 	select HAVE_OPTION_TABLE
 	select HAVE_MP_TABLE
 	select LIFT_BSP_APIC_ID

src/mainboard/asus/m4a78-em/Kconfig

@@ -9,7 +9,6 @@ config BOARD_SPECIFIC_OPTIONS # dummy
 	select SOUTHBRIDGE_AMD_RS780
 	select SOUTHBRIDGE_AMD_SB700
 	select SUPERIO_ITE_IT8712F
-	select HAVE_BUS_CONFIG
 	select HAVE_OPTION_TABLE
 	select HAVE_PIRQ_TABLE
 	select HAVE_MP_TABLE

src/mainboard/asus/m4a785-m/Kconfig

@@ -10,7 +10,6 @@ config BOARD_SPECIFIC_OPTIONS # dummy
 	select SOUTHBRIDGE_AMD_SB700
 	select SOUTHBRIDGE_AMD_SB700_SKIP_ISA_DMA_INIT
 	select SUPERIO_ITE_IT8712F
-	select HAVE_BUS_CONFIG
 	select HAVE_OPTION_TABLE
 	select HAVE_PIRQ_TABLE
 	select HAVE_MP_TABLE

src/mainboard/asus/m4a785t-m/Kconfig

@@ -11,7 +11,6 @@ config BOARD_SPECIFIC_OPTIONS # dummy
 	select SOUTHBRIDGE_AMD_SB700
 	select SOUTHBRIDGE_AMD_SB700_SKIP_ISA_DMA_INIT
 	select SUPERIO_ITE_IT8712F
-	select HAVE_BUS_CONFIG
 	select HAVE_OPTION_TABLE
 	select HAVE_PIRQ_TABLE
 	select HAVE_MP_TABLE

src/mainboard/asus/m5a88-v/Kconfig

@@ -11,7 +11,6 @@ config BOARD_SPECIFIC_OPTIONS # dummy
 	select SOUTHBRIDGE_AMD_RS780
 	select SOUTHBRIDGE_AMD_CIMX_SB800
 	select SUPERIO_ITE_IT8721F
-	select HAVE_BUS_CONFIG
 	select HAVE_OPTION_TABLE
 	select HAVE_PIRQ_TABLE
 	select HAVE_HARD_RESET

src/mainboard/avalue/eax-785e/Kconfig

@@ -13,7 +13,6 @@ config BOARD_SPECIFIC_OPTIONS # dummy
 	select SUPERIO_WINBOND_W83627HF #COM1, COM2
 	#select SUPERIO_FINTEK_F81216AD #COM3, COM4
 	select SB_SUPERIO_HWM
-	select HAVE_BUS_CONFIG
 	select HAVE_OPTION_TABLE
 	select HAVE_PIRQ_TABLE
 	select HAVE_HARD_RESET

src/mainboard/broadcom/blast/Kconfig

@@ -9,7 +9,6 @@ config BOARD_SPECIFIC_OPTIONS # dummy
 	select SOUTHBRIDGE_BROADCOM_BCM5780
 	select SOUTHBRIDGE_BROADCOM_BCM5785
 	select SUPERIO_NSC_PC87417
-	select HAVE_BUS_CONFIG
 	select HAVE_OPTION_TABLE
 	select HAVE_PIRQ_TABLE
 	select HAVE_MP_TABLE

src/mainboard/gigabyte/ga_2761gxdk/Kconfig

@@ -9,7 +9,6 @@ config BOARD_SPECIFIC_OPTIONS # dummy
 	select NORTHBRIDGE_AMD_AMDK8_ROOT_COMPLEX
 	select SOUTHBRIDGE_SIS_SIS966
 	select SUPERIO_ITE_IT8716F
-	select HAVE_BUS_CONFIG
 	select HAVE_OPTION_TABLE
 	select HAVE_PIRQ_TABLE
 	select HAVE_MP_TABLE

src/mainboard/gigabyte/m57sli/Kconfig

@@ -12,7 +12,6 @@ config BOARD_SPECIFIC_OPTIONS # dummy
 	select MCP55_USE_AZA
 	select SUPERIO_ITE_IT8716F
 	select SUPERIO_ITE_IT8716F_OVERRIDE_FANCTL
-	select HAVE_BUS_CONFIG
 	select HAVE_OPTION_TABLE
 	select HAVE_PIRQ_TABLE
 	select HAVE_MP_TABLE

src/mainboard/gigabyte/ma785gm/Kconfig

@@ -10,7 +10,6 @@ config BOARD_SPECIFIC_OPTIONS # dummy
 	select SOUTHBRIDGE_AMD_RS780
 	select SOUTHBRIDGE_AMD_SB700
 	select SUPERIO_ITE_IT8718F
-	select HAVE_BUS_CONFIG
 	select HAVE_OPTION_TABLE
 	select HAVE_PIRQ_TABLE
 	select HAVE_MP_TABLE

src/mainboard/gigabyte/ma785gmt/Kconfig

@@ -10,7 +10,6 @@ config BOARD_SPECIFIC_OPTIONS # dummy
 	select SOUTHBRIDGE_AMD_RS780
 	select SOUTHBRIDGE_AMD_SB700
 	select SUPERIO_ITE_IT8718F
-	select HAVE_BUS_CONFIG
 	select HAVE_OPTION_TABLE
 	select HAVE_PIRQ_TABLE
 	select HAVE_MP_TABLE

src/mainboard/gigabyte/ma78gm/Kconfig

@@ -10,7 +10,6 @@ config BOARD_SPECIFIC_OPTIONS # dummy
 	select SOUTHBRIDGE_AMD_RS780
 	select SOUTHBRIDGE_AMD_SB700
 	select SUPERIO_ITE_IT8718F
-	select HAVE_BUS_CONFIG
 	select HAVE_OPTION_TABLE
 	select HAVE_PIRQ_TABLE
 	select HAVE_MP_TABLE

src/mainboard/hp/dl145_g1/Kconfig

@@ -9,7 +9,6 @@ config BOARD_SPECIFIC_OPTIONS # dummy
 	select SOUTHBRIDGE_AMD_AMD8131
 	select SOUTHBRIDGE_AMD_AMD8111
 	select SUPERIO_WINBOND_W83627HF
-	select HAVE_BUS_CONFIG
 	select HAVE_OPTION_TABLE
 	select HAVE_PIRQ_TABLE
 	select HAVE_MP_TABLE

src/mainboard/hp/dl145_g3/Kconfig

@@ -11,7 +11,6 @@ config BOARD_SPECIFIC_OPTIONS # dummy
 	select SOUTHBRIDGE_BROADCOM_BCM21000
 	select SOUTHBRIDGE_BROADCOM_BCM5785
 	select SUPERIO_NSC_PC87417
-	select HAVE_BUS_CONFIG
 	select HAVE_OPTION_TABLE
 	select HAVE_PIRQ_TABLE
 	select HAVE_MP_TABLE

src/mainboard/hp/dl165_g6_fam10/Kconfig

@@ -12,7 +12,6 @@ config BOARD_SPECIFIC_OPTIONS # dummy
 	select DIMM_DDR2
 	select DIMM_REGISTERED
 	select HAVE_OPTION_TABLE
-	select HAVE_BUS_CONFIG
 	select HAVE_PIRQ_TABLE
 	select HAVE_MP_TABLE
 	select LIFT_BSP_APIC_ID

src/mainboard/iei/kino-780am2-fam10/Kconfig

@@ -10,7 +10,6 @@ config BOARD_SPECIFIC_OPTIONS # dummy
 	select SOUTHBRIDGE_AMD_RS780
 	select SOUTHBRIDGE_AMD_SB700
 	select SUPERIO_FINTEK_F71859
-	select HAVE_BUS_CONFIG
 	select HAVE_OPTION_TABLE
 	select HAVE_PIRQ_TABLE
 	select HAVE_MP_TABLE

src/mainboard/iwill/dk8_htx/Kconfig

@@ -10,7 +10,6 @@ config BOARD_SPECIFIC_OPTIONS # dummy
 	select SOUTHBRIDGE_AMD_AMD8131
 	select SUPERIO_WINBOND_W83627HF
 	select BOARD_HAS_FADT
-	select HAVE_BUS_CONFIG
 	select HAVE_OPTION_TABLE
 	select HAVE_PIRQ_TABLE
 	select HAVE_MP_TABLE

src/mainboard/jetway/pa78vm5/Kconfig

@@ -10,7 +10,6 @@ config BOARD_SPECIFIC_OPTIONS # dummy
 	select SOUTHBRIDGE_AMD_RS780
 	select SOUTHBRIDGE_AMD_SB700
 	select SUPERIO_FINTEK_F71863FG
-	select HAVE_BUS_CONFIG
 	select HAVE_OPTION_TABLE
 	select HAVE_PIRQ_TABLE
 	select HAVE_MP_TABLE

src/mainboard/kontron/kt690/Kconfig

@@ -11,7 +11,6 @@ config BOARD_SPECIFIC_OPTIONS # dummy
 	select SUPERIO_WINBOND_W83627DHG
 	select BOARD_HAS_FADT
 	select HAVE_OPTION_TABLE
-	select HAVE_BUS_CONFIG
 	select HAVE_PIRQ_TABLE
 	select HAVE_MP_TABLE
 	select GFXUMA

src/mainboard/msi/ms7135/Kconfig

@@ -8,7 +8,6 @@ config BOARD_SPECIFIC_OPTIONS # dummy
 	select NORTHBRIDGE_AMD_AMDK8_ROOT_COMPLEX
 	select SOUTHBRIDGE_NVIDIA_CK804
 	select SUPERIO_WINBOND_W83627THG
-	select HAVE_BUS_CONFIG
 	select HAVE_OPTION_TABLE
 	select HAVE_PIRQ_TABLE
 	select HAVE_MP_TABLE

src/mainboard/msi/ms7260/Kconfig

@@ -11,7 +11,6 @@ config BOARD_SPECIFIC_OPTIONS # dummy
 	select MCP55_USE_NIC
 	select MCP55_USE_AZA
 	select SUPERIO_WINBOND_W83627EHG
-	select HAVE_BUS_CONFIG
 	select HAVE_OPTION_TABLE
 	select HAVE_PIRQ_TABLE
 	select HAVE_MP_TABLE

src/mainboard/msi/ms9185/Kconfig

@@ -11,7 +11,6 @@ config BOARD_SPECIFIC_OPTIONS # dummy
 	select SOUTHBRIDGE_BROADCOM_BCM5780
 	select SOUTHBRIDGE_BROADCOM_BCM5785
 	select SUPERIO_NSC_PC87417
-	select HAVE_BUS_CONFIG
 	select HAVE_OPTION_TABLE
 	select HAVE_PIRQ_TABLE
 	select HAVE_MP_TABLE

src/mainboard/msi/ms9282/Kconfig

@@ -10,7 +10,6 @@ config BOARD_SPECIFIC_OPTIONS # dummy
 	select NORTHBRIDGE_AMD_AMDK8_ROOT_COMPLEX
 	select SOUTHBRIDGE_NVIDIA_MCP55
 	select SUPERIO_WINBOND_W83627EHG
-	select HAVE_BUS_CONFIG
 	select HAVE_OPTION_TABLE
 	select HAVE_PIRQ_TABLE
 	select HAVE_MP_TABLE

src/mainboard/msi/ms9652_fam10/Kconfig

@@ -11,7 +11,6 @@ config BOARD_SPECIFIC_OPTIONS # dummy
 	select MCP55_USE_NIC
 	select MCP55_USE_AZA
 	select SUPERIO_WINBOND_W83627EHG
-	select HAVE_BUS_CONFIG
 	select HAVE_PIRQ_TABLE
 	select HAVE_MP_TABLE
 	select HAVE_ACPI_TABLES

src/mainboard/nvidia/l1_2pvv/Kconfig

@@ -13,7 +13,6 @@ config BOARD_SPECIFIC_OPTIONS # dummy
 	select MCP55_USE_AZA
 	select SUPERIO_WINBOND_W83627EHG
 	select HAVE_OPTION_TABLE
-	select HAVE_BUS_CONFIG
 	select HAVE_PIRQ_TABLE
 	select HAVE_MP_TABLE
 	select LIFT_BSP_APIC_ID

src/mainboard/siemens/sitemp_g1p1/Kconfig

@@ -14,7 +14,6 @@ config BOARD_SPECIFIC_OPTIONS # dummy
 	select HAVE_MP_TABLE
 	select HAVE_PIRQ_TABLE
 	select HAVE_OPTION_TABLE
-	select HAVE_BUS_CONFIG
 	select SB_HT_CHAIN_UNITID_OFFSET_ONLY
 	select BOARD_ROMSIZE_KB_1024
 	select RAMINIT_SYSINFO

src/mainboard/sunw/ultra40/Kconfig

@@ -9,7 +9,6 @@ config BOARD_SPECIFIC_OPTIONS # dummy
 	select SOUTHBRIDGE_NVIDIA_CK804
 	select SUPERIO_SMSC_LPC47M10X
 	select HAVE_OPTION_TABLE
-	select HAVE_BUS_CONFIG
 	select HAVE_PIRQ_TABLE
 	select HAVE_MP_TABLE
 	select BOARD_ROMSIZE_KB_1024

src/mainboard/supermicro/h8dme/Kconfig

@@ -13,7 +13,6 @@ config BOARD_SPECIFIC_OPTIONS # dummy
 	select MCP55_USE_AZA
 	select SUPERIO_WINBOND_W83627HF
 	select HAVE_OPTION_TABLE
-	select HAVE_BUS_CONFIG
 	select HAVE_PIRQ_TABLE
 	select HAVE_MP_TABLE
 	#select AP_CODE_IN_CAR

src/mainboard/supermicro/h8dmr/Kconfig

@@ -13,7 +13,6 @@ config BOARD_SPECIFIC_OPTIONS # dummy
 	select MCP55_USE_AZA
 	select SUPERIO_WINBOND_W83627HF
 	select HAVE_OPTION_TABLE
-	select HAVE_BUS_CONFIG
 	select HAVE_PIRQ_TABLE
 	select HAVE_MP_TABLE
 	select LIFT_BSP_APIC_ID

src/mainboard/supermicro/h8dmr_fam10/Kconfig

@@ -11,7 +11,6 @@ config BOARD_SPECIFIC_OPTIONS # dummy
 	select MCP55_USE_NIC
 	select MCP55_USE_AZA
 	select SUPERIO_WINBOND_W83627HF
-	select HAVE_BUS_CONFIG
 	select HAVE_OPTION_TABLE
 	select HAVE_PIRQ_TABLE
 	select HAVE_MP_TABLE

src/mainboard/supermicro/h8qgi/Kconfig

@@ -33,7 +33,6 @@ config BOARD_SPECIFIC_OPTIONS
 	select DRIVERS_I2C_W83795
 	select UDELAY_TSC
 	select BOARD_HAS_FADT
-	select HAVE_BUS_CONFIG
 	select HAVE_OPTION_TABLE
 	select HAVE_PIRQ_TABLE
 	select HAVE_MP_TABLE
@@ -87,10 +86,6 @@ config STACK_SIZE
 	hex
 	default 0x10000
 
-config ACPI_SSDTX_NUM
-	int
-	default 0
-
 config RAMBASE
 	hex
 	default 0x200000

src/mainboard/supermicro/h8qme_fam10/Kconfig

@@ -10,7 +10,6 @@ config BOARD_SPECIFIC_OPTIONS # dummy
 	select SOUTHBRIDGE_AMD_AMD8132
 	select SOUTHBRIDGE_NVIDIA_MCP55
 	select SUPERIO_WINBOND_W83627HF
-	select HAVE_BUS_CONFIG
 	select HAVE_OPTION_TABLE
 	select HAVE_PIRQ_TABLE
 	select HAVE_MP_TABLE

src/mainboard/supermicro/h8scm_fam10/Kconfig

@@ -12,7 +12,6 @@ config BOARD_SPECIFIC_OPTIONS # dummy
 	select SOUTHBRIDGE_AMD_SUBTYPE_SP5100
 	select SUPERIO_WINBOND_W83627HF
 	select SUPERIO_NUVOTON_WPCM450
-	select HAVE_BUS_CONFIG
 	select HAVE_OPTION_TABLE
 	select GENERATE_PIRQ_TABLE
 	select GENERATE_MP_TABLE
@@ -77,10 +76,6 @@ config HEAP_SIZE
 	hex
 	default 0xc0000
 
-config ACPI_SSDTX_NUM
-	int
-	default 0
-
 config RAMBASE
 	hex
 	default 0x200000

src/mainboard/technexion/tim5690/Kconfig

@@ -10,7 +10,6 @@ config BOARD_SPECIFIC_OPTIONS # dummy
 	select SOUTHBRIDGE_AMD_SB600
 	select SUPERIO_ITE_IT8712F
 	select BOARD_HAS_FADT
-	select HAVE_BUS_CONFIG
 	select HAVE_OPTION_TABLE
 	select HAVE_PIRQ_TABLE
 	select HAVE_MP_TABLE

src/mainboard/technexion/tim8690/Kconfig

@@ -10,7 +10,6 @@ config BOARD_SPECIFIC_OPTIONS # dummy
 	select SOUTHBRIDGE_AMD_SB600
 	select SUPERIO_ITE_IT8712F
 	select BOARD_HAS_FADT
-	select HAVE_BUS_CONFIG
 	select HAVE_OPTION_TABLE
 	select HAVE_PIRQ_TABLE
 	select HAVE_MP_TABLE

src/mainboard/tyan/s2881/Kconfig

@@ -9,7 +9,6 @@ config BOARD_SPECIFIC_OPTIONS # dummy
 	select SOUTHBRIDGE_AMD_AMD8131
 	select SOUTHBRIDGE_AMD_AMD8111
 	select SUPERIO_WINBOND_W83627HF
-	select HAVE_BUS_CONFIG
 	select HAVE_OPTION_TABLE
 	select HAVE_PIRQ_TABLE
 	select HAVE_MP_TABLE

src/mainboard/tyan/s2885/Kconfig

@@ -10,7 +10,6 @@ config BOARD_SPECIFIC_OPTIONS # dummy
 	select SOUTHBRIDGE_AMD_AMD8131
 	select SOUTHBRIDGE_AMD_AMD8151
 	select SUPERIO_WINBOND_W83627HF
-	select HAVE_BUS_CONFIG
 	select HAVE_OPTION_TABLE
 	select HAVE_PIRQ_TABLE
 	select HAVE_MP_TABLE

src/mainboard/tyan/s2891/Kconfig

@@ -9,7 +9,6 @@ config BOARD_SPECIFIC_OPTIONS # dummy
 	select SOUTHBRIDGE_NVIDIA_CK804
 	select SOUTHBRIDGE_AMD_AMD8131
 	select SUPERIO_WINBOND_W83627HF
-	select HAVE_BUS_CONFIG
 	select HAVE_OPTION_TABLE
 	select HAVE_PIRQ_TABLE
 	select HAVE_MP_TABLE

src/mainboard/tyan/s2892/Kconfig

@@ -9,7 +9,6 @@ config BOARD_SPECIFIC_OPTIONS # dummy
 	select SOUTHBRIDGE_NVIDIA_CK804
 	select SOUTHBRIDGE_AMD_AMD8131
 	select SUPERIO_WINBOND_W83627HF
-	select HAVE_BUS_CONFIG
 	select HAVE_OPTION_TABLE
 	select HAVE_PIRQ_TABLE
 	select HAVE_MP_TABLE

src/mainboard/tyan/s2895/Kconfig

@@ -9,7 +9,6 @@ config BOARD_SPECIFIC_OPTIONS # dummy
 	select SOUTHBRIDGE_NVIDIA_CK804
 	select SOUTHBRIDGE_AMD_AMD8131
 	select SUPERIO_SMSC_LPC47B397
-	select HAVE_BUS_CONFIG
 	select HAVE_OPTION_TABLE
 	select HAVE_PIRQ_TABLE
 	select HAVE_MP_TABLE

src/mainboard/tyan/s2912/Kconfig

@@ -11,7 +11,6 @@ config BOARD_SPECIFIC_OPTIONS # dummy
 	select SOUTHBRIDGE_NVIDIA_MCP55
 	select MCP55_USE_NIC
 	select SUPERIO_WINBOND_W83627HF
-	select HAVE_BUS_CONFIG
 	select HAVE_OPTION_TABLE
 	select HAVE_PIRQ_TABLE
 	select HAVE_MP_TABLE

src/mainboard/tyan/s2912_fam10/Kconfig

@@ -10,7 +10,6 @@ config BOARD_SPECIFIC_OPTIONS # dummy
 	select SOUTHBRIDGE_NVIDIA_MCP55
 	select MCP55_USE_NIC
 	select SUPERIO_WINBOND_W83627HF
-	select HAVE_BUS_CONFIG
 	select HAVE_OPTION_TABLE
 	select HAVE_PIRQ_TABLE
 	select HAVE_MP_TABLE

src/mainboard/tyan/s8226/Kconfig

@@ -33,7 +33,6 @@ config BOARD_SPECIFIC_OPTIONS
 	select DRIVERS_I2C_W83795
 	select UDELAY_TSC
 	select BOARD_HAS_FADT
-	select HAVE_BUS_CONFIG
 	select HAVE_OPTION_TABLE
 	select HAVE_PIRQ_TABLE
 	select HAVE_MP_TABLE
@@ -84,10 +83,6 @@ config STACK_SIZE
 	hex
 	default 0x10000
 
-config ACPI_SSDTX_NUM
-	int
-	default 0
-
 config RAMBASE
 	hex
 	default 0x200000