diff options
| -rw-r--r-- | common/cmd_ide.c | 4 | ||||
| -rw-r--r-- | cpu/blackfin/interrupts.c | 5 | ||||
| -rw-r--r-- | include/configs/TQM834x.h | 20 |
3 files changed, 5 insertions, 24 deletions
diff --git a/common/cmd_ide.c b/common/cmd_ide.c index 782ad1c094..d86bf37030 100644 --- a/common/cmd_ide.c +++ b/common/cmd_ide.c @@ -532,7 +532,7 @@ __ide_outb(int dev, int port, unsigned char val) dev, port, val, (ATA_CURR_BASE(dev)+CONFIG_SYS_ATA_PORT_ADDR(port))); outb(val, (ATA_CURR_BASE(dev)+CONFIG_SYS_ATA_PORT_ADDR(port))); } -void inline ide_outb (int dev, int port, unsigned char val) +void ide_outb (int dev, int port, unsigned char val) __attribute__((weak, alias("__ide_outb"))); unsigned char inline @@ -544,7 +544,7 @@ __ide_inb(int dev, int port) dev, port, (ATA_CURR_BASE(dev)+CONFIG_SYS_ATA_PORT_ADDR(port)), val); return val; } -unsigned char inline ide_inb(int dev, int port) +unsigned char ide_inb(int dev, int port) __attribute__((weak, alias("__ide_inb"))); #ifdef CONFIG_TUNE_PIO diff --git a/cpu/blackfin/interrupts.c b/cpu/blackfin/interrupts.c index d4dd636101..bf6fb4b4cf 100644 --- a/cpu/blackfin/interrupts.c +++ b/cpu/blackfin/interrupts.c @@ -95,11 +95,12 @@ void udelay(unsigned long usec) int timer_init(void) { *pTCNTL = 0x1; + CSYNC(); *pTSCALE = 0x0; *pTCOUNT = MAX_TIM_LOAD; *pTPERIOD = MAX_TIM_LOAD; *pTCNTL = 0x7; - asm("CSYNC;"); + CSYNC(); timestamp = 0; last_time = 0; @@ -151,5 +152,5 @@ ulong get_timer(ulong base) void reset_timer(void) { - timestamp = 0; + timer_init(); } diff --git a/include/configs/TQM834x.h b/include/configs/TQM834x.h index b74b4046a5..5ca8720a32 100644 --- a/include/configs/TQM834x.h +++ b/include/configs/TQM834x.h @@ -140,26 +140,6 @@ extern int tqm834x_num_flash_banks; #define CONFIG_SYS_LBLAWBAR3_PRELIM 0x00000000 #define CONFIG_SYS_LBLAWAR3_PRELIM 0x00000000 -#define CONFIG_SYS_BR4_PRELIM 0x00000000 -#define CONFIG_SYS_OR4_PRELIM 0x00000000 -#define CONFIG_SYS_LBLAWBAR4_PRELIM 0x00000000 -#define CONFIG_SYS_LBLAWAR4_PRELIM 0x00000000 - -#define CONFIG_SYS_BR5_PRELIM 0x00000000 -#define CONFIG_SYS_OR5_PRELIM 0x00000000 -#define CONFIG_SYS_LBLAWBAR5_PRELIM 0x00000000 -#define CONFIG_SYS_LBLAWAR5_PRELIM 0x00000000 - -#define CONFIG_SYS_BR6_PRELIM 0x00000000 -#define CONFIG_SYS_OR6_PRELIM 0x00000000 -#define CONFIG_SYS_LBLAWBAR6_PRELIM 0x00000000 -#define CONFIG_SYS_LBLAWAR6_PRELIM 0x00000000 - -#define CONFIG_SYS_BR7_PRELIM 0x00000000 -#define CONFIG_SYS_OR7_PRELIM 0x00000000 -#define CONFIG_SYS_LBLAWBAR7_PRELIM 0x00000000 -#define CONFIG_SYS_LBLAWAR7_PRELIM 0x00000000 - /* * Monitor config */ |