summaryrefslogtreecommitdiff
path: root/include/configs/cpuat91.h
diff options
context:
space:
mode:
authorMinkyu Kang <mk7.kang@samsung.com>2010-11-16 09:55:11 +0900
committerMinkyu Kang <mk7.kang@samsung.com>2010-11-16 09:55:11 +0900
commit1032d97496f6d534bf0030a5779ff1cb38cc9ebf (patch)
tree3713c814a7453024eceb097c67532072950e2f2e /include/configs/cpuat91.h
parent37a3bda0c9c8a2ffbf7e2a9e121177a3385a0626 (diff)
parent227b72515546fca535dbd3274f6d875d97f494fe (diff)
downloadu-boot-imx-1032d97496f6d534bf0030a5779ff1cb38cc9ebf.zip
u-boot-imx-1032d97496f6d534bf0030a5779ff1cb38cc9ebf.tar.gz
u-boot-imx-1032d97496f6d534bf0030a5779ff1cb38cc9ebf.tar.bz2
Merge branch 'master' of git://git.denx.de/u-boot-arm
Diffstat (limited to 'include/configs/cpuat91.h')
-rw-r--r--include/configs/cpuat91.h2
1 files changed, 0 insertions, 2 deletions
diff --git a/include/configs/cpuat91.h b/include/configs/cpuat91.h
index 9ef4523..f31081d 100644
--- a/include/configs/cpuat91.h
+++ b/include/configs/cpuat91.h
@@ -28,7 +28,6 @@
#ifdef CONFIG_CPUAT91_RAM
#define CONFIG_SKIP_LOWLEVEL_INIT 1
-#define CONFIG_SKIP_RELOCATE_UBOOT 1
#else
#define CONFIG_BOOTDELAY 1
#endif
@@ -200,7 +199,6 @@
#define CONFIG_SYS_HZ_CLOCK (AT91C_MASTER_CLOCK / 2)
#define CONFIG_SYS_MALLOC_LEN (CONFIG_ENV_SIZE + 128 * 1024)
-#define CONFIG_SYS_GBL_DATA_SIZE 128
#define CONFIG_STACKSIZE (32 * 1024)
#if defined(CONFIG_USE_IRQ)