I accidentally also merged this commti when I meant to just merge the beagle one.
Should I revert it or is this ok to leave in? On Sat, Mar 14, 2015 at 8:08 PM, Gedare Bloom <ged...@gwu.edu> wrote: > Me too. I'm not sure why.. > > On Sat, Mar 14, 2015 at 1:44 PM, Ben Gras <b...@shrike-systems.com> wrote: >> Everytime I ./bootstrap && ./bootstrap -p, I get these changes >> w.r.t. mainline. Just tried again with a new tools build. (With the >> prefix/bin dir first in $PATH of course.) >> >> Or is it just me? >> >> --- >> c/src/lib/libbsp/bfin/acinclude.m4 | 4 ++-- >> c/src/lib/libbsp/powerpc/acinclude.m4 | 4 ++-- >> 2 files changed, 4 insertions(+), 4 deletions(-) >> >> diff --git a/c/src/lib/libbsp/bfin/acinclude.m4 >> b/c/src/lib/libbsp/bfin/acinclude.m4 >> index ab6082e..828fd89 100644 >> --- a/c/src/lib/libbsp/bfin/acinclude.m4 >> +++ b/c/src/lib/libbsp/bfin/acinclude.m4 >> @@ -2,12 +2,12 @@ >> AC_DEFUN([RTEMS_CHECK_BSPDIR], >> [ >> case "$1" in >> - TLL6527M ) >> - AC_CONFIG_SUBDIRS([TLL6527M]);; >> bf537Stamp ) >> AC_CONFIG_SUBDIRS([bf537Stamp]);; >> eZKit533 ) >> AC_CONFIG_SUBDIRS([eZKit533]);; >> + TLL6527M ) >> + AC_CONFIG_SUBDIRS([TLL6527M]);; >> *) >> AC_MSG_ERROR([Invalid BSP]);; >> esac >> diff --git a/c/src/lib/libbsp/powerpc/acinclude.m4 >> b/c/src/lib/libbsp/powerpc/acinclude.m4 >> index 6442399..e46fa2b 100644 >> --- a/c/src/lib/libbsp/powerpc/acinclude.m4 >> +++ b/c/src/lib/libbsp/powerpc/acinclude.m4 >> @@ -38,12 +38,12 @@ AC_DEFUN([RTEMS_CHECK_BSPDIR], >> AC_CONFIG_SUBDIRS([t32mppc]);; >> tqm8xx ) >> AC_CONFIG_SUBDIRS([tqm8xx]);; >> - virtex ) >> - AC_CONFIG_SUBDIRS([virtex]);; >> virtex4 ) >> AC_CONFIG_SUBDIRS([virtex4]);; >> virtex5 ) >> AC_CONFIG_SUBDIRS([virtex5]);; >> + virtex ) >> + AC_CONFIG_SUBDIRS([virtex]);; >> *) >> AC_MSG_ERROR([Invalid BSP]);; >> esac >> -- >> 1.9.1 >> >> _______________________________________________ >> devel mailing list >> devel@rtems.org >> http://lists.rtems.org/mailman/listinfo/devel _______________________________________________ devel mailing list devel@rtems.org http://lists.rtems.org/mailman/listinfo/devel
