Skip to contentSkip to conversation

Synology: common: Fix typo and fallout

PATCH In review Phil Sutter 2 participants 5 messages Feb 12 – Jun 10

lore
Share & tools
lore
#0 lore raw

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
#1 lore raw

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
index 2e3aa660eaace..5b7d07bc2eef7 100644
@@ -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
#2 lore raw

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_TCLK as a term involving readl() which is undefined otherwise.

Applied to u-boot-marvell/next

Thanks,
Stefan

#3 lore raw

PATCH v2 2/2 board: Synology: common: Fix typo in Makefile

In reply to Phil Sutter

Due 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.

Fixes 9774462e34faa ("arm: Disable ATAGs support")
---
 board/Synology/common/Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
board/Synology/common/Makefile +1 -1
index f688b5490631c..87be53321ee64 100644
@@ -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
#4 lore raw

Re: [PATCH v2 2/2] board: Synology: common: Fix typo in Makefile

Quoted 8 lines · Phil Sutter

Due 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.

Fixes 9774462e34faa ("arm: Disable ATAGs support")

Applied to u-boot-marvell/next

Thanks,
Stefan