summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHeiko Schocher <hs@denx.de>2015-03-17 08:26:11 +0100
committerAndreas Bießmann <andreas.devel@googlemail.com>2015-04-01 01:04:28 +0200
commit55ebd0c1ca41ddb1ccf6f7d172e867cfb8c68708 (patch)
tree777fc2952e21357b998d8b45b34f497d2cfdf666
parente755d54392554b82ce140cb96bca81ac52f69f43 (diff)
downloadtalos-obmc-uboot-55ebd0c1ca41ddb1ccf6f7d172e867cfb8c68708.tar.gz
talos-obmc-uboot-55ebd0c1ca41ddb1ccf6f7d172e867cfb8c68708.zip
arm, at91: corvus: move MACH_TYPE to defconfig
move MACH_TYPE into defconfig Signed-off-by: Heiko Schocher <hs@denx.de>
-rw-r--r--configs/corvus_defconfig2
-rw-r--r--include/configs/corvus.h3
2 files changed, 1 insertions, 4 deletions
diff --git a/configs/corvus_defconfig b/configs/corvus_defconfig
index 266a2ab498..0427e9ed60 100644
--- a/configs/corvus_defconfig
+++ b/configs/corvus_defconfig
@@ -1,5 +1,5 @@
CONFIG_SPL=y
-CONFIG_SYS_EXTRA_OPTIONS="AT91SAM9M10G45,SYS_USE_NANDFLASH"
+CONFIG_SYS_EXTRA_OPTIONS="AT91SAM9M10G45,MACH_TYPE=2066,SYS_USE_NANDFLASH"
CONFIG_ARM=y
CONFIG_ARCH_AT91=y
CONFIG_TARGET_CORVUS=y
diff --git a/include/configs/corvus.h b/include/configs/corvus.h
index ace511f765..f5b8f9b442 100644
--- a/include/configs/corvus.h
+++ b/include/configs/corvus.h
@@ -16,9 +16,6 @@
#include <asm/hardware.h>
-#define MACH_TYPE_CORVUS 2066
-
-#define CONFIG_MACH_TYPE MACH_TYPE_CORVUS
#define CONFIG_SYS_GENERIC_BOARD
/*
* Warning: changing CONFIG_SYS_TEXT_BASE requires
OpenPOWER on IntegriCloud