diff options
Diffstat (limited to 'board')
| -rw-r--r-- | board/logicpd/omap3som/omap3logic.c | 4 | ||||
| -rw-r--r-- | board/sysam/amcore/amcore.c | 2 | ||||
| -rw-r--r-- | board/ti/common/board_detect.c | 16 | ||||
| -rw-r--r-- | board/ti/common/board_detect.h | 12 |
4 files changed, 17 insertions, 17 deletions
diff --git a/board/logicpd/omap3som/omap3logic.c b/board/logicpd/omap3som/omap3logic.c index 3ddeb4647a..de6a06021c 100644 --- a/board/logicpd/omap3som/omap3logic.c +++ b/board/logicpd/omap3som/omap3logic.c @@ -219,6 +219,10 @@ int board_init(void) #ifdef CONFIG_BOARD_LATE_INIT int board_late_init(void) { + /* If we do not have an fdtimage, let's autodetect it*/ + if (getenv("fdtimage")) + return 0; + switch (gd->bd->bi_arch_number) { case MACH_TYPE_DM3730_TORPEDO: setenv("fdtimage", "logicpd-torpedo-37xx-devkit.dtb"); diff --git a/board/sysam/amcore/amcore.c b/board/sysam/amcore/amcore.c index b7217c56ec..77b5000de6 100644 --- a/board/sysam/amcore/amcore.c +++ b/board/sysam/amcore/amcore.c @@ -93,7 +93,7 @@ phys_size_t initdram(int board_type) out_be32((u32 *)0x00000004, 0xbeaddeed); /* issue AUTOREFRESH */ out_be32(&dc->dacr0, 0x0000b304); - /* let refresh occour */ + /* let refresh occur */ fudelay(1); out_be32(&dc->dacr0, 0x0000b344); diff --git a/board/ti/common/board_detect.c b/board/ti/common/board_detect.c index e0ae1a51a6..6e7ca9196d 100644 --- a/board/ti/common/board_detect.c +++ b/board/ti/common/board_detect.c @@ -131,6 +131,7 @@ int __maybe_unused ti_i2c_eeprom_am_get(int bus_addr, int dev_addr) ep->name[0] = 0x0; ep->version[0] = 0x0; ep->serial[0] = 0x0; + ep->config[0] = 0x0; rc = ti_i2c_eeprom_get(bus_addr, dev_addr, TI_EEPROM_HEADER_MAGIC, sizeof(am_ep), (uint8_t *)&am_ep); @@ -171,10 +172,11 @@ int __maybe_unused ti_i2c_eeprom_dra7_get(int bus_addr, int dev_addr) goto already_read; /* Initialize with a known bad marker for i2c fails.. */ - ep->header = 0xADEAD12C; + ep->header = TI_DEAD_EEPROM_MAGIC; ep->name[0] = 0x0; ep->version[0] = 0x0; ep->serial[0] = 0x0; + ep->config[0] = 0x0; ep->emif1_size = 0; ep->emif2_size = 0; @@ -229,9 +231,7 @@ char * __maybe_unused board_ti_get_rev(void) { struct ti_common_eeprom *ep = TI_EEPROM_DATA; - if (ep->header == TI_DEAD_EEPROM_MAGIC) - return NULL; - + /* if ep->header == TI_DEAD_EEPROM_MAGIC, this is empty already */ return ep->version; } @@ -239,9 +239,7 @@ char * __maybe_unused board_ti_get_config(void) { struct ti_common_eeprom *ep = TI_EEPROM_DATA; - if (ep->header == TI_DEAD_EEPROM_MAGIC) - return NULL; - + /* if ep->header == TI_DEAD_EEPROM_MAGIC, this is empty already */ return ep->config; } @@ -249,9 +247,7 @@ char * __maybe_unused board_ti_get_name(void) { struct ti_common_eeprom *ep = TI_EEPROM_DATA; - if (ep->header == TI_DEAD_EEPROM_MAGIC) - return NULL; - + /* if ep->header == TI_DEAD_EEPROM_MAGIC, this is empty already */ return ep->name; } diff --git a/board/ti/common/board_detect.h b/board/ti/common/board_detect.h index eb17f6f52a..343fcb463e 100644 --- a/board/ti/common/board_detect.h +++ b/board/ti/common/board_detect.h @@ -133,7 +133,7 @@ bool board_ti_is(char *name_tag); * * NOTE: revision information is often messed up (hence the str len match) :( * - * Return: false if board information does not match OR eeprom was'nt read. + * Return: false if board information does not match OR eeprom wasn't read. * true otherwise */ bool board_ti_rev_is(char *rev_tag, int cmp_len); @@ -141,7 +141,7 @@ bool board_ti_rev_is(char *rev_tag, int cmp_len); /** * board_ti_get_rev() - Get board revision for TI EVMs * - * Return: NULL if eeprom was'nt read. + * Return: Empty string if eeprom wasn't read. * Board revision otherwise */ char *board_ti_get_rev(void); @@ -149,7 +149,7 @@ char *board_ti_get_rev(void); /** * board_ti_get_config() - Get board config for TI EVMs * - * Return: NULL if eeprom was'nt read. + * Return: Empty string if eeprom wasn't read. * Board config otherwise */ char *board_ti_get_config(void); @@ -157,7 +157,7 @@ char *board_ti_get_config(void); /** * board_ti_get_name() - Get board name for TI EVMs * - * Return: NULL if eeprom was'nt read. + * Return: Empty string if eeprom wasn't read. * Board name otherwise */ char *board_ti_get_name(void); @@ -174,14 +174,14 @@ void board_ti_get_eth_mac_addr(int index, u8 mac_addr[TI_EEPROM_HDR_ETH_ALEN]); /** * board_ti_get_emif1_size() - Get size of the DDR on emif1 for TI EVMs * - * Return: NULL if eeprom was'nt read or emif1_size is not available. + * Return: NULL if eeprom wasn't read or emif1_size is not available. */ u64 board_ti_get_emif1_size(void); /** * board_ti_get_emif2_size() - Get size of the DDR on emif2 for TI EVMs * - * Return: NULL if eeprom was'nt read or emif2_size is not available. + * Return: NULL if eeprom wasn't read or emif2_size is not available. */ u64 board_ti_get_emif2_size(void); |