| Message ID | 20161110121323.11394-1-andre.przywara@arm.com |
|---|---|
| State | Accepted |
| Commit | d8c0d99e6607145c4cb65e39842328adfcb7ce46 |
| Delegated to: | Tom Rini |
| Headers | show |
Hi, On 10-11-16 13:13, Andre Przywara wrote: > Commit fed329aebe3a ("tools: add mksunxiboot to tools-all target") added > mksunxiboot to the tools-all target, but used the CONFIG_SUNXI symbol > to enable its build. Now commit aec9a0f19f64 ("sunxi: Rename CONFIG_SUNXI > to CONFIG_ARCH_SUNXI"), merged before that, renamed that symbol, so that > the first patch basically gets ineffective. > Adjust the symbol name in tools/Makefile to make it build again. > > Signed-off-by: Andre Przywara <andre.przywara@arm.com> LGTM: Reviewed-by: Hans de Goede <hdegoede@redhat.com> Regards, Hans > --- > tools/Makefile | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/tools/Makefile b/tools/Makefile > index 400588c..9edb504 100644 > --- a/tools/Makefile > +++ b/tools/Makefile > @@ -13,7 +13,7 @@ CONFIG_CMD_NET = y > CONFIG_XWAY_SWAP_BYTES = y > CONFIG_NETCONSOLE = y > CONFIG_SHA1_CHECK_UB_IMG = y > -CONFIG_SUNXI = y > +CONFIG_ARCH_SUNXI = y > endif > > subdir-$(HOST_TOOLS_ALL) += easylogo >
On Thu, Nov 10, 2016 at 12:13:23PM +0000, Andre Przywara wrote: > Commit fed329aebe3a ("tools: add mksunxiboot to tools-all target") added > mksunxiboot to the tools-all target, but used the CONFIG_SUNXI symbol > to enable its build. Now commit aec9a0f19f64 ("sunxi: Rename CONFIG_SUNXI > to CONFIG_ARCH_SUNXI"), merged before that, renamed that symbol, so that > the first patch basically gets ineffective. > Adjust the symbol name in tools/Makefile to make it build again. > > Signed-off-by: Andre Przywara <andre.przywara@arm.com> > Reviewed-by: Hans de Goede <hdegoede@redhat.com> Applied to u-boot/master, thanks!
diff --git a/tools/Makefile b/tools/Makefile index 400588c..9edb504 100644 --- a/tools/Makefile +++ b/tools/Makefile @@ -13,7 +13,7 @@ CONFIG_CMD_NET = y CONFIG_XWAY_SWAP_BYTES = y CONFIG_NETCONSOLE = y CONFIG_SHA1_CHECK_UB_IMG = y -CONFIG_SUNXI = y +CONFIG_ARCH_SUNXI = y endif subdir-$(HOST_TOOLS_ALL) += easylogo
Commit fed329aebe3a ("tools: add mksunxiboot to tools-all target") added mksunxiboot to the tools-all target, but used the CONFIG_SUNXI symbol to enable its build. Now commit aec9a0f19f64 ("sunxi: Rename CONFIG_SUNXI to CONFIG_ARCH_SUNXI"), merged before that, renamed that symbol, so that the first patch basically gets ineffective. Adjust the symbol name in tools/Makefile to make it build again. Signed-off-by: Andre Przywara <andre.przywara@arm.com> --- tools/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)