From: Daniel Golle <daniel@makrotopia.org>
Date: Fri, 14 Apr 2023 16:54:54 +0000 (+0100)
Subject: uboot-mediatek: fix build for RAVPower RP-WD009
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=00a240e77f6d6b1a57dfba1056167dab9584a43f;p=openwrt%2Fstaging%2Fblocktrron.git

uboot-mediatek: fix build for RAVPower RP-WD009

Updating to U-Boot 2023.04 broke the build for the RAVPower RP-WD009
MT7628 board. This was due to upstream conversion of CONFIG_* to CFG_*
which was not applied to our downstream patch adding support for the
RAVPower RP-WD009 device.

Apply CONFIG_* to CFG_* converion analog to what has been done also
for mt7928_rfb upstream.

Signed-off-by: Daniel Golle <daniel@makrotopia.org>
---

diff --git a/package/boot/uboot-mediatek/patches/420-add-support-for-RAVPower-RP-WD009.patch b/package/boot/uboot-mediatek/patches/420-add-support-for-RAVPower-RP-WD009.patch
index b29b83f807..3cd4d1b2df 100644
--- a/package/boot/uboot-mediatek/patches/420-add-support-for-RAVPower-RP-WD009.patch
+++ b/package/boot/uboot-mediatek/patches/420-add-support-for-RAVPower-RP-WD009.patch
@@ -125,10 +125,12 @@ Subject: [PATCH] add support for RAVPower RP-WD009
 +}
 --- /dev/null
 +++ b/configs/ravpower-rp-wd009-ram_defconfig
-@@ -0,0 +1,68 @@
+@@ -0,0 +1,71 @@
 +CONFIG_MIPS=y
 +CONFIG_SYS_LOAD_ADDR=0x80010000
 +CONFIG_NR_DRAM_BANKS=1
++CONFIG_SYS_MEMTEST_START=0x80100000
++CONFIG_SYS_MEMTEST_END=0x80400000
 +CONFIG_ARCH_MTMIPS=y
 +CONFIG_SOC_MT7628=y
 +CONFIG_MIPS_BOOT_FDT=y
@@ -141,6 +143,7 @@ Subject: [PATCH] add support for RAVPower RP-WD009
 +CONFIG_VERSION_VARIABLE=y
 +CONFIG_BOARD_RAVPOWER_RP_WD009=y
 +CONFIG_SYS_MIPS_TIMER_FREQ=290000000
++CONFIG_SYS_BOOTPARAMS_LEN=0x20000
 +CONFIG_HUSH_PARSER=y
 +CONFIG_CMD_LICENSE=y
 +# CONFIG_CMD_ELF is not set
@@ -196,7 +199,7 @@ Subject: [PATCH] add support for RAVPower RP-WD009
 +CONFIG_SERVERIP="192.168.1.254"
 --- /dev/null
 +++ b/include/configs/ravpower-rp-wd009.h
-@@ -0,0 +1,40 @@
+@@ -0,0 +1,17 @@
 +/* SPDX-License-Identifier: GPL-2.0+ */
 +/*
 + * Copyright (C) 2018 Stefan Roese <sr@denx.de>
@@ -205,37 +208,14 @@ Subject: [PATCH] add support for RAVPower RP-WD009
 +#ifndef __CONFIG_RAVPOWER_RP_WD009_H
 +#define __CONFIG_RAVPOWER_RP_WD009_H
 +
-+/* CPU */
-+#define CONFIG_SYS_MIPS_TIMER_FREQ	290000000
-+
 +/* RAM */
-+#define CONFIG_SYS_SDRAM_BASE		0x80000000
-+
-+#define CONFIG_SYS_INIT_SP_OFFSET	0x400000
++#define CFG_SYS_SDRAM_BASE		0x80000000
 +
-+#ifdef CONFIG_BOOT_RAM
-+#define CONFIG_SKIP_LOWLEVEL_INIT
-+#endif
++#define CFG_SYS_INIT_SP_OFFSET		0x400000
 +
 +/* UART */
-+#define CONFIG_SYS_BAUDRATE_TABLE	{ 9600, 19200, 38400, 57600, 115200, \
++#define CFG_SYS_BAUDRATE_TABLE		{ 9600, 19200, 38400, 57600, 115200, \
 +					  230400, 460800, 921600 }
-+
-+/* RAM */
-+#define CONFIG_SYS_MEMTEST_START	0x80100000
-+#define CONFIG_SYS_MEMTEST_END		0x80400000
-+
-+/* Memory usage */
-+#define CONFIG_SYS_BOOTPARAMS_LEN	(128 * 1024)
-+
-+/* Environment settings */
-+
-+/*
-+ * Environment is right behind U-Boot in flash. Make sure U-Boot
-+ * doesn't grow into the environment area.
-+ */
-+#define CONFIG_BOARD_SIZE_LIMIT		CONFIG_ENV_OFFSET
-+
 +#endif /* __CONFIG_RAVPOWER_RP_WD009_H */
 --- a/arch/mips/mach-mtmips/mt7628/Kconfig
 +++ b/arch/mips/mach-mtmips/mt7628/Kconfig