diff options
| author | Jon Loeliger | 2007-08-13 11:01:52 -0500 |
|---|---|---|
| committer | Jon Loeliger | 2007-08-13 11:01:52 -0500 |
| commit | 8e2dd87eee01bb1b83beab7caf22b851c5cafb2c (patch) | |
| tree | 47a43e05d90de7d64ed356bab5f15e8d89f5b5cc /Makefile | |
| parent | cca34967cbd13ff6bd352be29e3f1cc88ab24c05 (diff) | |
| parent | 9986bc3e40e899bea372a99a2bca4071bdf2e24b (diff) | |
Merge commit 'remotes/wd/master'
Conflicts:
MAKEALL
With any luck, this is the last MAKEALL merge conflict!
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 9 |
1 files changed, 9 insertions, 0 deletions
@@ -2023,6 +2023,15 @@ omap1510inn_config : unconfig omap5912osk_config : unconfig @$(MKCONFIG) $(@:_config=) arm arm926ejs omap5912osk NULL omap +davinci_dvevm_config : unconfig + @$(MKCONFIG) $(@:_config=) arm arm926ejs dv-evm davinci davinci + +davinci_schmoogie_config : unconfig + @$(MKCONFIG) $(@:_config=) arm arm926ejs schmoogie davinci davinci + +davinci_sonata_config : unconfig + @$(MKCONFIG) $(@:_config=) arm arm926ejs sonata davinci davinci + omap1610inn_config \ omap1610inn_cs0boot_config \ omap1610inn_cs3boot_config \ |