diff options
| author | Tom Rini <trini@ti.com> | 2012-08-13 14:11:06 -0700 |
|---|---|---|
| committer | Tom Rini <trini@ti.com> | 2012-09-27 09:48:39 -0700 |
| commit | 8082fda9fc6d6fb6ba1bc467fb117af3dbed928a (patch) | |
| tree | 6e2edbe7e0836755499eedd2ab8c5541d105a046 /arch | |
| parent | 37189a19589794f8482a1c64dcebca2d6fbe96a5 (diff) | |
| download | blackbird-obmc-uboot-8082fda9fc6d6fb6ba1bc467fb117af3dbed928a.tar.gz blackbird-obmc-uboot-8082fda9fc6d6fb6ba1bc467fb117af3dbed928a.zip | |
ARM: SPL: Remove NAND_MODE_HW_ECC from spl_nand.c
This detection code doesn't (and can't) do anything currently, so
remove.
Signed-off-by: Tom Rini <trini@ti.com>
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/arm/cpu/armv7/omap-common/spl_nand.c | 13 | ||||
| -rw-r--r-- | arch/arm/cpu/armv7/omap3/board.c | 3 | ||||
| -rw-r--r-- | arch/arm/include/asm/omap_common.h | 1 |
3 files changed, 3 insertions, 14 deletions
diff --git a/arch/arm/cpu/armv7/omap-common/spl_nand.c b/arch/arm/cpu/armv7/omap-common/spl_nand.c index ea7cc8a9d8..39221d5e7a 100644 --- a/arch/arm/cpu/armv7/omap-common/spl_nand.c +++ b/arch/arm/cpu/armv7/omap-common/spl_nand.c @@ -35,16 +35,9 @@ void spl_nand_load_image(void) int *src __attribute__((unused)); int *dst __attribute__((unused)); - switch (spl_boot_mode()) { - case NAND_MODE_HW_ECC: - debug("spl: nand - using hw ecc\n"); - gpmc_init(); - nand_init(); - break; - default: - puts("spl: ERROR: This bootmode is not implemented - hanging"); - hang(); - } + debug("spl: nand - using hw ecc\n"); + gpmc_init(); + nand_init(); /*use CONFIG_SYS_TEXT_BASE as temporary storage area */ header = (struct image_header *)(CONFIG_SYS_TEXT_BASE); diff --git a/arch/arm/cpu/armv7/omap3/board.c b/arch/arm/cpu/armv7/omap3/board.c index 164069662f..a487374f1f 100644 --- a/arch/arm/cpu/armv7/omap3/board.c +++ b/arch/arm/cpu/armv7/omap3/board.c @@ -77,9 +77,6 @@ u32 spl_boot_mode(void) case BOOT_DEVICE_MMC1: return MMCSD_MODE_FAT; break; - case BOOT_DEVICE_NAND: - return NAND_MODE_HW_ECC; - break; default: puts("spl: ERROR: unknown device - can't select boot mode\n"); hang(); diff --git a/arch/arm/include/asm/omap_common.h b/arch/arm/include/asm/omap_common.h index f5b9dfe559..4d331fc943 100644 --- a/arch/arm/include/asm/omap_common.h +++ b/arch/arm/include/asm/omap_common.h @@ -76,7 +76,6 @@ void preloader_console_init(void); #define MMCSD_MODE_UNDEFINED 0 #define MMCSD_MODE_RAW 1 #define MMCSD_MODE_FAT 2 -#define NAND_MODE_HW_ECC 3 struct spl_image_info { const char *name; |
