diff options
| author | Stefano Babic <sbabic@denx.de> | 2014-08-11 10:21:03 +0200 |
|---|---|---|
| committer | Stefano Babic <sbabic@denx.de> | 2014-08-11 10:21:03 +0200 |
| commit | e82abaeb7f2a0833fccf90460c48b9f2100258f8 (patch) | |
| tree | de701f5c90b7373966412d566b5c00d3837954bc /include/configs/P1022DS.h | |
| parent | f93f21906e374d46c6abfbdf4eb9cb1ab51b6384 (diff) | |
| parent | 1899fac925eda817e12234aef3d01d354788662e (diff) | |
| download | u-boot-imx-e82abaeb7f2a0833fccf90460c48b9f2100258f8.zip u-boot-imx-e82abaeb7f2a0833fccf90460c48b9f2100258f8.tar.gz u-boot-imx-e82abaeb7f2a0833fccf90460c48b9f2100258f8.tar.bz2 | |
Merge branch 'master' of git://git.denx.de/u-boot-arm
Conflicts:
boards.cfg
Signed-off-by: Stefano Babic <sbabic@denx.de>
Diffstat (limited to 'include/configs/P1022DS.h')
| -rw-r--r-- | include/configs/P1022DS.h | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/include/configs/P1022DS.h b/include/configs/P1022DS.h index 959cdf6..54e2569 100644 --- a/include/configs/P1022DS.h +++ b/include/configs/P1022DS.h @@ -16,7 +16,6 @@ #endif #ifdef CONFIG_SDCARD -#define CONFIG_SPL #define CONFIG_SPL_MPC8XXX_INIT_DDR_SUPPORT #define CONFIG_SPL_ENV_SUPPORT #define CONFIG_SPL_SERIAL_SUPPORT @@ -45,7 +44,6 @@ #endif #ifdef CONFIG_SPIFLASH -#define CONFIG_SPL #define CONFIG_SPL_MPC8XXX_INIT_DDR_SUPPORT #define CONFIG_SPL_ENV_SUPPORT #define CONFIG_SPL_SERIAL_SUPPORT @@ -79,8 +77,6 @@ #define CONFIG_SYS_NAND_MAX_OOBFREE 5 #ifdef CONFIG_NAND -#define CONFIG_SPL -#define CONFIG_TPL #ifdef CONFIG_TPL_BUILD #define CONFIG_SPL_NAND_BOOT #define CONFIG_SPL_FLUSH_IMAGE |