diff options
| author | Wolfgang Denk <wd@denx.de> | 2008-06-11 21:33:16 +0200 |
|---|---|---|
| committer | Wolfgang Denk <wd@denx.de> | 2008-06-11 21:33:16 +0200 |
| commit | 5ea67393b8b554b8165c38912d753a8df043020d (patch) | |
| tree | 080077826cffcfebbaa0a950c663e7d165cf6b7d /include/configs/MPC8540ADS.h | |
| parent | 2395db48869e759c4422efa3d3c25161601aa17b (diff) | |
| parent | ba04f7010958e88a8910f2a123fee53fdc72e013 (diff) | |
| download | u-boot-5ea67393b8b554b8165c38912d753a8df043020d.tar.gz u-boot-5ea67393b8b554b8165c38912d753a8df043020d.tar.xz u-boot-5ea67393b8b554b8165c38912d753a8df043020d.zip | |
Merge branch 'master' of git://www.denx.de/git/u-boot-mpc85xx
Conflicts:
include/asm-ppc/fsl_lbc.h
Signed-off-by: Wolfgang Denk <wd@denx.de>
Diffstat (limited to 'include/configs/MPC8540ADS.h')
| -rw-r--r-- | include/configs/MPC8540ADS.h | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/include/configs/MPC8540ADS.h b/include/configs/MPC8540ADS.h index 5719759808..d1d3cc3606 100644 --- a/include/configs/MPC8540ADS.h +++ b/include/configs/MPC8540ADS.h @@ -87,9 +87,6 @@ #define CONFIG_BTB /* toggle branch predition */ #define CONFIG_ADDR_STREAMING /* toggle addr streaming */ -#define CONFIG_BOARD_EARLY_INIT_F 1 /* Call board_pre_init */ - -#undef CFG_DRAM_TEST /* memory test, takes time */ #define CFG_MEMTEST_START 0x00200000 /* memtest region */ #define CFG_MEMTEST_END 0x00400000 |