diff options
| author | Wolfgang Denk | 2006-07-21 15:24:56 +0200 |
|---|---|---|
| committer | Wolfgang Denk | 2006-07-21 15:24:56 +0200 |
| commit | 966083e95f5ba2bf4a1723b19313e69c14b60092 (patch) | |
| tree | 511a1ed8d7147e38a8437a2afa26dcc221b0c471 /include | |
| parent | 144f7795eefae2997dbac461fc150fe9bd9057c8 (diff) | |
More code cleanup
Diffstat (limited to 'include')
| -rw-r--r-- | include/configs/TQM85xx.h | 16 | ||||
| -rw-r--r-- | include/galileo/core.h | 3 | ||||
| -rw-r--r-- | include/xyzModem.h | 3 |
3 files changed, 14 insertions, 8 deletions
diff --git a/include/configs/TQM85xx.h b/include/configs/TQM85xx.h index bda85e0c9cd..780f27433e6 100644 --- a/include/configs/TQM85xx.h +++ b/include/configs/TQM85xx.h @@ -158,7 +158,7 @@ #undef CONFIG_CONS_NONE /* define if console on something else */ #define CONFIG_CONS_INDEX 1 /* which serial channel for console */ -#else +#else /* ! TQM8560 */ #define CONFIG_CONS_INDEX 1 #undef CONFIG_SERIAL_SOFTWARE_FIFO @@ -170,13 +170,6 @@ #define CFG_NS16550_COM1 (CFG_CCSRBAR+0x4500) #define CFG_NS16550_COM2 (CFG_CCSRBAR+0x4600) -#endif /* CONFIG_TQM8560 */ - -#define CONFIG_BAUDRATE 115200 - -#define CFG_BAUDRATE_TABLE \ - {300, 600, 1200, 2400, 4800, 9600, 19200, 38400,115200} - /* PS/2 Keyboard */ #if !defined(CONFIG_TQM8560) #define CONFIG_PS2KBD /* AT-PS/2 Keyboard */ @@ -186,6 +179,13 @@ #define CONFIG_BOARD_EARLY_INIT_R 1 #endif /* !CONFIG_TQM8560 */ +#endif /* CONFIG_TQM8560 */ + +#define CONFIG_BAUDRATE 115200 + +#define CFG_BAUDRATE_TABLE \ + {300, 600, 1200, 2400, 4800, 9600, 19200, 38400,115200} + /* Use the HUSH parser */ #define CFG_HUSH_PARSER #ifdef CFG_HUSH_PARSER diff --git a/include/galileo/core.h b/include/galileo/core.h index 0735d075b3c..49f4dd2d210 100644 --- a/include/galileo/core.h +++ b/include/galileo/core.h @@ -110,7 +110,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/include/xyzModem.h b/include/xyzModem.h index 4ec10b5a379..f437bbd0bdf 100644 --- a/include/xyzModem.h +++ b/include/xyzModem.h @@ -97,7 +97,10 @@ typedef struct { #endif } connection_info_t; +#ifndef BOOL_WAS_DEFINED +#define BOOL_WAS_DEFINED typedef unsigned int bool; +#endif #define false 0 #define true 1 |