From 55ebd0c1ca41ddb1ccf6f7d172e867cfb8c68708 Mon Sep 17 00:00:00 2001 From: Heiko Schocher Date: Tue, 17 Mar 2015 08:26:11 +0100 Subject: [PATCH] arm, at91: corvus: move MACH_TYPE to defconfig move MACH_TYPE into defconfig Signed-off-by: Heiko Schocher --- configs/corvus_defconfig | 2 +- include/configs/corvus.h | 3 --- 2 files changed, 1 insertion(+), 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 -#define MACH_TYPE_CORVUS 2066 - -#define CONFIG_MACH_TYPE MACH_TYPE_CORVUS #define CONFIG_SYS_GENERIC_BOARD /* * Warning: changing CONFIG_SYS_TEXT_BASE requires -- 2.30.2