Skip to content

sunxi: Kconfig consolidation and cleanup

Ian Campbell u-boot 2 versions – New

Get series with b4
b4 am [email protected]

Versions newest first · linked by author and title

  1. v2 Latest7 patches 0 repliesNew
  2. v10 of 3 patches 0 repliesSuperseded

Changes in v2 from the cover letter

* Rebased to current u-boot-sunxi#next
* Hans' equivalent of my first patch has been applied to u-boot-sunxi#next, so my patch is dropped
* Toplevel option is now CONFIG_ARCH_SUNXI
* Per-SoC options are now CONFIG_MACH_SUN[45678]I
* Board selection has been pulled out of CONFIG_SYS_EXTRA_OPTIONS into Kconfig, as CONFIG_TARGET_<BOARD>
* The <BOARD>_FEL_defconfig files are now removed

Patches in v2 No applies recorded yet

#Subject and filesSizeRepliesApplied
1/7sunxi: kconfig: Add top-level ARCH_SUNXIarch/arm/Kconfig board/sunxi/Kconfig configs/A10-OLinuXino-Lime_defconfig +25 more+49 -150 replies
2/7sunxi: kconfig: Rename TARGET_SUN[45678]I to MACH_SUN[45678]I.board/sunxi/Kconfig configs/A10-OLinuXino-Lime_defconfig configs/A10s-OLinuXino-M_defconfig +24 more+36 -360 replies
3/7sunxi: Kconfig: Make SPL_FEL a toplevel Kconfig optionboard/sunxi/Kconfig configs/Cubieboard2_FEL_defconfig configs/Cubietruck_FEL_defconfig+9 -20 replies
4/7sunxi: Use CONFIG_MACH_SUN?I from Kconfig instead of CONFIG_SUN?Iarch/arm/cpu/armv7/sunxi/Makefile arch/arm/cpu/armv7/sunxi/board.c arch/arm/cpu/armv7/sunxi/clock_sun4i.c +14 more+52 -570 replies
5/7sunxi: Drop FEL variants of defconfigs.configs/Cubieboard2_FEL_defconfig configs/Cubietruck_FEL_defconfig+0 -140 replies
6/7sunxi: kconfig: Introduce CONFIG_TARGET_<BOARD>board/sunxi/Kconfig board/sunxi/Makefile configs/A10-OLinuXino-Lime_defconfig +23 more+170 -460 replies
7/7sunxi: kconfig: Add %_felconfig rule to enable FEL build of sunxi platforms.scripts/multiconfig.sh+12 -01 reply

Reviews trailers per patch

1 of 7 patches has a Reviewed-by or Acked-by.

PatchHans de Goede
1/7
2/7
3/7
4/7
5/7
6/7
7/7R-b

Trailers given in replies are filled; those carried in the patches from earlier versions are outlined with dashes.

Read the v2 thread

Cover letter [U-Boot] [PATCH v2 0/7] sunxi: Kconfig consolidation and cleanup

This series consolidates some Kconfig options and makes SPL_FEL a first class .config member instead of putting it in CONFIG_SYS_EXTRA_OPTIONS.

This means it is possible to do a FEL build for any board with:
make <board>_config
echo CONFIG_SPL_FEL=y >> .config
echo CONFIG_SPL_FEL=y >> spl/.config
or better
make <board>_config
sed -i -e 's/\# CONFIG_SPL_FEL is not set/CONFIG_SPL_FEL=y/g' .config spl/.config
which is still one more step than I would like but still preferable IMHO to:

        sed -i -e 's/^CONFIG_SYS_EXTRA_OPTIONS="[^"]*/&,SPL_FEL/g' .config spl/.config

Near the end I've added a patch which adds <BOARD>_felconfig to automate this, not sure how folks will feel about this, so I've deliberately made it last so it can easily be ignored...

I've been using a little hack (below, updated to use felconfig) to MAKEALL to help build test all this.

Since v1:
* Rebased to current u-boot-sunxi#next
* Hans' equivalent of my first patch has been applied to u-boot-sunxi#next, so my patch is dropped
* Toplevel option is now CONFIG_ARCH_SUNXI
* Per-SoC options are now CONFIG_MACH_SUN[45678]I
* Board selection has been pulled out of CONFIG_SYS_EXTRA_OPTIONS into Kconfig, as CONFIG_TARGET_<BOARD>
* The <BOARD>_FEL_defconfig files are now removed

Ian.

My MAKEALL hack, surely not upstreamable ;-)

MAKEALL +5 -0
index 7c16319..3a8d1d0 100755
@@ -660,6 +660,11 @@ build_target() {
        echo "Building ${target} board..."
        ${MAKE} -s ${target}_defconfig >/dev/null
 
+       if [ -n "$SUNXI_FORCE_FEL" ] ; then
+           sed -i -e 's/\# CONFIG_SPL_FEL is not set/CONFIG_SPL_FEL=y/g' \
+               .config spl/.config
+       fi
+
        ${MAKE} ${JOBS} ${CHECK} all \
                >${LOG_DIR}/$target.MAKELOG 2> ${LOG_DIR}/$target.ERR