On 2/19/20 1:45 PM, Holger Brunck wrote: >>>>> In message <20200217173249.4805-1-ma...@denx.de> you wrote: >>>>>> >>>>>> board/keymile/Kconfig | 11 +- >>>>>> board/keymile/common/ivm.c | 18 +- >>>>>> board/keymile/secu1/Makefile | 7 + >>>>>> board/keymile/secu1/qts/iocsr_config.h | 694 >>>>>> ++++++++++++++++++++++++ >> board/keymile/secu1/qts/pinmux_config.h >>>> | 218 ++++++++ >>>>>> board/keymile/secu1/qts/pll_config.h | 83 +++ >>>>>> board/keymile/secu1/qts/sdram_config.h | 327 +++++++++++ >>>>>> board/keymile/secu1/socfpga.c | 67 +++ >>>>> ... >>>>>> + select VENDOR_KM >>>>> >>>>> Would it make sense to rename keymile -> abb (or abb-ch) here (ditto >>>>> for KM in the config options / macro names) ? >>>> >>>> This is more of a question for Holger, but I agree the renaming >>>> should eventually happen to align it with current state of things. >>> >>> yes I have it on my list to rename this folder to wcom (wiredcom) or wcom- >> abb. >>> But this goes for all the boards in this folder and not only secu. But >>> until know I didn't find the right time to do it as we have currently >>> several activities ongoing for u-boot (re-aligning other boards and >>> migrating >> PPC to DTS). >>> >>> I assume SECU goes for v2020.07 as we are too late for v2020.04 or? I >>> think I can spend some time for the next merge window to tackle this >>> folder issue for all boards and then we rebase and adapt this patch. >> >> Boards and drivers which are self-contained can apparently go in even during >> RC cycle. > > ok. I prepared a patch to tackle the renaming topic and will upload it. Let's > see what > gets in first. We can then rebase this patch if necessary.
Indeed, your patch now conflicts with Heiko's patch and this patch. This will be quite a headache to merge, so I would suggest you update your patch once the other ones are in, since yours is just moving files around.