diff options
| author | Michael Brandt <Michael.Brandt@stericsson.com> | 2009-10-26 10:23:13 +0100 |
|---|---|---|
| committer | Michael Brandt <Michael.Brandt@stericsson.com> | 2009-10-26 10:23:13 +0100 |
| commit | dd037f7a4f779bdfa9984b0db74a1bcdf7170fe9 (patch) | |
| tree | ca7e06ab2c6ebd83269d24542b0881e622f314da /Makefile | |
| parent | 4bd4413ae52e40d8e4c4e801b8d6bc3daf3229e3 (diff) | |
| parent | f3ee25859e3920ee7c7cc519a3e6f60d70d7a53f (diff) | |
Merge branch 'master' of http://git.denx.de/u-boot
Conflicts:
Makefile
Diffstat (limited to 'Makefile')
| -rwxr-xr-x | Makefile | 12 |
1 files changed, 12 insertions, 0 deletions
@@ -2942,9 +2942,15 @@ davinci_sonata_config : unconfig davinci_dm355evm_config : unconfig @$(MKCONFIG) $(@:_config=) arm arm926ejs dm355evm davinci davinci +davinci_dm355leopard_config : unconfig + @$(MKCONFIG) $(@:_config=) arm arm926ejs dm355leopard davinci davinci + davinci_dm365evm_config : unconfig @$(MKCONFIG) $(@:_config=) arm arm926ejs dm365evm davinci davinci +davinci_dm6467evm_config : unconfig + @$(MKCONFIG) $(@:_config=) arm arm926ejs dm6467evm davinci davinci + imx27lite_config: unconfig @$(MKCONFIG) $(@:_config=) arm arm926ejs imx27lite logicpd mx27 @@ -3153,12 +3159,18 @@ omap3_evm_config : unconfig omap3_pandora_config : unconfig @$(MKCONFIG) $(@:_config=) arm arm_cortexa8 pandora NULL omap3 +omap3_sdp3430_config : unconfig + @$(MKCONFIG) $(@:_config=) arm arm_cortexa8 sdp3430 ti omap3 + omap3_zoom1_config : unconfig @$(MKCONFIG) $(@:_config=) arm arm_cortexa8 zoom1 logicpd omap3 omap3_zoom2_config : unconfig @$(MKCONFIG) $(@:_config=) arm arm_cortexa8 zoom2 logicpd omap3 +smdkc100_config: unconfig + @$(MKCONFIG) $(@:_config=) arm arm_cortexa8 smdkc100 samsung s5pc1xx + u8500_def_config \ u8500_noconsole_config \ u8500_auto_config: unconfig |