diff options
| author | Michal Simek <monstr@monstr.eu> | 2007-08-15 21:06:52 +0200 |
|---|---|---|
| committer | Michal Simek <monstr@monstr.eu> | 2007-08-15 21:06:52 +0200 |
| commit | 19909edb97140a5ea3139705589bb90e023ab5e1 (patch) | |
| tree | 6629766d2355d3c01b96b0c5ee6b9fd73502c943 /board/cm5200 | |
| parent | d1ed28cf36ab6b1d4c479809de7252bf53d2f2d4 (diff) | |
| parent | 210f463c71917b7a4495c2103c228b9c179ae64d (diff) | |
| download | u-boot-imx-19909edb97140a5ea3139705589bb90e023ab5e1.zip u-boot-imx-19909edb97140a5ea3139705589bb90e023ab5e1.tar.gz u-boot-imx-19909edb97140a5ea3139705589bb90e023ab5e1.tar.bz2 | |
Merge git://www.denx.de/git/u-boot into merge
Diffstat (limited to 'board/cm5200')
| -rw-r--r-- | board/cm5200/cm5200.c | 6 | ||||
| -rw-r--r-- | board/cm5200/cm5200.h | 2 | ||||
| -rw-r--r-- | board/cm5200/cmd_cm5200.c | 6 |
3 files changed, 7 insertions, 7 deletions
diff --git a/board/cm5200/cm5200.c b/board/cm5200/cm5200.c index 6804e33..b74ac08 100644 --- a/board/cm5200/cm5200.c +++ b/board/cm5200/cm5200.c @@ -122,7 +122,7 @@ long int initdram(int board_type) mem_conf_t *mem_conf; mem_conf = get_mem_config(board_type); - + /* configure SDRAM start/end for detection */ *(vu_long *)MPC5XXX_SDRAM_CS0CFG = 0x0000001e; /* 2G at 0x0 */ @@ -303,7 +303,7 @@ int checkboard(void) hw_id_t hw_id_tmp; char module_name_tmp[MODULE_NAME_MAXLEN] = ""; - /* + /* * We need I2C to access HW ID data from EEPROM, so we call i2c_init() * here despite the fact that it will be called again later on. We * also use a little trick to silence I2C-related output. @@ -321,7 +321,7 @@ int checkboard(void) else printf("Board: unrecognized cm5200 module (%s)\n", module_name_tmp); - + return 0; } diff --git a/board/cm5200/cm5200.h b/board/cm5200/cm5200.h index a6cbc88..b2ea5ce 100644 --- a/board/cm5200/cm5200.h +++ b/board/cm5200/cm5200.h @@ -138,7 +138,7 @@ static char **hw_id_list[] = { cmu1_qa_hw_id, }; -/* indices to the above list - keep in sync */ +/* indices to the above list - keep in sync */ enum { CM1_QA, CM11_QA, diff --git a/board/cm5200/cmd_cm5200.c b/board/cm5200/cmd_cm5200.c index 5119a99..513c365 100644 --- a/board/cm5200/cmd_cm5200.c +++ b/board/cm5200/cmd_cm5200.c @@ -1,7 +1,7 @@ /* * (C) Copyright 2007 Markus Kappeler <markus.kappeler@objectxp.com> * - * Adapted for U-Boot 1.2 by Piotr Kruszynski <ppk@semihalf.com> + * Adapted for U-Boot 1.2 by Piotr Kruszynski <ppk@semihalf.com> * * See file CREDITS for list of people who contributed to this * project. @@ -27,7 +27,7 @@ #include <i2c.h> #include <usb.h> -#if (CONFIG_COMMANDS & CFG_CMD_BSP) +#ifdef CONFIG_CMD_BSB int do_i2c(char *argv[]) { @@ -445,4 +445,4 @@ U_BOOT_CMD( "fkt usb\n" " - Test USB communication\n" ); -#endif /* CFG_CMD_BSP */ +#endif /* CONFIG_CMD_BSP */ |