summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIgor Grinberg <grinberg@compulab.co.il>2011-07-03 23:00:20 +0000
committerAlbert ARIBAUD <albert.u.boot@aribaud.net>2011-09-03 22:40:45 +0200
commit221a0666db6fd127f0a82d7e036c7709a9094d19 (patch)
tree7751be014e66e1a2d3b9686b95b7e69d79d77bb0
parentf37586bb14a338c03f6085b8b3ceec5f6d9e9313 (diff)
downloadu-boot-imx-221a0666db6fd127f0a82d7e036c7709a9094d19.zip
u-boot-imx-221a0666db6fd127f0a82d7e036c7709a9094d19.tar.gz
u-boot-imx-221a0666db6fd127f0a82d7e036c7709a9094d19.tar.bz2
arm: nvidia and smdk6400: use common code for machine type
NVIDIA boards and Samsung SMDK6400 already use a local variant of CONFIG_MACH_TYPE option. Switch to use the new common code. Signed-off-by: Igor Grinberg <grinberg@compulab.co.il>
-rw-r--r--board/nvidia/common/board.c2
-rw-r--r--board/samsung/smdk6400/smdk6400.c1
-rw-r--r--include/configs/smdk6400.h2
3 files changed, 1 insertions, 4 deletions
diff --git a/board/nvidia/common/board.c b/board/nvidia/common/board.c
index 8ab9440..5eca5eb 100644
--- a/board/nvidia/common/board.c
+++ b/board/nvidia/common/board.c
@@ -318,8 +318,6 @@ int board_init(void)
{
/* boot param addr */
gd->bd->bi_boot_params = (NV_PA_SDRAM_BASE + 0x100);
- /* board id for Linux */
- gd->bd->bi_arch_number = CONFIG_MACH_TYPE;
return 0;
}
diff --git a/board/samsung/smdk6400/smdk6400.c b/board/samsung/smdk6400/smdk6400.c
index 13c7ed5..c40d1f9 100644
--- a/board/samsung/smdk6400/smdk6400.c
+++ b/board/samsung/smdk6400/smdk6400.c
@@ -72,7 +72,6 @@ int board_init(void)
/* Enable WAIT */
SROM_BW_REG |= 4 | 8 | 1;
- gd->bd->bi_arch_number = MACH_TYPE;
gd->bd->bi_boot_params = PHYS_SDRAM_1 + 0x100;
return 0;
diff --git a/include/configs/smdk6400.h b/include/configs/smdk6400.h
index c9acf58..d175ed6 100644
--- a/include/configs/smdk6400.h
+++ b/include/configs/smdk6400.h
@@ -65,7 +65,7 @@
/*
* Architecture magic and machine type
*/
-#define MACH_TYPE 1270
+#define CONFIG_MACH_TYPE 1270
#define CONFIG_DISPLAY_CPUINFO
#define CONFIG_DISPLAY_BOARDINFO