Message ID | 1341821188-4994-3-git-send-email-bryan.wu@canonical.com |
---|---|
State | New |
Headers | show |
-----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 On 07/09/2012 10:06 AM, Bryan Wu wrote: > Signed-off-by: Bryan Wu <bryan.wu@canonical.com> > > diff --git a/debian.ti-omap4/config/config.common.ubuntu > b/debian.ti-omap4/config/config.common.ubuntu index > df3817d..1fee5a1 100644 --- > a/debian.ti-omap4/config/config.common.ubuntu +++ > b/debian.ti-omap4/config/config.common.ubuntu @@ -2919,7 +2919,7 @@ > CONFIG_RT_MUTEXES=y CONFIG_RWSEM_GENERIC_SPINLOCK=y CONFIG_RXKAD=m > # CONFIG_SAMPLES is not set -# CONFIG_SATA_AHCI_PLATFORM is not > set +CONFIG_SATA_AHCI_PLATFORM=m CONFIG_SATA_MV=m > CONFIG_SATA_PMP=y CONFIG_SCHEDSTATS=y > this option breaks compilation: (quantal-amd64)ppisati@tangerine:~/ubuntu-quantal$ git diff diff --git a/debian.ti-omap4/config/config.common.ubuntu b/debian.ti-omap4/config/config.common.ubuntu index d67f2be..6046bbd 100644 - --- a/debian.ti-omap4/config/config.common.ubuntu +++ b/debian.ti-omap4/config/config.common.ubuntu @@ -2919,7 +2919,7 @@ CONFIG_RT_MUTEXES=y CONFIG_RWSEM_GENERIC_SPINLOCK=y CONFIG_RXKAD=m # CONFIG_SAMPLES is not set - -# CONFIG_SATA_AHCI_PLATFORM is not set +CONFIG_SATA_AHCI_PLATFORM=m CONFIG_SATA_MV=m CONFIG_SATA_PMP=y CONFIG_SCHEDSTATS=y (quantal-amd64)ppisati@tangerine:~/ubuntu-quantal$ dpkg-buildpackage - -us -uc -aarmhf ... LD [M] fs/ocfs2/dlm/ocfs2_dlm.o LD [M] fs/xfs/xfs.o LD [M] fs/ocfs2/ocfs2.o LD [M] fs/ocfs2/ocfs2_stackglue.o LD [M] fs/ocfs2/ocfs2_stack_o2cb.o LD [M] fs/ocfs2/ocfs2_stack_user.o LD fs/built-in.o LD vmlinux.o MODPOST vmlinux.o GEN .version CHK include/generated/compile.h LD .tmp_vmlinux1 arch/arm/mach-omap2/built-in.o: In function `omap2_init_devices': /home/ppisati/ubuntu-quantal/arch/arm/mach-omap2/devices.c:1099: undefined reference to `omap_sata_init' make[2]: *** [.tmp_vmlinux1] Error 1 make[1]: *** [sub-make] Error 2 make[1]: Leaving directory `/home/ppisati/ubuntu-quantal' make: *** [/home/ppisati/ubuntu-quantal/debian/stamps/stamp-build-omap4] Error 2 dpkg-buildpackage: error: debian/rules build gave error exit status 2 (quantal-amd64)ppisati@tangerine:~/ubuntu-quantal$ - -- bye, p. -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.11 (GNU/Linux) Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org/ iQIcBAEBAgAGBQJP+sJNAAoJEJdscTmfuQbQjbwP/RznEO1f1kZAlGcM9QPcKzdb 5Zc6QVvuz3j50rbGAg8B+3YnU/s54kKGKaeVYNKzXtLE7gFNNlQvGviLyFVGQ43g hHxFtnx14PJOMBG3PT36Yi3/dJ8zmUBqB8xgeGI726o/9UifhrgKbJSASOUyH+m7 qbA0xOp2XJooMZHh2mhb3YpUFavFeZbKYi15scw4zu4p2obhkMGbtFRP6UWPUWwR SzFu6xJLDyitj6f0q+k6SvXZhEPpmTTAjK8g7cHV2dhkecJWCe1T50wEYlBbltRE pG0um12HffunXGBbsQY5I6zQO0gYN8XVTS3Uihw4eu8ZfNddJxQt7KGtboeDKMum 2ShfU3NlzUkUcX0FWtv4ylT8Tj8M2N7Dye7X1RYq6c47ijqa6COUZxX+w0drWDk+ F6AEEQRfqcucchsV671f01zFSOFyifwXr4fy1IZ4SC5UpDYpVcElLYwErKIDkwHm jOS09lnr4OUnJnwPvIi57spqnibybmXc6tOTZw+aAx0TlP1Ex1JTgmOJdCyfmc/h AF5MwmhR3eWFcZ1l8Y1GtNLBTfQUAa2WcR0hInkHSbar8nlkZO1XQ9/KInBOXTBA qIxhJWR42SzMuV2BkzfYOn+g3pAdkMpdkIMk2MK+CcdsYE06QysHdCrqWDov6tz7 UuTbPIc0/x6OKVNQs+zU =5VGU -----END PGP SIGNATURE-----
On Mon, Jul 9, 2012 at 7:36 PM, Paolo Pisati <paolo.pisati@canonical.com> wrote: > -----BEGIN PGP SIGNED MESSAGE----- > Hash: SHA1 > > On 07/09/2012 10:06 AM, Bryan Wu wrote: >> Signed-off-by: Bryan Wu <bryan.wu@canonical.com> >> >> diff --git a/debian.ti-omap4/config/config.common.ubuntu >> b/debian.ti-omap4/config/config.common.ubuntu index >> df3817d..1fee5a1 100644 --- >> a/debian.ti-omap4/config/config.common.ubuntu +++ >> b/debian.ti-omap4/config/config.common.ubuntu @@ -2919,7 +2919,7 @@ >> CONFIG_RT_MUTEXES=y CONFIG_RWSEM_GENERIC_SPINLOCK=y CONFIG_RXKAD=m >> # CONFIG_SAMPLES is not set -# CONFIG_SATA_AHCI_PLATFORM is not >> set +CONFIG_SATA_AHCI_PLATFORM=m CONFIG_SATA_MV=m >> CONFIG_SATA_PMP=y CONFIG_SCHEDSTATS=y >> > > this option breaks compilation: > > (quantal-amd64)ppisati@tangerine:~/ubuntu-quantal$ git diff > diff --git a/debian.ti-omap4/config/config.common.ubuntu > b/debian.ti-omap4/config/config.common.ubuntu > index d67f2be..6046bbd 100644 > - --- a/debian.ti-omap4/config/config.common.ubuntu > +++ b/debian.ti-omap4/config/config.common.ubuntu > @@ -2919,7 +2919,7 @@ CONFIG_RT_MUTEXES=y > CONFIG_RWSEM_GENERIC_SPINLOCK=y > CONFIG_RXKAD=m > # CONFIG_SAMPLES is not set > - -# CONFIG_SATA_AHCI_PLATFORM is not set > +CONFIG_SATA_AHCI_PLATFORM=m > CONFIG_SATA_MV=m > CONFIG_SATA_PMP=y > CONFIG_SCHEDSTATS=y > > (quantal-amd64)ppisati@tangerine:~/ubuntu-quantal$ dpkg-buildpackage > - -us -uc -aarmhf > ... > LD [M] fs/ocfs2/dlm/ocfs2_dlm.o > LD [M] fs/xfs/xfs.o > LD [M] fs/ocfs2/ocfs2.o > LD [M] fs/ocfs2/ocfs2_stackglue.o > LD [M] fs/ocfs2/ocfs2_stack_o2cb.o > LD [M] fs/ocfs2/ocfs2_stack_user.o > LD fs/built-in.o > LD vmlinux.o > MODPOST vmlinux.o > GEN .version > CHK include/generated/compile.h > LD .tmp_vmlinux1 > arch/arm/mach-omap2/built-in.o: In function `omap2_init_devices': > /home/ppisati/ubuntu-quantal/arch/arm/mach-omap2/devices.c:1099: > undefined reference to `omap_sata_init' > make[2]: *** [.tmp_vmlinux1] Error 1 > make[1]: *** [sub-make] Error 2 > make[1]: Leaving directory `/home/ppisati/ubuntu-quantal' > make: *** > [/home/ppisati/ubuntu-quantal/debian/stamps/stamp-build-omap4] Error 2 > dpkg-buildpackage: error: debian/rules build gave error exit status 2 > (quantal-amd64)ppisati@tangerine:~/ubuntu-quantal$ > Yeah, please drop this patch. CONFIG_SATA_AHCI_PLATFORM is only valid for OMAP5, but we normally disable OMAP5 for our ti-omap4 branch. So we should disable CONFIG_SATA_AHCI_PLATFORM as well. Thanks, -Bryan > - -- > bye, > p. > > > -----BEGIN PGP SIGNATURE----- > Version: GnuPG v1.4.11 (GNU/Linux) > Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org/ > > iQIcBAEBAgAGBQJP+sJNAAoJEJdscTmfuQbQjbwP/RznEO1f1kZAlGcM9QPcKzdb > 5Zc6QVvuz3j50rbGAg8B+3YnU/s54kKGKaeVYNKzXtLE7gFNNlQvGviLyFVGQ43g > hHxFtnx14PJOMBG3PT36Yi3/dJ8zmUBqB8xgeGI726o/9UifhrgKbJSASOUyH+m7 > qbA0xOp2XJooMZHh2mhb3YpUFavFeZbKYi15scw4zu4p2obhkMGbtFRP6UWPUWwR > SzFu6xJLDyitj6f0q+k6SvXZhEPpmTTAjK8g7cHV2dhkecJWCe1T50wEYlBbltRE > pG0um12HffunXGBbsQY5I6zQO0gYN8XVTS3Uihw4eu8ZfNddJxQt7KGtboeDKMum > 2ShfU3NlzUkUcX0FWtv4ylT8Tj8M2N7Dye7X1RYq6c47ijqa6COUZxX+w0drWDk+ > F6AEEQRfqcucchsV671f01zFSOFyifwXr4fy1IZ4SC5UpDYpVcElLYwErKIDkwHm > jOS09lnr4OUnJnwPvIi57spqnibybmXc6tOTZw+aAx0TlP1Ex1JTgmOJdCyfmc/h > AF5MwmhR3eWFcZ1l8Y1GtNLBTfQUAa2WcR0hInkHSbar8nlkZO1XQ9/KInBOXTBA > qIxhJWR42SzMuV2BkzfYOn+g3pAdkMpdkIMk2MK+CcdsYE06QysHdCrqWDov6tz7 > UuTbPIc0/x6OKVNQs+zU > =5VGU > -----END PGP SIGNATURE-----
diff --git a/debian.ti-omap4/config/config.common.ubuntu b/debian.ti-omap4/config/config.common.ubuntu index df3817d..1fee5a1 100644 --- a/debian.ti-omap4/config/config.common.ubuntu +++ b/debian.ti-omap4/config/config.common.ubuntu @@ -2919,7 +2919,7 @@ CONFIG_RT_MUTEXES=y CONFIG_RWSEM_GENERIC_SPINLOCK=y CONFIG_RXKAD=m # CONFIG_SAMPLES is not set -# CONFIG_SATA_AHCI_PLATFORM is not set +CONFIG_SATA_AHCI_PLATFORM=m CONFIG_SATA_MV=m CONFIG_SATA_PMP=y CONFIG_SCHEDSTATS=y
Signed-off-by: Bryan Wu <bryan.wu@canonical.com>