[SLOF] [PATCH 1/3] net: Get rid of netlib and netapps prefixes in include statements

Alexey Kardashevskiy aik at ozlabs.ru
Wed Jun 15 16:00:18 AEST 2016

On 14/06/16 17:19, Thomas Huth wrote:
> On 14.06.2016 04:10, Alexey Kardashevskiy wrote:
>> On 10/06/16 16:43, Thomas Huth wrote:
>>> On 10.06.2016 06:56, Alexey Kardashevskiy wrote:
>>>> On 09/06/16 17:06, Thomas Huth wrote:
>>>>> These prefixes prevent that the files can easily be moved to another
>>>>> folder, so let's use proper "-I" statements in the Makefiles instead.
>>>>> Signed-off-by: Thomas Huth <thuth at redhat.com>
>>>>> ---
>>> ...
>>>>> diff --git a/clients/net-snk/app/netlib/dhcp.h b/clients/net-snk/app/netlib/dhcp.h
>>>>> index 54fb1ee..4432c9b 100644
>>>>> --- a/clients/net-snk/app/netlib/dhcp.h
>>>>> +++ b/clients/net-snk/app/netlib/dhcp.h
>>>>> @@ -14,12 +14,7 @@
>>>>>  #define _DHCP_H_
>>>>>  #include <stdint.h>
>>>>> -
>>>>> -#ifdef USE_MTFTP
>>>>> -#include <netlib/mtftp.h>
>>>>> -#else
>>>>> -#include <netlib/tftp.h>
>>>>> -#endif
>>>>> +#include "tftp.h"
>>>> You are getting rid of MTFTP references by tiny bits? :)
>>> The MTFTP code is not in the repository, so we don't need that anymore.
>> I noticed this. It is just a bit confusing that you removed one mtftp
>> reference but left all others.
>>> But I can also put that into a separate patch if you prefer.
>> For this patch, just do not remove mtftp, or make another patch before this
>> one which ditches mtftp completely.
> Ok, I've already added a separate patch in v2 of my patch series that
> I've posted last Friday.

I noticed, thanks.

> [...]
>>>> Also, while we are on this topic, could you write a small text explaining
>>>> the romfs layout? Thanks!
>>> The different parts of the firmware are already explained in the README,
>>> isn't that enough?
>> romfs contains how many files? I could not spot this from the README. I
>> assume it is paflof (with llfw/lib/board-qemu compiled in), network drivers
>> and clients (takeover and net-snk), no?
> To show the contents of the romfs, you've got two options:
> 1) Use the "sloffs" tool from Adrian's repository
> (ttp://lisas.de/~adrian/slof/slof.git) ... and maybe consider to include
> it in the main SLOF repository, too.

I already considered, however I doubt I can pick bits I like from there
without asking a permission or violating a license, although the license is
the same and it is BSD.

Or this is a beauty of the BSD license when anyone can borrow anything? :)

> 2) At the firmware prompt, simply type "romfs-list"

Thanks, this is exactly what I was looking for.

> The romfs mainly consists of the various .fs files that get included
> while the Forth code is running. The other files are:
> stage1 : Low-level firmware (llfw), i.e. early setup code
> xvect : The exception vectors of Paflof
> ofw_main : The Paflof binary + OF.fs
> bootinfo : Not sure, seems to be used for js2x takeover
> snk : The net-snk binary
> default-font.bin : Font for SLOF when using VGA console
> build_info.img : Information from the GCC version that has been used
> I can write up a chapter for the README about this if you like - but I'd
> prefer if that could wait until I've finished my net-snk cleanup, so I
> don't have to explain that thing just to remove it again afterwards.


No, I am pretty happy with this post already, hold it for the times when
you get really (really) bored :)


More information about the SLOF mailing list