Merge branch 'rebase' of git://git.l4dev.org/~amit/codezero into amit

Conflicts:
	conts/baremetal/timer_service/main.c
This commit is contained in:
Bahadir Balban
2009-12-04 00:41:51 +02:00
61 changed files with 911 additions and 57 deletions

View File

@@ -24,6 +24,7 @@
#define PB926_UART1_BASE 0x101F2000 /* Console port (UART1) */
#define PB926_UART2_BASE 0x101F3000 /* Console port (UART2) */
#define PB926_UART3_BASE 0x10009000 /* Console port (UART3) */
#define PB926_CLCD_BASE 0x10120000 /* Color LCD */
/*
* Uart virtual address until a file-based console access

View File

@@ -29,17 +29,21 @@
#define PB926_UART_SIZE 0x1000
#define PB926_TIMER_SIZE 0x1000
#define PB926_CLCD_SIZE 0x1000
#define PLATFORM_UART1_BASE PB926_UART1_BASE
#define PLATFORM_UART2_BASE PB926_UART2_BASE
#define PLATFORM_UART3_BASE PB926_UART3_BASE
#define PLATFORM_UART1_SIZE PB926_UART_SIZE
#define PLATFORM_UART2_SIZE PB926_UART_SIZE
#define PLATFORM_UART3_SIZE PB926_UART_SIZE
#define PLATFORM_TIMER1_BASE PB926_TIMER23_BASE
#define PLATFORM_TIMER1_SIZE PB926_TIMER_SIZE
#define PLATFORM_CLCD0_BASE PB926_CLCD_BASE
#define PLATFORM_CLCD0_SIZE PB926_CLCD_SIZE
int platform_setup_device_caps(struct kernel_resources *kres);
void platform_irq_enable(int irq);
void platform_irq_disable(int irq);