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/m53evk.h | |
| parent | f93f21906e374d46c6abfbdf4eb9cb1ab51b6384 (diff) | |
| parent | 1899fac925eda817e12234aef3d01d354788662e (diff) | |
| download | blackbird-obmc-uboot-e82abaeb7f2a0833fccf90460c48b9f2100258f8.tar.gz blackbird-obmc-uboot-e82abaeb7f2a0833fccf90460c48b9f2100258f8.zip | |
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/m53evk.h')
| -rw-r--r-- | include/configs/m53evk.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/include/configs/m53evk.h b/include/configs/m53evk.h index e5756d32e7..df6a226109 100644 --- a/include/configs/m53evk.h +++ b/include/configs/m53evk.h @@ -252,7 +252,6 @@ /* * NAND SPL */ -#define CONFIG_SPL #define CONFIG_SPL_FRAMEWORK #define CONFIG_SPL_TARGET "u-boot-with-nand-spl.imx" #define CONFIG_SPL_BOARD_INIT |
