Changeset 5176


Ignore:
Timestamp:
Mar 1, 2010 8:42:02 AM (3 years ago)
Author:
oxygene
Message:
  • Add rules that build either 4 or 5 ssdts (only those variants exist in the board now)
  • Change ACPI_SSDTX_NUM to either 4 or 5 for boards that have ssdtX.asl files, according to the number of ssdtX.asl there.
  • Remove custom ssdt rules

Signed-off-by: Patrick Georgi <patrick.georgi@…>
Acked-by: Peter Stuge <peter@…>

Location:
trunk/src
Files:
1 deleted
8 edited

Legend:

Unmodified
Added
Removed

  • trunk/src/arch/i386/Makefile.inc

    r5175 r5176  
    203203objs += $(obj)/mainboard/$(MAINBOARDDIR)/acpi_tables.o 
    204204objs += $(obj)/mainboard/$(MAINBOARDDIR)/dsdt.o 
     205# make doesn't have arithmetic operators or greater-than comparisons 
     206ifeq ($(subst 5,4,$(CONFIG_ACPI_SSDTX_NUM)),4) 
     207objs += $(obj)/mainboard/$(MAINBOARDDIR)/ssdt2.o 
     208objs += $(obj)/mainboard/$(MAINBOARDDIR)/ssdt3.o 
     209objs += $(obj)/mainboard/$(MAINBOARDDIR)/ssdt4.o 
     210endif 
     211ifeq ($(CONFIG_ACPI_SSDTX_NUM),5) 
     212objs += $(obj)/mainboard/$(MAINBOARDDIR)/ssdt5.o 
     213endif 
    205214ifeq ($(CONFIG_BOARD_HAS_FADT),y) 
    206215objs += $(obj)/mainboard/$(MAINBOARDDIR)/fadt.o 

  • trunk/src/mainboard/amd/serengeti_cheetah/Kconfig

    r5174 r5176  
    129129config ACPI_SSDTX_NUM 
    130130        int 
    131         default 1 
     131        default 4 
    132132        depends on BOARD_AMD_SERENGETI_CHEETAH 

  • trunk/src/mainboard/amd/serengeti_cheetah/Makefile.inc

    r5171 r5176  
    1818## 
    1919 
    20 # Needed by irq_tables and mptable and acpi_tables. 
    21 obj-$(CONFIG_GENERATE_ACPI_TABLES) += ssdt2.o 
    22 obj-$(CONFIG_GENERATE_ACPI_TABLES) += ssdt3.o 
    23 obj-$(CONFIG_GENERATE_ACPI_TABLES) += ssdt4.o 
    24  
    2520obj-y += ../../../drivers/i2c/i2cmux/i2cmux.o 

  • trunk/src/mainboard/amd/serengeti_cheetah_fam10/Kconfig

    r5171 r5176  
    117117config ACPI_SSDTX_NUM 
    118118        int 
    119         default 31 
     119        default 5 
    120120        depends on BOARD_AMD_SERENGETI_CHEETAH_FAM10 
    121121 

  • trunk/src/mainboard/amd/serengeti_cheetah_fam10/Makefile.inc

    r5171 r5176  
    1818## 
    1919 
    20 # Needed by irq_tables and mptable and acpi_tables. 
    21  
    22 # ./ssdt.o is in northbridge/amd/amdfam10/Makefile.inc 
    23 obj-$(CONFIG_GENERATE_ACPI_TABLES) += ssdt2.o 
    24 obj-$(CONFIG_GENERATE_ACPI_TABLES) += ssdt3.o 
    25 obj-$(CONFIG_GENERATE_ACPI_TABLES) += ssdt4.o 
    26 obj-$(CONFIG_GENERATE_ACPI_TABLES) += ssdt5.o 
    27  
    2820obj-y += ../../../drivers/i2c/i2cmux2/i2cmux2.o 

  • trunk/src/mainboard/iwill/dk8_htx/Kconfig

    r5171 r5176  
    123123config ACPI_SSDTX_NUM 
    124124        int 
    125         default 3 
     125        default 5 
    126126        depends on BOARD_IWILL_DK8_HTX 

  • trunk/src/mainboard/tyan/s2912/Kconfig

    r5171 r5176  
    141141        default 11 
    142142        depends on BOARD_TYAN_S2912 
    143  
    144 config ACPI_SSDTX_NUM 
    145         int 
    146         default 3 
    147         depends on BOARD_TYAN_S2912 

  • trunk/src/mainboard/tyan/s2912_fam10/Kconfig

    r5171 r5176  
    154154        depends on BOARD_TYAN_S2912_FAM10 
    155155 
    156 config ACPI_SSDTX_NUM 
    157         int 
    158         default 31 
    159         depends on BOARD_TYAN_S2912_FAM10 
    160  
    161156config RAMBASE 
    162157        hex 
Note: See TracChangeset for help on using the changeset viewer.