diff options
| -rw-r--r-- | src/mainboard/agami/aruma/Options.lb | 13 | ||||
| -rw-r--r-- | src/mainboard/agami/aruma/acpi_tables_static.c | 10 | ||||
| -rw-r--r-- | targets/agami/aruma/Config.lb | 4 |
3 files changed, 21 insertions, 6 deletions
diff --git a/src/mainboard/agami/aruma/Options.lb b/src/mainboard/agami/aruma/Options.lb index 25dc835733..41d5b0c045 100644 --- a/src/mainboard/agami/aruma/Options.lb +++ b/src/mainboard/agami/aruma/Options.lb @@ -73,6 +73,10 @@ uses ENABLE_APIC_EXT_ID uses APIC_ID_OFFSET uses LIFT_BSP_APIC_ID +uses HW_MEM_HOLE_SIZEK +uses CONFIG_PCI_64BIT_PREF_MEM + + ### ### Build options ### @@ -100,6 +104,12 @@ default HAVE_FALLBACK_BOOT=1 default HAVE_HARD_RESET=1 ## +## set memory hole size +## +default HW_MEM_HOLE_SIZEK=0x300000 +#default HW_MEM_HOLE_SIZEK=0x200000 + +## ## Build code to export a programmable irq routing table ## default HAVE_PIRQ_TABLE=1 @@ -129,7 +139,6 @@ default LB_CKS_LOC=123 ## ## Build code for SMP support -## Only worry about 2 micro processors ## default CONFIG_SMP=1 default CONFIG_MAX_CPUS=8 @@ -139,7 +148,7 @@ default CONFIG_LOGICAL_CPUS=1 default ENABLE_APIC_EXT_ID=1 default APIC_ID_OFFSET=0x10 -default LIFT_BSP_APIC_ID=0 +default LIFT_BSP_APIC_ID=1 # SDE was 0 #HT Unit ID offset #default HT_CHAIN_UNITID_BASE=0xa diff --git a/src/mainboard/agami/aruma/acpi_tables_static.c b/src/mainboard/agami/aruma/acpi_tables_static.c index f899100102..8339be24bd 100644 --- a/src/mainboard/agami/aruma/acpi_tables_static.c +++ b/src/mainboard/agami/aruma/acpi_tables_static.c @@ -21,11 +21,17 @@ unsigned long acpi_fill_madt(unsigned long current) unsigned int gsi_base=0x18, ioapic_nr=2, i; device_t dev=0; - /* create all subtables for 4p */ - current += acpi_create_madt_lapic((acpi_madt_lapic_t *)current, 0, 0); //SDE BSP APIC ID=0 + /* creare all subtables for 4p */ +#ifdef PRE_REVE + current += acpi_create_madt_lapic((acpi_madt_lapic_t *)current, 0, 0); current += acpi_create_madt_lapic((acpi_madt_lapic_t *)current, 1, 17); current += acpi_create_madt_lapic((acpi_madt_lapic_t *)current, 2, 18); current += acpi_create_madt_lapic((acpi_madt_lapic_t *)current, 3, 19); +#endif + current += acpi_create_madt_lapic((acpi_madt_lapic_t *)current, 0, 16); + current += acpi_create_madt_lapic((acpi_madt_lapic_t *)current, 1, 18); + current += acpi_create_madt_lapic((acpi_madt_lapic_t *)current, 2, 20); + current += acpi_create_madt_lapic((acpi_madt_lapic_t *)current, 3, 22); /* Write 8111 IOAPIC */ current += acpi_create_madt_ioapic((acpi_madt_ioapic_t *)current, 1, diff --git a/targets/agami/aruma/Config.lb b/targets/agami/aruma/Config.lb index c1f6f7ff2a..bbf9c45b48 100644 --- a/targets/agami/aruma/Config.lb +++ b/targets/agami/aruma/Config.lb @@ -12,7 +12,7 @@ option MAXIMUM_CONSOLE_LOGLEVEL=8 romimage "normal" option ROM_SIZE = 512*1024-36*1024 option USE_FALLBACK_IMAGE=0 - option ROM_IMAGE_SIZE=0x16000 + option ROM_IMAGE_SIZE=0x17000 option XIP_ROM_SIZE=0x20000 option LINUXBIOS_EXTRA_VERSION=".0-normal" payload ../../../../../../filo.elf @@ -20,7 +20,7 @@ end romimage "fallback" option USE_FALLBACK_IMAGE=1 - option ROM_IMAGE_SIZE=0x16000 + option ROM_IMAGE_SIZE=0x17000 option XIP_ROM_SIZE=0x20000 option LINUXBIOS_EXTRA_VERSION=".0-fallback" payload ../../../../../../filo.elf |