diff options
| author | Justin Waters <justin.waters@timesys.com> | 2013-04-24 17:43:23 -0400 |
|---|---|---|
| committer | Justin Waters <justin.waters@timesys.com> | 2013-04-24 17:43:23 -0400 |
| commit | 15473818068d8de6672d6a83a6888ed40b1f9811 (patch) | |
| tree | c3f0db00b4b2f3d0a7fcd26c3b90599523440f57 /common | |
| parent | 18282017b14c0b32b4aa6fd05df58ba5cff0b472 (diff) | |
LogicPD Support for OMAP3/DM3/AM3 boards 2.3 Update
Diffstat (limited to 'common')
| -rw-r--r-- | common/cmd_nand.c | 10 | ||||
| -rw-r--r-- | common/env_common.c | 4 | ||||
| -rw-r--r-- | common/lcd.c | 5 |
3 files changed, 12 insertions, 7 deletions
diff --git a/common/cmd_nand.c b/common/cmd_nand.c index 509c85e303..164ac249bf 100644 --- a/common/cmd_nand.c +++ b/common/cmd_nand.c @@ -78,12 +78,12 @@ static int switch_ecc_bypart(const char *id) { if(!nand->has_chip_ecc) { - printf("NAND Chip doesn't support in-chip ECC\n"); - return -1; + printf("NAND Chip doesn't support in-chip ECC; defauting to HW\n"); + omap_nand_switch_ecc(OMAP_ECC_HW); + } else { + if(nand->ecc.mode != NAND_ECC_CHIP) + omap_nand_switch_ecc(OMAP_ECC_CHIP); } - if(nand->ecc.mode != NAND_ECC_CHIP) - omap_nand_switch_ecc(OMAP_ECC_CHIP); - printf("Here\n"); } else if(flags & (1 << MTDFLAGS_ECC_BCH)) { if(nand->ecc.mode != NAND_ECC_SOFT_BCH) diff --git a/common/env_common.c b/common/env_common.c index af7a9cb57c..27dcf0df46 100644 --- a/common/env_common.c +++ b/common/env_common.c @@ -217,7 +217,7 @@ int env_import(const char *buf, int check) if (check) { if (!env_check_valid(buf)) { - set_default_env("!bad CRC"); + set_default_env("!bad CRC or ECC error"); return 0; } } @@ -249,7 +249,7 @@ void env_relocate (void) set_default_env(NULL); #else show_boot_progress (-60); - set_default_env("!bad CRC"); + set_default_env("!bad CRC or ECC error"); #endif } else { env_relocate_spec (); diff --git a/common/lcd.c b/common/lcd.c index 3b89d4e0ef..143aae4bd6 100644 --- a/common/lcd.c +++ b/common/lcd.c @@ -887,6 +887,9 @@ void bitmap_plot (int x, int y) int lcd_display_bitmap(ulong bmp_image, int x, int y) { +#if defined(CONFIG_OMAP) + static ushort cmap_actual[256]; +#endif #if !defined(CONFIG_MCC200) ushort *cmap = NULL; #endif @@ -949,6 +952,8 @@ int lcd_display_bitmap(ulong bmp_image, int x, int y) cmap = (ushort *)fbi->palette; #elif defined(CONFIG_MPC823) cmap = (ushort *)&(cp->lcd_cmap[255*sizeof(ushort)]); +#elif defined(CONFIG_OMAP) + cmap = cmap_actual; #elif !defined(CONFIG_ATMEL_LCD) cmap = panel_info.cmap; #endif |