diff options
author | Minkyu Kang <mk7.kang@samsung.com> | 2010-11-16 09:55:11 +0900 |
---|---|---|
committer | Minkyu Kang <mk7.kang@samsung.com> | 2010-11-16 09:55:11 +0900 |
commit | 1032d97496f6d534bf0030a5779ff1cb38cc9ebf (patch) | |
tree | 3713c814a7453024eceb097c67532072950e2f2e /include/configs/SMN42.h | |
parent | 37a3bda0c9c8a2ffbf7e2a9e121177a3385a0626 (diff) | |
parent | 227b72515546fca535dbd3274f6d875d97f494fe (diff) | |
download | u-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/SMN42.h')
-rw-r--r-- | include/configs/SMN42.h | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/include/configs/SMN42.h b/include/configs/SMN42.h index ba3ada1..4a8acab 100644 --- a/include/configs/SMN42.h +++ b/include/configs/SMN42.h @@ -31,7 +31,6 @@ * so we MUST NOT initialize critical regs like mem-timing ... */ #undef CONFIG_SKIP_LOWLEVEL_INIT -#undef CONFIG_SKIP_RELOCATE_UBOOT /* * High Level Configuration Options @@ -48,7 +47,6 @@ * Size of malloc() pool */ #define CONFIG_SYS_MALLOC_LEN (CONFIG_ENV_SIZE + 128*1024) -#define CONFIG_SYS_GBL_DATA_SIZE 128 /* size in bytes reserved for initial data */ /* * Hardware drivers |