Commit 9e7d11ff34f2213ba4e7ef35720f058b9a1ec8c3
1 parent
ed005253
Remove a duplicate omap_l4_attach(), add one missing elsewhere.
git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@5900 c046a42c-6fe2-441c-8c8c-71466251a162
Showing
2 changed files
with
1 additions
and
1 deletions
hw/omap2.c
| @@ -3898,7 +3898,6 @@ struct omap_sysctl_s *omap_sysctl_init(struct omap_target_agent_s *ta, | @@ -3898,7 +3898,6 @@ struct omap_sysctl_s *omap_sysctl_init(struct omap_target_agent_s *ta, | ||
| 3898 | iomemtype = l4_register_io_memory(0, omap_sysctl_readfn, | 3898 | iomemtype = l4_register_io_memory(0, omap_sysctl_readfn, |
| 3899 | omap_sysctl_writefn, s); | 3899 | omap_sysctl_writefn, s); |
| 3900 | omap_l4_attach(ta, 0, iomemtype); | 3900 | omap_l4_attach(ta, 0, iomemtype); |
| 3901 | - omap_l4_attach(ta, 0, iomemtype); | ||
| 3902 | 3901 | ||
| 3903 | return s; | 3902 | return s; |
| 3904 | } | 3903 | } |
hw/omap_dss.c
| @@ -1049,6 +1049,7 @@ struct omap_dss_s *omap_dss_init(struct omap_target_agent_s *ta, | @@ -1049,6 +1049,7 @@ struct omap_dss_s *omap_dss_init(struct omap_target_agent_s *ta, | ||
| 1049 | omap_im3_writefn, s); | 1049 | omap_im3_writefn, s); |
| 1050 | omap_l4_attach(ta, 0, iomemtype[0]); | 1050 | omap_l4_attach(ta, 0, iomemtype[0]); |
| 1051 | omap_l4_attach(ta, 1, iomemtype[1]); | 1051 | omap_l4_attach(ta, 1, iomemtype[1]); |
| 1052 | + omap_l4_attach(ta, 2, iomemtype[2]); | ||
| 1052 | omap_l4_attach(ta, 3, iomemtype[3]); | 1053 | omap_l4_attach(ta, 3, iomemtype[3]); |
| 1053 | cpu_register_physical_memory(l3_base, 0x1000, iomemtype[4]); | 1054 | cpu_register_physical_memory(l3_base, 0x1000, iomemtype[4]); |
| 1054 | 1055 |