summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJean-Christophe PLAGNIOL-VILLARD <plagnioj at>2009-06-06 10:30:58 +0000
committerTom Rix <Tom.Rix@windriver.com>2009-11-27 16:26:17 -0600
commit990f569c4fa6b9e76b31d0a5229981c092b02dcf (patch)
tree9c5f91861f59824a87cf48fabb7e6019aafa823b
parent3f12f5217e8bdf8f6842bf1b8c5c5b98425ac3db (diff)
downloadu-boot-imx-990f569c4fa6b9e76b31d0a5229981c092b02dcf.zip
u-boot-imx-990f569c4fa6b9e76b31d0a5229981c092b02dcf.tar.gz
u-boot-imx-990f569c4fa6b9e76b31d0a5229981c092b02dcf.tar.bz2
avr32/hsdramc: Move conditional compilation to Makefile
Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj <at> jcrosoft.com> Cc: Haavard Skinnemoen <haavard.skinnemoen <at> atmel.com>
-rw-r--r--cpu/at32ap/Makefile2
-rw-r--r--cpu/at32ap/hsdramc.c3
2 files changed, 1 insertions, 4 deletions
diff --git a/cpu/at32ap/Makefile b/cpu/at32ap/Makefile
index e08f273..60899c7 100644
--- a/cpu/at32ap/Makefile
+++ b/cpu/at32ap/Makefile
@@ -30,7 +30,7 @@ LIB := $(obj)lib$(CPU).a
START-y += start.o
COBJS-y += cpu.o
-COBJS-y += hsdramc.o
+COBJS-$(CONFIG_SYS_HSDRAMC) += hsdramc.o
COBJS-y += exception.o
COBJS-y += cache.o
COBJS-y += interrupts.o
diff --git a/cpu/at32ap/hsdramc.c b/cpu/at32ap/hsdramc.c
index f74121c..b6eae66 100644
--- a/cpu/at32ap/hsdramc.c
+++ b/cpu/at32ap/hsdramc.c
@@ -21,7 +21,6 @@
*/
#include <common.h>
-#ifdef CONFIG_SYS_HSDRAMC
#include <asm/io.h>
#include <asm/sdram.h>
@@ -116,5 +115,3 @@ unsigned long sdram_init(void *sdram_base, const struct sdram_config *config)
return sdram_size;
}
-
-#endif /* CONFIG_SYS_HSDRAMC */