tighten up option exporting
git-svn-id: svn://svn.coreboot.org/coreboot/trunk@1468 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1
This commit is contained in:
		@@ -2,7 +2,7 @@
 | 
				
			|||||||
#include <arch/pirq_routing.h>
 | 
					#include <arch/pirq_routing.h>
 | 
				
			||||||
#include <string.h>
 | 
					#include <string.h>
 | 
				
			||||||
 | 
					
 | 
				
			||||||
#if DEBUG==1
 | 
					#if (DEBUG==1 && HAVE_PIRQ_TABLE==1)
 | 
				
			||||||
void check_pirq_routing_table(void)
 | 
					void check_pirq_routing_table(void)
 | 
				
			||||||
{
 | 
					{
 | 
				
			||||||
	const uint8_t *addr;
 | 
						const uint8_t *addr;
 | 
				
			||||||
@@ -84,6 +84,7 @@ int verify_copy_pirq_routing_table(unsigned long addr)
 | 
				
			|||||||
#define verify_copy_pirq_routing_table(addr)
 | 
					#define verify_copy_pirq_routing_table(addr)
 | 
				
			||||||
#endif
 | 
					#endif
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					#if HAVE_PIRQ_TABLE==1
 | 
				
			||||||
unsigned long copy_pirq_routing_table(unsigned long addr)
 | 
					unsigned long copy_pirq_routing_table(unsigned long addr)
 | 
				
			||||||
{
 | 
					{
 | 
				
			||||||
	/* Align the table to be 16 byte aligned. */
 | 
						/* Align the table to be 16 byte aligned. */
 | 
				
			||||||
@@ -97,3 +98,4 @@ unsigned long copy_pirq_routing_table(unsigned long addr)
 | 
				
			|||||||
	verify_copy_pirq_routing_table(addr);
 | 
						verify_copy_pirq_routing_table(addr);
 | 
				
			||||||
	return addr + intel_irq_routing_table.size;
 | 
						return addr + intel_irq_routing_table.size;
 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
 | 
					#endif
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -39,13 +39,13 @@ struct irq_routing_table {
 | 
				
			|||||||
 | 
					
 | 
				
			||||||
extern const struct irq_routing_table intel_irq_routing_table;
 | 
					extern const struct irq_routing_table intel_irq_routing_table;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
#if defined(DEBUG) && defined(HAVE_PIRQ_TABLE)
 | 
					#if (DEBUG==1 && HAVE_PIRQ_TABLE==1)
 | 
				
			||||||
void check_pirq_routing_table(void);
 | 
					void check_pirq_routing_table(void);
 | 
				
			||||||
#else
 | 
					#else
 | 
				
			||||||
#define check_pirq_routing_table() do {} while(0)
 | 
					#define check_pirq_routing_table() do {} while(0)
 | 
				
			||||||
#endif
 | 
					#endif
 | 
				
			||||||
 | 
					
 | 
				
			||||||
#if defined(HAVE_PIRQ_TABLE)
 | 
					#if HAVE_PIRQ_TABLE==1
 | 
				
			||||||
unsigned long copy_pirq_routing_table(unsigned long start);
 | 
					unsigned long copy_pirq_routing_table(unsigned long start);
 | 
				
			||||||
#else
 | 
					#else
 | 
				
			||||||
#define copy_pirq_routing_table(start) (start)
 | 
					#define copy_pirq_routing_table(start) (start)
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -63,27 +63,27 @@ define ARCH
 | 
				
			|||||||
end
 | 
					end
 | 
				
			||||||
define k7
 | 
					define k7
 | 
				
			||||||
	default none
 | 
						default none
 | 
				
			||||||
	export always
 | 
						export used
 | 
				
			||||||
	comment "We're a k7"
 | 
						comment "We're a k7"
 | 
				
			||||||
end
 | 
					end
 | 
				
			||||||
define k8
 | 
					define k8
 | 
				
			||||||
	default none
 | 
						default none
 | 
				
			||||||
	export always
 | 
						export used
 | 
				
			||||||
	comment "We're a k8"
 | 
						comment "We're a k8"
 | 
				
			||||||
end
 | 
					end
 | 
				
			||||||
define i586
 | 
					define i586
 | 
				
			||||||
	default none
 | 
						default none
 | 
				
			||||||
	export always
 | 
						export used
 | 
				
			||||||
	comment "We're a 586"
 | 
						comment "We're a 586"
 | 
				
			||||||
end
 | 
					end
 | 
				
			||||||
define i686
 | 
					define i686
 | 
				
			||||||
	default none
 | 
						default none
 | 
				
			||||||
	export always
 | 
						export used
 | 
				
			||||||
	comment "We're a 686"
 | 
						comment "We're a 686"
 | 
				
			||||||
end
 | 
					end
 | 
				
			||||||
define CPU_FIXUP
 | 
					define CPU_FIXUP
 | 
				
			||||||
	default none
 | 
						default none
 | 
				
			||||||
	export always
 | 
						export used
 | 
				
			||||||
	comment "Do CPU fixups"
 | 
						comment "Do CPU fixups"
 | 
				
			||||||
end
 | 
					end
 | 
				
			||||||
 | 
					
 | 
				
			||||||
@@ -263,7 +263,7 @@ end
 | 
				
			|||||||
define HEAP_SIZE
 | 
					define HEAP_SIZE
 | 
				
			||||||
	default 0x2000
 | 
						default 0x2000
 | 
				
			||||||
	format "0x%x"
 | 
						format "0x%x"
 | 
				
			||||||
	export used
 | 
						export always
 | 
				
			||||||
	comment "Default heap size"
 | 
						comment "Default heap size"
 | 
				
			||||||
end
 | 
					end
 | 
				
			||||||
define _RAMBASE
 | 
					define _RAMBASE
 | 
				
			||||||
@@ -415,7 +415,7 @@ define CONFIG_SERIAL_POST
 | 
				
			|||||||
end
 | 
					end
 | 
				
			||||||
define NO_POST
 | 
					define NO_POST
 | 
				
			||||||
	default none
 | 
						default none
 | 
				
			||||||
	export always
 | 
						export used
 | 
				
			||||||
	comment "Disable POST codes"
 | 
						comment "Disable POST codes"
 | 
				
			||||||
end
 | 
					end
 | 
				
			||||||
define TTYS0_BASE
 | 
					define TTYS0_BASE
 | 
				
			||||||
@@ -503,7 +503,7 @@ define CONFIG_LOGICAL_CPUS
 | 
				
			|||||||
end
 | 
					end
 | 
				
			||||||
define HAVE_MP_TABLE
 | 
					define HAVE_MP_TABLE
 | 
				
			||||||
	default none
 | 
						default none
 | 
				
			||||||
	export always
 | 
						export used
 | 
				
			||||||
	comment "Define to build an MP table"
 | 
						comment "Define to build an MP table"
 | 
				
			||||||
end
 | 
					end
 | 
				
			||||||
 | 
					
 | 
				
			||||||
@@ -565,22 +565,22 @@ end
 | 
				
			|||||||
 | 
					
 | 
				
			||||||
define HAVE_PIRQ_TABLE
 | 
					define HAVE_PIRQ_TABLE
 | 
				
			||||||
	default none
 | 
						default none
 | 
				
			||||||
	export always
 | 
						export used
 | 
				
			||||||
	comment "Define if we have a PIRQ table"
 | 
						comment "Define if we have a PIRQ table"
 | 
				
			||||||
end
 | 
					end
 | 
				
			||||||
define IRQ_SLOT_COUNT
 | 
					define IRQ_SLOT_COUNT
 | 
				
			||||||
	default none
 | 
						default none
 | 
				
			||||||
	export always
 | 
						export used
 | 
				
			||||||
	comment "Number of IRQ slots"
 | 
						comment "Number of IRQ slots"
 | 
				
			||||||
end
 | 
					end
 | 
				
			||||||
define CONFIG_PCIBIOS_IRQ
 | 
					define CONFIG_PCIBIOS_IRQ
 | 
				
			||||||
	default none
 | 
						default none
 | 
				
			||||||
	export always
 | 
						export used
 | 
				
			||||||
	comment "PCIBIOS IRQ support"
 | 
						comment "PCIBIOS IRQ support"
 | 
				
			||||||
end
 | 
					end
 | 
				
			||||||
define CONFIG_IOAPIC
 | 
					define CONFIG_IOAPIC
 | 
				
			||||||
	default none
 | 
						default none
 | 
				
			||||||
	export always
 | 
						export used
 | 
				
			||||||
	comment "IOAPIC support"
 | 
						comment "IOAPIC support"
 | 
				
			||||||
end
 | 
					end
 | 
				
			||||||
 | 
					
 | 
				
			||||||
@@ -600,7 +600,7 @@ define IDE_BOOT_DRIVE
 | 
				
			|||||||
end
 | 
					end
 | 
				
			||||||
define IDE_SWAB
 | 
					define IDE_SWAB
 | 
				
			||||||
	default none
 | 
						default none
 | 
				
			||||||
	export always
 | 
						export used
 | 
				
			||||||
	comment "Swap bytes when reading from IDE device"
 | 
						comment "Swap bytes when reading from IDE device"
 | 
				
			||||||
end
 | 
					end
 | 
				
			||||||
define IDE_OFFSET
 | 
					define IDE_OFFSET
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -1,4 +1,5 @@
 | 
				
			|||||||
uses k7
 | 
					uses k7
 | 
				
			||||||
uses CPU_FIXUP
 | 
					uses CPU_FIXUP
 | 
				
			||||||
 | 
					default k7=1
 | 
				
			||||||
dir /cpu/p6
 | 
					dir /cpu/p6
 | 
				
			||||||
#object cpufixup.o
 | 
					#object cpufixup.o
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -1,4 +1,6 @@
 | 
				
			|||||||
 | 
					uses k8
 | 
				
			||||||
uses CPU_FIXUP
 | 
					uses CPU_FIXUP
 | 
				
			||||||
 | 
					default k8=1
 | 
				
			||||||
dir /cpu/k7
 | 
					dir /cpu/k7
 | 
				
			||||||
config chip.h
 | 
					config chip.h
 | 
				
			||||||
if CPU_FIXUP
 | 
					if CPU_FIXUP
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -1,4 +1,3 @@
 | 
				
			|||||||
uses i686
 | 
					 | 
				
			||||||
uses INTEL_PPRO_MTRR
 | 
					uses INTEL_PPRO_MTRR
 | 
				
			||||||
dir /cpu/p5
 | 
					dir /cpu/p5
 | 
				
			||||||
object cpufixup.o
 | 
					object cpufixup.o
 | 
				
			||||||
 
 | 
				
			|||||||
		Reference in New Issue
	
	Block a user