Synology: common: Fix typo and fallout
v2 cover Synology: common: Fix typo and fallout
Patch 2 fixes a trivial typo which disabled building of legacy.c by accident. Compiling for some of the boards now including this source again fails though due to undefined readl(). Fix this in a preceeding patch 1 to retain bisectability.
Changes since v1:
- New patch 1
- Drop unrelated chunk from patch 2
Phil Sutter (2):
board: Synology: legacy.c: Include asm/io.h
board: Synology: common: Fix typo in Makefile
board/Synology/common/Makefile | 2 +- board/Synology/common/legacy.c | 1 + 2 files changed, 2 insertions(+), 1 deletion(-)
Signature · 1 line
2.52.0
PATCH v2 1/2 board: Synology: legacy.c: Include asm/io.h
Some boards building this source define CFG_SYS_TCLK as a term involving readl() which is undefined otherwise.
--- board/Synology/common/legacy.c | 1 + 1 file changed, 1 insertion(+)
board/Synology/common/legacy.c +1 -0
@@ -10,6 +10,7 @@#include <vsprintf.h> #include <env.h> #include <net.h> +#include <asm/io.h> #include <asm/setup.h> #include "legacy.h"
Signature · 1 line
2.52.0
Re: [PATCH v2 1/2] board: Synology: legacy.c: Include asm/io.h
Quoted 4 lines · Phil Sutter
Some boards building this source define
CFG_SYS_TCLKas a term involvingreadl()which is undefined otherwise.Signed-off-by Phil Sutter <[email protected]>
Applied to u-boot-marvell/next
Thanks,
Stefan
PATCH v2 2/2 board: Synology: common: Fix typo in Makefile
In reply to Phil SutterDue to this, legacy.c was neither compiled nor linked into the binary and thus booting legacy DS414 firmware failed. Missing atag setup led to no console output (and probably stalled boot) after:
| Uncompressing Linux... done, booting the kernel.
--- board/Synology/common/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
board/Synology/common/Makefile +1 -1
@@ -2,4 +2,4 @@ # # Copyright (C) 2021 Phil Sutter <[email protected]> -obj-$(SUPPORT_PASSING_ATAGS) += legacy.o +obj-$(CONFIG_SUPPORT_PASSING_ATAGS) += legacy.o
Signature · 1 line
2.52.0
Re: [PATCH v2 2/2] board: Synology: common: Fix typo in Makefile
Quoted 8 lines · Phil Sutter
Due to this,
legacy.cwas neither compiled nor linked into the binary and thus booting legacy DS414 firmware failed. Missing atag setup led to no console output (and probably stalled boot) after:| Uncompressing Linux... done, booting the kernel.
Fixes 9774462e34faa ("arm: Disable ATAGs support")Signed-off-by Phil Sutter <[email protected]>
Applied to u-boot-marvell/next
Thanks,
Stefan