diff options
| author | Wolfgang Denk <wd@denx.de> | 2009-07-23 00:59:37 +0200 |
|---|---|---|
| committer | Wolfgang Denk <wd@denx.de> | 2009-07-23 00:59:37 +0200 |
| commit | 84efbf4d144ff8aaed3cca036aebb1fe69eff3f4 (patch) | |
| tree | b0d5c7d8a13dcbd4a3bbdca78a64e09998568d20 /Makefile | |
| parent | 49a7720b215aa3da24bb13266c4c194012f499a6 (diff) | |
| parent | 57215cd2e59fd403248df8f2f195e382900d5fc2 (diff) | |
| download | blackbird-obmc-uboot-84efbf4d144ff8aaed3cca036aebb1fe69eff3f4.tar.gz blackbird-obmc-uboot-84efbf4d144ff8aaed3cca036aebb1fe69eff3f4.zip | |
Merge branch 'master' of git://git.denx.de/u-boot-arm
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 10 |
1 files changed, 9 insertions, 1 deletions
@@ -2852,6 +2852,9 @@ lpd7a400_config \ lpd7a404_config: unconfig @$(MKCONFIG) $(@:_config=) arm lh7a40x lpd7a40x +mv88f6281gtw_ge_config: unconfig + @$(MKCONFIG) $(@:_config=) arm arm926ejs $(@:_config=) Marvell kirkwood + mx1ads_config : unconfig @$(MKCONFIG) $(@:_config=) arm arm920t mx1ads NULL imx @@ -2917,12 +2920,18 @@ omap730p2_cs3boot_config : unconfig fi; @$(MKCONFIG) -a $(call xtract_omap730p2,$@) arm arm926ejs omap730p2 NULL omap +rd6281a_config: unconfig + @$(MKCONFIG) $(@:_config=) arm arm926ejs $(@:_config=) Marvell kirkwood + sbc2410x_config: unconfig @$(MKCONFIG) $(@:_config=) arm arm920t sbc2410x NULL s3c24x0 scb9328_config : unconfig @$(MKCONFIG) $(@:_config=) arm arm920t scb9328 NULL imx +sheevaplug_config: unconfig + @$(MKCONFIG) $(@:_config=) arm arm926ejs $(@:_config=) Marvell kirkwood + smdk2400_config : unconfig @$(MKCONFIG) $(@:_config=) arm arm920t smdk2400 samsung s3c24x0 @@ -3167,7 +3176,6 @@ omap2420h4_config : unconfig qong_config : unconfig @$(MKCONFIG) $(@:_config=) arm arm1136 qong davedenx mx31 - ######################################################################### ## ARM1176 Systems ######################################################################### |
