summaryrefslogtreecommitdiff
path: root/include/configs/mx31pdk.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/mx31pdk.h
parent37a3bda0c9c8a2ffbf7e2a9e121177a3385a0626 (diff)
parent227b72515546fca535dbd3274f6d875d97f494fe (diff)
Merge branch 'master' of git://git.denx.de/u-boot-arm
Diffstat (limited to 'include/configs/mx31pdk.h')
-rw-r--r--include/configs/mx31pdk.h2
1 files changed, 0 insertions, 2 deletions
diff --git a/include/configs/mx31pdk.h b/include/configs/mx31pdk.h
index 4b4fb1a06a..3b90a01623 100644
--- a/include/configs/mx31pdk.h
+++ b/include/configs/mx31pdk.h
@@ -47,7 +47,6 @@
#if defined(CONFIG_NAND_U_BOOT) && !defined(CONFIG_NAND_SPL)
#define CONFIG_SKIP_LOWLEVEL_INIT
-#define CONFIG_SKIP_RELOCATE_UBOOT
#endif
/*
@@ -55,7 +54,6 @@
*/
#define CONFIG_SYS_MALLOC_LEN (2*CONFIG_ENV_SIZE + 2 * 128 * 1024)
/* Bytes reserved for initial data */
-#define CONFIG_SYS_GBL_DATA_SIZE 128
/*
* Hardware drivers