[PATCH 7/17] Fixed .make file inclusion in BBB Makefile and UMONTOP in BBB bashrc
Jarielle Catbagan
jcatbagan93 at gmail.com
Thu Jun 18 16:33:43 UTC 2015
Yeah, it was my mistake. I haven't used git format-patch before. If
I had known a lot earlier that the commit messages were included, I
would have made much more better commit messages. I opted to fix the
descriptions of each patch and so I manually submitted each patch one
by one. As much as possible, I tried to have each commit pertain to
an individual logical change. Please let me know if I should fix
these patches and then resubmit them.
I will strive to make sure that future patches don't result in the
same thing. I will definitely look into "git send-email HEAD~16" for
future patch submissions.
On Thu, Jun 18, 2015 at 6:26 AM, Gedare Bloom <gedare at gwu.edu> wrote:
> On Wed, Jun 17, 2015 at 2:02 PM, Jarielle Catbagan
> <jcatbagan93 at gmail.com> wrote:
>> Minor typo, should be [PATCH 7/16] not [PATCH 7/17].
>>
> That's weird. Did you send the whole batch of commits at the same
> time, or did you manually specify each one?
>
> $ git send-email HEAD~16
>
> That should work..
>
>
>> On Wed, Jun 17, 2015 at 11:00 AM, Jarielle Catbagan
>> <jcatbagan93 at gmail.com> wrote:
>>> Fixed .make file inclusion in BBB Makefile and updated UMONTOP in BBB
>>> bashrc in order for Umon to build. During the process when Umon was
>>> being updated before the initial commit, top-level directories were
>>> renamed. As a result, this prevented Umon from being built, i.e.
>>> 'make' was looking for .make files in directories that didnt exist.
>>>
>>> ---
>>> ports/beagleboneblack/Makefile | 6 +++---
>>> ports/beagleboneblack/bashrc | 2 +-
>>> 2 files changed, 4 insertions(+), 4 deletions(-)
>>>
>>> diff --git a/ports/beagleboneblack/Makefile b/ports/beagleboneblack/Makefile
>>> index 29f53c5..511b8e2 100644
>>> --- a/ports/beagleboneblack/Makefile
>>> +++ b/ports/beagleboneblack/Makefile
>>> @@ -39,7 +39,7 @@ ATAGSIZE=0x1000
>>> MACADDRBASE=0x08000020
>>> ALTTFSDEVTBLBASE=0x08000040
>>>
>>> -include $(TOPDIR)/target/make/common.make
>>> +include $(TOPDIR)/make/common.make
>>>
>>> # Build each variable from a list of individual filenames...
>>> #
>>> @@ -61,7 +61,7 @@ IODEVSRC = smsc911x.c uart16550.c fb_draw.c
>>> FLASHSRC = s29gl512n_16x1.c
>>>
>>>
>>> -include $(TOPDIR)/target/make/objects.make
>>> +include $(TOPDIR)/make/objects.make
>>>
>>> OBJS = $(LOCSOBJ) $(CPUSOBJ) $(LOCCOBJ) $(CPUCOBJ) $(COMCOBJ) \
>>> $(FLASHOBJ) $(IODEVOBJ)
>>> @@ -116,7 +116,7 @@ $(BUILDDIR)/ramtst.$(FILETYPE): $(BUILDDIR) $(OBJS) libz.a \
>>> $(MAKE_BINARY)
>>> $(MAKE_GNUSYMS)
>>>
>>> -include $(TOPDIR)/target/make/rules.make
>>> +include $(TOPDIR)/make/rules.make
>>>
>>>
>>> #########################################################################
>>> diff --git a/ports/beagleboneblack/bashrc b/ports/beagleboneblack/bashrc
>>> index 5aaab72..98b038f 100644
>>> --- a/ports/beagleboneblack/bashrc
>>> +++ b/ports/beagleboneblack/bashrc
>>> @@ -1,6 +1,6 @@
>>> PS1=BEAGLEBONEBLACK:
>>> export TITLE="Beaglebone Black"
>>> -export UMONTOP=../../umon_main
>>> +export UMONTOP=../../main
>>> export tools=$UMONTOP/host
>>> export target=$UMONTOP/target
>>> export cpu=$target/cpu
>>> --
>>> 2.3.3
>> _______________________________________________
>> umon-devel mailing list
>> umon-devel at rtems.org
>> http://lists.rtems.org/mailman/listinfo/umon-devel
More information about the umon-devel
mailing list