diff options
author | Stefan Reinauer <stepan@coresystems.de> | 2010-02-22 06:09:43 +0000 |
---|---|---|
committer | Stefan Reinauer <stepan@openbios.org> | 2010-02-22 06:09:43 +0000 |
commit | de3206a7bebce99f11e753164cc4d46357bba96a (patch) | |
tree | 9843d883940e372dd357b1357ecd7eaba3e3365f /src/include | |
parent | d650e9934ff8da9b9cb69e42e642c0ee6d390bf6 (diff) |
This is a general cleanup patch
- drop include/part and move files to include/
- get rid lots of warnings
- make resource allocator happy with w83627thg
- trivial cbmem resume fix
- fix payload and log level settings in abuild
- fix kontron mptable for virtual wire mode
- drop some dead includes and dead code.
Signed-off-by: Stefan Reinauer <stepan@coresystems.de>
Acked-by: Ronald G. Minnich <rminnich@gmail.com>
git-svn-id: svn://svn.coreboot.org/coreboot/trunk@5136 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1
Diffstat (limited to 'src/include')
-rw-r--r-- | src/include/cpu/cpu.h | 2 | ||||
-rw-r--r-- | src/include/cpu/x86/bist.h | 2 | ||||
-rw-r--r-- | src/include/cpu/x86/lapic.h | 3 | ||||
-rw-r--r-- | src/include/cpu/x86/tsc.h | 3 | ||||
-rw-r--r-- | src/include/delay.h | 7 | ||||
-rw-r--r-- | src/include/device/pnp.h | 19 | ||||
-rw-r--r-- | src/include/device/pnp_def.h | 4 | ||||
-rw-r--r-- | src/include/fallback.h (renamed from src/include/part/fallback_boot.h) | 6 | ||||
-rw-r--r-- | src/include/part/init_timer.h | 10 | ||||
-rw-r--r-- | src/include/reset.h (renamed from src/include/part/hard_reset.h) | 6 | ||||
-rw-r--r-- | src/include/watchdog.h (renamed from src/include/part/watchdog.h) | 6 |
11 files changed, 35 insertions, 33 deletions
diff --git a/src/include/cpu/cpu.h b/src/include/cpu/cpu.h index 053e319d17..b64fd3ce2c 100644 --- a/src/include/cpu/cpu.h +++ b/src/include/cpu/cpu.h @@ -17,6 +17,8 @@ void secondary_cpu_init(void); #if CONFIG_HAVE_SMI_HANDLER void smm_init(void); +void smm_lock(void); +void smm_setup_structures(void *gnvs, void *tcg, void *smi1); #endif #define __cpu_driver __attribute__ ((used,__section__(".rodata.cpu_driver"))) diff --git a/src/include/cpu/x86/bist.h b/src/include/cpu/x86/bist.h index 21ea69e67b..c6cd7349fb 100644 --- a/src/include/cpu/x86/bist.h +++ b/src/include/cpu/x86/bist.h @@ -1,7 +1,7 @@ #ifndef CPU_X86_BIST_H #define CPU_X86_BIST_H -static void report_bist_failure(unsigned long bist) +static void report_bist_failure(u32 bist) { if (bist != 0) { #if CONFIG_USE_PRINTK_IN_CAR diff --git a/src/include/cpu/x86/lapic.h b/src/include/cpu/x86/lapic.h index 2b77177bbf..de99deebfe 100644 --- a/src/include/cpu/x86/lapic.h +++ b/src/include/cpu/x86/lapic.h @@ -60,12 +60,13 @@ static inline __attribute__((always_inline)) unsigned long lapicid(void) */ static inline __attribute__((always_inline)) void stop_this_cpu(void) { - /* Called by an AP when it is ready to halt and wait for a new task */ for(;;) { hlt(); } } +#else +void stop_this_cpu(void); #endif #if ! defined (__ROMCC__) && !defined(__PRE_RAM__) diff --git a/src/include/cpu/x86/tsc.h b/src/include/cpu/x86/tsc.h index 9370adfe00..9177d53818 100644 --- a/src/include/cpu/x86/tsc.h +++ b/src/include/cpu/x86/tsc.h @@ -24,9 +24,6 @@ static inline unsigned long long rdtscll(void) asm volatile ("rdtsc" : "=A" (val)); return val; } - -void init_timer(void); #endif - #endif /* CPU_X86_TSC_H */ diff --git a/src/include/delay.h b/src/include/delay.h index 175cdaaa29..5d0dc01790 100644 --- a/src/include/delay.h +++ b/src/include/delay.h @@ -1,7 +1,14 @@ #ifndef DELAY_H #define DELAY_H + #if !defined( __ROMCC__) +#if CONFIG_HAVE_INIT_TIMER == 1 +void init_timer(void); +#else +#define init_timer() do{} while(0) +#endif + void udelay(unsigned usecs); void mdelay(unsigned msecs); void delay(unsigned secs); diff --git a/src/include/device/pnp.h b/src/include/device/pnp.h index 4cf6ff47fb..32e9c5eada 100644 --- a/src/include/device/pnp.h +++ b/src/include/device/pnp.h @@ -33,14 +33,17 @@ struct pnp_info { struct device_operations *ops; unsigned function; unsigned flags; -#define PNP_IO0 0x01 -#define PNP_IO1 0x02 -#define PNP_IO2 0x04 -#define PNP_IO3 0x08 -#define PNP_IRQ0 0x10 -#define PNP_IRQ1 0x20 -#define PNP_DRQ0 0x40 -#define PNP_DRQ1 0x80 +#define PNP_IO0 0x001 +#define PNP_IO1 0x002 +#define PNP_IO2 0x004 +#define PNP_IO3 0x008 +#define PNP_IRQ0 0x010 +#define PNP_IRQ1 0x020 +#define PNP_DRQ0 0x040 +#define PNP_DRQ1 0x080 +#define PNP_EN 0x100 +#define PNP_MSC0 0x200 +#define PNP_MSC1 0x400 struct io_info io0, io1, io2, io3; }; struct resource *pnp_get_resource(device_t dev, unsigned index); diff --git a/src/include/device/pnp_def.h b/src/include/device/pnp_def.h index b17fde6478..91ec8f2e61 100644 --- a/src/include/device/pnp_def.h +++ b/src/include/device/pnp_def.h @@ -1,6 +1,7 @@ #ifndef DEVICE_PNP_DEF_H #define DEVICE_PNP_DEF_H +#define PNP_IDX_EN 0x30 #define PNP_IDX_IO0 0x60 #define PNP_IDX_IO1 0x62 #define PNP_IDX_IO2 0x64 @@ -9,6 +10,7 @@ #define PNP_IDX_IRQ1 0x72 #define PNP_IDX_DRQ0 0x74 #define PNP_IDX_DRQ1 0x75 - +#define PNP_IDX_MSC0 0xf0 +#define PNP_IDX_MSC1 0xf1 #endif /* DEVICE_PNP_DEF_H */ diff --git a/src/include/part/fallback_boot.h b/src/include/fallback.h index be4e3989bd..baf8684128 100644 --- a/src/include/part/fallback_boot.h +++ b/src/include/fallback.h @@ -1,5 +1,5 @@ -#ifndef PART_FALLBACK_BOOT_H -#define PART_FALLBACK_BOOT_H +#ifndef FALLBACK_H +#define FALLBACK_H #ifndef ASSEMBLY @@ -15,4 +15,4 @@ void boot_successful(void); #define RTC_BOOT_BYTE 48 -#endif /* PART_FALLBACK_BOOT_H */ +#endif /* FALLBACK_H */ diff --git a/src/include/part/init_timer.h b/src/include/part/init_timer.h deleted file mode 100644 index 61142964a2..0000000000 --- a/src/include/part/init_timer.h +++ /dev/null @@ -1,10 +0,0 @@ -#ifndef PART_INIT_TIMER_H -#define PART_DELAY_H - -#if CONFIG_HAVE_INIT_TIMER == 1 -void init_timer(void); -#else -#define init_timer() do{} while(0) -#endif - -#endif /* PART_INIT_TIMER_H */ diff --git a/src/include/part/hard_reset.h b/src/include/reset.h index cbfc747d1e..fd78189b17 100644 --- a/src/include/part/hard_reset.h +++ b/src/include/reset.h @@ -1,11 +1,11 @@ -#ifndef PART_HARD_RESET_H -#define PART_HARD_RESET_H +#ifndef RESET_H +#define RESET_H #if CONFIG_HAVE_HARD_RESET == 1 void hard_reset(void); #else #define hard_reset() do {} while(0) #endif - +void soft_reset(void); #endif diff --git a/src/include/part/watchdog.h b/src/include/watchdog.h index 26b537dbe9..98d6d51865 100644 --- a/src/include/part/watchdog.h +++ b/src/include/watchdog.h @@ -1,5 +1,5 @@ -#ifndef PART_WATCHDOG_H -#define PART_WATCHDOG_H +#ifndef WATCHDOG_H +#define WATCHDOG_H #if CONFIG_USE_WATCHDOG_ON_BOOT == 1 void watchdog_off(void); @@ -7,4 +7,4 @@ void watchdog_off(void); #define watchdog_off() #endif -#endif /* PART_WATCHDOG_H */ +#endif /* WATCHDOG_H */ |