summaryrefslogtreecommitdiff
path: root/include/configs
diff options
context:
space:
mode:
authorValentin Longchamp <valentin.longchamp@keymile.com>2012-06-13 03:01:03 +0000
committerAlbert ARIBAUD <albert.u.boot@aribaud.net>2012-07-07 14:07:33 +0200
commit0c25defccdc0461bf6695d7e0fe3091c9da8778e (patch)
tree86a9e4ae4a86be5a090847e052927627b1984bf4 /include/configs
parentdacc8c6f79aa4016e431278d31431a19d43c6b37 (diff)
arm/km: use spi claim bus to switch between SPI and NAND
We overwrite these weak functions from the kirkwood spi code to use our own method to be able to switch between the SPI NOR and the NAND flash. This is needed e.g. to update the u-boot. The former command do_spi_toggle can therefore be removed. And the usage of this command is removed from the u-boot update command in the u-boot environment. Signed-off-by: Valentin Longchamp <valentin.longchamp@keymile.com> Signed-off-by: Prafulla Wadaskar <prafulla@marvell.com> cc: Holger Brunck <holger.brunck@keymile.com> cc: Prafulla Wadaskar <prafulla@marvell.com>
Diffstat (limited to 'include/configs')
-rw-r--r--include/configs/km/km_arm.h9
1 files changed, 6 insertions, 3 deletions
diff --git a/include/configs/km/km_arm.h b/include/configs/km/km_arm.h
index 4a0b80e292..b14093f4f3 100644
--- a/include/configs/km/km_arm.h
+++ b/include/configs/km/km_arm.h
@@ -227,7 +227,11 @@ int get_scl(void);
#define CONFIG_SPI_FLASH
#define CONFIG_SPI_FLASH_STMICRO
+/* SPI bus claim MPP configuration */
+#define CONFIG_SYS_KW_SPI_MPP 0x0
+
#define FLASH_GPIO_PIN 0x00010000
+#define KM_FLASH_GPIO_PIN 16
#ifndef MTDIDS_DEFAULT
# define MTDIDS_DEFAULT "nand0=orion_nand"
@@ -241,9 +245,8 @@ int get_scl(void);
#define CONFIG_KM_UPDATE_UBOOT \
"update=" \
- "spi on;sf probe 0;sf erase 0 +${filesize};" \
- "sf write ${load_addr_r} 0 ${filesize};" \
- "spi off\0"
+ "sf probe 0;sf erase 0 +${filesize};" \
+ "sf write ${load_addr_r} 0 ${filesize};\0"
/*
* Default environment variables