[PULL] u-boot-mips for u-boot/next (v2022.10)
Gitlab CI: https://source.denx.de/u-boot/custodians/u-boot-mips/-/pipelines/12656
Azure: https://dev.azure.com/danielschwierzeck/u-boot/_build/results?buildId=30&...
The following changes since commit 2d2c61ff0460740d9ec5a44dbef9255a8c690696:
Merge tag 'efi-2022-07-rc7' of https://source.denx.de/u-boot/custodians/u-boot-efi (2022-07-06 09:17:08 -0400)
are available in the Git repository at:
https://source.denx.de/u-boot/custodians/u-boot-mips.git/ tags/mips-pull-2022-07-08
for you to fetch changes up to e5fc4022af3cfd59e3459276305671a595ac5ff0:
MAINTAINERS: update maintainer for MediaTek MIPS platform (2022-07-08 15:13:29 +0200)
---------------------------------------------------------------- - MIPS: add drivers and board support for Mediatek MT7621 SoC
---------------------------------------------------------------- Weijie Gao (25): mips: add asm/mipsmtregs.h for MIPS multi-threading mips: add more definitions for asm/cm.h mips: add __image_copy_len for SPL linker script mips: add support for noncached_alloc() mips: mtmips: add support for MediaTek MT7621 SoC mips: mtmips: add two reference boards for mt7621 doc: mediatek: add documentation for mt7621 reference boards clk: mtmips: add clock driver for MediaTek MT7621 SoC reset: mtmips: add reset controller support for MediaTek MT7621 SoC pinctrl: mtmips: add support for MediaTek MT7621 SoC usb: xhci-mtk: add support for MediaTek MT7621 SoC phy: mtk-tphy: add support for MediaTek MT7621 SoC spi: add support for MediaTek MT7621 SoC gpio: add support for MediaTek MT7621 SoC watchdog: add support for MediaTek MT7621 SoC mmc: mediatek: add support for MediaTek MT7621 SoC net: mediatek: remap iobase address net: mediatek: use regmap api to modify ethsys registers net: mediatek: add support for MediaTek MT7621 SoC nand: raw: add support for MediaTek MT7621 SoC spl: allow using nand base without standard nand driver spl: spl_legacy: fix the use of SPL_COPY_PAYLOAD_ONLY spl: nand: support loading legacy image with payload compressed tools: mtk_image: add support for MT7621 NAND images MAINTAINERS: update maintainer for MediaTek MIPS platform
MAINTAINERS | 8 + arch/mips/cpu/u-boot-spl.lds | 3 + arch/mips/dts/Makefile | 2 + arch/mips/dts/mediatek,mt7621-nand-rfb.dts | 67 ++ arch/mips/dts/mediatek,mt7621-rfb.dts | 82 ++ arch/mips/dts/mt7621-u-boot.dtsi | 111 +++ arch/mips/dts/mt7621.dtsi | 349 +++++++ arch/mips/include/asm/cm.h | 67 ++ arch/mips/include/asm/mipsmtregs.h | 142 +++ arch/mips/include/asm/system.h | 20 + arch/mips/lib/cache.c | 43 + arch/mips/mach-mtmips/Kconfig | 49 +- arch/mips/mach-mtmips/Makefile | 4 + arch/mips/mach-mtmips/cpu.c | 2 +- arch/mips/mach-mtmips/mt7621/Kconfig | 115 +++ arch/mips/mach-mtmips/mt7621/Makefile | 14 + arch/mips/mach-mtmips/mt7621/init.c | 246 +++++ arch/mips/mach-mtmips/mt7621/mt7621.h | 229 +++++ arch/mips/mach-mtmips/mt7621/serial.c | 23 + arch/mips/mach-mtmips/mt7621/spl/Makefile | 9 + arch/mips/mach-mtmips/mt7621/spl/cps.c | 153 +++ arch/mips/mach-mtmips/mt7621/spl/dram.c | 153 +++ arch/mips/mach-mtmips/mt7621/spl/dram.h | 39 + arch/mips/mach-mtmips/mt7621/spl/launch.c | 100 ++ arch/mips/mach-mtmips/mt7621/spl/launch.h | 52 + arch/mips/mach-mtmips/mt7621/spl/launch_ll.S | 339 +++++++ arch/mips/mach-mtmips/mt7621/spl/serial.c | 24 + arch/mips/mach-mtmips/mt7621/spl/spl.c | 95 ++ arch/mips/mach-mtmips/mt7621/spl/start.S | 226 +++++ arch/mips/mach-mtmips/mt7621/sram_init.S | 22 + arch/mips/mach-mtmips/mt7621/tpl/Makefile | 4 + arch/mips/mach-mtmips/mt7621/tpl/start.S | 161 ++++ arch/mips/mach-mtmips/mt7621/tpl/tpl.c | 144 +++ board/mediatek/mt7621/MAINTAINERS | 8 + board/mediatek/mt7621/Makefile | 3 + board/mediatek/mt7621/board.c | 6 + common/spl/Kconfig | 2 +- common/spl/spl_legacy.c | 21 +- common/spl/spl_nand.c | 27 + configs/mt7621_nand_rfb_defconfig | 85 ++ configs/mt7621_rfb_defconfig | 82 ++ doc/board/index.rst | 1 + doc/board/mediatek/index.rst | 9 + doc/board/mediatek/mt7621.rst | 48 + drivers/clk/mtmips/Makefile | 1 + drivers/clk/mtmips/clk-mt7621.c | 288 ++++++ drivers/gpio/Kconfig | 2 +- drivers/mmc/mtk-sd.c | 13 + drivers/mtd/nand/raw/Kconfig | 17 +- drivers/mtd/nand/raw/Makefile | 2 + drivers/mtd/nand/raw/mt7621_nand.c | 1205 ++++++++++++++++++++++++ drivers/mtd/nand/raw/mt7621_nand.h | 29 + drivers/mtd/nand/raw/mt7621_nand_spl.c | 237 +++++ drivers/net/mtk_eth.c | 45 +- drivers/phy/Kconfig | 2 +- drivers/pinctrl/mtmips/Kconfig | 9 + drivers/pinctrl/mtmips/Makefile | 1 + drivers/pinctrl/mtmips/pinctrl-mt7621.c | 306 ++++++ drivers/pinctrl/mtmips/pinctrl-mtmips-common.c | 4 +- drivers/pinctrl/mtmips/pinctrl-mtmips-common.h | 12 + drivers/spi/Kconfig | 2 +- drivers/usb/host/Kconfig | 2 +- drivers/watchdog/Kconfig | 2 +- include/configs/mt7621.h | 65 ++ include/dt-bindings/clock/mt7621-clk.h | 46 + include/dt-bindings/reset/mt7621-reset.h | 38 + tools/mtk_image.c | 182 ++++ tools/mtk_image.h | 24 + 68 files changed, 5887 insertions(+), 36 deletions(-) create mode 100644 arch/mips/dts/mediatek,mt7621-nand-rfb.dts create mode 100644 arch/mips/dts/mediatek,mt7621-rfb.dts create mode 100644 arch/mips/dts/mt7621-u-boot.dtsi create mode 100644 arch/mips/dts/mt7621.dtsi create mode 100644 arch/mips/include/asm/mipsmtregs.h create mode 100644 arch/mips/mach-mtmips/mt7621/Kconfig create mode 100644 arch/mips/mach-mtmips/mt7621/Makefile create mode 100644 arch/mips/mach-mtmips/mt7621/init.c create mode 100644 arch/mips/mach-mtmips/mt7621/mt7621.h create mode 100644 arch/mips/mach-mtmips/mt7621/serial.c create mode 100644 arch/mips/mach-mtmips/mt7621/spl/Makefile create mode 100644 arch/mips/mach-mtmips/mt7621/spl/cps.c create mode 100644 arch/mips/mach-mtmips/mt7621/spl/dram.c create mode 100644 arch/mips/mach-mtmips/mt7621/spl/dram.h create mode 100644 arch/mips/mach-mtmips/mt7621/spl/launch.c create mode 100644 arch/mips/mach-mtmips/mt7621/spl/launch.h create mode 100644 arch/mips/mach-mtmips/mt7621/spl/launch_ll.S create mode 100644 arch/mips/mach-mtmips/mt7621/spl/serial.c create mode 100644 arch/mips/mach-mtmips/mt7621/spl/spl.c create mode 100644 arch/mips/mach-mtmips/mt7621/spl/start.S create mode 100644 arch/mips/mach-mtmips/mt7621/sram_init.S create mode 100644 arch/mips/mach-mtmips/mt7621/tpl/Makefile create mode 100644 arch/mips/mach-mtmips/mt7621/tpl/start.S create mode 100644 arch/mips/mach-mtmips/mt7621/tpl/tpl.c create mode 100644 board/mediatek/mt7621/MAINTAINERS create mode 100644 board/mediatek/mt7621/Makefile create mode 100644 board/mediatek/mt7621/board.c create mode 100644 configs/mt7621_nand_rfb_defconfig create mode 100644 configs/mt7621_rfb_defconfig create mode 100644 doc/board/mediatek/index.rst create mode 100644 doc/board/mediatek/mt7621.rst create mode 100644 drivers/clk/mtmips/clk-mt7621.c create mode 100644 drivers/mtd/nand/raw/mt7621_nand.c create mode 100644 drivers/mtd/nand/raw/mt7621_nand.h create mode 100644 drivers/mtd/nand/raw/mt7621_nand_spl.c create mode 100644 drivers/pinctrl/mtmips/pinctrl-mt7621.c create mode 100644 include/configs/mt7621.h create mode 100644 include/dt-bindings/clock/mt7621-clk.h create mode 100644 include/dt-bindings/reset/mt7621-reset.h
On Fri, Jul 08, 2022 at 05:21:48PM +0200, Daniel Schwierzeck wrote:
Gitlab CI: https://source.denx.de/u-boot/custodians/u-boot-mips/-/pipelines/12656
Azure: https://dev.azure.com/danielschwierzeck/u-boot/_build/results?buildId=30&...
The following changes since commit 2d2c61ff0460740d9ec5a44dbef9255a8c690696:
Merge tag 'efi-2022-07-rc7' of https://source.denx.de/u-boot/custodians/u-boot-efi (2022-07-06 09:17:08 -0400)
are available in the Git repository at:
https://source.denx.de/u-boot/custodians/u-boot-mips.git/ tags/mips-pull-2022-07-08
for you to fetch changes up to e5fc4022af3cfd59e3459276305671a595ac5ff0:
MAINTAINERS: update maintainer for MediaTek MIPS platform (2022-07-08 15:13:29 +0200)
- MIPS: add drivers and board support for Mediatek MT7621 SoC
OK, we need a few changes here, sorry. There's now migrated CONFIG symbols, most of which are easy to do and I was about to, and then I saw this: #ifdef CONFIG_TPL_BUILD #define CONFIG_SPL_START_S_PATH "arch/mips/mach-mtmips/mt7621/tpl" /* .bss will not be used by TPL */ #define CONFIG_SPL_BSS_START_ADDR 0x80000000 #define CONFIG_SPL_BSS_MAX_SIZE 0 #else #define CONFIG_SPL_START_S_PATH "arch/mips/mach-mtmips/mt7621/spl" #define CONFIG_SPL_BSS_START_ADDR 0x80140000 #define CONFIG_SPL_BSS_MAX_SIZE 0x80000 #define CONFIG_SPL_MAX_SIZE 0x30000 #endif
No, you cannot abuse CONFIG_TPL_BUILD to set CONFIG_SPL_foo. Those need to become CONFIG_TPL_foo, and set appropriately. And then for [ST]PL_START_S_PATH, you need to set head-$(CONFIG_ARCH_xxx) to the right file, for SPL/TPL instead.
Hi Tom,
On 08.07.22 18:50, Tom Rini wrote:
On Fri, Jul 08, 2022 at 05:21:48PM +0200, Daniel SchwierzeckHi Tom, wrote:
Gitlab CI: https://source.denx.de/u-boot/custodians/u-boot-mips/-/pipelines/12656
Azure: https://dev.azure.com/danielschwierzeck/u-boot/_build/results?buildId=30&...
The following changes since commit 2d2c61ff0460740d9ec5a44dbef9255a8c690696:
Merge tag 'efi-2022-07-rc7' of https://source.denx.de/u-boot/custodians/u-boot-efi (2022-07-06 09:17:08 -0400)
are available in the Git repository at:
https://source.denx.de/u-boot/custodians/u-boot-mips.git/ tags/mips-pull-2022-07-08
for you to fetch changes up to e5fc4022af3cfd59e3459276305671a595ac5ff0:
MAINTAINERS: update maintainer for MediaTek MIPS platform (2022-07-08 15:13:29 +0200)
- MIPS: add drivers and board support for Mediatek MT7621 SoC
OK, we need a few changes here, sorry. There's now migrated CONFIG symbols, most of which are easy to do and I was about to, and then I saw this: #ifdef CONFIG_TPL_BUILD #define CONFIG_SPL_START_S_PATH "arch/mips/mach-mtmips/mt7621/tpl" /* .bss will not be used by TPL */ #define CONFIG_SPL_BSS_START_ADDR 0x80000000 #define CONFIG_SPL_BSS_MAX_SIZE 0 #else #define CONFIG_SPL_START_S_PATH "arch/mips/mach-mtmips/mt7621/spl" #define CONFIG_SPL_BSS_START_ADDR 0x80140000 #define CONFIG_SPL_BSS_MAX_SIZE 0x80000 #define CONFIG_SPL_MAX_SIZE 0x30000 #endif
No, you cannot abuse CONFIG_TPL_BUILD to set CONFIG_SPL_foo. Those need to become CONFIG_TPL_foo, and set appropriately. And then for [ST]PL_START_S_PATH, you need to set head-$(CONFIG_ARCH_xxx) to the right file, for SPL/TPL instead.
do you already have patches for converting stuff like CONFIG_SPL_BSS_START_ADDR prepared? Than I would wait with the pull request until those patches are applied to mainline and I would adapt the MT7621 patches.
I could also assist with converting CONFIG_SPL_START_S_PATH because that's only used on MIPS and one ARM board.
On Sat, Jul 09, 2022 at 02:01:01PM +0200, Daniel Schwierzeck wrote:
Hi Tom,
On 08.07.22 18:50, Tom Rini wrote:
On Fri, Jul 08, 2022 at 05:21:48PM +0200, Daniel SchwierzeckHi Tom, wrote:
Gitlab CI: https://source.denx.de/u-boot/custodians/u-boot-mips/-/pipelines/12656
Azure: https://dev.azure.com/danielschwierzeck/u-boot/_build/results?buildId=30&...
The following changes since commit 2d2c61ff0460740d9ec5a44dbef9255a8c690696:
Merge tag 'efi-2022-07-rc7' of https://source.denx.de/u-boot/custodians/u-boot-efi (2022-07-06 09:17:08 -0400)
are available in the Git repository at:
https://source.denx.de/u-boot/custodians/u-boot-mips.git/ tags/mips-pull-2022-07-08
for you to fetch changes up to e5fc4022af3cfd59e3459276305671a595ac5ff0:
MAINTAINERS: update maintainer for MediaTek MIPS platform (2022-07-08 15:13:29 +0200)
- MIPS: add drivers and board support for Mediatek MT7621 SoC
OK, we need a few changes here, sorry. There's now migrated CONFIG symbols, most of which are easy to do and I was about to, and then I saw this: #ifdef CONFIG_TPL_BUILD #define CONFIG_SPL_START_S_PATH "arch/mips/mach-mtmips/mt7621/tpl" /* .bss will not be used by TPL */ #define CONFIG_SPL_BSS_START_ADDR 0x80000000 #define CONFIG_SPL_BSS_MAX_SIZE 0 #else #define CONFIG_SPL_START_S_PATH "arch/mips/mach-mtmips/mt7621/spl" #define CONFIG_SPL_BSS_START_ADDR 0x80140000 #define CONFIG_SPL_BSS_MAX_SIZE 0x80000 #define CONFIG_SPL_MAX_SIZE 0x30000 #endif
No, you cannot abuse CONFIG_TPL_BUILD to set CONFIG_SPL_foo. Those need to become CONFIG_TPL_foo, and set appropriately. And then for [ST]PL_START_S_PATH, you need to set head-$(CONFIG_ARCH_xxx) to the right file, for SPL/TPL instead.
do you already have patches for converting stuff like CONFIG_SPL_BSS_START_ADDR prepared? Than I would wait with the pull request until those patches are applied to mainline and I would adapt the MT7621 patches.
I could also assist with converting CONFIG_SPL_START_S_PATH because that's only used on MIPS and one ARM board.
See what's in -next already? SPL_BSS_START_ADDR is migrated, but there were no TPL_BSS_START_ADDR cases. For START_S_PATH, the platform just needs to be reworked as I suggested above I believe, to achieve the desired result.
On 09.07.22 14:43, Tom Rini wrote:
On Sat, Jul 09, 2022 at 02:01:01PM +0200, Daniel Schwierzeck wrote:
Hi Tom,
On 08.07.22 18:50, Tom Rini wrote:
On Fri, Jul 08, 2022 at 05:21:48PM +0200, Daniel SchwierzeckHi Tom, wrote:
Gitlab CI: https://source.denx.de/u-boot/custodians/u-boot-mips/-/pipelines/12656
Azure: https://dev.azure.com/danielschwierzeck/u-boot/_build/results?buildId=30&...
The following changes since commit 2d2c61ff0460740d9ec5a44dbef9255a8c690696:
Merge tag 'efi-2022-07-rc7' of https://source.denx.de/u-boot/custodians/u-boot-efi (2022-07-06 09:17:08 -0400)are available in the Git repository at:
https://source.denx.de/u-boot/custodians/u-boot-mips.git/ tags/mips-pull-2022-07-08for you to fetch changes up to e5fc4022af3cfd59e3459276305671a595ac5ff0:
MAINTAINERS: update maintainer for MediaTek MIPS platform (2022-07-08 15:13:29 +0200)
- MIPS: add drivers and board support for Mediatek MT7621 SoC
OK, we need a few changes here, sorry. There's now migrated CONFIG symbols, most of which are easy to do and I was about to, and then I saw this: #ifdef CONFIG_TPL_BUILD #define CONFIG_SPL_START_S_PATH "arch/mips/mach-mtmips/mt7621/tpl" /* .bss will not be used by TPL */ #define CONFIG_SPL_BSS_START_ADDR 0x80000000 #define CONFIG_SPL_BSS_MAX_SIZE 0 #else #define CONFIG_SPL_START_S_PATH "arch/mips/mach-mtmips/mt7621/spl" #define CONFIG_SPL_BSS_START_ADDR 0x80140000 #define CONFIG_SPL_BSS_MAX_SIZE 0x80000 #define CONFIG_SPL_MAX_SIZE 0x30000 #endif
No, you cannot abuse CONFIG_TPL_BUILD to set CONFIG_SPL_foo. Those need to become CONFIG_TPL_foo, and set appropriately. And then for [ST]PL_START_S_PATH, you need to set head-$(CONFIG_ARCH_xxx) to the right file, for SPL/TPL instead.
do you already have patches for converting stuff like CONFIG_SPL_BSS_START_ADDR prepared? Than I would wait with the pull request until those patches are applied to mainline and I would adapt the MT7621 patches.
I could also assist with converting CONFIG_SPL_START_S_PATH because that's only used on MIPS and one ARM board.
See what's in -next already? SPL_BSS_START_ADDR is migrated, but there were no TPL_BSS_START_ADDR cases. For START_S_PATH, the platform just needs to be reworked as I suggested above I believe, to achieve the desired result.
sorry, didn't check the latest updates in -next and the series was too long on the list ;)
TPL_BSS_START_ADDR shouldn't be necessary because MT7621 doesn't use BSS in TPL, the defined values where just dummy values.
I rechecked and removed all migrated Kconfig options from mt7621.h and pushed an update to u-boot-mips/next. Weijie could you verify that? If all is okay, I'll prepare a new pull request, otherwise please send me a v7 patch series.
Hi Daniel,
On Sat, 2022-07-09 at 18:22 +0200, Daniel Schwierzeck wrote:
On 09.07.22 14:43, Tom Rini wrote:
On Sat, Jul 09, 2022 at 02:01:01PM +0200, Daniel Schwierzeck wrote:
Hi Tom,
On 08.07.22 18:50, Tom Rini wrote:
On Fri, Jul 08, 2022 at 05:21:48PM +0200, Daniel SchwierzeckHi Tom, wrote:
Gitlab CI: https://source.denx.de/u-boot/custodians/u-boot-mips/-/pi pelines/12656
Azure: https://dev.azure.com/danielschwierzeck/u-boot/_build/res ults?buildId=30&view=results
The following changes since commit 2d2c61ff0460740d9ec5a44dbef9255a8c690696:
Merge tag 'efi-2022-07-rc7' of https://source.denx.de/u-boot/custodians/u-boot-efi (2022-07-06 09:17:08 -0400)
are available in the Git repository at:
https://source.denx.de/u-boot/custodians/u-boot-mips.git/tags/mips-pull-2022-07-08
for you to fetch changes up to e5fc4022af3cfd59e3459276305671a595ac5ff0:
MAINTAINERS: update maintainer for MediaTek MIPS platform(2022-07-08 15:13:29 +0200)
- MIPS: add drivers and board support for Mediatek MT7621 SoC
OK, we need a few changes here, sorry. There's now migrated CONFIG symbols, most of which are easy to do and I was about to, and then I saw this: #ifdef CONFIG_TPL_BUILD #define CONFIG_SPL_START_S_PATH "arch/mips/mach- mtmips/mt7621/tpl" /* .bss will not be used by TPL */ #define CONFIG_SPL_BSS_START_ADDR 0x80000000 #define CONFIG_SPL_BSS_MAX_SIZE 0 #else #define CONFIG_SPL_START_S_PATH "arch/mips/mach- mtmips/mt7621/spl" #define CONFIG_SPL_BSS_START_ADDR 0x80140000 #define CONFIG_SPL_BSS_MAX_SIZE 0x80000 #define CONFIG_SPL_MAX_SIZE 0x30000 #endif
No, you cannot abuse CONFIG_TPL_BUILD to set CONFIG_SPL_foo. Those need to become CONFIG_TPL_foo, and set appropriately. And then for [ST]PL_START_S_PATH, you need to set head-$(CONFIG_ARCH_xxx) to the right file, for SPL/TPL instead.
do you already have patches for converting stuff like CONFIG_SPL_BSS_START_ADDR prepared? Than I would wait with the pull request until those patches are applied to mainline and I would adapt the MT7621 patches.
I could also assist with converting CONFIG_SPL_START_S_PATH because that's only used on MIPS and one ARM board.
See what's in -next already? SPL_BSS_START_ADDR is migrated, but there were no TPL_BSS_START_ADDR cases. For START_S_PATH, the platform just needs to be reworked as I suggested above I believe, to achieve the desired result.
sorry, didn't check the latest updates in -next and the series was too long on the list ;)
TPL_BSS_START_ADDR shouldn't be necessary because MT7621 doesn't use BSS in TPL, the defined values where just dummy values.
I rechecked and removed all migrated Kconfig options from mt7621.h and pushed an update to u-boot-mips/next. Weijie could you verify that? If all is okay, I'll prepare a new pull request, otherwise please send me a v7 patch series.
I've test the latest fixups on u-boot-mips/next, and all is ok. thx.
Best Regards, Weijie
Hi Daniel,
This is my personal email address. I found that my previous mail send from my company was still be marked as spam by gmail.
I've tested the latest fixups on u-boot-mips/next, and all is ok. thx.
Best Regards, Weijie
Daniel Schwierzeck daniel.schwierzeck@gmail.com 于2022年7月10日周日 00:23写道：
On 09.07.22 14:43, Tom Rini wrote:
On Sat, Jul 09, 2022 at 02:01:01PM +0200, Daniel Schwierzeck wrote:
Hi Tom,
On 08.07.22 18:50, Tom Rini wrote:
On Fri, Jul 08, 2022 at 05:21:48PM +0200, Daniel SchwierzeckHi Tom, wrote:
Gitlab CI: https://source.denx.de/u-boot/custodians/u-boot-mips/-/pipelines/12656
Azure: https://dev.azure.com/danielschwierzeck/u-boot/_build/results?buildId=30&...
The following changes since commit 2d2c61ff0460740d9ec5a44dbef9255a8c690696:
Merge tag 'efi-2022-07-rc7' of https://source.denx.de/u-boot/custodians/u-boot-efi (2022-07-06 09:17:08 -0400)are available in the Git repository at:
https://source.denx.de/u-boot/custodians/u-boot-mips.git/ tags/mips-pull-2022-07-08for you to fetch changes up to e5fc4022af3cfd59e3459276305671a595ac5ff0:
MAINTAINERS: update maintainer for MediaTek MIPS platform (2022-07-08 15:13:29 +0200)
- MIPS: add drivers and board support for Mediatek MT7621 SoC
OK, we need a few changes here, sorry. There's now migrated CONFIG symbols, most of which are easy to do and I was about to, and then I saw this: #ifdef CONFIG_TPL_BUILD #define CONFIG_SPL_START_S_PATH "arch/mips/mach-mtmips/mt7621/tpl" /* .bss will not be used by TPL */ #define CONFIG_SPL_BSS_START_ADDR 0x80000000 #define CONFIG_SPL_BSS_MAX_SIZE 0 #else #define CONFIG_SPL_START_S_PATH "arch/mips/mach-mtmips/mt7621/spl" #define CONFIG_SPL_BSS_START_ADDR 0x80140000 #define CONFIG_SPL_BSS_MAX_SIZE 0x80000 #define CONFIG_SPL_MAX_SIZE 0x30000 #endif
No, you cannot abuse CONFIG_TPL_BUILD to set CONFIG_SPL_foo. Those need to become CONFIG_TPL_foo, and set appropriately. And then for [ST]PL_START_S_PATH, you need to set head-$(CONFIG_ARCH_xxx) to the right file, for SPL/TPL instead.
do you already have patches for converting stuff like CONFIG_SPL_BSS_START_ADDR prepared? Than I would wait with the pull request until those patches are applied to mainline and I would adapt the MT7621 patches.
I could also assist with converting CONFIG_SPL_START_S_PATH because that's only used on MIPS and one ARM board.
See what's in -next already? SPL_BSS_START_ADDR is migrated, but there were no TPL_BSS_START_ADDR cases. For START_S_PATH, the platform just needs to be reworked as I suggested above I believe, to achieve the desired result.
sorry, didn't check the latest updates in -next and the series was too long on the list ;)
TPL_BSS_START_ADDR shouldn't be necessary because MT7621 doesn't use BSS in TPL, the defined values where just dummy values.
I rechecked and removed all migrated Kconfig options from mt7621.h and pushed an update to u-boot-mips/next. Weijie could you verify that? If all is okay, I'll prepare a new pull request, otherwise please send me a v7 patch series.
--
- Daniel
participants (4)
-
Daniel Schwierzeck -
Tom Rini -
Weijie Gao -
Weijie Gao