July 2024 - U-Boot

[PATCH v3 00/12] xtensa: Enable qemu-xtensa board
by Jiaxun Yang 05 Jul '24

05 Jul '24

Hi all, This series enabled qemu-xtensa board. For dc232b CPU it needs to be built with toolchain[1]. This is a side product of me investigating architectures physical address != virtual address in U-Boot. Now we can get it covered under CI and regular tests. VirtIO devices are not working as expected, due to U-Boot's assumption on VA == PA everywhere, I'm going to get this fixed later. My Xtensa knowledge is pretty limited, Xtensa people please feel free to point out if I got anything wrong. Thanks [1]: https://github.com/foss-xtensa/toolchain/releases/download/2020.07/x86_64-2… Signed-off-by: Jiaxun Yang <jiaxun.yang(a)flygoat.com> --- Changes in v3: - Wire up CI - Switch to dc233c CPU, which does not have PA != VA issue, to get CI pass first. - Link to v2: https://lore.kernel.org/r/20240522-qemu-xtensa-v2-0-04bf7e42b10b@flygoat.com Changes in v2: - Fix noMMU memory mappings - Addressing Max's comments in other patches - Link to v1: https://lore.kernel.org/r/20240519-qemu-xtensa-v1-0-8fff0cb11c19@flygoat.com --- Jiaxun Yang (12): xtensa: Move dram_init to xtfpga board file xtensa: Correct define of _end symbol xtensa: Implement phys virt conversion for PTP_MMU xtensa: Define PLATFORM_ELFFLAGS xtensa: Bring in semihosting headers and config options drivers: serial: Add xtensa semihosting driver drivers: cpu: Add xtensa CPU driver dts/upsteam: Add Makefile for xtensa board: emulation: New board qemu-xtensa doc: New documentation for qemu-xtensa ci: Wire up qemu_xtensa_dc233c [NFC]: CI Changes .azure-pipelines.yml | 5 +- .gitlab-ci.yml | 6 ++ arch/xtensa/Kconfig | 32 +++++++ arch/xtensa/config.mk | 6 ++ arch/xtensa/cpu/cpu.c | 5 - arch/xtensa/cpu/u-boot.lds | 2 + arch/xtensa/dts/virt-u-boot.dtsi | 17 ++++ arch/xtensa/include/asm/addrspace.h | 2 + arch/xtensa/include/asm/io.h | 32 +++++++ arch/xtensa/include/asm/ldscript.h | 1 - arch/xtensa/include/asm/platform/simcall-gdbio.h | 34 +++++++ arch/xtensa/include/asm/platform/simcall-iss.h | 73 ++++++++++++++ arch/xtensa/include/asm/platform/simcall.h | 110 +++++++++++++++++++++ board/cadence/xtfpga/xtfpga.c | 5 + board/emulation/qemu-xtensa/Kconfig | 43 +++++++++ board/emulation/qemu-xtensa/MAINTAINERS | 8 ++ board/emulation/qemu-xtensa/Makefile | 5 + board/emulation/qemu-xtensa/qemu-xtensa.c | 60 ++++++++++++ configs/qemu-xtensa-dc233c_defconfig | 32 +++++++ doc/board/emulation/index.rst | 1 + doc/board/emulation/qemu-xtensa.rst | 33 +++++++ drivers/cpu/Kconfig | 6 ++ drivers/cpu/Makefile | 1 + drivers/cpu/xtensa_cpu.c | 117 +++++++++++++++++++++++ drivers/serial/Kconfig | 18 +++- drivers/serial/Makefile | 1 + drivers/serial/serial_xtensa_semihosting.c | 92 ++++++++++++++++++ dts/upstream/src/xtensa/Makefile | 14 +++ include/configs/qemu-xtensa.h | 36 +++++++ 29 files changed, 789 insertions(+), 8 deletions(-) --- base-commit: 3be9f399e911cfc437a37ac826441f1d96da1c9b change-id: 20240519-qemu-xtensa-5fb95bb474e9 Best regards, -- Jiaxun Yang <jiaxun.yang(a)flygoat.com>

2 13

[PATCH] CI: Make pytest export JUnitXML
by Tom Rini 04 Jul '24

04 Jul '24

Both GitLab and Azure (and other CI systems) have native support for displaying JUnitXML test report results. The pytest framework that we use can generate these reports. Change our CI tests so that they will generate these reports and then have the respective CI platform pick them up. We write to different locations because of where each CI is (and isn't) able to easily pass things along. Signed-off-by: Tom Rini <trini(a)konsulko.com> --- .azure-pipelines.yml | 12 +++++++++++- .gitlab-ci.yml | 5 ++++- 2 files changed, 15 insertions(+), 2 deletions(-) diff --git a/.azure-pipelines.yml b/.azure-pipelines.yml index c43bb51066a5..fff78785ee92 100644 --- a/.azure-pipelines.yml +++ b/.azure-pipelines.yml @@ -287,7 +287,7 @@ stages: export PATH=/opt/qemu/bin:/tmp/uboot-test-hooks/bin:\${PATH} export PYTHONPATH=/tmp/uboot-test-hooks/py/travis-ci # "\${var:+"-k \$var"}" expands to "" if \$var is empty, "-k \$var" if not - ./test/py/test.py -ra -o cache_dir="\$UBOOT_TRAVIS_BUILD_DIR"/.pytest_cache --bd \${TEST_PY_BD} \${TEST_PY_ID} \${TEST_PY_TEST_SPEC:+"-k \${TEST_PY_TEST_SPEC}"} --build-dir "\$UBOOT_TRAVIS_BUILD_DIR" --report-dir "\$UBOOT_TRAVIS_BUILD_DIR" + ./test/py/test.py -ra -o cache_dir="\$UBOOT_TRAVIS_BUILD_DIR"/.pytest_cache --bd \${TEST_PY_BD} \${TEST_PY_ID} \${TEST_PY_TEST_SPEC:+"-k \${TEST_PY_TEST_SPEC}"} --build-dir "\$UBOOT_TRAVIS_BUILD_DIR" --report-dir "\$UBOOT_TRAVIS_BUILD_DIR" --junitxml=\$(System.DefaultWorkingDirectory)/results.xml # the below corresponds to .gitlab-ci.yml "after_script" rm -rf /tmp/uboot-test-hooks /tmp/venv EOF @@ -371,6 +371,7 @@ stages: docker run "$@" --device /dev/fuse:/dev/fuse \ -v $PWD:$(work_dir) \ -v $(Pipeline.Workspace):$(Pipeline.Workspace) \ + -v $(System.DefaultWorkingDirectory):$(System.DefaultWorkingDirectory) \ -e WORK_DIR="${WORK_DIR}" \ -e TEST_PY_BD="${TEST_PY_BD}" \ -e TEST_PY_ID="${TEST_PY_ID}" \ @@ -378,6 +379,10 @@ stages: -e OVERRIDE="${OVERRIDE}" \ -e BUILD_ENV="${BUILD_ENV}" $(ci_runner_image) \ $(Pipeline.Workspace)/testsh/test.sh + - task: PublishTestResults@2 + inputs: + testResultsFormat: 'JUnit' + testResultsFiles: 'results.xml' - stage: test_py_qemu jobs: @@ -495,6 +500,7 @@ stages: docker run "$@" --device /dev/fuse:/dev/fuse \ -v $PWD:$(work_dir) \ -v $(Pipeline.Workspace):$(Pipeline.Workspace) \ + -v $(System.DefaultWorkingDirectory):$(System.DefaultWorkingDirectory) \ -e WORK_DIR="${WORK_DIR}" \ -e TEST_PY_BD="${TEST_PY_BD}" \ -e TEST_PY_ID="${TEST_PY_ID}" \ @@ -503,6 +509,10 @@ stages: -e BUILD_ENV="${BUILD_ENV}" $(ci_runner_image) \ $(Pipeline.Workspace)/testsh/test.sh retryCountOnTaskFailure: 2 # QEMU may be too slow, etc. + - task: PublishTestResults@2 + inputs: + testResultsFormat: 'JUnit' + testResultsFiles: 'results.xml' - stage: world_build jobs: diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 165f765a8332..a6c5040239ae 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -41,7 +41,7 @@ stages: fi after_script: - - cp -v /tmp/${TEST_PY_BD}/*.{html,css} . + - cp -v /tmp/${TEST_PY_BD}/*.{html,css,xml} . - rm -rf /tmp/uboot-test-hooks /tmp/venv script: # If we've been asked to use clang only do one configuration. @@ -83,11 +83,14 @@ stages: ./test/py/test.py -ra --bd ${TEST_PY_BD} ${TEST_PY_ID} ${TEST_PY_TEST_SPEC:+"-k ${TEST_PY_TEST_SPEC}"} --build-dir "$UBOOT_TRAVIS_BUILD_DIR" + --junitxml=/tmp/${TEST_PY_BD}/results.xml artifacts: when: always paths: - "*.html" - "*.css" + reports: + junit: results.xml expire_in: 1 week .world_build: -- 2.34.1

2 2

[PATCH] test/py/tests: Update some network dependencies
by Tom Rini 04 Jul '24

04 Jul '24

On tests which require "tftpboot" we need to depend not on cmd_net but rather cmd_tftpboot. And on tests which require cmd_pxe we do not need to also depend on cmd_net as this should be handled already via Kconfig logic. Signed-off-by: Tom Rini <trini(a)konsulko.com> --- test/py/tests/test_net.py | 5 ++--- test/py/tests/test_net_boot.py | 5 +---- 2 files changed, 3 insertions(+), 7 deletions(-) diff --git a/test/py/tests/test_net.py b/test/py/tests/test_net.py index 038a473b2394..ad143c19b0d2 100644 --- a/test/py/tests/test_net.py +++ b/test/py/tests/test_net.py @@ -254,7 +254,7 @@ def test_net_network_discovery(u_boot_console): assert 'Set gatewayip6:' in output assert '0000:0000:0000:0000:0000:0000:0000:0000' not in output -(a)pytest.mark.buildconfigspec('cmd_net') +(a)pytest.mark.buildconfigspec('cmd_tftpboot') def test_net_tftpboot(u_boot_console): """Test the tftpboot command. @@ -335,7 +335,6 @@ def test_net_nfs(u_boot_console): output = u_boot_console.run_command('crc32 %x $filesize' % addr) assert expected_crc in output -(a)pytest.mark.buildconfigspec("cmd_net") @pytest.mark.buildconfigspec("cmd_pxe") def test_net_pxe_get(u_boot_console): """Test the pxe get command. @@ -391,7 +390,7 @@ def test_net_pxe_get(u_boot_console): assert "Config file 'default.boot' found" in output @pytest.mark.buildconfigspec("cmd_crc32") -(a)pytest.mark.buildconfigspec("cmd_net") +(a)pytest.mark.buildconfigspec("cmd_tftpboot") @pytest.mark.buildconfigspec("cmd_tftpput") def test_net_tftpput(u_boot_console): """Test the tftpput command. diff --git a/test/py/tests/test_net_boot.py b/test/py/tests/test_net_boot.py index 4729ccf07feb..63309fe82e12 100644 --- a/test/py/tests/test_net_boot.py +++ b/test/py/tests/test_net_boot.py @@ -156,7 +156,7 @@ def setup_tftpboot_boot(u_boot_console): return addr, timeout, pattern, chk_type, chk_pattern, config -(a)pytest.mark.buildconfigspec('cmd_net') +(a)pytest.mark.buildconfigspec('cmd_tftpboot') def test_net_tftpboot_boot(u_boot_console): """Boot the loaded image @@ -209,7 +209,6 @@ def setup_pxe_boot(u_boot_console): return f, bootfile -(a)pytest.mark.buildconfigspec('cmd_net') @pytest.mark.buildconfigspec('cmd_pxe') def test_net_pxe_boot(u_boot_console): """Test the pxe boot command. @@ -261,7 +260,6 @@ def test_net_pxe_boot(u_boot_console): u_boot_console.drain_console() u_boot_console.cleanup_spawn() -(a)pytest.mark.buildconfigspec('cmd_net') @pytest.mark.buildconfigspec('cmd_pxe') def test_net_pxe_boot_config(u_boot_console): """Test the pxe boot command by selecting different combination of labels @@ -341,7 +339,6 @@ def test_net_pxe_boot_config(u_boot_console): u_boot_console.drain_console() u_boot_console.cleanup_spawn() -(a)pytest.mark.buildconfigspec('cmd_net') @pytest.mark.buildconfigspec('cmd_pxe') def test_net_pxe_boot_config_invalid(u_boot_console): """Test the pxe boot command by selecting invalid label -- 2.34.1

1 1

[PATCH] efi_loader: adjust config options for capsule updates
by Ilias Apalodimas 04 Jul '24

04 Jul '24

EFI_IGNORE_OSINDICATIONS is used to ignore OsIndications if setvariable at runtime is not supported and allow the platform to perform capsule updates on disk. With the recent changes boards can conditionally enable setvariable at runtime using EFI_RT_VOLATILE_STORE. Let's make that visible in our Kconfigs and enable EFI_IGNORE_OSINDICATIONS when set variable at runtime is disabled. Since EFI_RT_VOLATILE_STORE needs help from the OS to persist the variables, allow users to ignore OsIndications even if setvariable at runtime is enabled. Signed-off-by: Ilias Apalodimas <ilias.apalodimas(a)linaro.org> --- lib/efi_loader/Kconfig | 1 + 1 file changed, 1 insertion(+) diff --git a/lib/efi_loader/Kconfig b/lib/efi_loader/Kconfig index ee71f417147a..6006e845cb1f 100644 --- a/lib/efi_loader/Kconfig +++ b/lib/efi_loader/Kconfig @@ -220,6 +220,7 @@ config EFI_CAPSULE_ON_DISK config EFI_IGNORE_OSINDICATIONS bool "Ignore OsIndications for CapsuleUpdate on-disk" depends on EFI_CAPSULE_ON_DISK + default y if !EFI_RT_VOLATILE_STORE help There are boards where U-Boot does not support SetVariable at runtime. Select this option if you want to use the capsule-on-disk feature -- 2.43.0

2 5

[PATCH] clk: Propagate clk_set_rate() if CLK_SET_PARENT_RATE present for gate and mux
by Michael Trimarchi 04 Jul '24

04 Jul '24

Gate and mux does not have .set_rate operation, but they could have CLK_SET_PARENT_RATE flag set. In that case it's usually possible to find a parent up the tree which is capable of setting the rate (div, pll, etc). Add clk_generic_set_rate to allow them to trasverse the clock tree. Cc: Sam Protsenko <semen.protsenko(a)linaro.org> Signed-off-by: Michael Trimarchi <michael(a)amarulasolutions.com> --- drivers/clk/clk-gate.c | 1 + drivers/clk/clk-mux.c | 2 +- drivers/clk/clk-uclass.c | 20 ++++++++++++++++++++ drivers/clk/clk.c | 9 +++++++++ 4 files changed, 31 insertions(+), 1 deletion(-) diff --git a/drivers/clk/clk-gate.c b/drivers/clk/clk-gate.c index cfd90b717e7..c86083ac5a3 100644 --- a/drivers/clk/clk-gate.c +++ b/drivers/clk/clk-gate.c @@ -116,6 +116,7 @@ const struct clk_ops clk_gate_ops = { .enable = clk_gate_enable, .disable = clk_gate_disable, .get_rate = clk_generic_get_rate, + .set_rate = clk_generic_set_rate, }; struct clk *clk_register_gate(struct device *dev, const char *name, diff --git a/drivers/clk/clk-mux.c b/drivers/clk/clk-mux.c index e3481be95fa..f99a67ebd35 100644 --- a/drivers/clk/clk-mux.c +++ b/drivers/clk/clk-mux.c @@ -151,13 +151,13 @@ static int clk_mux_set_parent(struct clk *clk, struct clk *parent) #else writel(reg, mux->reg); #endif - return 0; } const struct clk_ops clk_mux_ops = { .get_rate = clk_generic_get_rate, .set_parent = clk_mux_set_parent, + .set_rate = clk_generic_set_rate, }; struct clk *clk_hw_register_mux_table(struct device *dev, const char *name, diff --git a/drivers/clk/clk-uclass.c b/drivers/clk/clk-uclass.c index ed6e60bc484..638864e6774 100644 --- a/drivers/clk/clk-uclass.c +++ b/drivers/clk/clk-uclass.c @@ -517,6 +517,26 @@ ulong clk_get_parent_rate(struct clk *clk) return pclk->rate; } +ulong clk_set_parent_rate(struct clk *clk, ulong rate) +{ + const struct clk_ops *ops; + struct clk *pclk; + + debug("%s(clk=%p)\n", __func__, clk); + if (!clk_valid(clk)) + return 0; + + pclk = clk_get_parent(clk); + if (IS_ERR(pclk)) + return -ENODEV; + + ops = clk_dev_ops(pclk->dev); + if (!ops->set_rate) + return -ENOSYS; + + return clk_set_rate(pclk, rate); +} + ulong clk_round_rate(struct clk *clk, ulong rate) { const struct clk_ops *ops; diff --git a/drivers/clk/clk.c b/drivers/clk/clk.c index 6ede1b4d4dc..febd5314df2 100644 --- a/drivers/clk/clk.c +++ b/drivers/clk/clk.c @@ -14,6 +14,7 @@ #include <dm/uclass.h> #include <dm/lists.h> #include <dm/device-internal.h> +#include <linux/clk-provider.h> int clk_register(struct clk *clk, const char *drv_name, const char *name, const char *parent_name) @@ -61,6 +62,14 @@ ulong clk_generic_get_rate(struct clk *clk) return clk_get_parent_rate(clk); } +ulong clk_generic_set_rate(struct clk *clk, ulong rate) +{ + if (clk->flags & CLK_SET_RATE_PARENT) + return clk_set_parent_rate(clk, rate); + + return clk_get_parent_rate(clk); +} + const char *clk_hw_get_name(const struct clk *hw) { assert(hw); -- 2.43.0

1 0

[PATCH v2] test: test for ignore OsIndications
by Ilias Apalodimas 04 Jul '24

04 Jul '24

The tests we currently have expect the firmware update to fail when OsIndications is not set properly. However, we have a Kconfig flag that explicitly ignores that variable. Adjust the tests accordingly Signed-off-by: Ilias Apalodimas <ilias.apalodimas(a)linaro.org> --- Changes since v1: - v1 was rebased incorrectly and only sent half of the patch .../test_capsule_firmware_raw.py | 21 ++++++++++++++----- 1 file changed, 16 insertions(+), 5 deletions(-) diff --git a/test/py/tests/test_efi_capsule/test_capsule_firmware_raw.py b/test/py/tests/test_efi_capsule/test_capsule_firmware_raw.py index a5b5c8a3853a..f3a2dff5c2c8 100644 --- a/test/py/tests/test_efi_capsule/test_capsule_firmware_raw.py +++ b/test/py/tests/test_efi_capsule/test_capsule_firmware_raw.py @@ -76,7 +76,7 @@ class TestEfiCapsuleFirmwareRaw: self, u_boot_config, u_boot_console, efi_capsule_data): """ Test Case 2 Update U-Boot and U-Boot environment on SPI Flash but with OsIndications unset - No update should happen + No update should happen unless CONFIG_EFI_IGNORE_OSINDICATIONS is set 0x100000-0x150000: U-Boot binary (but dummy) 0x150000-0x200000: U-Boot environment (but dummy) """ @@ -91,16 +91,27 @@ class TestEfiCapsuleFirmwareRaw: # reboot u_boot_console.restart_uboot() + ignore_os_indications = u_boot_config.buildconfig.get( + 'config_efi_ignore_osindications') + need_reboot = True if ignore_os_indications else False + + capsule_auth = u_boot_config.buildconfig.get( + 'config_efi_capsule_authenticate') + capsule_early = u_boot_config.buildconfig.get( 'config_efi_capsule_on_disk_early') with u_boot_console.log.section('Test Case 2-b, after reboot'): if not capsule_early: - exec_manual_update(u_boot_console, disk_img, capsule_files, False) + exec_manual_update(u_boot_console, disk_img, capsule_files, need_reboot) - check_file_exist(u_boot_console, disk_img, capsule_files) + if not ignore_os_indications: + check_file_exist(u_boot_console, disk_img, capsule_files) - verify_content(u_boot_console, '100000', 'u-boot:Old') - verify_content(u_boot_console, '150000', 'u-boot-env:Old') + expected = 'u-boot:New' if (ignore_os_indications and not capsule_auth) else 'u-boot:Old' + verify_content(u_boot_console, '100000', expected) + + expected = 'u-boot-env:New' if (ignore_os_indications and not capsule_auth) else 'u-boot-env:Old' + verify_content(u_boot_console, '150000', expected) def test_efi_capsule_fw3( self, u_boot_config, u_boot_console, efi_capsule_data): -- 2.43.0

1 0

[PATCH] test: test for ignore OsIndications
by Ilias Apalodimas 04 Jul '24

04 Jul '24

The tests we currently have expect the firmware update to fail when OsIndications is not set properly. However, we have a Kconfig flag that explicitly ignores that variable and trigers the capsule update regardless. Adjust the tests accordingly Signed-off-by: Ilias Apalodimas <ilias.apalodimas(a)linaro.org> --- .../py/tests/test_efi_capsule/test_capsule_firmware_raw.py | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/test/py/tests/test_efi_capsule/test_capsule_firmware_raw.py b/test/py/tests/test_efi_capsule/test_capsule_firmware_raw.py index 05853578c293..f3a2dff5c2c8 100644 --- a/test/py/tests/test_efi_capsule/test_capsule_firmware_raw.py +++ b/test/py/tests/test_efi_capsule/test_capsule_firmware_raw.py @@ -95,6 +95,9 @@ class TestEfiCapsuleFirmwareRaw: 'config_efi_ignore_osindications') need_reboot = True if ignore_os_indications else False + capsule_auth = u_boot_config.buildconfig.get( + 'config_efi_capsule_authenticate') + capsule_early = u_boot_config.buildconfig.get( 'config_efi_capsule_on_disk_early') with u_boot_console.log.section('Test Case 2-b, after reboot'): @@ -104,10 +107,10 @@ class TestEfiCapsuleFirmwareRaw: if not ignore_os_indications: check_file_exist(u_boot_console, disk_img, capsule_files) - expected = 'u-boot:New' if ignore_os_indications else 'u-boot:Old' + expected = 'u-boot:New' if (ignore_os_indications and not capsule_auth) else 'u-boot:Old' verify_content(u_boot_console, '100000', expected) - expected = 'u-boot-env:New' if ignore_os_indications else 'u-boot-env:Old' + expected = 'u-boot-env:New' if (ignore_os_indications and not capsule_auth) else 'u-boot-env:Old' verify_content(u_boot_console, '150000', expected) def test_efi_capsule_fw3( -- 2.43.0

1 1

zynq_gem without PHY
by Patrick Huesmann 04 Jul '24

04 Jul '24

Dear U-Boot devs/maintainers, We are running Xilinx MPSoC based MicroTCA mezzanine boards that, according to the MicroTCA standard, connect to the crate's Ethernet switch via a 1000BASE-BX interface at the backplane (the interface is basically equivalent to a SFP module; we actually have a bring-up adapter that uses a SFP module to replicate the Ethernet functionality outside a MicroTCA crate). Most of our boards use a PHY in RGMII -> 1000BASE-X mode, but on some other boards a MPSoC MGT is wired directly to the backplane without a PHY in between (and the GEM set to 1000BASE-X mode accordingly). Now the Xilinx GEM driver (drivers/net/zynq_gem.c) assumes there is always a PHY connected to the Ethernet interface, and aborts the GEM initialization if there is no PHY found. In a previous U-Boot version, I have patched zynq_gem.c to just ignore absence of a PHY, but the recent version of the driver accesses priv->phydev quite a lot - so it required a bit of effort to port the patch. Now I'm wondering if I should clean it up and try to upstream it. (Basically, if priv->phydev is null, don't touch it, disable autonegotiation and use speed setting from devicetree). Would a patch like this have any chance of getting upstreamed? Thanks and best regards, Patrick — Deutsches Elektronen-Synchrotron DESY A Research Centre of the Helmholtz Association Notkestraße 85, D-22607 Hamburg E-Mail: patrick.huesmann(a)desy.de Web: https://msk.desy.de/

1 0

[PATCH] msc_sm2s_imx8mp: Adjust the initrd_addr location
by Fabio Estevam 04 Jul '24

04 Jul '24

From: Fabio Estevam <festevam(a)denx.de> Booting an initramfs with the current address may lead to initramfs corruption and boot failure. Move it 0x48000000 which avoids initramfs overlap and allows a successful initramfs boot. Signed-off-by: Fabio Estevam <festevam(a)denx.de> --- include/configs/msc_sm2s_imx8mp.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/configs/msc_sm2s_imx8mp.h b/include/configs/msc_sm2s_imx8mp.h index 3c7d96cb3c0a..2a52455ace34 100644 --- a/include/configs/msc_sm2s_imx8mp.h +++ b/include/configs/msc_sm2s_imx8mp.h @@ -39,7 +39,7 @@ "fdt_addr_r=0x43000000\0" \ "boot_fdt=try\0" \ "fdtfile=" CONFIG_DEFAULT_FDT_FILE "\0" \ - "initrd_addr=0x43800000\0" \ + "initrd_addr=0x48000000\0" \ "bootm_size=0x10000000\0" \ "mmcpart=1\0" \ "mmcroot=/dev/mmcblk1p2 rootwait rw\0" \ -- 2.34.1

2 4

[PATCH] arm: mediatek: split config into separate options for the board and SoC
by Leith Bade 04 Jul '24

04 Jul '24

The current MediaTek Kconfig layout prevents the addition of new board targets that require the existing SoC drivers. By making the SoC drivers depend on new CONFIG_MTxxxx variables, it becomes possible to select these drivers when adding new boards to the board selection list. The existing TARGET_MTxxxx are then changed to select the correct SoC driver targets and can continue to be used as a generic target. Signed-off-by: Leith Bade <leith(a)bade.nz> Cc: Chunfeng Yun <chunfeng.yun(a)mediatek.com> Cc: Ryder Lee <ryder.lee(a)mediatek.com> Cc: Weijie Gao <weijie.gao(a)mediatek.com> Cc: Sam Shih <sam.shih(a)mediatek.com> --- This is my first U-boot patch so I apologise in advance if I am doing something wrong. There seems to be a number of different ways to organise the Kconfig file to support multiple boards using the same CPU. So picked an approach that required the least number of changes. My motivation was to be able to add files under a new board/bananapi/bpi-r3 directory for the Banana Pi BPI-R3 board so I can add a .env file to set up the required values for the "Standard Boot". If this change is accepted I plan to follow up with future patches to add this .env file. arch/arm/mach-mediatek/Kconfig | 43 ++++++++++++++++++++++++++++++++- arch/arm/mach-mediatek/Makefile | 20 +++++++-------- drivers/clk/mediatek/Makefile | 20 +++++++-------- drivers/ram/mediatek/Makefile | 2 +- 4 files changed, 63 insertions(+), 22 deletions(-) diff --git a/arch/arm/mach-mediatek/Kconfig b/arch/arm/mach-mediatek/Kconfig index ff1fdee5c8..4b4faad8b4 100644 --- a/arch/arm/mach-mediatek/Kconfig +++ b/arch/arm/mach-mediatek/Kconfig @@ -6,8 +6,38 @@ config SYS_SOC config SYS_VENDOR default "mediatek" +config MT7622 + bool + +config MT7623 + bool + +config MT7629 + bool + +config MT7981 + bool + +config MT7986 + bool + +config MT7988 + bool + +config MT8183 + bool + +config MT8365 + bool + config MT8512 - bool "MediaTek MT8512 SoC" + bool + +config MT8516 + bool + +config MT8518 + bool choice prompt "MediaTek board select" @@ -15,6 +45,7 @@ choice config TARGET_MT7622 bool "MediaTek MT7622 SoC" select ARM64 + select MT7622 help The MediaTek MT7622 is a ARM64-based SoC with a dual-core Cortex-A53. including UART, SPI, USB3.0, SD and MMC cards, NAND, SNFI, PWM, PCIe, @@ -24,6 +55,7 @@ config TARGET_MT7623 bool "MediaTek MT7623 SoC" select CPU_V7A select MMC_SUPPORTS_TUNING + select MT7623 help The MediaTek MT7623 is a ARM-based SoC with a quad-core Cortex-A7 including NEON and GPU, Mali-450 graphics, several DDR3 options, @@ -36,6 +68,7 @@ config TARGET_MT7629 bool "MediaTek MT7629 SoC" select CPU_V7A select SPL + select MT7629 help The MediaTek MT7629 is a ARM-based SoC with a dual-core Cortex-A7 including DDR3, crypto engine, 3x3 11n/ac Wi-Fi, Gigabit Ethernet, @@ -45,6 +78,7 @@ config TARGET_MT7981 bool "MediaTek MT7981 SoC" select ARM64 select CPU + select MT7981 help The MediaTek MT7981 is a ARM64-based SoC with a dual-core Cortex-A53. including UART, SPI, USB, NAND, SNFI, PWM, Gigabit Ethernet, I2C, @@ -54,6 +88,7 @@ config TARGET_MT7986 bool "MediaTek MT7986 SoC" select ARM64 select CPU + select MT7986 help The MediaTek MT7986 is a ARM64-based SoC with a quad-core Cortex-A53. including UART, SPI, SPI flash, USB3.0, MMC, NAND, SNFI, PWM, PCIe, @@ -63,6 +98,7 @@ config TARGET_MT7988 bool "MediaTek MT7988 SoC" select ARM64 select CPU + select MT7988 help The MediaTek MT7988 is a ARM64-based SoC with a quad-core Cortex-A73. including UART, SPI, SPI flash, USB3.0, MMC, NAND, SNFI, PWM, PCIe, @@ -71,6 +107,7 @@ config TARGET_MT7988 config TARGET_MT8183 bool "MediaTek MT8183 SoC" select ARM64 + select MT8183 help The MediaTek MT8183 is a ARM64-based SoC with a quad-core Cortex-A73 and a quad-core Cortex-A53. It is including UART, SPI, USB3.0 dual role, @@ -80,6 +117,7 @@ config TARGET_MT8183 config TARGET_MT8365 bool "MediaTek MT8365 SoC" select ARM64 + select MT8365 help The MediaTek MT8365 is a ARM64-based SoC with a quad-core Cortex-A53. It is including UART, SPI, USB2.0 dual role, SD and MMC cards, NAND, PWM, @@ -98,6 +136,7 @@ config TARGET_MT8512 config TARGET_MT8516 bool "MediaTek MT8516 SoC" select ARM64 + select MT8516 help The MediaTek MT8516 is a ARM64-based SoC with a quad-core Cortex-A35. including UART, SPI, USB2.0 and OTG, SD and MMC cards, NAND, PWM, @@ -107,6 +146,7 @@ config TARGET_MT8516 config TARGET_MT8518 bool "MediaTek MT8518 SoC" select ARM64 + select MT8518 help The MediaTek MT8518 is a ARM64-based SoC with a quad-core Cortex-A53. including UART, SPI, USB2.0 and OTG, SD and MMC cards, NAND, PWM, @@ -124,6 +164,7 @@ config SYS_BOARD default "mt7986" if TARGET_MT7986 default "mt7988" if TARGET_MT7988 default "mt8183" if TARGET_MT8183 + default "mt8365" if TARGET_MT8365 default "mt8512" if TARGET_MT8512 default "mt8516" if TARGET_MT8516 default "mt8518" if TARGET_MT8518 diff --git a/arch/arm/mach-mediatek/Makefile b/arch/arm/mach-mediatek/Makefile index 46bdab8820..c32f78f82b 100644 --- a/arch/arm/mach-mediatek/Makefile +++ b/arch/arm/mach-mediatek/Makefile @@ -3,14 +3,14 @@ obj-y += cpu.o obj-$(CONFIG_SPL_BUILD) += spl.o +obj-$(CONFIG_MT7622) += mt7622/ +obj-$(CONFIG_MT7623) += mt7623/ +obj-$(CONFIG_MT7629) += mt7629/ +obj-$(CONFIG_MT7981) += mt7981/ +obj-$(CONFIG_MT7986) += mt7986/ +obj-$(CONFIG_MT7988) += mt7988/ +obj-$(CONFIG_MT8183) += mt8183/ +obj-$(TARGET_MT8365) += mt8365/ obj-$(CONFIG_MT8512) += mt8512/ -obj-$(CONFIG_TARGET_MT7622) += mt7622/ -obj-$(CONFIG_TARGET_MT7623) += mt7623/ -obj-$(CONFIG_TARGET_MT7629) += mt7629/ -obj-$(CONFIG_TARGET_MT7981) += mt7981/ -obj-$(CONFIG_TARGET_MT7986) += mt7986/ -obj-$(CONFIG_TARGET_MT7988) += mt7988/ -obj-$(CONFIG_TARGET_MT8183) += mt8183/ -obj-$(CONFIG_TARGET_MT8365) += mt8365/ -obj-$(CONFIG_TARGET_MT8516) += mt8516/ -obj-$(CONFIG_TARGET_MT8518) += mt8518/ +obj-$(CONFIG_MT8516) += mt8516/ +obj-$(CONFIG_MT8518) += mt8518/ diff --git a/drivers/clk/mediatek/Makefile b/drivers/clk/mediatek/Makefile index e631f79e4d..62e26de5e0 100644 --- a/drivers/clk/mediatek/Makefile +++ b/drivers/clk/mediatek/Makefile @@ -3,14 +3,14 @@ obj-$(CONFIG_ARCH_MEDIATEK) += clk-mtk.o # SoC Drivers +obj-$(CONFIG_MT7623) += clk-mt7623.o +obj-$(CONFIG_MT7622) += clk-mt7622.o +obj-$(CONFIG_MT7629) += clk-mt7629.o +obj-$(CONFIG_MT7986) += clk-mt7986.o +obj-$(CONFIG_MT7981) += clk-mt7981.o +obj-$(CONFIG_MT7988) += clk-mt7988.o +obj-$(CONFIG_MT8183) += clk-mt8183.o +obj-$(CONFIG_MT8365) += clk-mt8365.o obj-$(CONFIG_MT8512) += clk-mt8512.o -obj-$(CONFIG_TARGET_MT7623) += clk-mt7623.o -obj-$(CONFIG_TARGET_MT7622) += clk-mt7622.o -obj-$(CONFIG_TARGET_MT7629) += clk-mt7629.o -obj-$(CONFIG_TARGET_MT7986) += clk-mt7986.o -obj-$(CONFIG_TARGET_MT7981) += clk-mt7981.o -obj-$(CONFIG_TARGET_MT7988) += clk-mt7988.o -obj-$(CONFIG_TARGET_MT8183) += clk-mt8183.o -obj-$(CONFIG_TARGET_MT8365) += clk-mt8365.o -obj-$(CONFIG_TARGET_MT8516) += clk-mt8516.o -obj-$(CONFIG_TARGET_MT8518) += clk-mt8518.o +obj-$(CONFIG_MT8516) += clk-mt8516.o +obj-$(CONFIG_MT8518) += clk-mt8518.o diff --git a/drivers/ram/mediatek/Makefile b/drivers/ram/mediatek/Makefile index 95507b593c..71f2c4fe83 100644 --- a/drivers/ram/mediatek/Makefile +++ b/drivers/ram/mediatek/Makefile @@ -4,4 +4,4 @@ # SPDX-License-Identifier: GPL-2.0 # -obj-$(CONFIG_TARGET_MT7629) = ddr3-mt7629.o +obj-$(CONFIG_MT7629) = ddr3-mt7629.o -- 2.25.1

2 2