GNUBoot
/
coreboot-kgpe-d16
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

- Updates to config.g so that it works more reliably and has initial support 

for paths
- Renamed some configuration variables
  SMP -> CONFIG_SMP
  MAX_CPUS -> CONFIG_MAX_CPUS
  MAX_PHYSICAL_CPUS -> CONFIG_MAX_PHYSICAL_CPUS
- Removed some dead configuration variables
MAX_CPUS -> CONFIG_MAX_CPUS
MAX_PHYSICAL_CPUS -> CONFIG_MAX_PHYSICAL_CPUS
SMP -> CONFIG_SMP
FINAL_MAINBOARD_FIXUP
SIO_BASE
SIO_SYSTEM_CLK_INPUT
NO_KEYBOARD
USE_NORMAL_IMAGE
SERIAL_CONSOLE
USE_ELF_BOOT
ENABLE_FIXED_AND_VARIABLE_MTRRS
START_CPU_SEG
DISABLE_WATCHDOG
ENABLE_IOMMU
AMD8111_DEV

- Removed some assembly files that are no longer needed
killed src/southbridge/amd/amd8111/smbus.inc
killed src/southbrideg/amd/amd8111/cmos_boot_failover.inc
killed src/ram/ramtest.inc
- Updates to config.g so that it works more reliably and has initial support
  for paths
- Renamed some configuration variables
  SMP -> CONFIG_SMP
  MAX_CPUS -> CONFIG_MAX_CPUS
  MAX_PHYSICAL_CPUS -> CONFIG_MAX_PHYSICAL_CPUS
- Removed some dead configuration variables
MAX_CPUS -> CONFIG_MAX_CPUS
MAX_PHYSICAL_CPUS -> CONFIG_MAX_PHYSICAL_CPUS
SMP -> CONFIG_SMP
FINAL_MAINBOARD_FIXUP
SIO_BASE
SIO_SYSTEM_CLK_INPUT
NO_KEYBOARD
USE_NORMAL_IMAGE
SERIAL_CONSOLE
USE_ELF_BOOT
ENABLE_FIXED_AND_VARIABLE_MTRRS
START_CPU_SEG
DISABLE_WATCHDOG
ENABLE_IOMMU
AMD8111_DEV

- Removed some assembly files that are no longer needed
killed src/southbridge/amd/amd8111/smbus.inc
killed src/southbrideg/amd/amd8111/cmos_boot_failover.inc
killed src/ram/ramtest.inc
killed src/sdram/generic_dump_spd.inc
killed src/sdram/generic_dump_spd.inc

- Updated the arima/hdama to build with the new configuration system
- Updated config.g to list all of the variables with make echo


git-svn-id: svn://svn.coreboot.org/coreboot/trunk@1093 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1
This commit is contained in:
Eric Biederman 2003-09-01 23:17:58 +00:00
parent 0e97fe3904
commit 9bdb460a97
38 changed files with 503 additions and 732 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
NEWS
View File

@ -1,3 +1,9 @@
- 1.1.1
Updates to the new configuration system so it works more reliably
Removed a bunch of unused configuration variables
Removed a bunch of unused assembly code
- 1.1.0
A whole bunch of random ppc and opteron work we never put a good label on
- 1.1.0 - 1.1.0
Intial development release of LinuxBIOS. Intial development release of LinuxBIOS.
Everything is thrown overboard and will be reincluded as necessary so we can Everything is thrown overboard and will be reincluded as necessary so we can

21
documentation/RFC/config.tex
View File

@ -205,13 +205,11 @@ ldscript cpu/i386/entry32.lds
### Build our reset vector (This is where linuxBIOS is entered) ### Build our reset vector (This is where linuxBIOS is entered)
### ###
if USE_FALLBACK_IMAGE if USE_FALLBACK_IMAGE
mainboardinit cpu/i386/reset16.inc mainboardinit cpu/i386/reset16.inc
ldscript cpu/i386/reset16.lds ldscript cpu/i386/reset16.lds
end else
mainboardinit cpu/i386/reset32.inc
if USE_NORMAL_IMAGE ldscript cpu/i386/reset32.lds
mainboardinit cpu/i386/reset32.inc
ldscript cpu/i386/reset32.lds
end end
. .
. .
@ -229,13 +227,6 @@ makerule ./auto.inc dep "./romcc ./auto.E" act "./romcc -O ./auto.E > auto.inc"
mainboardinit ./auto.inc mainboardinit ./auto.inc
# #
### ###
### Setup RAM
###
mainboardinit ram/ramtest.inc
mainboardinit southbridge/amd/amd8111/smbus.inc
mainboardinit sdram/generic_dump_spd.inc
#
###
### Include the secondary Configuration files ### Include the secondary Configuration files
### ###
northbridge amd/amdk8 northbridge amd/amdk8
@ -286,7 +277,7 @@ export ARCH:=i386
export _RAMBASE:=0x4000 export _RAMBASE:=0x4000
export ROM_IMAGE_SIZE:=65535 export ROM_IMAGE_SIZE:=65535
export PAYLOAD_SIZE:=131073 export PAYLOAD_SIZE:=131073
export MAX_CPUS:=1 export CONFIG_MAX_CPUS:=1
export HEAP_SIZE:=8192 export HEAP_SIZE:=8192
export STACK_SIZE:=8192 export STACK_SIZE:=8192
export MEMORY_HOLE:=0 export MEMORY_HOLE:=0

2
src/arch/i386/boot/tables.c
View File

@ -20,7 +20,7 @@ static void remove_logical_cpus(unsigned long *processor_map)
if (disable_logical_cpus) { if (disable_logical_cpus) {
/* disable logical cpus */ /* disable logical cpus */
int cnt; int cnt;
for(cnt=MAX_PHYSICAL_CPUS;cnt<MAX_CPUS;cnt++) for(cnt=CONFIG_MAX_PHYSICAL_CPUS;cnt<CONFIG_MAX_CPUS;cnt++)
processor_map[cnt]=0; processor_map[cnt]=0;
printk_debug("logical cpus disabled\n"); printk_debug("logical cpus disabled\n");
} }

2
src/arch/i386/include/arch/smp/mpspec.h
View File

@ -268,7 +268,7 @@ void *smp_write_floating_table(unsigned long addr);
unsigned long write_smp_table(unsigned long addr, unsigned long *processor_map); unsigned long write_smp_table(unsigned long addr, unsigned long *processor_map);
/* A table (per mainboard) listing the initial apicid of each cpu. */ /* A table (per mainboard) listing the initial apicid of each cpu. */
extern unsigned long initial_apicid[MAX_CPUS]; extern unsigned long initial_apicid[CONFIG_MAX_CPUS];
#else /* HAVE_MP_TABLE */ #else /* HAVE_MP_TABLE */
static inline static inline

4
src/arch/i386/lib/c_start.S
View File

@ -45,10 +45,10 @@ _start:
movl APIC_ID(%edi), %eax movl APIC_ID(%edi), %eax
shrl $24, %eax shrl $24, %eax
/* Get the cpu index (MAX_CPUS on error) */ /* Get the cpu index (CONFIG_MAX_CPUS on error) */
movl $-4, %ebx movl $-4, %ebx
1: addl $4, %ebx 1: addl $4, %ebx
cmpl $(MAX_CPUS << 2), %ebx cmpl $(CONFIG_MAX_CPUS << 2), %ebx
je 2 je 2
cmpl %eax, initial_apicid(%ebx) cmpl %eax, initial_apicid(%ebx)
jne 1b jne 1b

2
src/arch/i386/smp/mpspec.c
View File

@ -108,7 +108,7 @@ void smp_write_processors(struct mp_config_table *mc,
cpuid(1, &eax, &ebx, &ecx, &edx); cpuid(1, &eax, &ebx, &ecx, &edx);
cpu_features = eax; cpu_features = eax;
cpu_feature_flags = edx; cpu_feature_flags = edx;
for(i = 0; i < MAX_CPUS; i++) { for(i = 0; i < CONFIG_MAX_CPUS; i++) {
unsigned long cpu_apicid = initial_apicid[i]; unsigned long cpu_apicid = initial_apicid[i];
unsigned long cpu_flag; unsigned long cpu_flag;
if(initial_apicid[i]==-1) if(initial_apicid[i]==-1)

4
src/arch/i386/smp/secondary.S
View File

@ -48,10 +48,10 @@ _secondary_start:
movl (APIC_ID + APIC_DEFAULT_BASE), %edi movl (APIC_ID + APIC_DEFAULT_BASE), %edi
shrl $24, %edi shrl $24, %edi
/* Get the cpu index (MAX_CPUS on error) */ /* Get the cpu index (CONFIG_MAX_CPUS on error) */
movl $-4, %ebx movl $-4, %ebx
1: addl $4, %ebx 1: addl $4, %ebx
cmpl $(MAX_CPUS << 2), %ebx cmpl $(CONFIG_MAX_CPUS << 2), %ebx
je 2 je 2
cmpl %edi, initial_apicid(%ebx) cmpl %edi, initial_apicid(%ebx)
jne 1b jne 1b

11
src/arch/i386/smp/start_stop.c
View File

@ -5,13 +5,6 @@
#include <string.h> #include <string.h>
#include <console/console.h> #include <console/console.h>
#ifndef START_CPU_SEG
#define START_CPU_SEG 0x90000
#endif
#if (START_CPU_SEG&0xffff) != 0
#error START_CPU_SEG must be 64k aligned
#endif
static inline void hlt(void) static inline void hlt(void)
{ {
asm("hlt"); asm("hlt");
@ -26,7 +19,7 @@ unsigned long this_processors_id(void)
int processor_index(unsigned long apicid) int processor_index(unsigned long apicid)
{ {
int i; int i;
for(i = 0; i < MAX_CPUS; i++) { for(i = 0; i < CONFIG_MAX_CPUS; i++) {
if (initial_apicid[i] == apicid) { if (initial_apicid[i] == apicid) {
return i; return i;
} }
@ -230,7 +223,7 @@ void startup_other_cpus(unsigned long *processor_map)
int i; int i;
/* Assume the cpus are densly packed by apicid */ /* Assume the cpus are densly packed by apicid */
for(i = 0; i < MAX_CPUS; i++) { for(i = 0; i < CONFIG_MAX_CPUS; i++) {
unsigned long cpu_apicid = initial_apicid[i]; unsigned long cpu_apicid = initial_apicid[i];
if (cpu_apicid == -1) { if (cpu_apicid == -1) {
printk_err("CPU %d not found\n",i); printk_err("CPU %d not found\n",i);

4
src/boot/hardwaremain.c
View File

@ -60,7 +60,7 @@ it with the version available from LANL.
* info per processor at some point. I hope we don't need * info per processor at some point. I hope we don't need
* anything more complex than an int. * anything more complex than an int.
*/ */
static unsigned long processor_map[MAX_CPUS]; static unsigned long processor_map[CONFIG_MAX_CPUS];
static struct mem_range *get_ramsize(void) static struct mem_range *get_ramsize(void)
{ {
@ -114,7 +114,7 @@ static void wait_for_other_cpus(void)
} }
active_count = atomic_read(&active_cpus); active_count = atomic_read(&active_cpus);
} }
for(i = 0; i < MAX_CPUS; i++) { for(i = 0; i < CONFIG_MAX_CPUS; i++) {
if (!(processor_map[i] & CPU_ENABLED)) { if (!(processor_map[i] & CPU_ENABLED)) {
printk_err("CPU %d did not initialize!\n", i); printk_err("CPU %d did not initialize!\n", i);
processor_map[i] = 0; processor_map[i] = 0;

127
src/config/Options.lb
View File

@ -117,7 +117,7 @@ define OBJCOPY
comment "Objcopy command" comment "Objcopy command"
end end
define LINUXBIOS_VERSION define LINUXBIOS_VERSION
default "1.1.0" default "1.1.1"
export always export always
comment "LinuxBIOS version" comment "LinuxBIOS version"
end end
@ -148,7 +148,7 @@ define LINUXBIOS_COMPILE_HOST
end end
define LINUXBIOS_COMPILE_DOMAIN define LINUXBIOS_COMPILE_DOMAIN
default "" default "$(shell dnsdomainname)"
export always export always
comment "Build domain name" comment "Build domain name"
end end
@ -183,16 +183,10 @@ define HAVE_FALLBACK_BOOT
comment "Set if fallback booting required" comment "Set if fallback booting required"
end end
define USE_FALLBACK_IMAGE define USE_FALLBACK_IMAGE
default 0 default 1
export used export used
comment "Set to build a fallback image" comment "Set to build a fallback image"
end end
define USE_NORMAL_IMAGE
format "%d"
default {!USE_FALLBACK_IMAGE}
export used
comment "Set to build a normal image"
end
define FALLBACK_SIZE define FALLBACK_SIZE
default 65536 default 65536
format "0x%x" format "0x%x"
@ -277,16 +271,16 @@ define CACHE_RAM_SIZE
comment "Size of cache when using it for temporary RAM" comment "Size of cache when using it for temporary RAM"
end end
define XIP_ROM_BASE define XIP_ROM_BASE
default 0xffff8000 default 0
format "0x%x" format "0x%x"
export used export used
comment "base address of range of ROM that can be cached to speed up linuxBIOS" comment "Start address of area to cache during LinuxBIOS execution directly from ROM"
end end
define XIP_ROM_SIZE define XIP_ROM_SIZE
default 0x8000 default 0
format "0x%x" format "0x%x"
export used export used
comment "size of range of ROM that can be cached to speed up linuxBIOS" comment "Size of area to cache during LinuxBIOS execution directly from ROM"
end end
define CONFIG_COMPRESS define CONFIG_COMPRESS
default 1 default 1
@ -348,14 +342,8 @@ end
define CONFIG_CONSOLE_SERIAL8250 define CONFIG_CONSOLE_SERIAL8250
default 0 default 0
export always export always
comment "Log messages to serial 8250 console" comment "Log messages to 8250 uart based serial console"
end end
define SERIAL_CONSOLE
default none
export used
comment "Log messages to serial console"
end
define DEFAULT_CONSOLE_LOGLEVEL define DEFAULT_CONSOLE_LOGLEVEL
default 7 default 7
export always export always
@ -373,17 +361,25 @@ define NO_POST
export always export always
comment "Disable POST codes" comment "Disable POST codes"
end end
define TTYS0_BASE
default 0x3f8
export always
comment "Base address for 8250 uart for the serial console"
end
define TTYS0_BAUD define TTYS0_BAUD
default 115200 default 115200
export always export always
comment "Default baud rate for serial console" comment "Default baud rate for serial console"
end end
define NO_KEYBOARD
default none
export never
comment "Set if we don't have a keyboard"
end
define TTYS0_LCS
default 0x3
export always
comment "Default flow control settings for the 8250 serial console uart"
end
############################################### ###############################################
# Mainboard options # Mainboard options
############################################### ###############################################
@ -403,11 +399,6 @@ define MAINBOARD_VENDOR
export always export always
comment "Vendor of mainboard" comment "Vendor of mainboard"
end end
define FINAL_MAINBOARD_FIXUP
default 0
export used
comment "Do final mainboard fixups"
end
define CONFIG_SYS_CLK_FREQ define CONFIG_SYS_CLK_FREQ
default none default none
export used export used
@ -426,23 +417,18 @@ end
define CONFIG_MAX_CPUS define CONFIG_MAX_CPUS
default 1 default 1
export always export always
comment "Config CPU count for this machine" comment "Maximum CPU count for this machine"
end end
define MAX_CPUS define CONFIG_MAX_PHYSICAL_CPUS
default 1 default {CONFIG_MAX_CPUS}
export always
comment "CPU count for this machine"
end
define CONFIG_LOGICAL_CPUS
default 1
export always
comment "Logical CPU count for this machine"
end
define MAX_PHYSICAL_CPUS
default 1
export always export always
comment "Physical CPU count for this machine" comment "Physical CPU count for this machine"
end end
define CONFIG_LOGICAL_CPUS
default 0
export always
comment "Should multiple cpus per die be enabled?"
end
define HAVE_MP_TABLE define HAVE_MP_TABLE
default none default none
export always export always
@ -453,11 +439,6 @@ end
# Boot options # Boot options
############################################### ###############################################
define USE_ELF_BOOT
default none
export always
comment "Use ELF boot loader"
end
define CONFIG_IDE_STREAM define CONFIG_IDE_STREAM
default 0 default 0
export always export always
@ -540,21 +521,6 @@ define SMBUS_MEM_DEVICE_INC
comment "Increment value SMBUS" comment "Increment value SMBUS"
end end
###############################################
# SuperIO options
###############################################
define SIO_BASE
default none
export used
comment "Superio base address"
end
define SIO_SYSTEM_CLK_INPUT
default none
export used
comment "Superio CLK input default"
end
############################################### ###############################################
# Misc options # Misc options
############################################### ###############################################
@ -569,57 +535,30 @@ define MEMORY_HOLE
export used export used
comment "Set to deal with memory hole" comment "Set to deal with memory hole"
end end
define ENABLE_FIXED_AND_VARIABLE_MTRRS
default none
export used
comment "Enable fixed and variable mtrrs"
end
define START_CPU_SEG
default 0xf0000
format "0x%x"
export always
comment "Start CPU segment"
end
define MAX_REBOOT_CNT define MAX_REBOOT_CNT
default 2 default 3
export always export always
comment "Set maximum reboots" comment "Set maximum reboots"
end end
define DISABLE_WATCHDOG
default {MAXIMUM_CONSOLE_LOGLEVEL >= 8}
export used
comment "Disable watchdog if we're doing lots of output"
end
define ENABLE_IOMMU
default 1
export used
comment "Enable IOMMU aperture"
end
############################################### ###############################################
# Misc device options # Misc device options
############################################### ###############################################
define CONFIG_TSC_X86RDTSC_CALIBRATE_WITH_TIMER2 define CONFIG_TSC_X86RDTSC_CALIBRATE_WITH_TIMER2
default none default 0
export used export used
comment "" comment "Use timer2 to callibrate the x86 time stamp counter"
end end
define INTEL_PPRO_MTRR define INTEL_PPRO_MTRR
default none default none
export always export always
comment "" comment ""
end end
define AMD8111_DEV
default 0x3800
format "0x%x"
export used
comment ""
end
define CONFIG_UDELAY_TSC define CONFIG_UDELAY_TSC
default 0 default 0
export used export used
comment "" comment "Implement udelay with the x86 time stamp counter"
end end
############################################### ###############################################

2
src/config/linuxbios_c.ld
View File

@ -87,7 +87,7 @@ SECTIONS
_stack = .; _stack = .;
.stack . : { .stack . : {
/* Reserve a stack for each possible cpu, +1 extra */ /* Reserve a stack for each possible cpu, +1 extra */
. = ((MAX_CPUS * STACK_SIZE) + STACK_SIZE) ; . = ((CONFIG_MAX_CPUS * STACK_SIZE) + STACK_SIZE) ;
} }
_estack = .; _estack = .;
_heap = .; _heap = .;

1
src/include/device/device.h
View File

@ -1,6 +1,7 @@
#ifndef DEVICE_H #ifndef DEVICE_H
#define DEVICE_H #define DEVICE_H
#include <stdint.h>
#include <device/resource.h> #include <device/resource.h>
struct device; struct device;

35
src/mainboard/amd/quartet/Config.lb
View File

@ -1,8 +1,6 @@
uses HAVE_MP_TABLE uses HAVE_MP_TABLE
uses HAVE_PIRQ_TABLE uses HAVE_PIRQ_TABLE
uses USE_FALLBACK_IMAGE uses USE_FALLBACK_IMAGE
uses USE_NORMAL_IMAGE
uses ENABLE_IOMMU
# #
# #
### ###
@ -34,15 +32,11 @@ ldscript /cpu/i386/entry32.lds
### Build our reset vector (This is where linuxBIOS is entered) ### Build our reset vector (This is where linuxBIOS is entered)
### ###
if USE_FALLBACK_IMAGE if USE_FALLBACK_IMAGE
mainboardinit cpu/i386/reset16.inc mainboardinit cpu/i386/reset16.inc
ldscript /cpu/i386/reset16.lds ldscript /cpu/i386/reset16.lds
else else
print "NO FALLBACK USED!" mainboardinit cpu/i386/reset32.inc
end ldscript /cpu/i386/reset32.lds
if USE_NORMAL_IMAGE
mainboardinit cpu/i386/reset32.inc
ldscript /cpu/i386/reset32.lds
end end
# #
#### Should this be in the northbridge code? #### Should this be in the northbridge code?
@ -76,15 +70,6 @@ end
mainboardinit cpu/k8/earlymtrr.inc mainboardinit cpu/k8/earlymtrr.inc
# #
# #
###
### Only the bootstrap cpu makes it here.
### Failover if we need to
###
#
if USE_FALLBACK_IMAGE
mainboardinit southbridge/amd/amd8111/cmos_boot_failover.inc
end
#
#### ####
#### O.k. We aren't just an intermediary anymore! #### O.k. We aren't just an intermediary anymore!
#### ####
@ -94,10 +79,6 @@ end
### ###
##option MAXIMUM_CONSOLE_LOGLEVEL=7 ##option MAXIMUM_CONSOLE_LOGLEVEL=7
#default MAXIMUM_CONSOLE_LOGLEVEL=7 #default MAXIMUM_CONSOLE_LOGLEVEL=7
#option DISABLE_WATCHDOG= (MAXIMUM_CONSOLE_LOGLEVEL >= 8)
#if DISABLE_WATCHDOG
# mainboardinit southbridgeamd/amd8111/disable_watchdog.inc
#end
# #
if USE_FALLBACK_IMAGE mainboardinit arch/i386/lib/noop_failover.inc end if USE_FALLBACK_IMAGE mainboardinit arch/i386/lib/noop_failover.inc end
# #
@ -118,13 +99,6 @@ end
mainboardinit ./auto.inc mainboardinit ./auto.inc
# #
### ###
### Setup RAM
###
mainboardinit ram/ramtest.inc
mainboardinit southbridge/amd/amd8111/smbus.inc
mainboardinit sdram/generic_dump_spd.inc
#
###
### Include the secondary Configuration files ### Include the secondary Configuration files
### ###
northbridge amd/amdk8 northbridge amd/amdk8
@ -142,4 +116,3 @@ cpu p6 end
cpu k7 end cpu k7 end
cpu k8 end cpu k8 end
option ENABLE_IOMMU=1

2
src/mainboard/amd/quartet/auto.c
View File

@ -17,6 +17,8 @@
#include "northbridge/amd/amdk8/reset_test.c" #include "northbridge/amd/amdk8/reset_test.c"
#include "debug.c" #include "debug.c"
#define SIO_BASE 0x2e
static void memreset_setup(void) static void memreset_setup(void)
{ {
/* Set the memreset low */ /* Set the memreset low */

2
src/mainboard/amd/quartet/mainboard.c
View File

@ -5,7 +5,7 @@
#include <device/pci_ops.h> #include <device/pci_ops.h>
unsigned long initial_apicid[MAX_CPUS] = unsigned long initial_apicid[CONFIG_MAX_CPUS] =
{ {
0, 1, 2, 3 0, 1, 2, 3
}; };

71
src/mainboard/amd/solo/Config.lb
View File

@ -24,8 +24,6 @@ default CONFIG_UDELAY_TSC=0
### ###
### Customize our winbond superio chip for this motherboard ### Customize our winbond superio chip for this motherboard
### ###
option SIO_BASE=0x2e
option SIO_SYSTEM_CLK_INPUT=0
option CONFIG_CONSOLE_SERIAL8250=0 option CONFIG_CONSOLE_SERIAL8250=0
# #
### ###
@ -51,16 +49,11 @@ option IRQ_SLOT_COUNT=7
##option HAVE_MP_TABLE=1 ##option HAVE_MP_TABLE=1
# #
### ###
### Do not build special code for the keyboard
###
default NO_KEYBOARD=1
#
###
### Build code for SMP support ### Build code for SMP support
### Only worry about 2 micro processors ### Only worry about 2 micro processors
### ###
##option CONFIG_SMP=1 ##option CONFIG_SMP=1
option MAX_CPUS=1 option CONFIG_MAX_CPUS=1
# #
### ###
### Build code to setup a generic IOAPIC ### Build code to setup a generic IOAPIC
@ -79,37 +72,17 @@ option CONFIG_IOAPIC=1
option MEMORY_HOLE=0 option MEMORY_HOLE=0
# #
### ###
### Enable both fixed and variable MTRRS
### When we setup MTRRs in mtrr.c
###
### We must setup the fixed mtrrs or we confuse SMP secondary
### processor identification
###
option ENABLE_FIXED_AND_VARIABLE_MTRRS=1
#
###
### Clean up the motherboard id strings ### Clean up the motherboard id strings
### ###
option MAINBOARD_PART_NUMBER="Solo7" option MAINBOARD_PART_NUMBER="Solo7"
option MAINBOARD_VENDOR="AMD" option MAINBOARD_VENDOR="AMD"
# #
### ###
### Let Assembly code know where on the pci bus the AMD southbridge is
###
option AMD8111_DEV=0x3800
#
###
### Call the final_mainboard_fixup function
###
option FINAL_MAINBOARD_FIXUP=1
#
###
### Figure out which type of linuxBIOS image to build ### Figure out which type of linuxBIOS image to build
### If we aren't a fallback image we must be a normal image ### If we aren't a fallback image we must be a normal image
### This is useful for optional includes ### This is useful for optional includes
### ###
default USE_FALLBACK_IMAGE=0 default USE_FALLBACK_IMAGE=0
option USE_NORMAL_IMAGE=(! USE_FALLBACK_IMAGE)
# #
#### ####
#### LinuxBIOS layout values #### LinuxBIOS layout values
@ -144,8 +117,7 @@ default FALLBACK_SIZE=65536
if USE_FALLBACK_IMAGE if USE_FALLBACK_IMAGE
option ROM_SECTION_SIZE = FALLBACK_SIZE option ROM_SECTION_SIZE = FALLBACK_SIZE
option ROM_SECTION_OFFSET= (ROM_SIZE - FALLBACK_SIZE) option ROM_SECTION_OFFSET= (ROM_SIZE - FALLBACK_SIZE)
end else
if USE_NORMAL_IMAGE
option ROM_SECTION_SIZE = (ROM_SIZE - FALLBACK_SIZE) option ROM_SECTION_SIZE = (ROM_SIZE - FALLBACK_SIZE)
option ROM_SECTION_OFFSET= 0 option ROM_SECTION_OFFSET= 0
end end
@ -177,13 +149,6 @@ option _ROMBASE = (CONFIG_ROM_STREAM_START + PAYLOAD_SIZE)
##option XIP_ROM_BASE=0xffff8000 ##option XIP_ROM_BASE=0xffff8000
# #
### ###
### Compute where the SMP startup code needs to live
### FIXME I don't see how to make this work for the normal image....
###
option START_CPU_SEG=0xf0000
#
#
###
### Set all of the defaults for an x86 architecture ### Set all of the defaults for an x86 architecture
### ###
# #
@ -217,13 +182,11 @@ ldscript /cpu/i386/entry32.lds
### Build our reset vector (This is where linuxBIOS is entered) ### Build our reset vector (This is where linuxBIOS is entered)
### ###
if USE_FALLBACK_IMAGE if USE_FALLBACK_IMAGE
mainboardinit cpu/i386/reset16.inc mainboardinit cpu/i386/reset16.inc
ldscript /cpu/i386/reset16.lds ldscript /cpu/i386/reset16.lds
end else
mainboardinit cpu/i386/reset32.inc
if USE_NORMAL_IMAGE ldscript /cpu/i386/reset32.lds
mainboardinit cpu/i386/reset32.inc
ldscript /cpu/i386/reset32.lds
end end
# #
#### Should this be in the northbridge code? #### Should this be in the northbridge code?
@ -251,15 +214,6 @@ end
mainboardinit cpu/k8/earlymtrr.inc mainboardinit cpu/k8/earlymtrr.inc
# #
# #
###
### Only the bootstrap cpu makes it here.
### Failover if we need to
###
#
if USE_FALLBACK_IMAGE
mainboardinit southbridge/amd/amd8111/cmos_boot_failover.inc
end
#
#### ####
#### O.k. We aren't just an intermediary anymore! #### O.k. We aren't just an intermediary anymore!
#### ####
@ -269,10 +223,6 @@ end
### ###
##option MAXIMUM_CONSOLE_LOGLEVEL=7 ##option MAXIMUM_CONSOLE_LOGLEVEL=7
#default MAXIMUM_CONSOLE_LOGLEVEL=7 #default MAXIMUM_CONSOLE_LOGLEVEL=7
#option DISABLE_WATCHDOG= (MAXIMUM_CONSOLE_LOGLEVEL >= 8)
#if DISABLE_WATCHDOG
# mainboardinit southbridgeamd/amd8111/disable_watchdog.inc
#end
# #
### ###
### Setup the serial port ### Setup the serial port
@ -293,13 +243,6 @@ makerule ./auto.inc dep "./romcc ./auto.E" act "./romcc -O ./auto.E > auto.inc"
mainboardinit ./auto.inc mainboardinit ./auto.inc
# #
### ###
### Setup RAM
###
mainboardinit ram/ramtest.inc
mainboardinit southbridge/amd/amd8111/smbus.inc
mainboardinit sdram/generic_dump_spd.inc
#
###
### Include the secondary Configuration files ### Include the secondary Configuration files
### ###
northbridge amd/amdk8 northbridge amd/amdk8

2
src/mainboard/amd/solo/mainboard.c
View File

@ -5,7 +5,7 @@
#include <device/pci_ops.h> #include <device/pci_ops.h>
unsigned long initial_apicid[MAX_CPUS] = unsigned long initial_apicid[CONFIG_MAX_CPUS] =
{ {
0 0
}; };

380
src/mainboard/arima/hdama/Config.lb
View File

@ -1,168 +1,286 @@
uses HAVE_MP_TABLE uses HAVE_MP_TABLE
uses HAVE_PIRQ_TABLE uses HAVE_PIRQ_TABLE
uses USE_FALLBACK_IMAGE uses USE_FALLBACK_IMAGE
uses USE_NORMAL_IMAGE
uses AMD8111_DEV
uses MAINBOARD uses MAINBOARD
uses ARCH uses ARCH
uses ENABLE_IOMMU uses FALLBACK_SIZE
# uses ROM_SIZE
# uses ROM_SECTION_SIZE
uses ROM_IMAGE_SIZE
uses ROM_SECTION_SIZE
uses ROM_SECTION_OFFSET
uses CONFIG_ROM_STREAM_START
uses PAYLOAD_SIZE
uses _ROMBASE
uses XIP_ROM_SIZE
uses XIP_ROM_BASE
### ###
### Set all of the defaults for an x86 architecture ### Build options
### ###
#
# ##
## Build code for the fallback boot
##
option HAVE_FALLBACK_BOOT=1
##
## Build code to reset the motherboard from linuxBIOS
##
option HAVE_HARD_RESET=1
##
## Build code to export a programmable irq routing table
##
option HAVE_PIRQ_TABLE=1
option IRQ_SLOT_COUNT=7
##
## Build code to export an x86 MP table
## Useful for specifying IRQ routing values
##
option HAVE_MP_TABLE=1
##
## Build code to export a CMOS option table
##
option HAVE_OPTION_TABLE=1
##
## Build code for SMP support
## Only worry about 2 micro processors
##
option CONFIG_SMP=1
option CONFIG_MAX_CPUS=2
##
## Build code to setup a generic IOAPIC
##
option CONFIG_IOAPIC=1
##
## Clean up the motherboard id strings
##
option MAINBOARD_PART_NUMBER="HDAMA"
option MAINBOARD_VENDOR="ARIMA"
### ###
### Build the objects we have code for in this directory. ### LinuxBIOS layout values
### ###
##object mainboard.o
driver mainboard.o ## ROM_SIZE is the size of boot ROM that this board will use.
object static_devices.o option ROM_SIZE = 524288
if HAVE_MP_TABLE object mptable.o end
if HAVE_PIRQ_TABLE object irq_tables.o end ## ROM_IMAGE_SIZE is the amount of space to allow linuxBIOS to occupy.
# option ROM_IMAGE_SIZE = 65536
##
## Use a small 8K stack
##
option STACK_SIZE=0x2000
##
## Use a small 16K heap
##
option HEAP_SIZE=0x4000
##
## Only use the option table in a normal image
##
option USE_OPTION_TABLE = !USE_FALLBACK_IMAGE
##
## Compute the location and size of where this firmware image
## (linuxBIOS plus bootloader) will live in the boot rom chip.
##
if USE_FALLBACK_IMAGE
option ROM_SECTION_SIZE = FALLBACK_SIZE
option ROM_SECTION_OFFSET = ( ROM_SIZE - FALLBACK_SIZE )
else
option ROM_SECTION_SIZE = ( ROM_SIZE - FALLBACK_SIZE )
option ROM_SECTION_OFFSET = 0
end
##
## Compute the start location and size size of
## The linuxBIOS bootloader.
##
option PAYLOAD_SIZE = ( ROM_SECTION_SIZE - ROM_IMAGE_SIZE )
option CONFIG_ROM_STREAM_START = (0xffffffff - ROM_SIZE + ROM_SECTION_OFFSET + 1)
option CONFIG_ROM_STREAM = 1
##
## Compute where this copy of linuxBIOS will start in the boot rom
##
option _ROMBASE = ( CONFIG_ROM_STREAM_START + PAYLOAD_SIZE )
##
## Compute a range of ROM that can cached to speed up linuxBIOS,
## execution speed.
##
## XIP_ROM_SIZE must be a power of 2.
## XIP_ROM_BASE must be a multiple of XIP_ROM_SIZE
##
option XIP_ROM_SIZE=65536
option XIP_ROM_BASE = ( _ROMBASE + ROM_IMAGE_SIZE - XIP_ROM_SIZE )
##
## Set all of the defaults for an x86 architecture
##
arch i386 end arch i386 end
#cpu k8 end #cpu k8 end
#
###
### Build our 16 bit and 32 bit linuxBIOS entry code
###
mainboardinit cpu/i386/entry16.inc
mainboardinit cpu/i386/entry32.inc
ldscript /cpu/i386/entry16.lds
ldscript /cpu/i386/entry32.lds
#
###
### Build our reset vector (This is where linuxBIOS is entered)
###
if USE_FALLBACK_IMAGE
mainboardinit cpu/i386/reset16.inc
ldscript /cpu/i386/reset16.lds
else
print "NO FALLBACK USED!"
end
if USE_NORMAL_IMAGE ##
mainboardinit cpu/i386/reset32.inc ## Build the objects we have code for in this directory.
ldscript /cpu/i386/reset32.lds ##
end
#
#### Should this be in the northbridge code?
mainboardinit arch/i386/lib/cpu_reset.inc
#
###
### Include an id string (For safe flashing)
###
mainboardinit arch/i386/lib/id.inc
ldscript /arch/i386/lib/id.lds
#
####
#### This is the early phase of linuxBIOS startup
#### Things are delicate and we test to see if we should
#### failover to another image.
####
#option MAX_REBOOT_CNT=2
if USE_FALLBACK_IMAGE
ldscript /arch/i386/lib/failover.lds
end
#
###
### Setup our mtrrs
###
mainboardinit cpu/k8/earlymtrr.inc
###
### Only the bootstrap cpu makes it here.
### Failover if we need to
###
#
if USE_FALLBACK_IMAGE
mainboardinit ./failover.inc
# mainboardinit southbridge/amd/amd8111/cmos_boot_failover.inc
end
# #object mainboard.o
# driver mainboard.o
### #object static_devices.o
### Setup the serial port if HAVE_MP_TABLE object mptable.o end
### if HAVE_PIRQ_TABLE object irq_tables.o end
#mainboardinit superiowinbond/w83627hf/setup_serial.inc object reset.o
mainboardinit pc80/serial.inc
mainboardinit arch/i386/lib/console.inc
#
####
#### O.k. We aren't just an intermediary anymore!
####
#
###
### When debugging disable the watchdog timer
###
##option MAXIMUM_CONSOLE_LOGLEVEL=7
#default MAXIMUM_CONSOLE_LOGLEVEL=7
#option DISABLE_WATCHDOG= (MAXIMUM_CONSOLE_LOGLEVEL >= 8)
#if DISABLE_WATCHDOG
# mainboardinit southbridgeamd/amd8111/disable_watchdog.inc
#end
#
#if USE_FALLBACK_IMAGE mainboardinit arch/i386/lib/noop_failover.inc end
#
###
### Romcc output
###
#makerule ./failover.E dep "$(MAINBOARD)/failover.c" act "$(CPP) -I$(TOP)/src $(CPPFLAGS) $(MAINBOARD)/failover.c > ./failever.E"
#makerule ./failover.inc dep "./romcc ./failover.E" act "./romcc -O ./failover.E > failover.inc"
#mainboardinit .failover.inc
##
## Romcc output
##
makerule ./failover.E makerule ./failover.E
depends "$(MAINBOARD)/failover.c" depends "$(MAINBOARD)/failover.c"
action "$(CPP) -I$(TOP)/src $(ROMCCPPFLAGS) $(CPPFLAGS) $(MAINBOARD)/failover.c > ./failover.E" action "$(CPP) -I$(TOP)/src $(ROMCCPPFLAGS) $(CPPFLAGS) $(MAINBOARD)/failover.c > ./failover.E"
end end
makerule ./failover.inc makerule ./failover.inc
depends "./romcc ./failover.E" depends "./failover.E ./romcc"
action "./romcc -O -o failover.inc --label-prefix=failover ./failover.E"end action "./romcc -O -o failover.inc --label-prefix=failover ./failover.E"
end
makerule ./auto.E makerule ./auto.E
depends "$(MAINBOARD)/auto.c" depends "$(MAINBOARD)/auto.c"
action "$(CPP) -I$(TOP)/src $(ROMCCPPFLAGS) $(CPPFLAGS) $(MAINBOARD)/auto.c > ./auto.E" action "$(CPP) -I$(TOP)/src $(ROMCCPPFLAGS) $(CPPFLAGS) $(MAINBOARD)/auto.c > ./auto.E"
end end
makerule ./auto.inc makerule ./auto.inc
depends "./romcc ./auto.E" depends "./auto.E ./romcc"
action "./romcc -mcpu=k8 -O ./auto.E > auto.inc" action "./romcc -mcpu=k8 -O ./auto.E > auto.inc"
end end
##
## Build our 16 bit and 32 bit linuxBIOS entry code
##
mainboardinit cpu/i386/entry16.inc
mainboardinit cpu/i386/entry32.inc
ldscript /cpu/i386/entry16.lds
ldscript /cpu/i386/entry32.lds
##
## Build our reset vector (This is where linuxBIOS is entered)
##
if USE_FALLBACK_IMAGE
mainboardinit cpu/i386/reset16.inc
ldscript /cpu/i386/reset16.lds
else
mainboardinit cpu/i386/reset32.inc
ldscript /cpu/i386/reset32.lds
end
### Should this be in the northbridge code?
mainboardinit arch/i386/lib/cpu_reset.inc
##
## Include an id string (For safe flashing)
##
mainboardinit arch/i386/lib/id.inc
ldscript /arch/i386/lib/id.lds
##
## Setup our mtrrs
##
mainboardinit cpu/k8/earlymtrr.inc
###
### This is the early phase of linuxBIOS startup
### Things are delicate and we test to see if we should
### failover to another image.
###
if USE_FALLBACK_IMAGE
ldscript /arch/i386/lib/failover.lds
mainboardinit ./failover.inc
end
###
### O.k. We aren't just an intermediary anymore!
###
##
## Setup RAM
##
mainboardinit cpu/k8/enable_mmx_sse.inc mainboardinit cpu/k8/enable_mmx_sse.inc
mainboardinit ./auto.inc mainboardinit ./auto.inc
mainboardinit cpu/k8/disable_mmx_sse.inc mainboardinit cpu/k8/disable_mmx_sse.inc
#
### ##
### Setup RAM ## Include the secondary Configuration files
### ##
#mainboardinit ram/ramtest.inc
#mainboardinit southbridge/amd/amd8111/smbus.inc
#mainboardinit sdram/generic_dump_spd.inc
#
###
### Include the secondary Configuration files
###
northbridge amd/amdk8
end
southbridge amd/amd8111 "amd8111"
end
southbridge amd/amd8131 "amd8131"
end
#mainboardinit archi386/smp/secondary.inc
superio NSC/pc87360
register "com1" = "{1}"
register "lpt" = "{1}"
end
dir /pc80 dir /pc80
##dir /src/superio/winbond/w83627hf
#dir /cpu/k8 northbridge amd/amdk8 "mc0"
cpu k8 "cpu0" #pci 0:18.0
register "up" = "{.chip = &amd8111, .ht_width=8, .ht_speed=200}" #pci 0:18.0
#pci 0:18.0
#pci 0:18.1
#pci 0:18.2
#pci 0:18.3
southbridge amd/amd8131 "amd8131"
#pci 0:0.0
#pci 0:0.1
#pci 0:1.0
#pci 0:1.1
end
southbridge amd/amd8111 "amd8111"
#pci 0:0.0
#pci 0:1.0
#pci 0:1.1
#pci 0:1.2
#pci 0:1.3
#pci 0:1.5 off
#pci 0:1.6 off
superio NSC/pc87360
#pnp 1:2e.0
#pnp 1:2e.1
#pnp 1:2e.2
#pnp 1:2e.3
#pnp 1:2e.4
#pnp 1:2e.5
#pnp 1:2e.6
#pnp 1:2e.7
#pnp 1:2e.8
#pnp 1:2e.9
#pnp 1:2e.a
register "com1" = "{1, 0, 0x3f8, 4}"
register "lpt" = "{1}"
end
end
end
northbridge amd/amdk8 "mc1"
#pci 0:19.0
#pci 0:19.0
#pci 0:19.0
#pci 0:19.1
#pci 0:19.2
#pci 0:19.3
end
cpu k8 "cpu0"
register "up" = "{ .chip = &amd8131, .ht_width=16, .ht_speed=600 }"
end end
cpu k8 "cpu1" cpu k8 "cpu1"
end end
option ENABLE_IOMMU=1 ##
## Include the old serial code for those few places that still need it.
##
mainboardinit pc80/serial.inc
mainboardinit arch/i386/lib/console.inc

30
src/mainboard/arima/hdama/auto.c
View File

@ -1,6 +1,4 @@
#define ASSEMBLY 1 #define ASSEMBLY 1
#define MAXIMUM_CONSOLE_LOGLEVEL 9
#define DEFAULT_CONSOLE_LOGLEVEL 9
#include <stdint.h> #include <stdint.h>
#include <device/pci_def.h> #include <device/pci_def.h>
@ -20,6 +18,8 @@
#include "northbridge/amd/amdk8/reset_test.c" #include "northbridge/amd/amdk8/reset_test.c"
#include "debug.c" #include "debug.c"
#define SIO_BASE 0x2e
static void memreset_setup(void) static void memreset_setup(void)
{ {
/* Set the memreset low */ /* Set the memreset low */
@ -151,7 +151,7 @@ static void pc87360_enable_serial(void)
} }
#define FIRST_CPU 1 #define FIRST_CPU 1
#define SECOND_CPU 0 #define SECOND_CPU 1
#define TOTAL_CPUS (FIRST_CPU + SECOND_CPU) #define TOTAL_CPUS (FIRST_CPU + SECOND_CPU)
static void main(void) static void main(void)
{ {
@ -209,7 +209,7 @@ static void main(void)
memreset_setup(); memreset_setup();
sdram_initialize(sizeof(cpu)/sizeof(cpu[0]), cpu); sdram_initialize(sizeof(cpu)/sizeof(cpu[0]), cpu);
#if 1 #if 0
dump_pci_devices(); dump_pci_devices();
#endif #endif
#if 0 #if 0
@ -227,13 +227,21 @@ static void main(void)
#endif #endif
#if 0 #if 0
ram_check(0x00000000, msr.lo); ram_check(0x00000000, msr.lo);
#else
#if TOTAL_CPUS < 2
/* Check 16MB of memory @ 0*/
ram_check(0x00000000, 0x01000);
#else
/* Check 16MB of memory @ 2GB */
ram_check(0x80000000, 0x81000000);
#endif #endif
#if 0
static const struct {
unsigned long lo, hi;
} check_addrs[] = {
/* Check 16MB of memory @ 0*/
{ 0x00000000, 0x01000000 },
#if TOTAL_CPUS > 1
/* Check 16MB of memory @ 2GB */
{ 0x80000000, 0x81000000 },
#endif
};
int i;
for(i = 0; i < sizeof(check_addrs)/sizeof(check_addrs[0]); i++) {
ram_check(check_addrs[i].lo, check_addrs[i].hi);
}
#endif #endif
} }

2
src/mainboard/arima/hdama/mainboard.c
View File

@ -9,7 +9,7 @@
#include "chip.h" #include "chip.h"
unsigned long initial_apicid[MAX_CPUS] = unsigned long initial_apicid[CONFIG_MAX_CPUS] =
{ {
0, 1, 0, 1,
}; };

28
src/mainboard/newisys/khepri/Config.lb
View File

@ -1,11 +1,8 @@
uses HAVE_MP_TABLE uses HAVE_MP_TABLE
uses HAVE_PIRQ_TABLE uses HAVE_PIRQ_TABLE
uses USE_FALLBACK_IMAGE uses USE_FALLBACK_IMAGE
uses USE_NORMAL_IMAGE
uses AMD8111_DEV
uses MAINBOARD uses MAINBOARD
uses ARCH uses ARCH
uses ENABLE_IOMMU
# #
# #
### ###
@ -37,15 +34,11 @@ ldscript /cpu/i386/entry32.lds
### Build our reset vector (This is where linuxBIOS is entered) ### Build our reset vector (This is where linuxBIOS is entered)
### ###
if USE_FALLBACK_IMAGE if USE_FALLBACK_IMAGE
mainboardinit cpu/i386/reset16.inc mainboardinit cpu/i386/reset16.inc
ldscript /cpu/i386/reset16.lds ldscript /cpu/i386/reset16.lds
else else
print "NO FALLBACK USED!" mainboardinit cpu/i386/reset32.inc
end ldscript /cpu/i386/reset32.lds
if USE_NORMAL_IMAGE
mainboardinit cpu/i386/reset32.inc
ldscript /cpu/i386/reset32.lds
end end
# #
#### Should this be in the northbridge code? #### Should this be in the northbridge code?
@ -78,7 +71,6 @@ mainboardinit cpu/k8/earlymtrr.inc
# #
if USE_FALLBACK_IMAGE if USE_FALLBACK_IMAGE
mainboardinit ./failover.inc mainboardinit ./failover.inc
# mainboardinit southbridge/amd/amd8111/cmos_boot_failover.inc
end end
# #
@ -99,10 +91,6 @@ mainboardinit arch/i386/lib/console.inc
### ###
##option MAXIMUM_CONSOLE_LOGLEVEL=7 ##option MAXIMUM_CONSOLE_LOGLEVEL=7
#default MAXIMUM_CONSOLE_LOGLEVEL=7 #default MAXIMUM_CONSOLE_LOGLEVEL=7
#option DISABLE_WATCHDOG= (MAXIMUM_CONSOLE_LOGLEVEL >= 8)
#if DISABLE_WATCHDOG
# mainboardinit southbridgeamd/amd8111/disable_watchdog.inc
#end
# #
#if USE_FALLBACK_IMAGE mainboardinit arch/i386/lib/noop_failover.inc end #if USE_FALLBACK_IMAGE mainboardinit arch/i386/lib/noop_failover.inc end
# #
@ -135,13 +123,6 @@ mainboardinit ./auto.inc
mainboardinit cpu/k8/disable_mmx_sse.inc mainboardinit cpu/k8/disable_mmx_sse.inc
# #
### ###
### Setup RAM
###
#mainboardinit ram/ramtest.inc
#mainboardinit southbridge/amd/amd8111/smbus.inc
#mainboardinit sdram/generic_dump_spd.inc
#
###
### Include the secondary Configuration files ### Include the secondary Configuration files
### ###
northbridge amd/amdk8 northbridge amd/amdk8
@ -165,4 +146,3 @@ end
cpu k8 "cpu1" cpu k8 "cpu1"
end end
option ENABLE_IOMMU=1

2
src/mainboard/newisys/khepri/auto.c
View File

@ -20,6 +20,8 @@
#include "northbridge/amd/amdk8/reset_test.c" #include "northbridge/amd/amdk8/reset_test.c"
#include "debug.c" #include "debug.c"
#define SIO_BASE 0x2e
static void memreset_setup(void) static void memreset_setup(void)
{ {
/* Set the memreset low */ /* Set the memreset low */

2
src/mainboard/newisys/khepri/mainboard.c
View File

@ -9,7 +9,7 @@
#include "chip.h" #include "chip.h"
unsigned long initial_apicid[MAX_CPUS] = unsigned long initial_apicid[CONFIG_MAX_CPUS] =
{ {
0, 1, 0, 1,
}; };

29
src/mainboard/tyan/s2880/Config.lb
View File

@ -1,11 +1,8 @@
uses HAVE_MP_TABLE uses HAVE_MP_TABLE
uses HAVE_PIRQ_TABLE uses HAVE_PIRQ_TABLE
uses USE_FALLBACK_IMAGE uses USE_FALLBACK_IMAGE
uses USE_NORMAL_IMAGE
uses AMD8111_DEV
uses MAINBOARD uses MAINBOARD
uses ARCH uses ARCH
uses ENABLE_IOMMU
# #
# #
### ###
@ -46,15 +43,11 @@ ldscript /cpu/i386/entry32.lds
### Build our reset vector (This is where linuxBIOS is entered) ### Build our reset vector (This is where linuxBIOS is entered)
### ###
if USE_FALLBACK_IMAGE if USE_FALLBACK_IMAGE
mainboardinit cpu/i386/reset16.inc mainboardinit cpu/i386/reset16.inc
ldscript /cpu/i386/reset16.lds ldscript /cpu/i386/reset16.lds
else else
# print "NO FALLBACK USED!" mainboardinit cpu/i386/reset32.inc
end ldscript /cpu/i386/reset32.lds
if USE_NORMAL_IMAGE
mainboardinit cpu/i386/reset32.inc
ldscript /cpu/i386/reset32.lds
end end
# #
#### Should this be in the northbridge code? #### Should this be in the northbridge code?
@ -87,7 +80,6 @@ mainboardinit cpu/k8/earlymtrr.inc
# #
if USE_FALLBACK_IMAGE if USE_FALLBACK_IMAGE
mainboardinit ./failover.inc mainboardinit ./failover.inc
# mainboardinit southbridge/amd/amd8111/cmos_boot_failover.inc
end end
# #
@ -108,10 +100,6 @@ mainboardinit arch/i386/lib/console.inc
### ###
##option MAXIMUM_CONSOLE_LOGLEVEL=7 ##option MAXIMUM_CONSOLE_LOGLEVEL=7
#default MAXIMUM_CONSOLE_LOGLEVEL=7 #default MAXIMUM_CONSOLE_LOGLEVEL=7
#option DISABLE_WATCHDOG= (MAXIMUM_CONSOLE_LOGLEVEL >= 8)
#if DISABLE_WATCHDOG
# mainboardinit southbridgeamd/amd8111/disable_watchdog.inc
#end
# #
#if USE_FALLBACK_IMAGE mainboardinit arch/i386/lib/noop_failover.inc end #if USE_FALLBACK_IMAGE mainboardinit arch/i386/lib/noop_failover.inc end
# #
@ -145,13 +133,6 @@ mainboardinit ./auto.inc
mainboardinit cpu/k8/disable_mmx_sse.inc mainboardinit cpu/k8/disable_mmx_sse.inc
# #
### ###
### Setup RAM
###
#mainboardinit ram/ramtest.inc
#mainboardinit southbridge/amd/amd8111/smbus.inc
#mainboardinit sdram/generic_dump_spd.inc
#
###
### Include the secondary Configuration files ### Include the secondary Configuration files
### ###
northbridge amd/amdk8 northbridge amd/amdk8
@ -175,5 +156,3 @@ end
cpu k8 "cpu1" cpu k8 "cpu1"
end end
option ENABLE_IOMMU=1

2
src/mainboard/tyan/s2880/mainboard.c
View File

@ -7,7 +7,7 @@
#include "chip.h" #include "chip.h"
//#include <part/mainboard.h> //#include <part/mainboard.h>
//#include "lsi_scsi.c" //#include "lsi_scsi.c"
unsigned long initial_apicid[MAX_CPUS] = unsigned long initial_apicid[CONFIG_MAX_CPUS] =
{ {
0,1 0,1
}; };

29
src/mainboard/tyan/s2882/Config.lb
View File

@ -1,11 +1,8 @@
uses HAVE_MP_TABLE uses HAVE_MP_TABLE
uses HAVE_PIRQ_TABLE uses HAVE_PIRQ_TABLE
uses USE_FALLBACK_IMAGE uses USE_FALLBACK_IMAGE
uses USE_NORMAL_IMAGE
uses AMD8111_DEV
uses MAINBOARD uses MAINBOARD
uses ARCH uses ARCH
uses ENABLE_IOMMU
# #
# #
### ###
@ -45,15 +42,11 @@ ldscript /cpu/i386/entry32.lds
### Build our reset vector (This is where linuxBIOS is entered) ### Build our reset vector (This is where linuxBIOS is entered)
### ###
if USE_FALLBACK_IMAGE if USE_FALLBACK_IMAGE
mainboardinit cpu/i386/reset16.inc mainboardinit cpu/i386/reset16.inc
ldscript /cpu/i386/reset16.lds ldscript /cpu/i386/reset16.lds
else else
# print "NO FALLBACK USED!" mainboardinit cpu/i386/reset32.inc
end ldscript /cpu/i386/reset32.lds
if USE_NORMAL_IMAGE
mainboardinit cpu/i386/reset32.inc
ldscript /cpu/i386/reset32.lds
end end
# #
#### Should this be in the northbridge code? #### Should this be in the northbridge code?
@ -86,7 +79,6 @@ mainboardinit cpu/k8/earlymtrr.inc
# #
if USE_FALLBACK_IMAGE if USE_FALLBACK_IMAGE
mainboardinit ./failover.inc mainboardinit ./failover.inc
# mainboardinit southbridge/amd/amd8111/cmos_boot_failover.inc
end end
# #
@ -107,10 +99,6 @@ mainboardinit arch/i386/lib/console.inc
### ###
##option MAXIMUM_CONSOLE_LOGLEVEL=7 ##option MAXIMUM_CONSOLE_LOGLEVEL=7
#default MAXIMUM_CONSOLE_LOGLEVEL=7 #default MAXIMUM_CONSOLE_LOGLEVEL=7
#option DISABLE_WATCHDOG= (MAXIMUM_CONSOLE_LOGLEVEL >= 8)
#if DISABLE_WATCHDOG
# mainboardinit southbridgeamd/amd8111/disable_watchdog.inc
#end
# #
#if USE_FALLBACK_IMAGE mainboardinit arch/i386/lib/noop_failover.inc end #if USE_FALLBACK_IMAGE mainboardinit arch/i386/lib/noop_failover.inc end
# #
@ -144,13 +132,6 @@ mainboardinit ./auto.inc
mainboardinit cpu/k8/disable_mmx_sse.inc mainboardinit cpu/k8/disable_mmx_sse.inc
# #
### ###
### Setup RAM
###
#mainboardinit ram/ramtest.inc
#mainboardinit southbridge/amd/amd8111/smbus.inc
#mainboardinit sdram/generic_dump_spd.inc
#
###
### Include the secondary Configuration files ### Include the secondary Configuration files
### ###
northbridge amd/amdk8 northbridge amd/amdk8
@ -174,5 +155,3 @@ end
cpu k8 "cpu1" cpu k8 "cpu1"
end end
option ENABLE_IOMMU=1

2
src/mainboard/tyan/s2882/mainboard.c
View File

@ -7,7 +7,7 @@
#include "chip.h" #include "chip.h"
//#include <part/mainboard.h> //#include <part/mainboard.h>
//#include "lsi_scsi.c" //#include "lsi_scsi.c"
unsigned long initial_apicid[MAX_CPUS] = unsigned long initial_apicid[CONFIG_MAX_CPUS] =
{ {
0,1 0,1
}; };

29
src/mainboard/tyan/s2885/Config.lb
View File

@ -1,11 +1,8 @@
uses HAVE_MP_TABLE uses HAVE_MP_TABLE
uses HAVE_PIRQ_TABLE uses HAVE_PIRQ_TABLE
uses USE_FALLBACK_IMAGE uses USE_FALLBACK_IMAGE
uses USE_NORMAL_IMAGE
uses AMD8111_DEV
uses MAINBOARD uses MAINBOARD
uses ARCH uses ARCH
uses ENABLE_IOMMU
# #
# #
### ###
@ -46,15 +43,11 @@ ldscript /cpu/i386/entry32.lds
### Build our reset vector (This is where linuxBIOS is entered) ### Build our reset vector (This is where linuxBIOS is entered)
### ###
if USE_FALLBACK_IMAGE if USE_FALLBACK_IMAGE
mainboardinit cpu/i386/reset16.inc mainboardinit cpu/i386/reset16.inc
ldscript /cpu/i386/reset16.lds ldscript /cpu/i386/reset16.lds
else else
# print "NO FALLBACK USED!" mainboardinit cpu/i386/reset32.inc
end ldscript /cpu/i386/reset32.lds
if USE_NORMAL_IMAGE
mainboardinit cpu/i386/reset32.inc
ldscript /cpu/i386/reset32.lds
end end
# #
#### Should this be in the northbridge code? #### Should this be in the northbridge code?
@ -87,7 +80,6 @@ mainboardinit cpu/k8/earlymtrr.inc
# #
if USE_FALLBACK_IMAGE if USE_FALLBACK_IMAGE
mainboardinit ./failover.inc mainboardinit ./failover.inc
# mainboardinit southbridge/amd/amd8111/cmos_boot_failover.inc
end end
# #
@ -108,10 +100,6 @@ mainboardinit arch/i386/lib/console.inc
### ###
##option MAXIMUM_CONSOLE_LOGLEVEL=7 ##option MAXIMUM_CONSOLE_LOGLEVEL=7
#default MAXIMUM_CONSOLE_LOGLEVEL=7 #default MAXIMUM_CONSOLE_LOGLEVEL=7
#option DISABLE_WATCHDOG= (MAXIMUM_CONSOLE_LOGLEVEL >= 8)
#if DISABLE_WATCHDOG
# mainboardinit southbridgeamd/amd8111/disable_watchdog.inc
#end
# #
#if USE_FALLBACK_IMAGE mainboardinit arch/i386/lib/noop_failover.inc end #if USE_FALLBACK_IMAGE mainboardinit arch/i386/lib/noop_failover.inc end
# #
@ -145,13 +133,6 @@ mainboardinit ./auto.inc
mainboardinit cpu/k8/disable_mmx_sse.inc mainboardinit cpu/k8/disable_mmx_sse.inc
# #
### ###
### Setup RAM
###
#mainboardinit ram/ramtest.inc
#mainboardinit southbridge/amd/amd8111/smbus.inc
#mainboardinit sdram/generic_dump_spd.inc
#
###
### Include the secondary Configuration files ### Include the secondary Configuration files
### ###
northbridge amd/amdk8 northbridge amd/amdk8
@ -178,5 +159,3 @@ end
cpu k8 "cpu1" cpu k8 "cpu1"
end end
option ENABLE_IOMMU=0

2
src/mainboard/tyan/s2885/mainboard.c
View File

@ -7,7 +7,7 @@
#include "chip.h" #include "chip.h"
//#include <part/mainboard.h> //#include <part/mainboard.h>
//#include "lsi_scsi.c" //#include "lsi_scsi.c"
unsigned long initial_apicid[MAX_CPUS] = unsigned long initial_apicid[CONFIG_MAX_CPUS] =
{ {
0,1 0,1
}; };

12
src/northbridge/amd/amdk8/coherent_ht.c
View File

@ -157,7 +157,7 @@ static void enable_routing(u8 node)
print_debug(" done.\r\n"); print_debug(" done.\r\n");
} }
#if MAX_CPUS > 1 #if CONFIG_MAX_CPUS > 1
static void rename_temp_node(u8 node) static void rename_temp_node(u8 node)
{ {
@ -290,7 +290,7 @@ static void setup_remote_node(u8 node, u8 cpus)
#endif #endif
#if MAX_CPUS > 2 #if CONFIG_MAX_CPUS > 2
static void setup_temp_node(u8 node, u8 cpus) static void setup_temp_node(u8 node, u8 cpus)
{ {
u8 row; u8 row;
@ -306,7 +306,7 @@ static u8 setup_uniprocessor(void)
return 1; return 1;
} }
#if MAX_CPUS > 1 #if CONFIG_MAX_CPUS > 1
static u8 setup_smp(void) static u8 setup_smp(void)
{ {
u8 cpus=2; u8 cpus=2;
@ -332,7 +332,7 @@ static u8 setup_smp(void)
clear_temp_row(0); /* delete temporary connection */ clear_temp_row(0); /* delete temporary connection */
#if MAX_CPUS > 2 #if CONFIG_MAX_CPUS > 2
cpus=4; cpus=4;
/* Setup and check temporary connection from Node 0 to Node 2 */ /* Setup and check temporary connection from Node 0 to Node 2 */
@ -386,7 +386,7 @@ static u8 setup_smp(void)
} }
#endif #endif
#if MAX_CPUS > 1 #if CONFIG_MAX_CPUS > 1
static unsigned detect_mp_capabilities(unsigned cpus) static unsigned detect_mp_capabilities(unsigned cpus)
{ {
unsigned node, row, mask; unsigned node, row, mask;
@ -479,7 +479,7 @@ static int setup_coherent_ht_domain(void)
enable_bsp_routing(); enable_bsp_routing();
#if MAX_CPUS == 1 #if CONFIG_MAX_CPUS == 1
cpus=setup_uniprocessor(); cpus=setup_uniprocessor();
#else #else
cpus=setup_smp(); cpus=setup_smp();

2
src/northbridge/amd/amdk8/raminit.c
View File

@ -1,6 +1,8 @@
#include <cpu/k8/mtrr.h> #include <cpu/k8/mtrr.h>
#include "raminit.h" #include "raminit.h"
#define ENABLE_IOMMU 1
/* Function 2 */ /* Function 2 */
#define DRAM_CSBASE 0x40 #define DRAM_CSBASE 0x40
#define DRAM_CSMASK 0x60 #define DRAM_CSMASK 0x60

142
targets/arima/hdama/Config.lb
View File

@ -6,31 +6,29 @@ loadoptions
target hdama target hdama
uses AMD8111_DEV
uses ARCH uses ARCH
uses CONFIG_COMPRESS uses CONFIG_COMPRESS
uses CONFIG_IOAPIC uses CONFIG_IOAPIC
uses CONFIG_ROM_STREAM uses CONFIG_ROM_STREAM
uses CONFIG_ROM_STREAM_START uses CONFIG_ROM_STREAM_START
uses CONFIG_SMP
uses CONFIG_UDELAY_TSC uses CONFIG_UDELAY_TSC
uses CPU_FIXUP uses CPU_FIXUP
uses ENABLE_FIXED_AND_VARIABLE_MTRRS
uses FALLBACK_SIZE uses FALLBACK_SIZE
uses FINAL_MAINBOARD_FIXUP
uses HAVE_FALLBACK_BOOT uses HAVE_FALLBACK_BOOT
uses HAVE_MP_TABLE uses HAVE_MP_TABLE
uses HAVE_PIRQ_TABLE uses HAVE_PIRQ_TABLE
uses HAVE_HARD_RESET
uses i586 uses i586
uses i686 uses i686
uses INTEL_PPRO_MTRR uses INTEL_PPRO_MTRR
uses IRQ_SLOT_COUNT
uses HEAP_SIZE uses HEAP_SIZE
uses IRQ_SLOT_COUNT
uses k7 uses k7
uses k8 uses k8
uses MAINBOARD_PART_NUMBER uses MAINBOARD_PART_NUMBER
uses MAINBOARD_VENDOR uses MAINBOARD_VENDOR
uses MAX_CPUS uses CONFIG_SMP
uses CONFIG_MAX_CPUS
uses MEMORY_HOLE uses MEMORY_HOLE
uses PAYLOAD_SIZE uses PAYLOAD_SIZE
uses _RAMBASE uses _RAMBASE
@ -39,12 +37,8 @@ uses ROM_IMAGE_SIZE
uses ROM_SECTION_OFFSET uses ROM_SECTION_OFFSET
uses ROM_SECTION_SIZE uses ROM_SECTION_SIZE
uses ROM_SIZE uses ROM_SIZE
uses SIO_BASE
uses SIO_SYSTEM_CLK_INPUT
uses STACK_SIZE uses STACK_SIZE
uses USE_ELF_BOOT
uses USE_FALLBACK_IMAGE uses USE_FALLBACK_IMAGE
uses USE_NORMAL_IMAGE
uses USE_OPTION_TABLE uses USE_OPTION_TABLE
uses HAVE_OPTION_TABLE uses HAVE_OPTION_TABLE
uses MAXIMUM_CONSOLE_LOGLEVEL uses MAXIMUM_CONSOLE_LOGLEVEL
@ -52,15 +46,16 @@ uses DEFAULT_CONSOLE_LOGLEVEL
uses CONFIG_CONSOLE_SERIAL8250 uses CONFIG_CONSOLE_SERIAL8250
uses MAINBOARD uses MAINBOARD
uses CONFIG_CHIP_CONFIGURE uses CONFIG_CHIP_CONFIGURE
uses XIP_ROM_SIZE
uses XIP_ROM_BASE
uses LINUXBIOS_EXTRA_VERSION
option CONFIG_CHIP_CONFIGURE=1 option CONFIG_CHIP_CONFIGURE=1
option MAXIMUM_CONSOLE_LOGLEVEL=7 option MAXIMUM_CONSOLE_LOGLEVEL=8
option DEFAULT_CONSOLE_LOGLEVEL=7 option DEFAULT_CONSOLE_LOGLEVEL=8
option CONFIG_CONSOLE_SERIAL8250=1 option CONFIG_CONSOLE_SERIAL8250=1
option HAVE_OPTION_TABLE=1
option HAVE_MP_TABLE=1
option CPU_FIXUP=1 option CPU_FIXUP=1
option CONFIG_UDELAY_TSC=0 option CONFIG_UDELAY_TSC=0
option i686=1 option i686=1
@ -68,95 +63,22 @@ option i586=1
option INTEL_PPRO_MTRR=1 option INTEL_PPRO_MTRR=1
option k7=1 option k7=1
option k8=1 option k8=1
option ROM_SIZE=0x100000
### Customize our winbond superio chip for this motherboard option ROM_SIZE=524288
###
option SIO_BASE=0x2e
option SIO_SYSTEM_CLK_INPUT=0
#
###
### Build code to export a programmable irq routing table
###
option HAVE_PIRQ_TABLE=1
option IRQ_SLOT_COUNT=18
#
###
### Build code for SMP support
### Only worry about 2 micro processors
###
option CONFIG_SMP=1
option MAX_CPUS=2
#
###
### Build code to setup a generic IOAPIC
###
option CONFIG_IOAPIC=1
#
###
### MEMORY_HOLE instructs earlymtrr.inc to
### enable caching from 0-640KB and to disable
### caching from 640KB-1MB using fixed MTRRs
###
### Enabling this option breaks SMP because secondary
### CPU identification depends on only variable MTRRs
### being enabled.
###
option MEMORY_HOLE=0
#
###
### Enable both fixed and variable MTRRS
### When we setup MTRRs in mtrr.c
###
### We must setup the fixed mtrrs or we confuse SMP secondary
### processor identification
###
option ENABLE_FIXED_AND_VARIABLE_MTRRS=1
###
### Call the final_mainboard_fixup function option HAVE_OPTION_TABLE=1
### option CONFIG_ROM_STREAM=1
option FINAL_MAINBOARD_FIXUP=1 option HAVE_FALLBACK_BOOT=1
### ###
### Compute the location and size of where this firmware image ### Compute the location and size of where this firmware image
### (linuxBIOS plus bootloader) will live in the boot rom chip. ### (linuxBIOS plus bootloader) will live in the boot rom chip.
### ###
option FALLBACK_SIZE=0x100000 option FALLBACK_SIZE=131072
###
### Compute where this copy of linuxBIOS will start in the boot rom
###
#
###
### Compute a range of ROM that can cached to speed up linuxBIOS,
### execution speed.
###
##expr XIP_ROM_SIZE = 65536
##expr XIP_ROM_BASE = _ROMBASE + ROM_IMAGE_SIZE - XIP_ROM_SIZE
##option XIP_ROM_SIZE=65536
##option XIP_ROM_BASE=0xffff0000
#
## XIP_ROM_SIZE && XIP_ROM_BASE values that work.
##option XIP_ROM_SIZE=0x8000
##option XIP_ROM_BASE=0xffff8000
## We don't use compressed image
option CONFIG_COMPRESS=1
option USE_ELF_BOOT=1
## LinuxBIOS C code runs at this location in RAM ## LinuxBIOS C code runs at this location in RAM
option _RAMBASE=0x4000 option _RAMBASE=0x00004000
##
## Use a 64K stack
##
option STACK_SIZE=0x10000
##
## Use a 64K heap
##
option HEAP_SIZE=0x10000
# #
### ###
@ -166,32 +88,20 @@ option HEAP_SIZE=0x10000
# #
# Arima hdama # Arima hdama
#romimage "normal" romimage "normal"
# option USE_FALLBACK_IMAGE=0 option USE_FALLBACK_IMAGE=0
# option ROM_SECTION_SIZE = (ROM_SIZE - FALLBACK_SIZE) option ROM_IMAGE_SIZE=0x10000
# option ROM_SECTION_OFFSET= 0 option LINUXBIOS_EXTRA_VERSION=".0Normal"
# option PAYLOAD_SIZE = (ROM_SECTION_SIZE - ROM_IMAGE_SIZE) mainboard arima/hdama
# option CONFIG_ROM_STREAM_START = (0xffffffff - ROM_SIZE + ROM_SECTION_OFFSET + 1) payload /usr/share/etherboot/5.1.9pre2-lnxi-lb/tg3--ide_disk.zelf
# option CONFIG_ROM_STREAM = 1 end
# option _ROMBASE = (CONFIG_ROM_STREAM_START + PAYLOAD_SIZE)
# mainboard arima/hdama
# payload ../eepro100.ebi
#end
romimage "fallback" romimage "fallback"
option ROM_IMAGE_SIZE=0x10000
# option ROM_IMAGE_SIZE=120*1024
option USE_FALLBACK_IMAGE=1 option USE_FALLBACK_IMAGE=1
option HAVE_FALLBACK_BOOT=1 option ROM_IMAGE_SIZE=0x10000
option ROM_SECTION_SIZE = FALLBACK_SIZE option LINUXBIOS_EXTRA_VERSION=".0Fallback"
option ROM_SECTION_OFFSET= (ROM_SIZE - FALLBACK_SIZE)
option PAYLOAD_SIZE = (ROM_SECTION_SIZE - ROM_IMAGE_SIZE)
option CONFIG_ROM_STREAM_START = (0xffffffff - ROM_SIZE + ROM_SECTION_OFFSET + 1)
option CONFIG_ROM_STREAM = 1
option _ROMBASE = (CONFIG_ROM_STREAM_START + PAYLOAD_SIZE)
mainboard arima/hdama mainboard arima/hdama
payload ../../../../tg3--ide_disk.zelf payload /usr/share/etherboot/5.1.9pre2-lnxi-lb/tg3--ide_disk.zelf
# payload ../../../../opteron_phase1_p4_noapic
end end
buildrom ROM_SIZE "normal" "fallback" buildrom ROM_SIZE "normal" "fallback"

2
targets/embeddedplanet/ep405pc/Config.lb
View File

@ -15,7 +15,6 @@ uses NO_POST
uses CONFIG_IDE_STREAM uses CONFIG_IDE_STREAM
uses CONFIG_SYS_CLK_FREQ uses CONFIG_SYS_CLK_FREQ
uses IDE_BOOT_DRIVE uses IDE_BOOT_DRIVE
uses USE_ELF_BOOT
uses IDE_SWAB IDE_OFFSET uses IDE_SWAB IDE_OFFSET
uses ROM_SIZE ROM_IMAGE_SIZE uses ROM_SIZE ROM_IMAGE_SIZE
uses ROM_SECTION_SIZE uses ROM_SECTION_SIZE
@ -48,7 +47,6 @@ option NO_POST=1
## Boot linux from IDE ## Boot linux from IDE
option CONFIG_IDE_STREAM=1 option CONFIG_IDE_STREAM=1
option IDE_BOOT_DRIVE=0 option IDE_BOOT_DRIVE=0
option USE_ELF_BOOT=1
option IDE_SWAB=1 option IDE_SWAB=1
option IDE_OFFSET=0 option IDE_OFFSET=0

2
targets/motorola/sandpoint/Config.lb
View File

@ -16,7 +16,6 @@ uses NO_POST
uses CONFIG_CONSOLE_SERIAL8250 uses CONFIG_CONSOLE_SERIAL8250
uses CONFIG_IDE_STREAM uses CONFIG_IDE_STREAM
uses IDE_BOOT_DRIVE uses IDE_BOOT_DRIVE
uses USE_ELF_BOOT
uses IDE_SWAB IDE_OFFSET uses IDE_SWAB IDE_OFFSET
uses ROM_SIZE ROM_IMAGE_SIZE uses ROM_SIZE ROM_IMAGE_SIZE
uses ROM_SECTION_SIZE uses ROM_SECTION_SIZE
@ -51,7 +50,6 @@ option CONFIG_CONSOLE_SERIAL8250=1
## Boot linux from IDE ## Boot linux from IDE
option CONFIG_IDE_STREAM=1 option CONFIG_IDE_STREAM=1
option IDE_BOOT_DRIVE=0 option IDE_BOOT_DRIVE=0
option USE_ELF_BOOT=1
option IDE_SWAB=1 option IDE_SWAB=1
option IDE_OFFSET=0 option IDE_OFFSET=0

36
targets/tyan/s2880/Config.lb
View File

@ -6,7 +6,6 @@ loadoptions
target s2880 target s2880
uses AMD8111_DEV
uses ARCH uses ARCH
uses CONFIG_COMPRESS uses CONFIG_COMPRESS
uses CONFIG_IOAPIC uses CONFIG_IOAPIC
@ -15,9 +14,7 @@ uses CONFIG_ROM_STREAM_START
uses CONFIG_SMP uses CONFIG_SMP
uses CONFIG_UDELAY_TSC uses CONFIG_UDELAY_TSC
uses CPU_FIXUP uses CPU_FIXUP
uses ENABLE_FIXED_AND_VARIABLE_MTRRS
uses FALLBACK_SIZE uses FALLBACK_SIZE
uses FINAL_MAINBOARD_FIXUP
uses HAVE_FALLBACK_BOOT uses HAVE_FALLBACK_BOOT
uses HAVE_MP_TABLE uses HAVE_MP_TABLE
uses HAVE_PIRQ_TABLE uses HAVE_PIRQ_TABLE
@ -31,7 +28,6 @@ uses k8
uses MAINBOARD uses MAINBOARD
uses MAINBOARD_PART_NUMBER uses MAINBOARD_PART_NUMBER
uses MAINBOARD_VENDOR uses MAINBOARD_VENDOR
uses MAX_CPUS
#uses MEMORY_HOLE #uses MEMORY_HOLE
uses PAYLOAD_SIZE uses PAYLOAD_SIZE
uses _RAMBASE uses _RAMBASE
@ -40,12 +36,8 @@ uses ROM_IMAGE_SIZE
uses ROM_SECTION_OFFSET uses ROM_SECTION_OFFSET
uses ROM_SECTION_SIZE uses ROM_SECTION_SIZE
uses ROM_SIZE uses ROM_SIZE
uses SIO_BASE
uses SIO_SYSTEM_CLK_INPUT
uses STACK_SIZE uses STACK_SIZE
uses USE_ELF_BOOT
uses USE_FALLBACK_IMAGE uses USE_FALLBACK_IMAGE
uses USE_NORMAL_IMAGE
uses USE_OPTION_TABLE uses USE_OPTION_TABLE
uses HAVE_OPTION_TABLE uses HAVE_OPTION_TABLE
uses CONFIG_CHIP_CONFIGURE uses CONFIG_CHIP_CONFIGURE
@ -57,7 +49,7 @@ uses MAXIMUM_CONSOLE_LOGLEVEL
uses DEBUG uses DEBUG
uses CONFIG_MAX_CPUS uses CONFIG_MAX_CPUS
uses CONFIG_LOGICAL_CPUS uses CONFIG_LOGICAL_CPUS
uses MAX_PHYSICAL_CPUS uses CONFIG_MAX_PHYSICAL_CPUS
uses LINUXBIOS_EXTRA_VERSION uses LINUXBIOS_EXTRA_VERSION
uses XIP_ROM_SIZE uses XIP_ROM_SIZE
uses XIP_ROM_BASE uses XIP_ROM_BASE
@ -97,10 +89,6 @@ option CONFIG_CHIP_CONFIGURE=1
#option CONFIG_LSI_SCSI_FW_FIXUP=1 #option CONFIG_LSI_SCSI_FW_FIXUP=1
### Customize our winbond superio chip for this motherboard
###
option SIO_BASE=0x2e
option SIO_SYSTEM_CLK_INPUT=0
# #
### ###
### Build code to export a programmable irq routing table ### Build code to export a programmable irq routing table
@ -114,9 +102,8 @@ option IRQ_SLOT_COUNT=13
### ###
option CONFIG_SMP=1 option CONFIG_SMP=1
option CONFIG_MAX_CPUS=2 option CONFIG_MAX_CPUS=2
option MAX_CPUS=2
option CONFIG_LOGICAL_CPUS=0 option CONFIG_LOGICAL_CPUS=0
option MAX_PHYSICAL_CPUS=2 option CONFIG_MAX_PHYSICAL_CPUS=2
# #
### ###
### Build code to setup a generic IOAPIC ### Build code to setup a generic IOAPIC
@ -135,25 +122,11 @@ option CONFIG_IOAPIC=1
#option MEMORY_HOLE=0 #option MEMORY_HOLE=0
# #
### ###
### Enable both fixed and variable MTRRS
### When we setup MTRRs in mtrr.c
###
### We must setup the fixed mtrrs or we confuse SMP secondary
### processor identification
###
option ENABLE_FIXED_AND_VARIABLE_MTRRS=1
#
###
### Clean up the motherboard id strings ### Clean up the motherboard id strings
### ###
option MAINBOARD_PART_NUMBER="S2880" option MAINBOARD_PART_NUMBER="S2880"
option MAINBOARD_VENDOR="Tyan" option MAINBOARD_VENDOR="Tyan"
# #
###
### Call the final_mainboard_fixup function
###
option FINAL_MAINBOARD_FIXUP=1
### ###
### Compute the location and size of where this firmware image ### Compute the location and size of where this firmware image
### (linuxBIOS plus bootloader) will live in the boot rom chip. ### (linuxBIOS plus bootloader) will live in the boot rom chip.
@ -174,9 +147,6 @@ option ROM_IMAGE_SIZE=65536
## We do use compressed image ## We do use compressed image
option CONFIG_COMPRESS=1 option CONFIG_COMPRESS=1
option USE_ELF_BOOT=1
option CONFIG_CONSOLE_SERIAL8250=1 option CONFIG_CONSOLE_SERIAL8250=1
option TTYS0_BAUD=115200 option TTYS0_BAUD=115200
@ -200,8 +170,6 @@ option MAXIMUM_CONSOLE_LOGLEVEL=9
option DEBUG=1 option DEBUG=1
option AMD8111_DEV=0x5
# #
## LinuxBIOS C code runs at this location in RAM ## LinuxBIOS C code runs at this location in RAM

37
targets/tyan/s2882/Config.lb
View File

@ -6,7 +6,6 @@ loadoptions
target s2882 target s2882
uses AMD8111_DEV
uses ARCH uses ARCH
uses CONFIG_COMPRESS uses CONFIG_COMPRESS
uses CONFIG_IOAPIC uses CONFIG_IOAPIC
@ -15,9 +14,7 @@ uses CONFIG_ROM_STREAM_START
uses CONFIG_SMP uses CONFIG_SMP
uses CONFIG_UDELAY_TSC uses CONFIG_UDELAY_TSC
uses CPU_FIXUP uses CPU_FIXUP
uses ENABLE_FIXED_AND_VARIABLE_MTRRS
uses FALLBACK_SIZE uses FALLBACK_SIZE
uses FINAL_MAINBOARD_FIXUP
uses HAVE_FALLBACK_BOOT uses HAVE_FALLBACK_BOOT
uses HAVE_MP_TABLE uses HAVE_MP_TABLE
uses HAVE_PIRQ_TABLE uses HAVE_PIRQ_TABLE
@ -31,7 +28,6 @@ uses k8
uses MAINBOARD uses MAINBOARD
uses MAINBOARD_PART_NUMBER uses MAINBOARD_PART_NUMBER
uses MAINBOARD_VENDOR uses MAINBOARD_VENDOR
uses MAX_CPUS
#uses MEMORY_HOLE #uses MEMORY_HOLE
uses PAYLOAD_SIZE uses PAYLOAD_SIZE
uses _RAMBASE uses _RAMBASE
@ -40,12 +36,8 @@ uses ROM_IMAGE_SIZE
uses ROM_SECTION_OFFSET uses ROM_SECTION_OFFSET
uses ROM_SECTION_SIZE uses ROM_SECTION_SIZE
uses ROM_SIZE uses ROM_SIZE
uses SIO_BASE
uses SIO_SYSTEM_CLK_INPUT
uses STACK_SIZE uses STACK_SIZE
uses USE_ELF_BOOT
uses USE_FALLBACK_IMAGE uses USE_FALLBACK_IMAGE
uses USE_NORMAL_IMAGE
uses USE_OPTION_TABLE uses USE_OPTION_TABLE
uses HAVE_OPTION_TABLE uses HAVE_OPTION_TABLE
uses CONFIG_CHIP_CONFIGURE uses CONFIG_CHIP_CONFIGURE
@ -57,7 +49,7 @@ uses MAXIMUM_CONSOLE_LOGLEVEL
uses DEBUG uses DEBUG
uses CONFIG_MAX_CPUS uses CONFIG_MAX_CPUS
uses CONFIG_LOGICAL_CPUS uses CONFIG_LOGICAL_CPUS
uses MAX_PHYSICAL_CPUS uses CONFIG_MAX_PHYSICAL_CPUS
uses LINUXBIOS_EXTRA_VERSION uses LINUXBIOS_EXTRA_VERSION
uses XIP_ROM_SIZE uses XIP_ROM_SIZE
uses XIP_ROM_BASE uses XIP_ROM_BASE
@ -97,10 +89,6 @@ option CONFIG_CHIP_CONFIGURE=1
#option CONFIG_LSI_SCSI_FW_FIXUP=1 #option CONFIG_LSI_SCSI_FW_FIXUP=1
### Customize our winbond superio chip for this motherboard
###
option SIO_BASE=0x2e
option SIO_SYSTEM_CLK_INPUT=0
# #
### ###
### Build code to export a programmable irq routing table ### Build code to export a programmable irq routing table
@ -114,9 +102,8 @@ option IRQ_SLOT_COUNT=15
### ###
option CONFIG_SMP=1 option CONFIG_SMP=1
option CONFIG_MAX_CPUS=2 option CONFIG_MAX_CPUS=2
option MAX_CPUS=2
option CONFIG_LOGICAL_CPUS=0 option CONFIG_LOGICAL_CPUS=0
option MAX_PHYSICAL_CPUS=2 option CONFIG_MAX_PHYSICAL_CPUS=2
# #
### ###
### Build code to setup a generic IOAPIC ### Build code to setup a generic IOAPIC
@ -135,25 +122,10 @@ option CONFIG_IOAPIC=1
#option MEMORY_HOLE=0 #option MEMORY_HOLE=0
# #
### ###
### Enable both fixed and variable MTRRS
### When we setup MTRRs in mtrr.c
###
### We must setup the fixed mtrrs or we confuse SMP secondary
### processor identification
###
option ENABLE_FIXED_AND_VARIABLE_MTRRS=1
#
###
### Clean up the motherboard id strings ### Clean up the motherboard id strings
### ###
option MAINBOARD_PART_NUMBER="S2882" option MAINBOARD_PART_NUMBER="S2882"
option MAINBOARD_VENDOR="Tyan" option MAINBOARD_VENDOR="Tyan"
#
###
### Call the final_mainboard_fixup function
###
option FINAL_MAINBOARD_FIXUP=1
### ###
### Compute the location and size of where this firmware image ### Compute the location and size of where this firmware image
### (linuxBIOS plus bootloader) will live in the boot rom chip. ### (linuxBIOS plus bootloader) will live in the boot rom chip.
@ -174,9 +146,6 @@ option ROM_IMAGE_SIZE=65536
## We do use compressed image ## We do use compressed image
option CONFIG_COMPRESS=1 option CONFIG_COMPRESS=1
option USE_ELF_BOOT=1
option CONFIG_CONSOLE_SERIAL8250=1 option CONFIG_CONSOLE_SERIAL8250=1
option TTYS0_BAUD=115200 option TTYS0_BAUD=115200
@ -200,8 +169,6 @@ option MAXIMUM_CONSOLE_LOGLEVEL=9
option DEBUG=1 option DEBUG=1
option AMD8111_DEV=0x5
# #
## LinuxBIOS C code runs at this location in RAM ## LinuxBIOS C code runs at this location in RAM

37
targets/tyan/s2885/Config.lb
View File

@ -6,7 +6,6 @@ loadoptions
target s2885 target s2885
uses AMD8111_DEV
uses ARCH uses ARCH
uses CONFIG_COMPRESS uses CONFIG_COMPRESS
uses CONFIG_IOAPIC uses CONFIG_IOAPIC
@ -15,9 +14,7 @@ uses CONFIG_ROM_STREAM_START
uses CONFIG_SMP uses CONFIG_SMP
uses CONFIG_UDELAY_TSC uses CONFIG_UDELAY_TSC
uses CPU_FIXUP uses CPU_FIXUP
uses ENABLE_FIXED_AND_VARIABLE_MTRRS
uses FALLBACK_SIZE uses FALLBACK_SIZE
uses FINAL_MAINBOARD_FIXUP
uses HAVE_FALLBACK_BOOT uses HAVE_FALLBACK_BOOT
uses HAVE_MP_TABLE uses HAVE_MP_TABLE
uses HAVE_PIRQ_TABLE uses HAVE_PIRQ_TABLE
@ -31,7 +28,6 @@ uses k8
uses MAINBOARD uses MAINBOARD
uses MAINBOARD_PART_NUMBER uses MAINBOARD_PART_NUMBER
uses MAINBOARD_VENDOR uses MAINBOARD_VENDOR
uses MAX_CPUS
#uses MEMORY_HOLE #uses MEMORY_HOLE
uses PAYLOAD_SIZE uses PAYLOAD_SIZE
uses _RAMBASE uses _RAMBASE
@ -40,12 +36,8 @@ uses ROM_IMAGE_SIZE
uses ROM_SECTION_OFFSET uses ROM_SECTION_OFFSET
uses ROM_SECTION_SIZE uses ROM_SECTION_SIZE
uses ROM_SIZE uses ROM_SIZE
uses SIO_BASE
uses SIO_SYSTEM_CLK_INPUT
uses STACK_SIZE uses STACK_SIZE
uses USE_ELF_BOOT
uses USE_FALLBACK_IMAGE uses USE_FALLBACK_IMAGE
uses USE_NORMAL_IMAGE
uses USE_OPTION_TABLE uses USE_OPTION_TABLE
uses HAVE_OPTION_TABLE uses HAVE_OPTION_TABLE
uses CONFIG_CHIP_CONFIGURE uses CONFIG_CHIP_CONFIGURE
@ -57,7 +49,7 @@ uses MAXIMUM_CONSOLE_LOGLEVEL
uses DEBUG uses DEBUG
uses CONFIG_MAX_CPUS uses CONFIG_MAX_CPUS
uses CONFIG_LOGICAL_CPUS uses CONFIG_LOGICAL_CPUS
uses MAX_PHYSICAL_CPUS uses CONFIG_MAX_PHYSICAL_CPUS
uses LINUXBIOS_EXTRA_VERSION uses LINUXBIOS_EXTRA_VERSION
uses XIP_ROM_SIZE uses XIP_ROM_SIZE
uses XIP_ROM_BASE uses XIP_ROM_BASE
@ -97,11 +89,6 @@ option CONFIG_CHIP_CONFIGURE=1
#option CONFIG_LSI_SCSI_FW_FIXUP=1 #option CONFIG_LSI_SCSI_FW_FIXUP=1
### Customize our winbond superio chip for this motherboard
###
option SIO_BASE=0x2e
option SIO_SYSTEM_CLK_INPUT=0
#
### ###
### Build code to export a programmable irq routing table ### Build code to export a programmable irq routing table
### ###
@ -114,9 +101,8 @@ option IRQ_SLOT_COUNT=11
### ###
option CONFIG_SMP=1 option CONFIG_SMP=1
option CONFIG_MAX_CPUS=2 option CONFIG_MAX_CPUS=2
option MAX_CPUS=2
option CONFIG_LOGICAL_CPUS=0 option CONFIG_LOGICAL_CPUS=0
option MAX_PHYSICAL_CPUS=2 option CONFIG_MAX_PHYSICAL_CPUS=2
# #
### ###
### Build code to setup a generic IOAPIC ### Build code to setup a generic IOAPIC
@ -135,25 +121,11 @@ option CONFIG_IOAPIC=1
#option MEMORY_HOLE=0 #option MEMORY_HOLE=0
# #
### ###
### Enable both fixed and variable MTRRS
### When we setup MTRRs in mtrr.c
###
### We must setup the fixed mtrrs or we confuse SMP secondary
### processor identification
###
option ENABLE_FIXED_AND_VARIABLE_MTRRS=1
#
###
### Clean up the motherboard id strings ### Clean up the motherboard id strings
### ###
option MAINBOARD_PART_NUMBER="S2885" option MAINBOARD_PART_NUMBER="S2885"
option MAINBOARD_VENDOR="Tyan" option MAINBOARD_VENDOR="Tyan"
# #
###
### Call the final_mainboard_fixup function
###
option FINAL_MAINBOARD_FIXUP=1
### ###
### Compute the location and size of where this firmware image ### Compute the location and size of where this firmware image
### (linuxBIOS plus bootloader) will live in the boot rom chip. ### (linuxBIOS plus bootloader) will live in the boot rom chip.
@ -174,9 +146,6 @@ option ROM_IMAGE_SIZE=65536
## We do use compressed image ## We do use compressed image
option CONFIG_COMPRESS=1 option CONFIG_COMPRESS=1
option USE_ELF_BOOT=1
option CONFIG_CONSOLE_SERIAL8250=1 option CONFIG_CONSOLE_SERIAL8250=1
option TTYS0_BAUD=115200 option TTYS0_BAUD=115200
@ -200,8 +169,6 @@ option MAXIMUM_CONSOLE_LOGLEVEL=9
option DEBUG=1 option DEBUG=1
option AMD8111_DEV=0x5
# #
## LinuxBIOS C code runs at this location in RAM ## LinuxBIOS C code runs at this location in RAM

130
util/newconfig/config.g
View File

@ -4,6 +4,8 @@ import re
import string import string
import types import types
import traceback
warnings = 0 warnings = 0
errors = 0 errors = 0
@ -54,10 +56,7 @@ class stack:
return len(self.stack) return len(self.stack)
def __getitem__ (self, i): def __getitem__ (self, i):
try: return self.stack[i]
return self.stack[i]
except IndexError:
return 0
def __iter__ (self): def __iter__ (self):
return self.__stack_iter(self.stack) return self.__stack_iter(self.stack)
@ -618,6 +617,9 @@ class partobj:
# definitions for this part (only want to do it once) # definitions for this part (only want to do it once)
self.done_types = 0 self.done_types = 0
# Path to the device
self.path = ""
# If no instance name is supplied then generate # If no instance name is supplied then generate
# a unique name # a unique name
if (instance_name == 0): if (instance_name == 0):
@ -637,8 +639,12 @@ class partobj:
# me as the child. # me as the child.
if (parent.children): if (parent.children):
debug.info(debug.gencode, "add %s (%d) as sibling" % (parent.children.dir, parent.children.instance)) debug.info(debug.gencode, "add %s (%d) as sibling" % (parent.children.dir, parent.children.instance))
self.siblings = parent.children youngest = parent.children;
parent.children = self while(youngest.siblings):
youngest = youngest.siblings
youngest.siblings = self
else:
parent.children = self
else: else:
self.parent = self self.parent = self
@ -656,10 +662,10 @@ class partobj:
print "%d: siblings %s" % (lvl, self.siblings.dir) print "%d: siblings %s" % (lvl, self.siblings.dir)
print "%d: initcode " % lvl print "%d: initcode " % lvl
for i in self.initcode: for i in self.initcode:
print " %s" % i print "\t%s" % i
print "%d: registercode " % lvl print "%d: registercode " % lvl
for f, v in self.registercode.items(): for f, v in self.registercode.items():
print " %s = %s" % (f, v) print "\t%s = %s" % (f, v)
print "\n" print "\n"
def gencode(self, file, pass_num): def gencode(self, file, pass_num):
@ -681,7 +687,7 @@ class partobj:
if (self.registercode): if (self.registercode):
file.write("\t= {\n") file.write("\t= {\n")
for f, v in self.registercode.items(): for f, v in self.registercode.items():
file.write( " .%s = %s,\n" % (f, v)) file.write( "\t.%s = %s,\n" % (f, v))
file.write("};\n") file.write("};\n")
else: else:
file.write(";") file.write(";")
@ -690,33 +696,35 @@ class partobj:
file.write("struct chip %s = {\n" % self.instance_name) file.write("struct chip %s = {\n" % self.instance_name)
else: else:
file.write("struct chip static_root = {\n") file.write("struct chip static_root = {\n")
file.write("/* %s %s */\n" % (self.part, self.dir)) file.write("\t/* %s %s */\n" % (self.part, self.dir))
if (self.path != ""):
file.write("\t.path = { %s\n\t},\n" % (self.path) );
if (self.siblings): if (self.siblings):
debug.info(debug.gencode, "gencode: siblings(%d)" \ debug.info(debug.gencode, "gencode: siblings(%d)" \
% self.siblings.instance) % self.siblings.instance)
file.write(" .next = &%s,\n" \ file.write("\t.next = &%s,\n" \
% self.siblings.instance_name) % self.siblings.instance_name)
else: else:
file.write(" .next = 0,\n") file.write("\t.next = 0,\n")
if (self.children): if (self.children):
debug.info(debug.gencode, "gencode: children(%d)" \ debug.info(debug.gencode, "gencode: children(%d)" \
% self.children.instance) % self.children.instance)
file.write(" .children = &%s,\n" \ file.write("\t.children = &%s,\n" \
% self.children.instance_name) % self.children.instance_name)
else: else:
file.write(" .children = 0,\n") file.write("\t.children = 0,\n")
if (self.chipconfig): if (self.chipconfig):
# set the pointer to the structure for all this # set the pointer to the structure for all this
# type of part # type of part
file.write(" .control= &%s_control,\n" % \ file.write("\t.control= &%s_control,\n" % \
self.type_name ) self.type_name )
# generate the pointer to the isntance # generate the pointer to the isntance
# of the chip struct # of the chip struct
file.write(" .chip_info = (void *) &%s,\n" \ file.write("\t.chip_info = (void *) &%s,\n" \
% self.config_name) % self.config_name)
else: else:
file.write(" .control= 0,\n") file.write("\t.control= 0,\n")
file.write(" .chip_info= 0,\n") file.write("\t.chip_info= 0,\n")
file.write("};\n") file.write("};\n")
def addinit(self, code): def addinit(self, code):
@ -734,6 +742,34 @@ class partobj:
value = dequote(value) value = dequote(value)
setdict(self.registercode, field, value) setdict(self.registercode, field, value)
def addpcipath(self, enable, channel, slot, function):
""" Add a relative pci style path from our parent to this device """
if (channel < 0):
fatal("Invalid channel")
if ((slot < 0) or (slot > 0x1f)):
fatal("Invalid device id")
if ((function < 0) or (function > 7)):
fatal("Invalid function")
self.path = "%s\n\t\t{ .channel = %d, .enable = %d, .path = {.type=DEVICE_PATH_PCI,.u={.pci={ .devfn = PCI_DEVFN(0x%x,%d) }}}}," % (self.path, channel, enable, slot, function)
def addpnppath(self, enable, channel, port, device):
""" Add a relative path to a pnp device hanging off our parent """
if (channel < 0):
fatal("Invalid channel")
if ((port < 0) or (port > 65536)):
fatal("Invalid port")
if ((device < 0) or (device > 0xff)):
fatal("Invalid device")
self.path = "%s\n\t\t{ .channel = %d, .enable = %d, .path={.type=DEVICE_PATH_PNP,.u={.pnp={ .port = 0x%x, .device = 0x%x }}}}," % (self.path, channel, enable, port, device)
def addi2cpath(self, enable, channel, device):
""" Add a relative path to a i2c device hanging off our parent """
if (channel < 0):
fatal("Invalid channel")
if ((device < 0) or (device > 0x7f)):
fatal("Invalid device")
self.path = "%s\n\t\t{ .channel = %d, .enable = %d, .path = {.type=DEVICE_PATH_I2C,.u={.i2c={ .device = 0x%x }}}}, " % (self.path, channel, enable, device)
def usesoption(self, name): def usesoption(self, name):
"""Declare option that can be used by this part""" """Declare option that can be used by this part"""
global global_options global global_options
@ -1070,10 +1106,9 @@ def cpudir(path):
global cpu_type global cpu_type
if (cpu_type and (cpu_type != path)): if (cpu_type and (cpu_type != path)):
fatal("Two different CPU types: %s and %s" % (cpu_type, path)) fatal("Two different CPU types: %s and %s" % (cpu_type, path))
if (not cpu_type): srcdir = "/cpu/%s" % path
srcdir = "/cpu/%s" % path dodir(srcdir, "Config.lb")
dodir(srcdir, "Config.lb") cpu_type = path
cpu_type = path
def part(type, path, file, name): def part(type, path, file, name):
global curimage, dirstack, partstack global curimage, dirstack, partstack
@ -1183,7 +1218,7 @@ def tohex(name):
def IsInt( str ): def IsInt( str ):
""" Is the given string an integer?""" """ Is the given string an integer?"""
try: try:
num = int(str) num = long(str)
return 1 return 1
except ValueError: except ValueError:
return 0 return 0
@ -1265,8 +1300,9 @@ parser Config:
token TARGET: 'target' token TARGET: 'target'
token USED: 'used' token USED: 'used'
token USES: 'uses' token USES: 'uses'
token NUM: r'[0-9]+' token NUM: '[0-9]+'
token XNUM: r'0x[0-9a-fA-F]+' token HEX_NUM: '[0-9a-fA-F]+'
token HEX_PREFIX: '0x'
# Why is path separate? Because paths to resources have to at least # Why is path separate? Because paths to resources have to at least
# have a slash, we thinks # have a slash, we thinks
token PATH: r'[a-zA-Z0-9_.][a-zA-Z0-9/_.]+[a-zA-Z0-9_.]+' token PATH: r'[a-zA-Z0-9_.][a-zA-Z0-9/_.]+[a-zA-Z0-9_.]+'
@ -1277,6 +1313,12 @@ parser Config:
token DELEXPR: r'{([^}]+|\\.)*}' token DELEXPR: r'{([^}]+|\\.)*}'
token STR: r'"([^\\"]+|\\.)*"' token STR: r'"([^\\"]+|\\.)*"'
token RAWTEXT: r'.*' token RAWTEXT: r'.*'
token ON: 'on'
token OFF: 'off'
token PCI: 'pci'
token PNP: 'pnp'
token I2C: 'i2c'
rule expr: logical {{ l = logical }} rule expr: logical {{ l = logical }}
( "&&" logical {{ l = l and logical }} ( "&&" logical {{ l = l and logical }}
@ -1296,8 +1338,8 @@ parser Config:
)* {{ return v }} )* {{ return v }}
# A term is a number, variable, or an expression surrounded by parentheses # A term is a number, variable, or an expression surrounded by parentheses
rule term: NUM {{ return atoi(NUM) }} rule term: NUM {{ return long(NUM, 10) }}
| XNUM {{ return tohex(XNUM) }} | HEX_PREFIX HEX_NUM {{ return long(HEX_NUM, 16) }}
| ID {{ return lookup(ID) }} | ID {{ return lookup(ID) }}
| unop {{ return unop }} | unop {{ return unop }}
| "\\(" expr "\\)" {{ return expr }} | "\\(" expr "\\)" {{ return expr }}
@ -1373,6 +1415,28 @@ parser Config:
rule register<<C>>: REGISTER field '=' STR {{ if (C): addregister(field, STR) }} rule register<<C>>: REGISTER field '=' STR {{ if (C): addregister(field, STR) }}
rule enable: {{ val = 1 }}
[ ( ON {{ val = 1 }}
| OFF {{ val = 0 }}
) ] {{ return val }}
rule pci<<C>>: PCI HEX_NUM {{ channel = int(HEX_NUM,16) }}
':' HEX_NUM {{ slot = int(HEX_NUM,16) }}
'.' HEX_NUM {{ function = int(HEX_NUM, 16) }}
enable
{{ if (C): partstack.tos().addpcipath(enable, channel, slot, function) }}
rule pnp<<C>>: PNP HEX_NUM {{ channel = int(HEX_NUM,16) }}
':' HEX_NUM {{ port = int(HEX_NUM,16) }}
'.' HEX_NUM {{ device = int(HEX_NUM, 16) }}
enable
{{ if (C): partstack.tos().addpnppath(enable, channel, port, device) }}
rule i2c<<C>>: I2C HEX_NUM {{ channel = int(HEX_NUM, 16) }}
':' HEX_NUM {{ device = int(HEX_NUM, 16) }}
enable
{{ if (C): partstatck.tos().addi2cpath(enable, channel, device) }}
rule prtval: expr {{ return str(expr) }} rule prtval: expr {{ return str(expr) }}
| STR {{ return STR }} | STR {{ return STR }}
@ -1402,8 +1466,10 @@ parser Config:
| object<<C>> {{ return object }} | object<<C>> {{ return object }}
| option<<C>> {{ return option }} | option<<C>> {{ return option }}
| partdef<<C>> {{ return partdef }} | partdef<<C>> {{ return partdef }}
| prtstmt<<C>> {{ return prtstmt}} | prtstmt<<C>> {{ return prtstmt }}
| register<<C>> {{ return register}} | register<<C>> {{ return register }}
| pci<<C>> {{ return pci }}
| pnp<<C>> {{ return pnp }}
# ENTRY for parsing Config.lb file # ENTRY for parsing Config.lb file
rule cfgfile: (uses<<1>>)* rule cfgfile: (uses<<1>>)*
@ -1560,7 +1626,7 @@ def writeimagemakefile(image):
# Instead, let make do the work of computing CPUFLAGS: # Instead, let make do the work of computing CPUFLAGS:
file.write("# Get the value of TOP, VARIABLES, and several other variables.\n") file.write("# Get the value of TOP, VARIABLES, and several other variables.\n")
file.write("include Makefile.settings\n\n") file.write("include Makefile.settings\n\n")
file.write("# Function to create an item like -Di586 or -DMAX_CPUS='1' or -Ui686\n") file.write("# Function to create an item like -Di586 or -DCONFIG_MAX_CPUS='1' or -Ui686\n")
file.write("D_item = $(if $(subst undefined,,$(origin $1)),-D$1$(if $($1),='$($1)',),-U$1)\n\n") file.write("D_item = $(if $(subst undefined,,$(origin $1)),-D$1$(if $($1),='$($1)',),-U$1)\n\n")
file.write("# Compute the value of CPUFLAGS here during make's first pass.\n") file.write("# Compute the value of CPUFLAGS here during make's first pass.\n")
file.write("CPUFLAGS := $(foreach _var_,$(VARIABLES),$(call D_item,$(_var_)))\n\n") file.write("CPUFLAGS := $(foreach _var_,$(VARIABLES),$(call D_item,$(_var_)))\n\n")
@ -1688,7 +1754,8 @@ def writeimagemakefile(image):
#file.write("\tpython $(TOP)/util/config/NLBConfig.py %s $(TOP)\n" #file.write("\tpython $(TOP)/util/config/NLBConfig.py %s $(TOP)\n"
# % top_config_file) # % top_config_file)
keys = image.getroot().uses_options.keys() #keys = image.getroot().uses_options.keys()
keys = global_options_by_order
keys.sort() keys.sort()
file.write("\necho:\n") file.write("\necho:\n")
for key in keys: for key in keys:
@ -1791,6 +1858,7 @@ def writecode(image):
print "Creating", filename print "Creating", filename
file = safe_open(filename, 'w+') file = safe_open(filename, 'w+')
file.write("#include <device/chip.h>\n") file.write("#include <device/chip.h>\n")
file.write("#include <device/pci.h>\n")
for path in image.getconfigincludes().values(): for path in image.getconfigincludes().values():
file.write("#include \"%s\"\n" % path) file.write("#include \"%s\"\n" % path)
gencode(image.getroot(), file, 0) gencode(image.getroot(), file, 0)