diff options
author | Wolfgang Denk <wd@pollux.denx.de> | 2006-07-21 15:24:56 +0200 |
---|---|---|
committer | Wolfgang Denk <wd@pollux.denx.de> | 2006-07-21 15:24:56 +0200 |
commit | 966083e95f5ba2bf4a1723b19313e69c14b60092 (patch) | |
tree | 511a1ed8d7147e38a8437a2afa26dcc221b0c471 /board | |
parent | 144f7795eefae2997dbac461fc150fe9bd9057c8 (diff) | |
download | u-boot-imx-966083e95f5ba2bf4a1723b19313e69c14b60092.zip u-boot-imx-966083e95f5ba2bf4a1723b19313e69c14b60092.tar.gz u-boot-imx-966083e95f5ba2bf4a1723b19313e69c14b60092.tar.bz2 |
More code cleanup
Diffstat (limited to 'board')
-rw-r--r-- | board/Marvell/include/core.h | 3 | ||||
-rw-r--r-- | board/fads/fads.h | 2 | ||||
-rw-r--r-- | board/tqm834x/tqm834x.c | 6 | ||||
-rw-r--r-- | board/tqm85xx/tqm85xx.c | 1 |
4 files changed, 10 insertions, 2 deletions
diff --git a/board/Marvell/include/core.h b/board/Marvell/include/core.h index 081d5fd..c413439 100644 --- a/board/Marvell/include/core.h +++ b/board/Marvell/include/core.h @@ -91,7 +91,10 @@ extern unsigned int INTERNAL_REG_BASE_ADDR; #define _1G 0x40000000 #define _2G 0x80000000 +#ifndef BOOL_WAS_DEFINED +#define BOOL_WAS_DEFINED typedef enum _bool{false,true} bool; +#endif /* Little to Big endian conversion macros */ diff --git a/board/fads/fads.h b/board/fads/fads.h index e981be0..41f18b5 100644 --- a/board/fads/fads.h +++ b/board/fads/fads.h @@ -467,7 +467,9 @@ #define CONFIG_ISO_PARTITION 1 #undef CONFIG_ATAPI +#if 0 /* does not make sense when CFG_CMD_IDE is not enabled, too */ #define CONFIG_IDE_8xx_PCCARD 1 /* Use IDE with PC Card Adapter */ +#endif #undef CONFIG_IDE_8xx_DIRECT /* Direct IDE not supported */ #undef CONFIG_IDE_LED /* LED for ide not supported */ #undef CONFIG_IDE_RESET /* reset for ide not supported */ diff --git a/board/tqm834x/tqm834x.c b/board/tqm834x/tqm834x.c index d992aec..41b34cc 100644 --- a/board/tqm834x/tqm834x.c +++ b/board/tqm834x/tqm834x.c @@ -424,10 +424,12 @@ static void set_ddr_config(void) { * which has to be written with a certain value defined by * errata sheet. */ + u32 *reserved_p = (u32 *)((u8 *)im + 0x2f00); + #if defined(DDR_CASLAT_20) - *((u8 *)im + 0x2f00) = 0x201c0000; + *reserved_p = 0x201c0000; #else - *((u8 *)im + 0x2f00) = 0x202c0000; + *reserved_p = 0x202c0000; #endif } } diff --git a/board/tqm85xx/tqm85xx.c b/board/tqm85xx/tqm85xx.c index be2dd64..b4ef5af 100644 --- a/board/tqm85xx/tqm85xx.c +++ b/board/tqm85xx/tqm85xx.c @@ -42,6 +42,7 @@ extern flash_info_t flash_info[]; /* FLASH chips info */ void local_bus_init (void); long int fixed_sdram (void); ulong flash_get_size (ulong base, int banknum); + #ifdef CONFIG_PS2MULT void ps2mult_early_init(void); #endif |