]> git.ipfire.org Git - thirdparty/u-boot.git/commitdiff
Merge patch series "nand: Add sandbox tests"
authorTom Rini <trini@konsulko.com>
Thu, 16 Nov 2023 17:46:09 +0000 (12:46 -0500)
committerTom Rini <trini@konsulko.com>
Thu, 16 Nov 2023 18:49:13 +0000 (13:49 -0500)
To quote the author:

This series tests raw nand flash in sandbox and fixes various bugs discovered in
the process. I've tried to do things in a contemporary manner, avoiding the
(numerous) variations present on only a few boards. The test is pretty minimal.
Future work could test the rest of the nand API as well as the MTD API.

Bloat (for v1) at [1] (for boards with SPL_NAND_SUPPORT enabled). Almost
everything grows by a few bytes due to nand_page_size. A few boards grow more,
mostly those using nand_spl_loaders.c. CI at [2].

[1] https://gist.github.com/Forty-Bot/9694f3401893c9e706ccc374922de6c2
[2] https://source.denx.de/u-boot/custodians/u-boot-clk/-/pipelines/18443

257 files changed:
.azure-pipelines.yml
.gitlab-ci.yml
.mailmap
Makefile
api/api_storage.c
arch/Kconfig
arch/arm/Kconfig
arch/arm/dts/Makefile
arch/arm/dts/stm32mp25-pinctrl.dtsi [new file with mode: 0644]
arch/arm/dts/stm32mp25-u-boot.dtsi [new file with mode: 0644]
arch/arm/dts/stm32mp251.dtsi [new file with mode: 0644]
arch/arm/dts/stm32mp253.dtsi [new file with mode: 0644]
arch/arm/dts/stm32mp255.dtsi [new file with mode: 0644]
arch/arm/dts/stm32mp257.dtsi [new file with mode: 0644]
arch/arm/dts/stm32mp257f-ev1-u-boot.dtsi [new file with mode: 0644]
arch/arm/dts/stm32mp257f-ev1.dts [new file with mode: 0644]
arch/arm/dts/stm32mp25xc.dtsi [new file with mode: 0644]
arch/arm/dts/stm32mp25xf.dtsi [new file with mode: 0644]
arch/arm/dts/stm32mp25xxai-pinctrl.dtsi [new file with mode: 0644]
arch/arm/dts/stm32mp25xxak-pinctrl.dtsi [new file with mode: 0644]
arch/arm/dts/stm32mp25xxal-pinctrl.dtsi [new file with mode: 0644]
arch/arm/include/asm/arch-omap3/cpu.h
arch/arm/include/asm/system.h
arch/arm/lib/interrupts.c
arch/arm/lib/semihosting.S
arch/arm/lib/vectors.S
arch/arm/mach-davinci/include/mach/dm365_lowlevel.h
arch/arm/mach-imx/mx6/Kconfig
arch/arm/mach-ipq40xx/pinctrl-snapdragon.h
arch/arm/mach-k3/am62ax/am62a_qos_data.c
arch/arm/mach-k3/am642_init.c
arch/arm/mach-k3/am654_init.c
arch/arm/mach-k3/arm64-mmu.c
arch/arm/mach-k3/common.c
arch/arm/mach-k3/j721e_init.c
arch/arm/mach-k3/j721s2_init.c
arch/arm/mach-k3/r5_mpu.c
arch/arm/mach-k3/security.c
arch/arm/mach-k3/sysfw-loader.c
arch/arm/mach-keystone/include/mach/mux-k2g.h
arch/arm/mach-mvebu/cpu.c
arch/arm/mach-mvebu/include/mach/efuse.h
arch/arm/mach-omap2/Makefile
arch/arm/mach-omap2/boot-common.c
arch/arm/mach-omap2/omap5/hw_data.c
arch/arm/mach-omap2/pipe3-phy.c [deleted file]
arch/arm/mach-omap2/pipe3-phy.h [deleted file]
arch/arm/mach-omap2/sata.c [deleted file]
arch/arm/mach-stm32mp/Kconfig
arch/arm/mach-stm32mp/Kconfig.25x [new file with mode: 0644]
arch/arm/mach-stm32mp/Makefile
arch/arm/mach-stm32mp/bsec.c
arch/arm/mach-stm32mp/dram_init.c
arch/arm/mach-stm32mp/include/mach/stm32.h
arch/arm/mach-stm32mp/include/mach/sys_proto.h
arch/arm/mach-stm32mp/stm32mp1/Makefile [new file with mode: 0644]
arch/arm/mach-stm32mp/stm32mp1/cpu.c [moved from arch/arm/mach-stm32mp/cpu.c with 100% similarity]
arch/arm/mach-stm32mp/stm32mp1/fdt.c [moved from arch/arm/mach-stm32mp/fdt.c with 100% similarity]
arch/arm/mach-stm32mp/stm32mp1/psci.c [moved from arch/arm/mach-stm32mp/psci.c with 100% similarity]
arch/arm/mach-stm32mp/stm32mp1/pwr_regulator.c [moved from arch/arm/mach-stm32mp/pwr_regulator.c with 100% similarity]
arch/arm/mach-stm32mp/stm32mp1/spl.c [moved from arch/arm/mach-stm32mp/spl.c with 100% similarity]
arch/arm/mach-stm32mp/stm32mp1/stm32mp13x.c [moved from arch/arm/mach-stm32mp/stm32mp13x.c with 100% similarity]
arch/arm/mach-stm32mp/stm32mp1/stm32mp15x.c [moved from arch/arm/mach-stm32mp/stm32mp15x.c with 100% similarity]
arch/arm/mach-stm32mp/stm32mp1/tzc400.c [moved from arch/arm/mach-stm32mp/tzc400.c with 100% similarity]
arch/arm/mach-stm32mp/stm32mp2/Makefile [new file with mode: 0644]
arch/arm/mach-stm32mp/stm32mp2/arm64-mmu.c [new file with mode: 0644]
arch/arm/mach-stm32mp/stm32mp2/cpu.c [new file with mode: 0644]
arch/arm/mach-stm32mp/stm32mp2/fdt.c [new file with mode: 0644]
arch/arm/mach-stm32mp/stm32mp2/stm32mp25x.c [new file with mode: 0644]
arch/arm/mach-stm32mp/syscon.c
arch/arm/mach-tegra/xusb-padctl-common.h
arch/arm/mach-zynqmp/include/mach/psu_init_gpl.h
arch/m68k/include/asm/fsl_mcdmafec.h [deleted file]
arch/m68k/include/asm/immap.h
arch/m68k/lib/fec.c
arch/mips/dts/Makefile
arch/mips/dts/inteno,xg6846.dts [new file with mode: 0644]
arch/mips/mach-bmips/Kconfig
arch/powerpc/cpu/mpc83xx/cpu_init.c
arch/powerpc/cpu/mpc83xx/start.S
arch/powerpc/cpu/mpc85xx/cpu_init.c
arch/powerpc/include/asm/fsl_lbc.h
arch/powerpc/include/asm/global_data.h
arch/sandbox/include/asm/barrier.h [new file with mode: 0644]
arch/sandbox/include/asm/clk.h
arch/sandbox/include/asm/mbox.h
arch/sandbox/include/asm/power-domain.h
arch/sandbox/include/asm/reset.h
arch/x86/include/asm/arch-slimbootloader/slimbootloader.h
arch/x86/include/asm/dma-mapping.h
board/emulation/qemu-arm/Kconfig
board/emulation/qemu-riscv/Kconfig
board/emulation/qemu-x86/Kconfig
board/freescale/common/arm_sleep.c
board/freescale/common/mpc85xx_sleep.c
board/freescale/ls1021aqds/ls1021aqds.c
board/freescale/ls1021atsn/ls1021atsn.c
board/freescale/ls1021atwr/ls1021atwr.c
board/freescale/ls1043ardb/ls1043ardb.c
board/freescale/ls1088a/eth_ls1088aqds.c
board/freescale/ls2080aqds/eth.c
board/highbank/highbank.c
board/inteno/xg6846/Kconfig [new file with mode: 0644]
board/inteno/xg6846/MAINTAINERS [new file with mode: 0644]
board/keymile/pg-wcom-ls102xa/pg-wcom-ls102xa.c
board/st/stm32mp2/Kconfig [new file with mode: 0644]
board/st/stm32mp2/MAINTAINERS [new file with mode: 0644]
board/st/stm32mp2/Makefile [new file with mode: 0644]
board/st/stm32mp2/stm32mp2.c [new file with mode: 0644]
board/ti/am62ax/evm.c
board/ti/am64x/evm.c
board/ti/am65x/evm.c
board/ti/j721e/evm.c
board/ti/j721s2/evm.c
boot/Kconfig
boot/Makefile
cmd/Kconfig
cmd/Makefile
cmd/nvedit.c
cmd/pxe.c
cmd/scsi.c
cmd/version.c
common/Kconfig
common/Makefile
common/board_r.c
common/cli_simple.c
common/version.c [new file with mode: 0644]
configs/apalis_imx6_defconfig
configs/brsmarc1_defconfig
configs/dh_imx6_defconfig
configs/edison_defconfig
configs/efi-x86_app32_defconfig
configs/efi-x86_app64_defconfig
configs/evb-rk3036_defconfig
configs/galileo_defconfig
configs/imx28_xea_sb_defconfig
configs/inteno_xg6846_ram_defconfig [new file with mode: 0644]
configs/kylin-rk3036_defconfig
configs/mt7620_rfb_defconfig
configs/mvebu_ac5_rd_defconfig
configs/novena_defconfig
configs/sandbox64_defconfig
configs/sandbox_defconfig
configs/sandbox_flattree_defconfig
configs/sandbox_noinst_defconfig
configs/sandbox_spl_defconfig
configs/sandbox_vpl_defconfig
configs/socfpga_secu1_defconfig
configs/stm32mp25_defconfig [new file with mode: 0644]
configs/udoo_defconfig
configs/wandboard_defconfig
configs/x240_defconfig
doc/develop/release_cycle.rst
drivers/ata/Kconfig
drivers/ata/Makefile
drivers/ata/ahci.c
drivers/ata/sata.c
drivers/ata/sata_sandbox.c [deleted file]
drivers/block/Kconfig
drivers/clk/clk_k210.c
drivers/clk/meson/a1.c
drivers/dfu/Kconfig
drivers/dma/Kconfig
drivers/dma/MCD_dmaApi.c [deleted file]
drivers/dma/MCD_tasks.c [deleted file]
drivers/dma/MCD_tasksInit.c [deleted file]
drivers/dma/Makefile
drivers/fastboot/Kconfig
drivers/net/Kconfig
drivers/net/Makefile
drivers/net/designware.c
drivers/net/designware.h
drivers/net/dwc_eth_qos.c
drivers/net/e1000.c
drivers/net/fm/fm.c
drivers/net/fsl_mcdmafec.c [deleted file]
drivers/net/ftgmac100.c
drivers/net/hifemac.c [new file with mode: 0644]
drivers/net/hifemac_mdio.c [new file with mode: 0644]
drivers/net/mv88e6xxx.c
drivers/net/phy/dp83869.c
drivers/net/qe/uccf.c
drivers/pinctrl/pinctrl_stm32.c
drivers/qe/fdt.c
drivers/qe/qe.c
drivers/scsi/Kconfig
drivers/scsi/Makefile
drivers/scsi/scsi.c
drivers/serial/serial_stm32.c
drivers/serial/serial_stm32.h
drivers/sm/meson-sm.c
drivers/spi/spi-mem-nodm.c
drivers/ufs/Kconfig
drivers/video/Kconfig
drivers/virtio/Kconfig
env/common.c
include/MCD_dma.h [deleted file]
include/MCD_progCheck.h [deleted file]
include/MCD_tasksInit.h [deleted file]
include/ahci.h
include/bootcount.h
include/configs/inteno_xg6846.h [new file with mode: 0644]
include/configs/libretech-ac.h
include/configs/ls1021aiot.h
include/configs/ls1028ardb.h
include/configs/ls1043ardb.h
include/configs/stm32mp25_common.h [new file with mode: 0644]
include/dfu.h
include/display_options.h
include/dt-bindings/pinctrl/stm32-pinfunc.h
include/efi_loader.h
include/efi_selftest.h
include/env.h
include/env_internal.h
include/fm_eth.h
include/fs.h
include/fsl-mc/fsl_mc.h
include/fsl_errata.h
include/fsl_ifc.h
include/fsl_qe.h
include/fsl_sec.h
include/fsl_sec_mon.h
include/fsl_sfp.h
include/iotrace.h
include/k210/pll.h
include/key_matrix.h
include/libata.h
include/linux/mii.h
include/linux/mtd/spinand.h
include/linux/usb/composite.h
include/miiphy.h
include/mpc83xx.h
include/mv88e6352.h
include/net.h
include/net/ncsi.h
include/palmas.h
include/post.h
include/sata.h
include/scsi.h
include/spi.h
include/tegra-kbc.h
include/twl4030.h
include/twl6030.h
include/ubi_uboot.h
include/usbdevice.h
lib/Kconfig
lib/efi_loader/Kconfig
lib/efi_loader/Makefile
net/bootp.c
net/dhcpv6.c
net/eth-uclass.c
net/net.c
test/Kconfig
test/py/tests/test_sandbox_opts.py [new file with mode: 0644]
tools/buildman/builder.py
tools/buildman/builderthread.py
tools/buildman/func_test.py

index d6f3fa423c643a67c65b15ac015549a963fcdc52..b9d6aa98a0b9afec50a45e93297b923b4dc91fd6 100644 (file)
@@ -287,9 +287,6 @@ stages:
         sandbox64_clang:
           TEST_PY_BD: "sandbox64"
           OVERRIDE: "-O clang-16"
-        sandbox_nolto:
-          TEST_PY_BD: "sandbox"
-          BUILD_ENV: "NO_LTO=1"
         sandbox_spl:
           TEST_PY_BD: "sandbox_spl"
           TEST_PY_TEST_SPEC: "test_ofplatdata or test_handoff or test_spl"
index fee165198ae9a56c8d9dc2590c6e00aaaa469b0c..fbf99f0322a7be2c16cfead4c5857955590a8d05 100644 (file)
@@ -258,12 +258,6 @@ sandbox with clang test.py:
     OVERRIDE: "-O clang-16"
   <<: *buildman_and_testpy_dfn
 
-sandbox without LTO test.py:
-  variables:
-    TEST_PY_BD: "sandbox"
-    BUILD_ENV: "NO_LTO=1"
-  <<: *buildman_and_testpy_dfn
-
 sandbox64 test.py:
   variables:
     TEST_PY_BD: "sandbox64"
@@ -275,12 +269,6 @@ sandbox64 with clang test.py:
     OVERRIDE: "-O clang-16"
   <<: *buildman_and_testpy_dfn
 
-sandbox64 without LTO test.py:
-  variables:
-    TEST_PY_BD: "sandbox64"
-    BUILD_ENV: "NO_LTO=1"
-  <<: *buildman_and_testpy_dfn
-
 sandbox_spl test.py:
   variables:
     TEST_PY_BD: "sandbox_spl"
index 05cb310e416fdaf3d88b517d5c15b5fa02aa083d..d1f08f3eca8a70a3af120e9c150a70d71e155ea5 100644 (file)
--- a/.mailmap
+++ b/.mailmap
@@ -80,6 +80,8 @@ Nava kishore Manne <nava.kishore.manne@amd.com> <nava.manne@xilinx.com>
 Neal Frager <neal.frager@amd.com> <neal.frager@xilinx.com>
 Neil Armstrong <neil.armstrong@linaro.org> <narmstrong@baylibre.com>
 Nicolas Saenz Julienne <nsaenz@kernel.org> <nsaenzjulienne@suse.de>
+This contributor prefers not to receive mails <noreply@example.com> <pali@kernel.org>
+This contributor prefers not to receive mails <noreply@example.com> <pali.rohar@gmail.com>
 Patrice Chotard <patrice.chotard@foss.st.com> <patrice.chotard@st.com>
 Patrick Delaunay <patrick.delaunay@foss.st.com> <patrick.delaunay@st.com>
 Paul Burton <paul.burton@mips.com> <paul.burton@imgtec.com>
index 8a04dfcf3638fefb98cd6e241761f1663e8dc17e..b2e9cd3cb2137855f02719e699c6f0dc4f1850ea 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -3,7 +3,7 @@
 VERSION = 2024
 PATCHLEVEL = 01
 SUBLEVEL =
-EXTRAVERSION = -rc1
+EXTRAVERSION = -rc2
 NAME =
 
 # *DOCUMENTATION*
@@ -851,7 +851,7 @@ HAVE_VENDOR_COMMON_LIB = $(if $(wildcard $(srctree)/board/$(VENDOR)/common/Makef
 libs-$(CONFIG_API) += api/
 libs-$(HAVE_VENDOR_COMMON_LIB) += board/$(VENDOR)/common/
 libs-y += boot/
-libs-y += cmd/
+libs-$(CONFIG_CMDLINE) += cmd/
 libs-y += common/
 libs-$(CONFIG_OF_EMBED) += dts/
 libs-y += env/
@@ -1153,7 +1153,6 @@ endif
        @# is enable to tell 'deprecated' that one of these symbols exists
        $(call deprecated,CONFIG_TIMER,Timer drivers,v2023.01,$(if $(strip $(CFG_SYS_TIMER_RATE)$(CFG_SYS_TIMER_COUNTER)),x))
        $(call deprecated,CONFIG_DM_SERIAL,Serial drivers,v2023.04,$(CONFIG_SERIAL))
-       $(call deprecated,CONFIG_DM_SCSI,SCSI drivers,v2023.04,$(CONFIG_SCSI))
        @# Check that this build does not override OF_HAS_PRIOR_STAGE by
        @# disabling OF_BOARD.
        $(call cmd,ofcheck,$(KCONFIG_CONFIG))
index 997e8727a9650f763517fe3e0650a6186d21d13b..78becbe39fb6546656f62490172da0c1205e0df0 100644 (file)
@@ -67,13 +67,6 @@ void dev_stor_init(void)
        specs[ENUM_SATA].type = DEV_TYP_STOR | DT_STOR_SATA;
        specs[ENUM_SATA].name = "sata";
 #endif
-#if defined(CONFIG_SCSI)
-       specs[ENUM_SCSI].max_dev = SCSI_MAX_DEVICE;
-       specs[ENUM_SCSI].enum_started = 0;
-       specs[ENUM_SCSI].enum_ended = 0;
-       specs[ENUM_SCSI].type = DEV_TYP_STOR | DT_STOR_SCSI;
-       specs[ENUM_SCSI].name = "scsi";
-#endif
 #if defined(CONFIG_CMD_USB) && defined(CONFIG_USB_STORAGE)
        specs[ENUM_USB].max_dev = USB_MAX_STOR_DEV;
        specs[ENUM_USB].enum_started = 0;
index 4f5b75129f34cb974130ae5da9b8131aef9d52c3..2e0528d819c9cecc4fb56c9f99244683f4ec6592 100644 (file)
@@ -134,7 +134,7 @@ config SANDBOX
        select ARCH_SUPPORTS_LTO
        select BOARD_LATE_INIT
        select BZIP2
-       select CMD_POWEROFF
+       select CMD_POWEROFF if CMDLINE
        select DM
        select DM_EVENT
        select DM_FUZZING_ENGINE
@@ -152,10 +152,10 @@ config SANDBOX
        select PCI_ENDPOINT
        select SPI
        select SUPPORT_OF_CONTROL
-       select SYSRESET_CMD_POWEROFF
+       select SYSRESET_CMD_POWEROFF if CMD_POWEROFF
        select SYS_CACHE_SHIFT_4
        select IRQ
-       select SUPPORT_EXTENSION_SCAN
+       select SUPPORT_EXTENSION_SCAN if CMDLINE
        select SUPPORT_ACPI
        imply BITREVERSE
        select BLOBLIST
@@ -210,6 +210,9 @@ config SANDBOX
        imply BINMAN
        imply CMD_MBR
        imply CMD_MMC
+       imply BOOTSTD_DEFAULTS if BOOTSTD_FULL && CMDLINE
+       imply BOOTMETH_DISTRO if BOOTSTD_FULL && CMDLINE
+       imply CMD_SYSBOOT if BOOTSTD_FULL
 
 config SH
        bool "SuperH architecture"
@@ -248,7 +251,7 @@ config X86
        imply DM_KEYBOARD
        imply DM_MMC
        imply DM_RTC
-       imply DM_SCSI
+       imply SCSI
        imply DM_SERIAL
        imply DM_SPI
        imply DM_SPI_FLASH
index d812685c9842161878b4810600954fb45fbabaec..1fd7aacc3804907981c3ebbbd3debd003a1bd7ce 100644 (file)
@@ -568,6 +568,7 @@ config ARCH_AT91
        select GPIO_EXTRA_HEADER
        select SPL_BOARD_INIT if SPL && !TARGET_SMARTWEB
        select SPL_SEPARATE_BSS if SPL
+       imply SYS_THUMB_BUILD
 
 config ARCH_DAVINCI
        bool "TI DaVinci"
@@ -1133,7 +1134,6 @@ config ARCH_SUNXI
        select DM_SPI_FLASH if SPI
        select DM_KEYBOARD
        select DM_MMC if MMC
-       select DM_SCSI if SCSI
        select DM_SERIAL
        select OF_BOARD_SETUP
        select OF_CONTROL
@@ -1838,7 +1838,7 @@ config TARGET_SL28
        select PCI
        select DM_RNG
        select DM_RTC
-       select DM_SCSI
+       select SCSI
        select DM_SERIAL
        select DM_SPI
        select GPIO_EXTRA_HEADER
@@ -1945,7 +1945,7 @@ config ARCH_STM32MP
        select REGMAP
        select SYSCON
        select SYSRESET
-       select SYS_THUMB_BUILD
+       select SYS_THUMB_BUILD if !ARM64
        imply SPL_SYSRESET
        imply CMD_DM
        imply CMD_POWEROFF
@@ -2053,7 +2053,6 @@ config TARGET_POMELO
        select PCI
        select DM_PCI
        select SCSI
-       select DM_SCSI
        select DM_SERIAL
        imply CMD_PCI
        help
index 55aceb51cdb00eb3f10477a0e886d081b0b6f930..e0a0d430dab87ac3cc98cc75bf5581e6f0a137ae 100644 (file)
@@ -1352,6 +1352,9 @@ dtb-$(CONFIG_STM32MP15x) += \
        stm32mp15xx-dhcor-drc-compact.dtb \
        stm32mp15xx-dhcor-testbench.dtb
 
+dtb-$(CONFIG_STM32MP25X) += \
+       stm32mp257f-ev1.dtb
+
 dtb-$(CONFIG_SOC_K3_AM654) += \
        k3-am654-base-board.dtb \
        k3-am654-r5-base-board.dtb \
diff --git a/arch/arm/dts/stm32mp25-pinctrl.dtsi b/arch/arm/dts/stm32mp25-pinctrl.dtsi
new file mode 100644 (file)
index 0000000..d34a1d5
--- /dev/null
@@ -0,0 +1,38 @@
+// SPDX-License-Identifier: (GPL-2.0-or-later OR BSD-3-Clause)
+/*
+ * Copyright (C) STMicroelectronics 2023 - All Rights Reserved
+ * Author: Alexandre Torgue <alexandre.torgue@foss.st.com> for STMicroelectronics.
+ */
+#include <dt-bindings/pinctrl/stm32-pinfunc.h>
+
+&pinctrl {
+       usart2_pins_a: usart2-0 {
+               pins1 {
+                       pinmux = <STM32_PINMUX('A', 4, AF6)>; /* USART2_TX */
+                       bias-disable;
+                       drive-push-pull;
+                       slew-rate = <0>;
+               };
+               pins2 {
+                       pinmux = <STM32_PINMUX('A', 8, AF8)>; /* USART2_RX */
+                       bias-disable;
+               };
+       };
+
+       usart2_idle_pins_a: usart2-idle-0 {
+               pins1 {
+                       pinmux = <STM32_PINMUX('A', 4, ANALOG)>; /* USART2_TX */
+               };
+               pins2 {
+                       pinmux = <STM32_PINMUX('A', 8, AF8)>; /* USART2_RX */
+                       bias-disable;
+               };
+       };
+
+       usart2_sleep_pins_a: usart2-sleep-0 {
+               pins {
+                       pinmux = <STM32_PINMUX('A', 4, ANALOG)>, /* USART2_TX */
+                                <STM32_PINMUX('A', 8, ANALOG)>; /* USART2_RX */
+               };
+       };
+};
diff --git a/arch/arm/dts/stm32mp25-u-boot.dtsi b/arch/arm/dts/stm32mp25-u-boot.dtsi
new file mode 100644 (file)
index 0000000..f4f26ad
--- /dev/null
@@ -0,0 +1,102 @@
+// SPDX-License-Identifier: GPL-2.0-or-later OR BSD-3-Clause
+/*
+ * Copyright : STMicroelectronics 2023
+ */
+
+/ {
+       aliases {
+               gpio0 = &gpioa;
+               gpio1 = &gpiob;
+               gpio2 = &gpioc;
+               gpio3 = &gpiod;
+               gpio4 = &gpioe;
+               gpio5 = &gpiof;
+               gpio6 = &gpiog;
+               gpio7 = &gpioh;
+               gpio8 = &gpioi;
+               gpio9 = &gpioj;
+               gpio10 = &gpiok;
+               gpio25 = &gpioz;
+               pinctrl0 = &pinctrl;
+               pinctrl1 = &pinctrl_z;
+       };
+
+       firmware {
+               optee {
+                       bootph-all;
+               };
+       };
+
+       /* need PSCI for sysreset during board_f */
+       psci {
+               bootph-all;
+       };
+
+       soc@0 {
+               bootph-all;
+       };
+};
+
+&gpioa {
+       bootph-all;
+};
+
+&gpiob {
+       bootph-all;
+};
+
+&gpioc {
+       bootph-all;
+};
+
+&gpiod {
+       bootph-all;
+};
+
+&gpioe {
+       bootph-all;
+};
+
+&gpiof {
+       bootph-all;
+};
+
+&gpiog {
+       bootph-all;
+};
+
+&gpioh {
+       bootph-all;
+};
+
+&gpioi {
+       bootph-all;
+};
+
+&gpioj {
+       bootph-all;
+};
+
+&gpiok {
+       bootph-all;
+};
+
+&gpioz {
+       bootph-all;
+};
+
+&pinctrl {
+       bootph-all;
+};
+
+&rifsc {
+       bootph-all;
+};
+
+&scmi_clk {
+       bootph-all;
+};
+
+&syscfg {
+       bootph-all;
+};
diff --git a/arch/arm/dts/stm32mp251.dtsi b/arch/arm/dts/stm32mp251.dtsi
new file mode 100644 (file)
index 0000000..cf2f28d
--- /dev/null
@@ -0,0 +1,285 @@
+// SPDX-License-Identifier: (GPL-2.0-or-later OR BSD-3-Clause)
+/*
+ * Copyright (C) STMicroelectronics 2023 - All Rights Reserved
+ * Author: Alexandre Torgue <alexandre.torgue@foss.st.com> for STMicroelectronics.
+ */
+#include <dt-bindings/interrupt-controller/arm-gic.h>
+
+/ {
+       #address-cells = <2>;
+       #size-cells = <2>;
+
+       cpus {
+               #address-cells = <1>;
+               #size-cells = <0>;
+
+               cpu0: cpu@0 {
+                       compatible = "arm,cortex-a35";
+                       device_type = "cpu";
+                       reg = <0>;
+                       enable-method = "psci";
+               };
+       };
+
+       arm-pmu {
+               compatible = "arm,cortex-a35-pmu";
+               interrupts = <GIC_SPI 368 IRQ_TYPE_LEVEL_HIGH>;
+               interrupt-affinity = <&cpu0>;
+               interrupt-parent = <&intc>;
+       };
+
+       arm_wdt: watchdog {
+               compatible = "arm,smc-wdt";
+               arm,smc-id = <0xb200005a>;
+               status = "disabled";
+       };
+
+       clocks {
+               ck_flexgen_08: ck-flexgen-08 {
+                       #clock-cells = <0>;
+                       compatible = "fixed-clock";
+                       clock-frequency = <100000000>;
+               };
+
+               ck_flexgen_51: ck-flexgen-51 {
+                       #clock-cells = <0>;
+                       compatible = "fixed-clock";
+                       clock-frequency = <200000000>;
+               };
+
+               ck_icn_ls_mcu: ck-icn-ls-mcu {
+                       #clock-cells = <0>;
+                       compatible = "fixed-clock";
+                       clock-frequency = <200000000>;
+               };
+       };
+
+       firmware {
+               optee {
+                       compatible = "linaro,optee-tz";
+                       method = "smc";
+               };
+
+               scmi {
+                       compatible = "linaro,scmi-optee";
+                       #address-cells = <1>;
+                       #size-cells = <0>;
+                       linaro,optee-channel-id = <0>;
+
+                       scmi_clk: protocol@14 {
+                               reg = <0x14>;
+                               #clock-cells = <1>;
+                       };
+
+                       scmi_reset: protocol@16 {
+                               reg = <0x16>;
+                               #reset-cells = <1>;
+                       };
+               };
+       };
+
+       intc: interrupt-controller@4ac00000 {
+               compatible = "arm,cortex-a7-gic";
+               #interrupt-cells = <3>;
+               #address-cells = <1>;
+               interrupt-controller;
+               reg = <0x0 0x4ac10000 0x0 0x1000>,
+                     <0x0 0x4ac20000 0x0 0x2000>,
+                     <0x0 0x4ac40000 0x0 0x2000>,
+                     <0x0 0x4ac60000 0x0 0x2000>;
+       };
+
+       psci {
+               compatible = "arm,psci-1.0";
+               method = "smc";
+       };
+
+       timer {
+               compatible = "arm,armv8-timer";
+               interrupt-parent = <&intc>;
+               interrupts = <GIC_PPI 13 (GIC_CPU_MASK_SIMPLE(4) | IRQ_TYPE_LEVEL_LOW)>,
+                            <GIC_PPI 14 (GIC_CPU_MASK_SIMPLE(4) | IRQ_TYPE_LEVEL_LOW)>,
+                            <GIC_PPI 11 (GIC_CPU_MASK_SIMPLE(4) | IRQ_TYPE_LEVEL_LOW)>,
+                            <GIC_PPI 10 (GIC_CPU_MASK_SIMPLE(4) | IRQ_TYPE_LEVEL_LOW)>;
+               always-on;
+       };
+
+       soc@0 {
+               compatible = "simple-bus";
+               #address-cells = <1>;
+               #size-cells = <1>;
+               interrupt-parent = <&intc>;
+               ranges = <0x0 0x0 0x0 0x80000000>;
+
+               rifsc: rifsc-bus@42080000 {
+                       compatible = "simple-bus";
+                       reg = <0x42080000 0x1000>;
+                       #address-cells = <1>;
+                       #size-cells = <1>;
+                       ranges;
+
+                       usart2: serial@400e0000 {
+                               compatible = "st,stm32h7-uart";
+                               reg = <0x400e0000 0x400>;
+                               interrupts = <GIC_SPI 115 IRQ_TYPE_LEVEL_HIGH>;
+                               clocks = <&ck_flexgen_08>;
+                               status = "disabled";
+                       };
+               };
+
+               syscfg: syscon@44230000 {
+                       compatible = "st,stm32mp25-syscfg", "syscon";
+                       reg = <0x44230000 0x10000>;
+               };
+
+               pinctrl: pinctrl@44240000 {
+                       #address-cells = <1>;
+                       #size-cells = <1>;
+                       compatible = "st,stm32mp257-pinctrl";
+                       ranges = <0 0x44240000 0xa0400>;
+                       pins-are-numbered;
+
+                       gpioa: gpio@44240000 {
+                               gpio-controller;
+                               #gpio-cells = <2>;
+                               interrupt-controller;
+                               #interrupt-cells = <2>;
+                               reg = <0x0 0x400>;
+                               clocks = <&ck_icn_ls_mcu>;
+                               st,bank-name = "GPIOA";
+                               status = "disabled";
+                       };
+
+                       gpiob: gpio@44250000 {
+                               gpio-controller;
+                               #gpio-cells = <2>;
+                               interrupt-controller;
+                               #interrupt-cells = <2>;
+                               reg = <0x10000 0x400>;
+                               clocks = <&ck_icn_ls_mcu>;
+                               st,bank-name = "GPIOB";
+                               status = "disabled";
+                       };
+
+                       gpioc: gpio@44260000 {
+                               gpio-controller;
+                               #gpio-cells = <2>;
+                               interrupt-controller;
+                               #interrupt-cells = <2>;
+                               reg = <0x20000 0x400>;
+                               clocks = <&ck_icn_ls_mcu>;
+                               st,bank-name = "GPIOC";
+                               status = "disabled";
+                       };
+
+                       gpiod: gpio@44270000 {
+                               gpio-controller;
+                               #gpio-cells = <2>;
+                               interrupt-controller;
+                               #interrupt-cells = <2>;
+                               reg = <0x30000 0x400>;
+                               clocks = <&ck_icn_ls_mcu>;
+                               st,bank-name = "GPIOD";
+                               status = "disabled";
+                       };
+
+                       gpioe: gpio@44280000 {
+                               gpio-controller;
+                               #gpio-cells = <2>;
+                               interrupt-controller;
+                               #interrupt-cells = <2>;
+                               reg = <0x40000 0x400>;
+                               clocks = <&ck_icn_ls_mcu>;
+                               st,bank-name = "GPIOE";
+                               status = "disabled";
+                       };
+
+                       gpiof: gpio@44290000 {
+                               gpio-controller;
+                               #gpio-cells = <2>;
+                               interrupt-controller;
+                               #interrupt-cells = <2>;
+                               reg = <0x50000 0x400>;
+                               clocks = <&ck_icn_ls_mcu>;
+                               st,bank-name = "GPIOF";
+                               status = "disabled";
+                       };
+
+                       gpiog: gpio@442a0000 {
+                               gpio-controller;
+                               #gpio-cells = <2>;
+                               interrupt-controller;
+                               #interrupt-cells = <2>;
+                               reg = <0x60000 0x400>;
+                               clocks = <&ck_icn_ls_mcu>;
+                               st,bank-name = "GPIOG";
+                               status = "disabled";
+                       };
+
+                       gpioh: gpio@442b0000 {
+                               gpio-controller;
+                               #gpio-cells = <2>;
+                               interrupt-controller;
+                               #interrupt-cells = <2>;
+                               reg = <0x70000 0x400>;
+                               clocks = <&ck_icn_ls_mcu>;
+                               st,bank-name = "GPIOH";
+                               status = "disabled";
+                       };
+
+                       gpioi: gpio@442c0000 {
+                               gpio-controller;
+                               #gpio-cells = <2>;
+                               interrupt-controller;
+                               #interrupt-cells = <2>;
+                               reg = <0x80000 0x400>;
+                               clocks = <&ck_icn_ls_mcu>;
+                               st,bank-name = "GPIOI";
+                               status = "disabled";
+                       };
+
+                       gpioj: gpio@442d0000 {
+                               gpio-controller;
+                               #gpio-cells = <2>;
+                               interrupt-controller;
+                               #interrupt-cells = <2>;
+                               reg = <0x90000 0x400>;
+                               clocks = <&ck_icn_ls_mcu>;
+                               st,bank-name = "GPIOJ";
+                               status = "disabled";
+                       };
+
+                       gpiok: gpio@442e0000 {
+                               gpio-controller;
+                               #gpio-cells = <2>;
+                               interrupt-controller;
+                               #interrupt-cells = <2>;
+                               reg = <0xa0000 0x400>;
+                               clocks = <&ck_icn_ls_mcu>;
+                               st,bank-name = "GPIOK";
+                               status = "disabled";
+                       };
+               };
+
+               pinctrl_z: pinctrl@46200000 {
+                       #address-cells = <1>;
+                       #size-cells = <1>;
+                       compatible = "st,stm32mp257-z-pinctrl";
+                       ranges = <0 0x46200000 0x400>;
+                       pins-are-numbered;
+
+                       gpioz: gpio@46200000 {
+                               gpio-controller;
+                               #gpio-cells = <2>;
+                               interrupt-controller;
+                               #interrupt-cells = <2>;
+                               reg = <0 0x400>;
+                               clocks = <&ck_icn_ls_mcu>;
+                               st,bank-name = "GPIOZ";
+                               st,bank-ioport = <11>;
+                               status = "disabled";
+                       };
+
+               };
+       };
+};
diff --git a/arch/arm/dts/stm32mp253.dtsi b/arch/arm/dts/stm32mp253.dtsi
new file mode 100644 (file)
index 0000000..af48e82
--- /dev/null
@@ -0,0 +1,23 @@
+// SPDX-License-Identifier: (GPL-2.0-or-later OR BSD-3-Clause)
+/*
+ * Copyright (C) STMicroelectronics 2023 - All Rights Reserved
+ * Author: Alexandre Torgue <alexandre.torgue@foss.st.com> for STMicroelectronics.
+ */
+#include "stm32mp251.dtsi"
+
+/ {
+       cpus {
+               cpu1: cpu@1 {
+                       compatible = "arm,cortex-a35";
+                       device_type = "cpu";
+                       reg = <1>;
+                       enable-method = "psci";
+               };
+       };
+
+       arm-pmu {
+               interrupts = <GIC_SPI 368 IRQ_TYPE_LEVEL_HIGH>,
+                            <GIC_SPI 369 IRQ_TYPE_LEVEL_HIGH>;
+               interrupt-affinity = <&cpu0>, <&cpu1>;
+       };
+};
diff --git a/arch/arm/dts/stm32mp255.dtsi b/arch/arm/dts/stm32mp255.dtsi
new file mode 100644 (file)
index 0000000..e6fa596
--- /dev/null
@@ -0,0 +1,9 @@
+// SPDX-License-Identifier: (GPL-2.0-or-later OR BSD-3-Clause)
+/*
+ * Copyright (C) STMicroelectronics 2023 - All Rights Reserved
+ * Author: Alexandre Torgue <alexandre.torgue@foss.st.com> for STMicroelectronics.
+ */
+#include "stm32mp253.dtsi"
+
+/ {
+};
diff --git a/arch/arm/dts/stm32mp257.dtsi b/arch/arm/dts/stm32mp257.dtsi
new file mode 100644 (file)
index 0000000..5c5000d
--- /dev/null
@@ -0,0 +1,9 @@
+// SPDX-License-Identifier: (GPL-2.0-or-later OR BSD-3-Clause)
+/*
+ * Copyright (C) STMicroelectronics 2023 - All Rights Reserved
+ * Author: Alexandre Torgue <alexandre.torgue@foss.st.com> for STMicroelectronics.
+ */
+#include "stm32mp255.dtsi"
+
+/ {
+};
diff --git a/arch/arm/dts/stm32mp257f-ev1-u-boot.dtsi b/arch/arm/dts/stm32mp257f-ev1-u-boot.dtsi
new file mode 100644 (file)
index 0000000..a35a9b9
--- /dev/null
@@ -0,0 +1,20 @@
+// SPDX-License-Identifier: GPL-2.0-or-later OR BSD-3-Clause
+/*
+ * Copyright (C) STMicroelectronics 2023 - All Rights Reserved
+ */
+
+#include "stm32mp25-u-boot.dtsi"
+
+&usart2 {
+       bootph-all;
+};
+
+&usart2_pins_a {
+       bootph-all;
+       pins1 {
+               bootph-all;
+       };
+       pins2 {
+               bootph-all;
+       };
+};
diff --git a/arch/arm/dts/stm32mp257f-ev1.dts b/arch/arm/dts/stm32mp257f-ev1.dts
new file mode 100644 (file)
index 0000000..a88494e
--- /dev/null
@@ -0,0 +1,55 @@
+// SPDX-License-Identifier: (GPL-2.0-or-later OR BSD-3-Clause)
+/*
+ * Copyright (C) STMicroelectronics 2023 - All Rights Reserved
+ * Author: Alexandre Torgue <alexandre.torgue@foss.st.com> for STMicroelectronics.
+ */
+
+/dts-v1/;
+
+#include "stm32mp257.dtsi"
+#include "stm32mp25xf.dtsi"
+#include "stm32mp25-pinctrl.dtsi"
+#include "stm32mp25xxai-pinctrl.dtsi"
+
+/ {
+       model = "STMicroelectronics STM32MP257F-EV1 Evaluation Board";
+       compatible = "st,stm32mp257f-ev1", "st,stm32mp257";
+
+       aliases {
+               serial0 = &usart2;
+       };
+
+       chosen {
+               stdout-path = "serial0:115200n8";
+       };
+
+       memory@80000000 {
+               device_type = "memory";
+               reg = <0x0 0x80000000 0x1 0x0>;
+       };
+
+       reserved-memory {
+               #address-cells = <2>;
+               #size-cells = <2>;
+               ranges;
+
+               fw@80000000 {
+                       compatible = "shared-dma-pool";
+                       reg = <0x0 0x80000000 0x0 0x4000000>;
+                       no-map;
+               };
+       };
+};
+
+&arm_wdt {
+       timeout-sec = <32>;
+       status = "okay";
+};
+
+&usart2 {
+       pinctrl-names = "default", "idle", "sleep";
+       pinctrl-0 = <&usart2_pins_a>;
+       pinctrl-1 = <&usart2_idle_pins_a>;
+       pinctrl-2 = <&usart2_sleep_pins_a>;
+       status = "okay";
+};
diff --git a/arch/arm/dts/stm32mp25xc.dtsi b/arch/arm/dts/stm32mp25xc.dtsi
new file mode 100644 (file)
index 0000000..5e83a69
--- /dev/null
@@ -0,0 +1,8 @@
+// SPDX-License-Identifier: (GPL-2.0-or-later OR BSD-3-Clause)
+/*
+ * Copyright (C) STMicroelectronics 2023 - All Rights Reserved
+ * Author: Alexandre Torgue <alexandre.torgue@foss.st.com> for STMicroelectronics.
+ */
+
+/ {
+};
diff --git a/arch/arm/dts/stm32mp25xf.dtsi b/arch/arm/dts/stm32mp25xf.dtsi
new file mode 100644 (file)
index 0000000..5e83a69
--- /dev/null
@@ -0,0 +1,8 @@
+// SPDX-License-Identifier: (GPL-2.0-or-later OR BSD-3-Clause)
+/*
+ * Copyright (C) STMicroelectronics 2023 - All Rights Reserved
+ * Author: Alexandre Torgue <alexandre.torgue@foss.st.com> for STMicroelectronics.
+ */
+
+/ {
+};
diff --git a/arch/arm/dts/stm32mp25xxai-pinctrl.dtsi b/arch/arm/dts/stm32mp25xxai-pinctrl.dtsi
new file mode 100644 (file)
index 0000000..abdbc7a
--- /dev/null
@@ -0,0 +1,83 @@
+// SPDX-License-Identifier: (GPL-2.0-or-later OR BSD-3-Clause)
+/*
+ * Copyright (C) STMicroelectronics 2023 - All Rights Reserved
+ * Author: Alexandre Torgue <alexandre.torgue@foss.st.com> for STMicroelectronics.
+ */
+
+&pinctrl {
+       st,package = <STM32MP_PKG_AI>;
+
+       gpioa: gpio@44240000 {
+               status = "okay";
+               ngpios = <16>;
+               gpio-ranges = <&pinctrl 0 0 16>;
+       };
+
+       gpiob: gpio@44250000 {
+               status = "okay";
+               ngpios = <16>;
+               gpio-ranges = <&pinctrl 0 16 16>;
+       };
+
+       gpioc: gpio@44260000 {
+               status = "okay";
+               ngpios = <14>;
+               gpio-ranges = <&pinctrl 0 32 14>;
+       };
+
+       gpiod: gpio@44270000 {
+               status = "okay";
+               ngpios = <16>;
+               gpio-ranges = <&pinctrl 0 48 16>;
+       };
+
+       gpioe: gpio@44280000 {
+               status = "okay";
+               ngpios = <16>;
+               gpio-ranges = <&pinctrl 0 64 16>;
+       };
+
+       gpiof: gpio@44290000 {
+               status = "okay";
+               ngpios = <16>;
+               gpio-ranges = <&pinctrl 0 80 16>;
+       };
+
+       gpiog: gpio@442a0000 {
+               status = "okay";
+               ngpios = <16>;
+               gpio-ranges = <&pinctrl 0 96 16>;
+       };
+
+       gpioh: gpio@442b0000 {
+               status = "okay";
+               ngpios = <12>;
+               gpio-ranges = <&pinctrl 2 114 12>;
+       };
+
+       gpioi: gpio@442c0000 {
+               status = "okay";
+               ngpios = <16>;
+               gpio-ranges = <&pinctrl 0 128 16>;
+       };
+
+       gpioj: gpio@442d0000 {
+               status = "okay";
+               ngpios = <16>;
+               gpio-ranges = <&pinctrl 0 144 16>;
+       };
+
+       gpiok: gpio@442e0000 {
+               status = "okay";
+               ngpios = <8>;
+               gpio-ranges = <&pinctrl 0 160 8>;
+       };
+};
+
+&pinctrl_z {
+       gpioz: gpio@46200000 {
+               status = "okay";
+               ngpios = <10>;
+               gpio-ranges = <&pinctrl_z 0 400 10>;
+       };
+};
diff --git a/arch/arm/dts/stm32mp25xxak-pinctrl.dtsi b/arch/arm/dts/stm32mp25xxak-pinctrl.dtsi
new file mode 100644 (file)
index 0000000..2e0d4d3
--- /dev/null
@@ -0,0 +1,71 @@
+// SPDX-License-Identifier: (GPL-2.0-or-later OR BSD-3-Clause)
+/*
+ * Copyright (C) STMicroelectronics 2023 - All Rights Reserved
+ * Author: Alexandre Torgue <alexandre.torgue@foss.st.com> for STMicroelectronics.
+ */
+
+&pinctrl {
+       st,package = <STM32MP_PKG_AK>;
+
+       gpioa: gpio@44240000 {
+               status = "okay";
+               ngpios = <16>;
+               gpio-ranges = <&pinctrl 0 0 16>;
+       };
+
+       gpiob: gpio@44250000 {
+               status = "okay";
+               ngpios = <16>;
+               gpio-ranges = <&pinctrl 0 16 16>;
+       };
+
+       gpioc: gpio@44260000 {
+               status = "okay";
+               ngpios = <14>;
+               gpio-ranges = <&pinctrl 0 32 14>;
+       };
+
+       gpiod: gpio@44270000 {
+               status = "okay";
+               ngpios = <16>;
+               gpio-ranges = <&pinctrl 0 48 16>;
+       };
+
+       gpioe: gpio@44280000 {
+               status = "okay";
+               ngpios = <16>;
+               gpio-ranges = <&pinctrl 0 64 16>;
+       };
+
+       gpiof: gpio@44290000 {
+               status = "okay";
+               ngpios = <16>;
+               gpio-ranges = <&pinctrl 0 80 16>;
+       };
+
+       gpiog: gpio@442a0000 {
+               status = "okay";
+               ngpios = <16>;
+               gpio-ranges = <&pinctrl 0 96 16>;
+       };
+
+       gpioh: gpio@442b0000 {
+               status = "okay";
+               ngpios = <12>;
+               gpio-ranges = <&pinctrl 2 114 12>;
+       };
+
+       gpioi: gpio@442c0000 {
+               status = "okay";
+               ngpios = <12>;
+               gpio-ranges = <&pinctrl 0 128 12>;
+       };
+};
+
+&pinctrl_z {
+       gpioz: gpio@46200000 {
+               status = "okay";
+               ngpios = <10>;
+               gpio-ranges = <&pinctrl_z 0 400 10>;
+       };
+};
diff --git a/arch/arm/dts/stm32mp25xxal-pinctrl.dtsi b/arch/arm/dts/stm32mp25xxal-pinctrl.dtsi
new file mode 100644 (file)
index 0000000..2406e97
--- /dev/null
@@ -0,0 +1,71 @@
+// SPDX-License-Identifier: (GPL-2.0-or-later OR BSD-3-Clause)
+/*
+ * Copyright (C) STMicroelectronics 2023 - All Rights Reserved
+ * Author: Alexandre Torgue <alexandre.torgue@foss.st.com> for STMicroelectronics.
+ */
+
+&pinctrl {
+       st,package = <STM32MP_PKG_AL>;
+
+       gpioa: gpio@44240000 {
+               status = "okay";
+               ngpios = <16>;
+               gpio-ranges = <&pinctrl 0 0 16>;
+       };
+
+       gpiob: gpio@44250000 {
+               status = "okay";
+               ngpios = <16>;
+               gpio-ranges = <&pinctrl 0 16 16>;
+       };
+
+       gpioc: gpio@44260000 {
+               status = "okay";
+               ngpios = <14>;
+               gpio-ranges = <&pinctrl 0 32 14>;
+       };
+
+       gpiod: gpio@44270000 {
+               status = "okay";
+               ngpios = <16>;
+               gpio-ranges = <&pinctrl 0 48 16>;
+       };
+
+       gpioe: gpio@44280000 {
+               status = "okay";
+               ngpios = <16>;
+               gpio-ranges = <&pinctrl 0 64 16>;
+       };
+
+       gpiof: gpio@44290000 {
+               status = "okay";
+               ngpios = <16>;
+               gpio-ranges = <&pinctrl 0 80 16>;
+       };
+
+       gpiog: gpio@442a0000 {
+               status = "okay";
+               ngpios = <16>;
+               gpio-ranges = <&pinctrl 0 96 16>;
+       };
+
+       gpioh: gpio@442b0000 {
+               status = "okay";
+               ngpios = <12>;
+               gpio-ranges = <&pinctrl 2 114 12>;
+       };
+
+       gpioi: gpio@442c0000 {
+               status = "okay";
+               ngpios = <12>;
+               gpio-ranges = <&pinctrl 0 128 12>;
+       };
+};
+
+&pinctrl_z {
+       gpioz: gpio@46200000 {
+               status = "okay";
+               ngpios = <10>;
+               gpio-ranges = <&pinctrl_z 0 400 10>;
+       };
+};
index 3f0182e7665be4bc89dfe3beca16eead5b525d27..d2fbf919a5bba6e353170050251a7e9ec7308a16 100644 (file)
@@ -7,6 +7,7 @@
 #ifndef _CPU_H
 #define _CPU_H
 
+#include <asm/arch/omap.h>
 #if !(defined(__KERNEL_STRICT_NAMES) || defined(__ASSEMBLY__))
 #include <asm/types.h>
 #endif /* !(__KERNEL_STRICT_NAMES || __ASSEMBLY__) */
index 0eae857e73a0adcc9eaa2279214685bfcdb897c7..43f7503571d7a1c94a274be16a3f785f7d331df1 100644 (file)
@@ -513,14 +513,6 @@ enum dcache_option {
 };
 #endif
 
-#if defined(CONFIG_SYS_ARM_CACHE_WRITETHROUGH)
-#define DCACHE_DEFAULT_OPTION  DCACHE_WRITETHROUGH
-#elif defined(CONFIG_SYS_ARM_CACHE_WRITEALLOC)
-#define DCACHE_DEFAULT_OPTION  DCACHE_WRITEALLOC
-#elif defined(CONFIG_SYS_ARM_CACHE_WRITEBACK)
-#define DCACHE_DEFAULT_OPTION  DCACHE_WRITEBACK
-#endif
-
 /* Size of an MMU section */
 enum {
 #ifdef CONFIG_ARMV7_LPAE
@@ -578,6 +570,14 @@ void psci_system_reset(void);
 
 #endif /* CONFIG_ARM64 */
 
+#if defined(CONFIG_SYS_ARM_CACHE_WRITETHROUGH)
+#define DCACHE_DEFAULT_OPTION  DCACHE_WRITETHROUGH
+#elif defined(CONFIG_SYS_ARM_CACHE_WRITEALLOC)
+#define DCACHE_DEFAULT_OPTION  DCACHE_WRITEALLOC
+#elif defined(CONFIG_SYS_ARM_CACHE_WRITEBACK)
+#define DCACHE_DEFAULT_OPTION  DCACHE_WRITEBACK
+#endif
+
 #ifndef __ASSEMBLY__
 /**
  * save_boot_params() - Save boot parameters before starting reset sequence
index 6dc27d1d589adddbc69dca0e6347ee7755255b89..9961472f69f76098faf61fc4b04faf6c6f22d7dc 100644 (file)
@@ -22,6 +22,7 @@
 #include <cpu_func.h>
 #include <efi_loader.h>
 #include <irq_func.h>
+#include <semihosting.h>
 #include <asm/global_data.h>
 #include <asm/proc-armv/ptrace.h>
 #include <asm/ptrace.h>
@@ -135,6 +136,32 @@ static inline void fixup_pc(struct pt_regs *regs, int offset)
        regs->ARM_pc = pc | (regs->ARM_pc & PCMASK);
 }
 
+/*
+ * Try to "emulate" a semihosting call in the event that we don't have a
+ * debugger attached.
+ */
+static bool smh_emulate_trap(struct pt_regs *regs)
+{
+       if (regs->ARM_cpsr & T_BIT) {
+               u16 *insn = (u16 *)(regs->ARM_pc - 2);
+
+               if (*insn != SMH_T32_SVC)
+                       return false;
+       } else {
+               u32 *insn = (u32 *)(regs->ARM_pc - 4);
+
+               if (*insn != SMH_A32_SVC)
+                       return false;
+       }
+
+       /* Avoid future semihosting calls */
+       disable_semihosting();
+
+       /* Just pretend the call failed */
+       regs->ARM_r0 = -1;
+       return true;
+}
+
 void do_undefined_instruction (struct pt_regs *pt_regs)
 {
        efi_restore_gd();
@@ -147,6 +174,10 @@ void do_undefined_instruction (struct pt_regs *pt_regs)
 
 void do_software_interrupt (struct pt_regs *pt_regs)
 {
+       if (CONFIG_IS_ENABLED(SEMIHOSTING_FALLBACK) &&
+           smh_emulate_trap(pt_regs))
+               return;
+
        efi_restore_gd();
        printf ("software interrupt\n");
        fixup_pc(pt_regs, -4);
index 393aade94a535ef050b2c19710270e95829a2cdc..6e1691a832c1311fe2f090a7686337c92830e29e 100644 (file)
@@ -18,11 +18,17 @@ ENTRY(smh_trap)
 #elif defined(CONFIG_SYS_THUMB_BUILD)
        svc     #0xab
 #else
+#if CONFIG_SYS_ARM_ARCH < 7
+       /* Before the ARMv7 exception model, svc (swi) clobbers lr */
+       mov     r2, lr
+#endif
        svc     #0x123456
 #endif
 
 #if defined(CONFIG_ARM64)
        ret
+#elif CONFIG_SYS_ARM_ARCH < 7
+       bx      r2
 #else
        bx      lr
 #endif
index 7cf7d1636f54c68f8e023d4e3fc94f1b1965cd33..843f9b9c281c9d5cf67aa01b08d5583677bfe222 100644 (file)
@@ -240,6 +240,18 @@ IRQ_STACK_START_IN:
        movs    pc, lr          @ jump to next instruction & switch modes.
        .endm
 
+       .macro get_bad_stack_swi
+       sub     r13, r13, #4    @ space on current stack for scratch reg.
+       str     r0, [r13]       @ save R0's value.
+       ldr     r0, IRQ_STACK_START_IN          @ get data regions start
+       str     lr, [r0]        @ save caller lr in position 0 of saved stack
+       mrs     lr, spsr        @ get the spsr
+       str     lr, [r0, #4]    @ save spsr in position 1 of saved stack
+       ldr     lr, [r0]        @ restore lr
+       ldr     r0, [r13]       @ restore r0
+       add     r13, r13, #4    @ pop stack entry
+       .endm
+
        .macro get_irq_stack                    @ setup IRQ stack
        ldr     sp, IRQ_STACK_START
        .endm
@@ -260,9 +272,16 @@ undefined_instruction:
 
        .align  5
 software_interrupt:
-       get_bad_stack
+       get_bad_stack_swi
        bad_save_user_regs
        bl      do_software_interrupt
+#if CONFIG_IS_ENABLED(SEMIHOSTING_FALLBACK)
+       ldmia   sp, {r0 - lr}^                  @ Calling r0 - lr
+       mov     r0, r0
+       ldr     lr, [sp, #S_PC]                 @ Get PC
+       add     sp, sp, #S_FRAME_SIZE
+       movs    pc, lr          @ return & move spsr_svc into cpsr
+#endif
 
        .align  5
 prefetch_abort:
index eb1488e74425c2c8bbd575c39616ab221a8b97f6..0cd13d8aaa59b8edee7c626b9b77f9d0b3c6a606 100644 (file)
@@ -8,7 +8,6 @@
 #ifndef __DM365_LOWLEVEL_H
 #define __DM365_LOWLEVEL_H
 
-#include <common.h>
 #include <asm/arch/hardware.h>
 #include <asm/io.h>
 
index 7529b311f80e2d721f077af1a7b162a2b3d94213..50a9c3e4203dbe7459c45ea555c55aadfd59c2a0 100644 (file)
@@ -246,7 +246,7 @@ config TARGET_KOSAGI_NOVENA
        select DM_GPIO
        select DM_MMC
        select PCI
-       select DM_SCSI
+       select SCSI
        select VIDEO
        select OF_CONTROL
        select SUPPORT_SPL
index 2341a713495d3c669716130725141144a13996e2..b4823a309fced747f0cabb3d02ca96e41ae6f571 100644 (file)
@@ -8,8 +8,6 @@
 #ifndef _PINCTRL_SNAPDRAGON_H
 #define _PINCTRL_SNAPDRAGON_H
 
-#include <common.h>
-
 struct msm_pinctrl_data {
        int pin_count;
        int functions_count;
index 01b76f7493c3f1d44db8920edd6ef6d62e1fa98f..38db4f2f5c8ee37a7ae5f0267b685d9fcb8261fa 100644 (file)
@@ -5,7 +5,6 @@
  *
  * Copyright (C) 2022 Texas Instruments Incorporated - https://www.ti.com/
  */
-#include <common.h>
 #include <asm/arch/hardware.h>
 #include "common.h"
 
index c871e92330bc2d9c5ab9b9439f1c549406766ad3..6085379f1db1f32c92fff870622a5f80c4edb457 100644 (file)
@@ -7,7 +7,6 @@
  *     Dave Gerlach <d-gerlach@ti.com>
  */
 
-#include <common.h>
 #include <fdt_support.h>
 #include <spl.h>
 #include <asm/io.h>
index 0d3889cde2ba49cadd031f9853f814c66f8db619..2c5d6334527c886a67217060fbf8410d5d4a3113 100644 (file)
@@ -6,7 +6,6 @@
  *     Lokesh Vutla <lokeshvutla@ti.com>
  */
 
-#include <common.h>
 #include <fdt_support.h>
 #include <init.h>
 #include <asm/global_data.h>
index f8087d2421e7b988c017a0a72f724b47e44977e5..14e7c896f9151d870d55450fd6cc6dbf82ab583c 100644 (file)
@@ -9,7 +9,6 @@
  *
  */
 
-#include <common.h>
 #include <asm/system.h>
 #include <asm/armv8/mmu.h>
 
index c3006ba387ec620ffc99fe3b98aa3fcbe60a8dc6..eff2fff3c706ca135d25054d21bcd76690f66b66 100644 (file)
@@ -6,7 +6,6 @@
  *     Lokesh Vutla <lokeshvutla@ti.com>
  */
 
-#include <common.h>
 #include <cpu_func.h>
 #include <image.h>
 #include <init.h>
index b1f7e25ed092635a8986d66a2bf6b2525ce5c791..099301d61ac087ec978b2b0612af8fd871c99cb0 100644 (file)
@@ -6,7 +6,6 @@
  *     Lokesh Vutla <lokeshvutla@ti.com>
  */
 
-#include <common.h>
 #include <init.h>
 #include <spl.h>
 #include <asm/io.h>
index a5be84b147c0451d73c5f0df7d04ba87de45e192..7d4481009041363c4b235cc8aae7497717b4dc33 100644 (file)
@@ -6,7 +6,6 @@
  *     David Huang <d-huang@ti.com>
  */
 
-#include <common.h>
 #include <init.h>
 #include <spl.h>
 #include <asm/io.h>
index 2aec96277e6f276416042133ae985251348bef95..6786e7e1e5afaf505c1e6fd53b3768ec06e8b2ed 100644 (file)
@@ -6,7 +6,6 @@
  *     Lokesh Vutla <lokeshvutla@ti.com>
  */
 
-#include <common.h>
 #include <asm/io.h>
 #include <linux/kernel.h>
 #include "common.h"
index 89659f479eed4ccbc839529e644e93ad4ab8a18b..3b7c26c6125a96e285d0d938fd60d641e3d56091 100644 (file)
@@ -7,7 +7,6 @@
  */
 
 #include <asm/io.h>
-#include <common.h>
 #include <cpu_func.h>
 #include <dm.h>
 #include <hang.h>
index ef245fef9c4b9cf80665b7173684da541bbe0d8b..aa401ae3a09e537ff9ae96aa6d723b1f98813093 100644 (file)
@@ -6,7 +6,6 @@
  *     Andreas Dannenberg <dannenberg@ti.com>
  */
 
-#include <common.h>
 #include <dm.h>
 #include <image.h>
 #include <log.h>
index 67d47f8172167ea30423c0bff401793bbb537d43..dfb5ad43506a86a7cfc96eef7479096a7ef2ebb0 100644 (file)
@@ -9,7 +9,6 @@
 #ifndef __ASM_ARCH_MUX_K2G_H
 #define __ASM_ARCH_MUX_K2G_H
 
-#include <common.h>
 #include <asm/io.h>
 
 #define K2G_PADCFG_REG (KS2_DEVICE_STATE_CTRL_BASE + 0x1000)
index 6deffb8183620550b553130e1f400e373ae52ff9..8e0de935385887727429d03fa644e6dab5b77da4 100644 (file)
@@ -589,15 +589,6 @@ int board_ahci_enable(void)
        return 0;
 }
 
-#ifdef CONFIG_SCSI_AHCI_PLAT
-void scsi_init(void)
-{
-       printf("MVEBU SATA INIT\n");
-       board_ahci_enable();
-       ahci_init((void __iomem *)MVEBU_SATA0_BASE);
-}
-#endif
-
 #ifdef CONFIG_USB_XHCI_MVEBU
 #define USB3_MAX_WINDOWS        4
 #define USB3_WIN_CTRL(w)        (0x0 + ((w) * 8))
index b125c30beb8c469a4a016d3cd80248fb470a4312..fd8ebceb26cff8264f5472b6b5f400d793bce582 100644 (file)
@@ -6,8 +6,6 @@
 #ifndef _MVEBU_EFUSE_H
 #define _MVEBU_EFUSE_H
 
-#include <common.h>
-
 struct efuse_val {
        union {
                struct {
index bb01eab80e674d6754665ee7ecbb7a94f49c3067..8c10c694dffbea33e1165cf863fa0bbe6480d56f 100644 (file)
@@ -27,13 +27,6 @@ obj-y        += vc.o
 obj-y  += abb.o
 endif
 
-ifneq ($(CONFIG_OMAP54XX),)
-ifeq ($(CONFIG_DM_SCSI),)
-obj-y  += pipe3-phy.o
-obj-$(CONFIG_SCSI_AHCI_PLAT) += sata.o
-endif
-endif
-
 ifeq ($(CONFIG_$(SPL_TPL_)SYS_DCACHE_OFF),)
 obj-y  += omap-cache.o
 endif
index a2dd5f6df01e88eed40fb6a49ed9b5195f6c282d..5e4d29910c9788956049d5dd74ec3d0ffa2ddd66 100644 (file)
@@ -309,13 +309,6 @@ void __noreturn jump_to_image_no_args(struct spl_image_info *spl_image)
 }
 #endif
 
-#ifdef CONFIG_SCSI_AHCI_PLAT
-void arch_preboot_os(void)
-{
-       ahci_reset((void __iomem *)DWC_AHSATA_BASE);
-}
-#endif
-
 #ifdef CONFIG_TI_SECURE_DEVICE
 void board_fit_image_post_process(const void *fit, int node, void **p_image,
                                  size_t *p_size)
index e6bee48dfcb32eab9988871f314ae5decedd6acd..b39132222ee5b820c8a68d2d903904d268f1d8b7 100644 (file)
@@ -485,9 +485,6 @@ void enable_basic_clocks(void)
                (*prcm)->cm_l4per_gpio6_clkctrl,
                (*prcm)->cm_l4per_gpio7_clkctrl,
                (*prcm)->cm_l4per_gpio8_clkctrl,
-#ifdef CONFIG_SCSI_AHCI_PLAT
-               (*prcm)->cm_l3init_ocp2scp3_clkctrl,
-#endif
                0
        };
 
@@ -506,9 +503,6 @@ void enable_basic_clocks(void)
 
 #ifdef CONFIG_TI_QSPI
                (*prcm)->cm_l4per_qspi_clkctrl,
-#endif
-#ifdef CONFIG_SCSI_AHCI_PLAT
-               (*prcm)->cm_l3init_sata_clkctrl,
 #endif
                0
        };
@@ -542,12 +536,6 @@ void enable_basic_clocks(void)
        setbits_le32((*prcm)->cm_l4per_qspi_clkctrl, (1<<24));
 #endif
 
-#ifdef CONFIG_SCSI_AHCI_PLAT
-       /* Enable optional functional clock for SATA */
-       setbits_le32((*prcm)->cm_l3init_sata_clkctrl,
-                    SATA_CLKCTRL_OPTFCLKEN_MASK);
-#endif
-
        /* Enable SCRM OPT clocks for PER and CORE dpll */
        setbits_le32((*prcm)->cm_wkupaon_scrm_clkctrl,
                        OPTFCLKEN_SCRM_PER_MASK);
diff --git a/arch/arm/mach-omap2/pipe3-phy.c b/arch/arm/mach-omap2/pipe3-phy.c
deleted file mode 100644 (file)
index 3dfb184..0000000
+++ /dev/null
@@ -1,231 +0,0 @@
-// SPDX-License-Identifier: GPL-2.0+
-/*
- * TI PIPE3 PHY
- *
- * (C) Copyright 2013
- * Texas Instruments, <www.ti.com>
- */
-
-#include <common.h>
-#include <sata.h>
-#include <asm/arch/clock.h>
-#include <asm/arch/sys_proto.h>
-#include <asm/io.h>
-#include <linux/bitops.h>
-#include <linux/delay.h>
-#include <linux/errno.h>
-#include "pipe3-phy.h"
-
-/* PLLCTRL Registers */
-#define PLL_STATUS              0x00000004
-#define PLL_GO                  0x00000008
-#define PLL_CONFIGURATION1      0x0000000C
-#define PLL_CONFIGURATION2      0x00000010
-#define PLL_CONFIGURATION3      0x00000014
-#define PLL_CONFIGURATION4      0x00000020
-
-#define PLL_REGM_MASK           0x001FFE00
-#define PLL_REGM_SHIFT          9
-#define PLL_REGM_F_MASK         0x0003FFFF
-#define PLL_REGM_F_SHIFT        0
-#define PLL_REGN_MASK           0x000001FE
-#define PLL_REGN_SHIFT          1
-#define PLL_SELFREQDCO_MASK     0x0000000E
-#define PLL_SELFREQDCO_SHIFT    1
-#define PLL_SD_MASK             0x0003FC00
-#define PLL_SD_SHIFT            10
-#define SET_PLL_GO              0x1
-#define PLL_TICOPWDN            BIT(16)
-#define PLL_LDOPWDN             BIT(15)
-#define PLL_LOCK                0x2
-#define PLL_IDLE                0x1
-
-/* PHY POWER CONTROL Register */
-#define OMAP_CTRL_PIPE3_PHY_PWRCTL_CLK_CMD_MASK         0x003FC000
-#define OMAP_CTRL_PIPE3_PHY_PWRCTL_CLK_CMD_SHIFT        0xE
-
-#define OMAP_CTRL_PIPE3_PHY_PWRCTL_CLK_FREQ_MASK        0xFFC00000
-#define OMAP_CTRL_PIPE3_PHY_PWRCTL_CLK_FREQ_SHIFT       0x16
-
-#define OMAP_CTRL_PIPE3_PHY_TX_RX_POWERON       0x3
-#define OMAP_CTRL_PIPE3_PHY_TX_RX_POWEROFF      0x0
-
-
-#define PLL_IDLE_TIME   100     /* in milliseconds */
-#define PLL_LOCK_TIME   100     /* in milliseconds */
-
-static inline u32 omap_pipe3_readl(void __iomem *addr, unsigned offset)
-{
-       return __raw_readl(addr + offset);
-}
-
-static inline void omap_pipe3_writel(void __iomem *addr, unsigned offset,
-               u32 data)
-{
-       __raw_writel(data, addr + offset);
-}
-
-static struct pipe3_dpll_params *omap_pipe3_get_dpll_params(struct omap_pipe3
-                                                                       *pipe3)
-{
-       u32 rate;
-       struct pipe3_dpll_map *dpll_map = pipe3->dpll_map;
-
-       rate = get_sys_clk_freq();
-
-       for (; dpll_map->rate; dpll_map++) {
-               if (rate == dpll_map->rate)
-                       return &dpll_map->params;
-       }
-
-       printf("%s: No DPLL configuration for %u Hz SYS CLK\n",
-              __func__, rate);
-       return NULL;
-}
-
-
-static int omap_pipe3_wait_lock(struct omap_pipe3 *phy)
-{
-       u32 val;
-       int timeout = PLL_LOCK_TIME;
-
-       do {
-               mdelay(1);
-               val = omap_pipe3_readl(phy->pll_ctrl_base, PLL_STATUS);
-               if (val & PLL_LOCK)
-                       break;
-       } while (--timeout);
-
-       if (!(val & PLL_LOCK)) {
-               printf("%s: DPLL failed to lock\n", __func__);
-               return -EBUSY;
-       }
-
-       return 0;
-}
-
-static int omap_pipe3_dpll_program(struct omap_pipe3 *phy)
-{
-       u32                     val;
-       struct pipe3_dpll_params *dpll_params;
-
-       dpll_params = omap_pipe3_get_dpll_params(phy);
-       if (!dpll_params) {
-               printf("%s: Invalid DPLL parameters\n", __func__);
-               return -EINVAL;
-       }
-
-       val = omap_pipe3_readl(phy->pll_ctrl_base, PLL_CONFIGURATION1);
-       val &= ~PLL_REGN_MASK;
-       val |= dpll_params->n << PLL_REGN_SHIFT;
-       omap_pipe3_writel(phy->pll_ctrl_base, PLL_CONFIGURATION1, val);
-
-       val = omap_pipe3_readl(phy->pll_ctrl_base, PLL_CONFIGURATION2);
-       val &= ~PLL_SELFREQDCO_MASK;
-       val |= dpll_params->freq << PLL_SELFREQDCO_SHIFT;
-       omap_pipe3_writel(phy->pll_ctrl_base, PLL_CONFIGURATION2, val);
-
-       val = omap_pipe3_readl(phy->pll_ctrl_base, PLL_CONFIGURATION1);
-       val &= ~PLL_REGM_MASK;
-       val |= dpll_params->m << PLL_REGM_SHIFT;
-       omap_pipe3_writel(phy->pll_ctrl_base, PLL_CONFIGURATION1, val);
-
-       val = omap_pipe3_readl(phy->pll_ctrl_base, PLL_CONFIGURATION4);
-       val &= ~PLL_REGM_F_MASK;
-       val |= dpll_params->mf << PLL_REGM_F_SHIFT;
-       omap_pipe3_writel(phy->pll_ctrl_base, PLL_CONFIGURATION4, val);
-
-       val = omap_pipe3_readl(phy->pll_ctrl_base, PLL_CONFIGURATION3);
-       val &= ~PLL_SD_MASK;
-       val |= dpll_params->sd << PLL_SD_SHIFT;
-       omap_pipe3_writel(phy->pll_ctrl_base, PLL_CONFIGURATION3, val);
-
-       omap_pipe3_writel(phy->pll_ctrl_base, PLL_GO, SET_PLL_GO);
-
-       return omap_pipe3_wait_lock(phy);
-}
-
-static void omap_control_phy_power(struct omap_pipe3 *phy, int on)
-{
-       u32 val, rate;
-
-       val = readl(phy->power_reg);
-
-       rate = get_sys_clk_freq();
-       rate = rate/1000000;
-
-       if (on) {
-               val &= ~(OMAP_CTRL_PIPE3_PHY_PWRCTL_CLK_CMD_MASK |
-                               OMAP_CTRL_PIPE3_PHY_PWRCTL_CLK_FREQ_MASK);
-               val |= OMAP_CTRL_PIPE3_PHY_TX_RX_POWERON <<
-                       OMAP_CTRL_PIPE3_PHY_PWRCTL_CLK_CMD_SHIFT;
-               val |= rate <<
-                       OMAP_CTRL_PIPE3_PHY_PWRCTL_CLK_FREQ_SHIFT;
-       } else {
-               val &= ~OMAP_CTRL_PIPE3_PHY_PWRCTL_CLK_CMD_MASK;
-               val |= OMAP_CTRL_PIPE3_PHY_TX_RX_POWEROFF <<
-                       OMAP_CTRL_PIPE3_PHY_PWRCTL_CLK_CMD_SHIFT;
-       }
-
-       writel(val, phy->power_reg);
-}
-
-int phy_pipe3_power_on(struct omap_pipe3 *phy)
-{
-       int ret;
-       u32 val;
-
-       /* Program the DPLL only if not locked */
-       val = omap_pipe3_readl(phy->pll_ctrl_base, PLL_STATUS);
-       if (!(val & PLL_LOCK)) {
-               ret = omap_pipe3_dpll_program(phy);
-               if (ret)
-                       return ret;
-       } else {
-               /* else just bring it out of IDLE mode */
-               val = omap_pipe3_readl(phy->pll_ctrl_base, PLL_CONFIGURATION2);
-               if (val & PLL_IDLE) {
-                       val &= ~PLL_IDLE;
-                       omap_pipe3_writel(phy->pll_ctrl_base,
-                                         PLL_CONFIGURATION2, val);
-                       ret = omap_pipe3_wait_lock(phy);
-                       if (ret)
-                               return ret;
-               }
-       }
-
-       /* Power up the PHY */
-       omap_control_phy_power(phy, 1);
-
-       return 0;
-}
-
-int phy_pipe3_power_off(struct omap_pipe3 *phy)
-{
-       u32 val;
-       int timeout = PLL_IDLE_TIME;
-
-       /* Power down the PHY */
-       omap_control_phy_power(phy, 0);
-
-       /* Put DPLL in IDLE mode */
-       val = omap_pipe3_readl(phy->pll_ctrl_base, PLL_CONFIGURATION2);
-       val |= PLL_IDLE;
-       omap_pipe3_writel(phy->pll_ctrl_base, PLL_CONFIGURATION2, val);
-
-       /* wait for LDO and Oscillator to power down */
-       do {
-               mdelay(1);
-               val = omap_pipe3_readl(phy->pll_ctrl_base, PLL_STATUS);
-               if ((val & PLL_TICOPWDN) && (val & PLL_LDOPWDN))
-                       break;
-       } while (--timeout);
-
-       if (!(val & PLL_TICOPWDN) || !(val & PLL_LDOPWDN)) {
-               printf("%s: Failed to power down DPLL: PLL_STATUS 0x%x\n",
-                      __func__, val);
-               return -EBUSY;
-       }
-
-       return 0;
-}
diff --git a/arch/arm/mach-omap2/pipe3-phy.h b/arch/arm/mach-omap2/pipe3-phy.h
deleted file mode 100644 (file)
index 182bdcd..0000000
+++ /dev/null
@@ -1,35 +0,0 @@
-/* SPDX-License-Identifier: GPL-2.0+ */
-/*
- * TI PIPE3 PHY
- *
- * (C) Copyright 2013
- * Texas Instruments, <www.ti.com>
- */
-
-#ifndef __OMAP_PIPE3_PHY_H
-#define __OMAP_PIPE3_PHY_H
-
-struct pipe3_dpll_params {
-       u16     m;
-       u8      n;
-       u8      freq:3;
-       u8      sd;
-       u32     mf;
-};
-
-struct pipe3_dpll_map {
-       unsigned long rate;
-       struct pipe3_dpll_params params;
-};
-
-struct omap_pipe3 {
-       void __iomem            *pll_ctrl_base;
-       void __iomem            *power_reg;
-       struct pipe3_dpll_map   *dpll_map;
-};
-
-
-int phy_pipe3_power_on(struct omap_pipe3 *phy);
-int phy_pipe3_power_off(struct omap_pipe3 *pipe3);
-
-#endif /* __OMAP_PIPE3_PHY_H */
diff --git a/arch/arm/mach-omap2/sata.c b/arch/arm/mach-omap2/sata.c
deleted file mode 100644 (file)
index 53c39ce..0000000
+++ /dev/null
@@ -1,72 +0,0 @@
-// SPDX-License-Identifier: GPL-2.0+
-/*
- * TI SATA platform driver
- *
- * (C) Copyright 2013
- * Texas Instruments, <www.ti.com>
- */
-
-#include <common.h>
-#include <ahci.h>
-#include <scsi.h>
-#include <asm/arch/clock.h>
-#include <asm/arch/sata.h>
-#include <sata.h>
-#include <asm/io.h>
-#include <asm/omap_common.h>
-#include "pipe3-phy.h"
-
-static struct pipe3_dpll_map dpll_map_sata[] = {
-       {12000000, {1000, 7, 4, 6, 0} },        /* 12 MHz */
-       {16800000, {714, 7, 4, 6, 0} },         /* 16.8 MHz */
-       {19200000, {625, 7, 4, 6, 0} },         /* 19.2 MHz */
-       {20000000, {600, 7, 4, 6, 0} },         /* 20 MHz */
-       {26000000, {461, 7, 4, 6, 0} },         /* 26 MHz */
-       {38400000, {312, 7, 4, 6, 0} },         /* 38.4 MHz */
-       { },                                    /* Terminator */
-};
-
-struct omap_pipe3 sata_phy = {
-       .pll_ctrl_base = (void __iomem *)TI_SATA_PLLCTRL_BASE,
-       /* .power_reg is updated at runtime */
-       .dpll_map = dpll_map_sata,
-};
-
-int init_sata(int dev)
-{
-       int ret;
-       u32 val;
-
-       sata_phy.power_reg = (void __iomem *)(*ctrl)->control_phy_power_sata;
-
-       /* Power up the PHY */
-       phy_pipe3_power_on(&sata_phy);
-
-       /* Enable SATA module, No Idle, No Standby */
-       val = TI_SATA_IDLE_NO | TI_SATA_STANDBY_NO;
-       writel(val, TI_SATA_WRAPPER_BASE + TI_SATA_SYSCONFIG);
-
-       ret = ahci_init((void __iomem *)DWC_AHSATA_BASE);
-
-       return ret;
-}
-
-int reset_sata(int dev)
-{
-       return 0;
-}
-
-/* On OMAP platforms SATA provides the SCSI subsystem */
-void scsi_init(void)
-{
-       init_sata(0);
-       scsi_scan(1);
-}
-
-int scsi_bus_reset(struct udevice *dev)
-{
-       ahci_reset((void __iomem *)DWC_AHSATA_BASE);
-       ahci_init((void __iomem *)DWC_AHSATA_BASE);
-
-       return 0;
-}
index db47baba6d1ae8377cbe51bafa325d4dd4f950bc..5fc92d07fe6d00d26fafcc061fb173f232795388 100644 (file)
@@ -76,6 +76,30 @@ config STM32MP15x
                STM32MP157, STM32MP153 or STM32MP151
                STMicroelectronics MPU with core ARMv7
                dual core A7 for STM32MP157/3, monocore for STM32MP151
+
+config STM32MP25X
+       bool "Support STMicroelectronics STM32MP25x Soc"
+       select ARM64
+       select CLK_STM32MP25
+       select OF_BOARD
+       select PINCTRL_STM32
+       select STM32_RCC
+       select STM32_RESET
+       select STM32_SERIAL
+       select SYS_ARCH_TIMER
+       select TFABOOT
+       imply CLK_SCMI
+       imply CMD_NVEDIT_INFO
+       imply DM_REGULATOR
+       imply DM_REGULATOR_SCMI
+       imply OPTEE
+       imply RESET_SCMI
+       imply SYSRESET_PSCI
+       imply TEE
+       imply VERSION_VARIABLE
+       help
+               Support of STMicroelectronics SOC STM32MP25x family
+               STMicroelectronics MPU with 2 * A53 core and 1 M33 core
 endchoice
 
 config NR_DRAM_BANKS
@@ -128,6 +152,6 @@ config CMD_STM32KEY
 
 source "arch/arm/mach-stm32mp/Kconfig.13x"
 source "arch/arm/mach-stm32mp/Kconfig.15x"
-
+source "arch/arm/mach-stm32mp/Kconfig.25x"
 source "arch/arm/mach-stm32mp/cmd_stm32prog/Kconfig"
 endif
diff --git a/arch/arm/mach-stm32mp/Kconfig.25x b/arch/arm/mach-stm32mp/Kconfig.25x
new file mode 100644 (file)
index 0000000..2c0f691
--- /dev/null
@@ -0,0 +1,43 @@
+if STM32MP25X
+
+choice
+       prompt "STM32MP25x board select"
+       optional
+
+config TARGET_ST_STM32MP25X
+       bool "STMicroelectronics STM32MP25x boards"
+       imply BOOTSTAGE
+       imply CMD_BOOTSTAGE
+       help
+               target the STMicroelectronics board with SOC STM32MP25x
+               managed by board/st/stm32mp2
+               The difference between board are managed with devicetree
+
+endchoice
+
+config TEXT_BASE
+       default 0x84000000
+
+config PRE_CON_BUF_ADDR
+       default 0x84800000
+
+config PRE_CON_BUF_SZ
+       default 4096
+
+config BOOTSTAGE_STASH_ADDR
+       default 0x87000000
+
+if DEBUG_UART
+
+config DEBUG_UART_BOARD_INIT
+       default y
+
+# debug on USART2 by default
+config DEBUG_UART_BASE
+       default 0x400e0000
+
+endif
+
+source "board/st/stm32mp2/Kconfig"
+
+endif
index a19b2797c8b33d28e3fb39cbb2dcfed79d910501..00dc25bb275c816cea14948f4ce8c412694c36c7 100644 (file)
@@ -3,24 +3,17 @@
 # Copyright (C) 2018, STMicroelectronics - All Rights Reserved
 #
 
-obj-y += cpu.o
 obj-y += dram_init.o
 obj-y += syscon.o
 obj-y += bsec.o
 
-obj-$(CONFIG_STM32MP13x) += stm32mp13x.o
-obj-$(CONFIG_STM32MP15x) += stm32mp15x.o
+obj-$(CONFIG_STM32MP15x) += stm32mp1/
+obj-$(CONFIG_STM32MP13x) += stm32mp1/
+obj-$(CONFIG_STM32MP25X) += stm32mp2/
 
 obj-$(CONFIG_STM32_ECDSA_VERIFY) += ecdsa_romapi.o
-ifdef CONFIG_SPL_BUILD
-obj-y += spl.o
-obj-y += tzc400.o
-else
+ifndef CONFIG_SPL_BUILD
 obj-y += cmd_stm32prog/
 obj-$(CONFIG_CMD_STM32KEY) += cmd_stm32key.o
-obj-$(CONFIG_ARMV7_PSCI) += psci.o
 obj-$(CONFIG_TFABOOT) += boot_params.o
 endif
-
-obj-$(CONFIG_$(SPL_)STM32MP15_PWR) += pwr_regulator.o
-obj-$(CONFIG_OF_SYSTEM_SETUP) += fdt.o
index 599e63a93dd90ec1f02c12c5cbfbb562cc15680f..28a8280b2804ccb5f70b9fd0ec77b8131310f828 100644 (file)
  * @otp: otp number (0 - BSEC_OTP_MAX_VALUE)
  * Return: true if locked else false
  */
-static bool bsec_read_lock(u32 address, u32 otp)
+static bool bsec_read_lock(void __iomem *address, u32 otp)
 {
        u32 bit;
        u32 bank;
@@ -118,7 +118,7 @@ static bool bsec_read_lock(u32 address, u32 otp)
        bit = 1 << (otp & OTP_LOCK_MASK);
        bank = ((otp >> OTP_LOCK_BANK_SHIFT) & OTP_LOCK_MASK) * sizeof(u32);
 
-       return !!(readl(address + bank) & bit);
+       return !!(readl((address + bank)) & bit);
 }
 
 /**
@@ -127,7 +127,7 @@ static bool bsec_read_lock(u32 address, u32 otp)
  * @otp: otp number (0 - BSEC_OTP_MAX_VALUE)
  * Return: 0 if no error, -EAGAIN or -ENOTSUPP
  */
-static u32 bsec_check_error(u32 base, u32 otp)
+static u32 bsec_check_error(void __iomem *base, u32 otp)
 {
        u32 bit;
        u32 bank;
@@ -149,7 +149,7 @@ static u32 bsec_check_error(u32 base, u32 otp)
  * @otp: otp number (0 - BSEC_OTP_MAX_VALUE)
  * Return: true if locked else false
  */
-static bool bsec_read_SR_lock(u32 base, u32 otp)
+static bool bsec_read_SR_lock(void __iomem *base, u32 otp)
 {
        return bsec_read_lock(base + BSEC_SRLOCK_OFF, otp);
 }
@@ -160,7 +160,7 @@ static bool bsec_read_SR_lock(u32 base, u32 otp)
  * @otp: otp number (0 - BSEC_OTP_MAX_VALUE)
  * Return: true if locked else false
  */
-static bool bsec_read_SP_lock(u32 base, u32 otp)
+static bool bsec_read_SP_lock(void __iomem *base, u32 otp)
 {
        return bsec_read_lock(base + BSEC_SPLOCK_OFF, otp);
 }
@@ -171,7 +171,7 @@ static bool bsec_read_SP_lock(u32 base, u32 otp)
  * @otp: otp number (0 - BSEC_OTP_MAX_VALUE)
  * Return: true if locked else false
  */
-static bool bsec_read_SW_lock(u32 base, u32 otp)
+static bool bsec_read_SW_lock(void __iomem *base, u32 otp)
 {
        return bsec_read_lock(base + BSEC_SWLOCK_OFF, otp);
 }
@@ -182,7 +182,7 @@ static bool bsec_read_SW_lock(u32 base, u32 otp)
  * @power: true to power up , false to power down
  * Return: 0 if succeed
  */
-static int bsec_power_safmem(u32 base, bool power)
+static int bsec_power_safmem(void __iomem *base, bool power)
 {
        u32 val;
        u32 mask;
@@ -208,7 +208,7 @@ static int bsec_power_safmem(u32 base, bool power)
  * @otp: otp number (0 - BSEC_OTP_MAX_VALUE)
  * Return: 0 if no error
  */
-static int bsec_shadow_register(struct udevice *dev, u32 base, u32 otp)
+static int bsec_shadow_register(struct udevice *dev, void __iomem *base, u32 otp)
 {
        u32 val;
        int ret;
@@ -253,7 +253,8 @@ static int bsec_shadow_register(struct udevice *dev, u32 base, u32 otp)
  * @otp: otp number (0 - BSEC_OTP_MAX_VALUE)
  * Return: 0 if no error
  */
-static int bsec_read_shadow(struct udevice *dev, u32 base, u32 *val, u32 otp)
+static int bsec_read_shadow(struct udevice *dev, void __iomem *base, u32 *val,
+                           u32 otp)
 {
        *val = readl(base + BSEC_OTP_DATA_OFF + otp * sizeof(u32));
 
@@ -268,7 +269,7 @@ static int bsec_read_shadow(struct udevice *dev, u32 base, u32 *val, u32 otp)
  * @otp: otp number (0 - BSEC_OTP_MAX_VALUE)
  * Return: 0 if no error
  */
-static int bsec_write_shadow(struct udevice *dev, u32 base, u32 val, u32 otp)
+static int bsec_write_shadow(struct udevice *dev, void __iomem *base, u32 val, u32 otp)
 {
        /* check if programming of otp is locked */
        if (bsec_read_SW_lock(base, otp))
@@ -288,7 +289,7 @@ static int bsec_write_shadow(struct udevice *dev, u32 base, u32 val, u32 otp)
  * after the function the otp data is not refreshed in shadow
  * Return: 0 if no error
  */
-static int bsec_program_otp(struct udevice *dev, long base, u32 val, u32 otp)
+static int bsec_program_otp(struct udevice *dev, void __iomem *base, u32 val, u32 otp)
 {
        u32 ret;
        bool power_up = false;
@@ -338,7 +339,7 @@ static int bsec_program_otp(struct udevice *dev, long base, u32 val, u32 otp)
  * @otp: otp number (0 - BSEC_OTP_MAX_VALUE)
  * Return: 0 if no error
  */
-static int bsec_permanent_lock_otp(struct udevice *dev, long base, uint32_t otp)
+static int bsec_permanent_lock_otp(struct udevice *dev, void __iomem *base, uint32_t otp)
 {
        int ret;
        bool power_up = false;
@@ -392,7 +393,7 @@ static int bsec_permanent_lock_otp(struct udevice *dev, long base, uint32_t otp)
 
 /* BSEC MISC driver *******************************************************/
 struct stm32mp_bsec_plat {
-       u32 base;
+       void __iomem *base;
 };
 
 struct stm32mp_bsec_priv {
@@ -724,7 +725,7 @@ static int stm32mp_bsec_of_to_plat(struct udevice *dev)
 {
        struct stm32mp_bsec_plat *plat = dev_get_plat(dev);
 
-       plat->base = (u32)dev_read_addr_ptr(dev);
+       plat->base = dev_read_addr_ptr(dev);
 
        return 0;
 }
index 7f37b0d2aa2cdd50649fc86ac8133ad35a5750b1..fb1208fc5d570bb3e4676c308bf67f56c57f626f 100644 (file)
@@ -24,8 +24,11 @@ int dram_init(void)
        int ret;
 
        ret = uclass_get_device(UCLASS_RAM, 0, &dev);
-       if (ret) {
-               log_debug("RAM init failed: %d\n", ret);
+       /* in case there is no RAM driver, retrieve DDR size from DT */
+       if (ret == -ENODEV) {
+               return fdtdec_setup_mem_size_base();
+       } else if (ret) {
+               log_err("RAM init failed: %d\n", ret);
                return ret;
        }
        ret = ram_get_info(dev, &ram);
@@ -33,7 +36,7 @@ int dram_init(void)
                log_debug("Cannot get RAM size: %d\n", ret);
                return ret;
        }
-       log_debug("RAM init base=%lx, size=%x\n", ram.base, ram.size);
+       log_debug("RAM init base=%p, size=%zx\n", (void *)ram.base, ram.size);
 
        gd->ram_size = ram.size;
 
@@ -49,9 +52,15 @@ phys_addr_t board_get_usable_ram_top(phys_size_t total_size)
        if (!total_size)
                return gd->ram_top;
 
+       /*
+        * make sure U-Boot uses address space below 4GB boundaries even
+        * if the effective available memory is bigger
+        */
+       gd->ram_top = clamp_val(gd->ram_top, 0, SZ_4G - 1);
+
        /* found enough not-reserved memory to relocated U-Boot */
        lmb_init(&lmb);
-       lmb_add(&lmb, gd->ram_base, get_effective_memsize());
+       lmb_add(&lmb, gd->ram_base, gd->ram_top - gd->ram_base);
        boot_fdt_add_mem_rsv_regions(&lmb, (void *)gd->fdt_blob);
        /* add 8M for reserved memory for display, fdt, gd,... */
        size = ALIGN(SZ_8M + CONFIG_SYS_MALLOC_LEN + total_size, MMU_SECTION_SIZE),
index 1cdc5e3b1864bbc1ebfaa7ebf864659a8d86f529..b31e4a5d0dcf5760ba028f2b19728bb773e9301a 100644 (file)
@@ -6,14 +6,69 @@
 #ifndef _MACH_STM32_H_
 #define _MACH_STM32_H_
 
+#include <linux/sizes.h>
 #ifndef __ASSEMBLY__
 #include <linux/bitops.h>
+
+enum boot_device {
+       BOOT_FLASH_SD = 0x10,
+       BOOT_FLASH_SD_1 = 0x11,
+       BOOT_FLASH_SD_2 = 0x12,
+       BOOT_FLASH_SD_3 = 0x13,
+
+       BOOT_FLASH_EMMC = 0x20,
+       BOOT_FLASH_EMMC_1 = 0x21,
+       BOOT_FLASH_EMMC_2 = 0x22,
+       BOOT_FLASH_EMMC_3 = 0x23,
+
+       BOOT_FLASH_NAND = 0x30,
+       BOOT_FLASH_NAND_FMC = 0x31,
+
+       BOOT_FLASH_NOR = 0x40,
+       BOOT_FLASH_NOR_QSPI = 0x41,
+
+       BOOT_SERIAL_UART = 0x50,
+       BOOT_SERIAL_UART_1 = 0x51,
+       BOOT_SERIAL_UART_2 = 0x52,
+       BOOT_SERIAL_UART_3 = 0x53,
+       BOOT_SERIAL_UART_4 = 0x54,
+       BOOT_SERIAL_UART_5 = 0x55,
+       BOOT_SERIAL_UART_6 = 0x56,
+       BOOT_SERIAL_UART_7 = 0x57,
+       BOOT_SERIAL_UART_8 = 0x58,
+
+       BOOT_SERIAL_USB = 0x60,
+       BOOT_SERIAL_USB_OTG = 0x62,
+
+       BOOT_FLASH_SPINAND = 0x70,
+       BOOT_FLASH_SPINAND_1 = 0x71,
+};
+
+#define TAMP_BOOT_MODE_MASK            GENMASK(15, 8)
+#define TAMP_BOOT_MODE_SHIFT           8
+#define TAMP_BOOT_DEVICE_MASK          GENMASK(7, 4)
+#define TAMP_BOOT_INSTANCE_MASK                GENMASK(3, 0)
+#define TAMP_BOOT_FORCED_MASK          GENMASK(7, 0)
+#define TAMP_BOOT_DEBUG_ON             BIT(16)
+
+enum forced_boot_mode {
+       BOOT_NORMAL = 0x00,
+       BOOT_FASTBOOT = 0x01,
+       BOOT_RECOVERY = 0x02,
+       BOOT_STM32PROG = 0x03,
+       BOOT_UMS_MMC0 = 0x10,
+       BOOT_UMS_MMC1 = 0x11,
+       BOOT_UMS_MMC2 = 0x12,
+};
+
 #endif
 
 /*
  * Peripheral memory map
  * only address used before device tree parsing
  */
+
+#if defined(CONFIG_STM32MP15x) || defined(CONFIG_STM32MP13x)
 #define STM32_RCC_BASE                 0x50000000
 #define STM32_PWR_BASE                 0x50001000
 #define STM32_SYSCFG_BASE              0x50020000
 #define STM32_DDR_SIZE                 SZ_1G
 
 #ifndef __ASSEMBLY__
-/* enumerated used to identify the SYSCON driver instance */
-enum {
-       STM32MP_SYSCON_UNKNOWN,
-       STM32MP_SYSCON_SYSCFG,
-};
-
 /*
  * enumerated for boot interface from Bootrom, used in TAMP_BOOT_CONTEXT
  * - boot device = bit 8:4
@@ -74,40 +123,6 @@ enum {
 #define BOOT_INSTANCE_MASK     0x0F
 #define BOOT_INSTANCE_SHIFT    0
 
-enum boot_device {
-       BOOT_FLASH_SD = 0x10,
-       BOOT_FLASH_SD_1 = 0x11,
-       BOOT_FLASH_SD_2 = 0x12,
-       BOOT_FLASH_SD_3 = 0x13,
-
-       BOOT_FLASH_EMMC = 0x20,
-       BOOT_FLASH_EMMC_1 = 0x21,
-       BOOT_FLASH_EMMC_2 = 0x22,
-       BOOT_FLASH_EMMC_3 = 0x23,
-
-       BOOT_FLASH_NAND = 0x30,
-       BOOT_FLASH_NAND_FMC = 0x31,
-
-       BOOT_FLASH_NOR = 0x40,
-       BOOT_FLASH_NOR_QSPI = 0x41,
-
-       BOOT_SERIAL_UART = 0x50,
-       BOOT_SERIAL_UART_1 = 0x51,
-       BOOT_SERIAL_UART_2 = 0x52,
-       BOOT_SERIAL_UART_3 = 0x53,
-       BOOT_SERIAL_UART_4 = 0x54,
-       BOOT_SERIAL_UART_5 = 0x55,
-       BOOT_SERIAL_UART_6 = 0x56,
-       BOOT_SERIAL_UART_7 = 0x57,
-       BOOT_SERIAL_UART_8 = 0x58,
-
-       BOOT_SERIAL_USB = 0x60,
-       BOOT_SERIAL_USB_OTG = 0x62,
-
-       BOOT_FLASH_SPINAND = 0x70,
-       BOOT_FLASH_SPINAND_1 = 0x71,
-};
-
 /* TAMP registers */
 #define TAMP_BACKUP_REGISTER(x)                (STM32_TAMP_BASE + 0x100 + 4 * x)
 
@@ -123,7 +138,6 @@ enum boot_device {
 #define TAMP_FWU_BOOT_IDX_MASK         GENMASK(3, 0)
 
 #define TAMP_FWU_BOOT_IDX_OFFSET       0
-
 #define TAMP_COPRO_STATE_OFF           0
 #define TAMP_COPRO_STATE_INIT          1
 #define TAMP_COPRO_STATE_CRUN          2
@@ -137,21 +151,23 @@ enum boot_device {
 #define TAMP_BOOT_CONTEXT              TAMP_BACKUP_REGISTER(30)
 #endif
 
-#define TAMP_BOOT_MODE_MASK            GENMASK(15, 8)
-#define TAMP_BOOT_MODE_SHIFT           8
-#define TAMP_BOOT_DEVICE_MASK          GENMASK(7, 4)
-#define TAMP_BOOT_INSTANCE_MASK                GENMASK(3, 0)
-#define TAMP_BOOT_FORCED_MASK          GENMASK(7, 0)
+#endif /* __ASSEMBLY__ */
+#endif /* CONFIG_STM32MP15X || CONFIG_STM32MP13X */
 
-enum forced_boot_mode {
-       BOOT_NORMAL = 0x00,
-       BOOT_FASTBOOT = 0x01,
-       BOOT_RECOVERY = 0x02,
-       BOOT_STM32PROG = 0x03,
-       BOOT_UMS_MMC0 = 0x10,
-       BOOT_UMS_MMC1 = 0x11,
-       BOOT_UMS_MMC2 = 0x12,
-};
+#if CONFIG_STM32MP25X
+#define STM32_RCC_BASE                 0x44200000
+#define STM32_TAMP_BASE                        0x46010000
+
+#define STM32_DDR_BASE                 0x80000000
+
+#define STM32_DDR_SIZE                 SZ_4G
+
+/* TAMP registers x = 0 to 127 : hardcoded description, waiting NVMEM node in DT */
+#define TAMP_BACKUP_REGISTER(x)                (STM32_TAMP_BASE + 0x100 + 4 * (x))
+
+/* TAMP registers zone 3 RIF 1 (RW) at 96*/
+#define TAMP_BOOT_CONTEXT              TAMP_BACKUP_REGISTER(96)
+#endif /* STM32MP25X */
 
 /* offset used for BSEC driver: misc_read and misc_write */
 #define STM32_BSEC_SHADOW_OFFSET       0x0
@@ -175,6 +191,20 @@ enum forced_boot_mode {
 #define BSEC_OTP_MAC   57
 #define BSEC_OTP_BOARD 60
 #endif
+#ifdef CONFIG_STM32MP25X
+#define BSEC_OTP_SERIAL        5
+#define BSEC_OTP_RPN   9
+#define BSEC_OTP_PKG   246
+#endif
+
+#ifndef __ASSEMBLY__
+#include <asm/types.h>
+
+/* enumerated used to identify the SYSCON driver instance */
+enum {
+       STM32MP_SYSCON_UNKNOWN,
+       STM32MP_SYSCON_SYSCFG,
+};
+#endif /* __ASSEMBLY__*/
 
-#endif /* __ASSEMBLY__ */
 #endif /* _MACH_STM32_H_ */
index 83fb32a45fccbe71f62d8fb2536934440d77ff9f..7b2df09a33c7d47cf82be2b868c506b4869f0476 100644 (file)
 #define CPU_STM32MP131Fxx      0x05010EC8
 #define CPU_STM32MP131Dxx      0x05010EC9
 
+/* ID for STM32MP25x = Device Part Number (RPN) (bit31:0) */
+#define CPU_STM32MP257Cxx       0x00002000
+#define CPU_STM32MP255Cxx       0x00082000
+#define CPU_STM32MP253Cxx       0x000B2004
+#define CPU_STM32MP251Cxx       0x000B3065
+#define CPU_STM32MP257Axx       0x40002E00
+#define CPU_STM32MP255Axx       0x40082E00
+#define CPU_STM32MP253Axx       0x400B2E04
+#define CPU_STM32MP251Axx       0x400B3E65
+#define CPU_STM32MP257Fxx       0x80002000
+#define CPU_STM32MP255Fxx       0x80082000
+#define CPU_STM32MP253Fxx       0x800B2004
+#define CPU_STM32MP251Fxx       0x800B3065
+#define CPU_STM32MP257Dxx       0xC0002E00
+#define CPU_STM32MP255Dxx       0xC0082E00
+#define CPU_STM32MP253Dxx       0xC00B2E04
+#define CPU_STM32MP251Dxx       0xC00B3E65
+
 /* return CPU_STMP32MP...Xxx constants */
 u32 get_cpu_type(void);
 
 #define CPU_DEV_STM32MP15      0x500
 #define CPU_DEV_STM32MP13      0x501
+#define CPU_DEV_STM32MP25      0x505
 
 /* return CPU_DEV constants */
 u32 get_cpu_dev(void);
@@ -59,6 +78,13 @@ u32 get_cpu_package(void);
 #define STM32MP15_PKG_AD_TFBGA257      1
 #define STM32MP15_PKG_UNKNOWN          0
 
+/* package used for STM32MP25x */
+#define STM32MP25_PKG_CUSTOM           0
+#define STM32MP25_PKG_AL_TBGA361       3
+#define STM32MP25_PKG_AK_TBGA424       4
+#define STM32MP25_PKG_AI_TBGA436       5
+#define STM32MP25_PKG_UNKNOWN          7
+
 /* Get SOC name */
 #define SOC_NAME_SIZE 20
 void get_soc_name(char name[SOC_NAME_SIZE]);
diff --git a/arch/arm/mach-stm32mp/stm32mp1/Makefile b/arch/arm/mach-stm32mp/stm32mp1/Makefile
new file mode 100644 (file)
index 0000000..94c7724
--- /dev/null
@@ -0,0 +1,20 @@
+# SPDX-License-Identifier: GPL-2.0+
+#
+# Copyright (C) 2018, STMicroelectronics - All Rights Reserved
+#
+
+obj-y += cpu.o
+
+obj-$(CONFIG_STM32MP13x) += stm32mp13x.o
+obj-$(CONFIG_STM32MP15x) += stm32mp15x.o
+
+obj-$(CONFIG_STM32_ECDSA_VERIFY) += ecdsa_romapi.o
+ifdef CONFIG_SPL_BUILD
+obj-y += spl.o
+obj-y += tzc400.o
+else
+obj-$(CONFIG_ARMV7_PSCI) += psci.o
+endif
+
+obj-$(CONFIG_$(SPL_)STM32MP15_PWR) += pwr_regulator.o
+obj-$(CONFIG_OF_SYSTEM_SETUP) += fdt.o
diff --git a/arch/arm/mach-stm32mp/stm32mp2/Makefile b/arch/arm/mach-stm32mp/stm32mp2/Makefile
new file mode 100644 (file)
index 0000000..b579ce5
--- /dev/null
@@ -0,0 +1,9 @@
+# SPDX-License-Identifier: GPL-2.0-or-later OR BSD-3-Clause
+#
+# Copyright (C) 2023, STMicroelectronics - All Rights Reserved
+#
+
+obj-y += cpu.o
+obj-y += arm64-mmu.o
+obj-$(CONFIG_OF_SYSTEM_SETUP) += fdt.o
+obj-$(CONFIG_STM32MP25X) += stm32mp25x.o
diff --git a/arch/arm/mach-stm32mp/stm32mp2/arm64-mmu.c b/arch/arm/mach-stm32mp/stm32mp2/arm64-mmu.c
new file mode 100644 (file)
index 0000000..36c631e
--- /dev/null
@@ -0,0 +1,68 @@
+// SPDX-License-Identifier: GPL-2.0-or-later OR BSD-3-Clause
+/*
+ * Copyright (C) 2023, STMicroelectronics - All Rights Reserved
+ */
+
+#include <asm/system.h>
+#include <asm/armv8/mmu.h>
+#include <mach/stm32.h>
+
+#define MP2_MEM_MAP_MAX 10
+
+#if (CONFIG_TEXT_BASE < STM32_DDR_BASE) || \
+       (CONFIG_TEXT_BASE > (STM32_DDR_BASE + STM32_DDR_SIZE))
+#error "invalid CONFIG_TEXT_BASE value"
+#endif
+
+struct mm_region stm32mp2_mem_map[MP2_MEM_MAP_MAX] = {
+       {
+               /* PCIe */
+               .virt = 0x10000000UL,
+               .phys = 0x10000000UL,
+               .size = 0x10000000UL,
+               .attrs = PTE_BLOCK_MEMTYPE(MT_DEVICE_NGNRNE) |
+                        PTE_BLOCK_NON_SHARE |
+                        PTE_BLOCK_PXN | PTE_BLOCK_UXN
+       }, {
+               /* LPSRAMs, VDERAM, RETRAM, SRAMs, SYSRAM: alias1 */
+               .virt = 0x20000000UL,
+               .phys = 0x20000000UL,
+               .size = 0x00200000UL,
+               .attrs = PTE_BLOCK_MEMTYPE(MT_DEVICE_NGNRNE) |
+                        PTE_BLOCK_NON_SHARE |
+                        PTE_BLOCK_PXN | PTE_BLOCK_UXN
+       }, {
+               /* Peripherals: alias1 */
+               .virt = 0x40000000UL,
+               .phys = 0x40000000UL,
+               .size = 0x10000000UL,
+               .attrs = PTE_BLOCK_MEMTYPE(MT_DEVICE_NGNRNE) |
+                        PTE_BLOCK_NON_SHARE |
+                        PTE_BLOCK_PXN | PTE_BLOCK_UXN
+       }, {
+               /* OSPI and FMC: memory-map area */
+               .virt = 0x60000000UL,
+               .phys = 0x60000000UL,
+               .size = 0x20000000UL,
+               .attrs = PTE_BLOCK_MEMTYPE(MT_DEVICE_NGNRNE) |
+                        PTE_BLOCK_NON_SHARE |
+                        PTE_BLOCK_PXN | PTE_BLOCK_UXN
+       }, {
+               /*
+                * DDR = STM32_DDR_BASE / STM32_DDR_SIZE
+                * the beginning of DDR (before CONFIG_TEXT_BASE) is not
+                * mapped, protected by RIF and reserved for other firmware
+                * (OP-TEE / TF-M / Cube M33)
+                */
+               .virt = CONFIG_TEXT_BASE,
+               .phys = CONFIG_TEXT_BASE,
+               .size = STM32_DDR_SIZE - (CONFIG_TEXT_BASE - STM32_DDR_BASE),
+               .attrs = PTE_BLOCK_MEMTYPE(MT_NORMAL) |
+                        PTE_BLOCK_INNER_SHARE
+       }, {
+               /* List terminator */
+               0,
+       }
+};
+
+struct mm_region *mem_map = stm32mp2_mem_map;
diff --git a/arch/arm/mach-stm32mp/stm32mp2/cpu.c b/arch/arm/mach-stm32mp/stm32mp2/cpu.c
new file mode 100644 (file)
index 0000000..f43d1aa
--- /dev/null
@@ -0,0 +1,107 @@
+// SPDX-License-Identifier: GPL-2.0-or-later OR BSD-3-Clause
+/*
+ * Copyright (C) 2023, STMicroelectronics - All Rights Reserved
+ */
+
+#define LOG_CATEGORY LOGC_ARCH
+
+#include <clk.h>
+#include <cpu_func.h>
+#include <debug_uart.h>
+#include <env_internal.h>
+#include <init.h>
+#include <misc.h>
+#include <wdt.h>
+#include <asm/io.h>
+#include <asm/arch/stm32.h>
+#include <asm/arch/sys_proto.h>
+#include <asm/system.h>
+#include <dm/device.h>
+#include <dm/lists.h>
+#include <dm/uclass.h>
+
+/*
+ * early TLB into the .data section so that it not get cleared
+ * with 16kB alignment
+ */
+#define EARLY_TLB_SIZE 0xA000
+u8 early_tlb[EARLY_TLB_SIZE] __section(".data") __aligned(0x4000);
+
+/*
+ * initialize the MMU and activate cache in U-Boot pre-reloc stage
+ * MMU/TLB is updated in enable_caches() for U-Boot after relocation
+ */
+static void early_enable_caches(void)
+{
+       if (CONFIG_IS_ENABLED(SYS_DCACHE_OFF))
+               return;
+
+       if (!(CONFIG_IS_ENABLED(SYS_ICACHE_OFF) && CONFIG_IS_ENABLED(SYS_DCACHE_OFF))) {
+               gd->arch.tlb_size = EARLY_TLB_SIZE;
+               gd->arch.tlb_addr = (unsigned long)&early_tlb;
+       }
+       /* enable MMU (default configuration) */
+       dcache_enable();
+}
+
+/*
+ * Early system init
+ */
+int arch_cpu_init(void)
+{
+       icache_enable();
+       early_enable_caches();
+
+       return 0;
+}
+
+void enable_caches(void)
+{
+       /* deactivate the data cache, early enabled in arch_cpu_init() */
+       dcache_disable();
+       /*
+        * Force the call of setup_all_pgtables() in mmu_setup() by clearing tlb_fillptr
+        * to update the TLB location udpated in board_f.c::reserve_mmu
+        */
+       gd->arch.tlb_fillptr = 0;
+       dcache_enable();
+}
+
+/* used when CONFIG_DISPLAY_CPUINFO is activated */
+int print_cpuinfo(void)
+{
+       char name[SOC_NAME_SIZE];
+
+       get_soc_name(name);
+       printf("CPU: %s\n", name);
+
+       return 0;
+}
+
+int arch_misc_init(void)
+{
+       return 0;
+}
+
+/*
+ * Force data-section, as .bss will not be valid
+ * when save_boot_params is invoked.
+ */
+static uintptr_t nt_fw_dtb __section(".data");
+
+uintptr_t get_stm32mp_bl2_dtb(void)
+{
+       return nt_fw_dtb;
+}
+
+/*
+ * Save the FDT address provided by TF-A in r2 at boot time
+ * This function is called from start.S
+ */
+void save_boot_params(unsigned long r0, unsigned long r1, unsigned long r2,
+                     unsigned long r3)
+{
+       nt_fw_dtb = r2;
+
+       save_boot_params_ret();
+}
diff --git a/arch/arm/mach-stm32mp/stm32mp2/fdt.c b/arch/arm/mach-stm32mp/stm32mp2/fdt.c
new file mode 100644 (file)
index 0000000..31b127b
--- /dev/null
@@ -0,0 +1,16 @@
+// SPDX-License-Identifier: GPL-2.0-or-later OR BSD-3-Clause
+/*
+ * Copyright (C) 2023, STMicroelectronics - All Rights Reserved
+ */
+
+#include <asm/u-boot.h>
+
+/*
+ * This function is called right before the kernel is booted. "blob" is the
+ * device tree that will be passed to the kernel.
+ */
+int ft_system_setup(void *blob, struct bd_info *bd)
+{
+       return 0;
+}
+
diff --git a/arch/arm/mach-stm32mp/stm32mp2/stm32mp25x.c b/arch/arm/mach-stm32mp/stm32mp2/stm32mp25x.c
new file mode 100644 (file)
index 0000000..4b2f70a
--- /dev/null
@@ -0,0 +1,193 @@
+// SPDX-License-Identifier: GPL-2.0-or-later OR BSD-3-Clause
+/*
+ * Copyright (C) 2023, STMicroelectronics - All Rights Reserved
+ */
+
+#define LOG_CATEGORY LOGC_ARCH
+
+#include <log.h>
+#include <syscon.h>
+#include <asm/io.h>
+#include <asm/arch/stm32.h>
+#include <asm/arch/sys_proto.h>
+
+/* SYSCFG register */
+#define SYSCFG_DEVICEID_OFFSET         0x6400
+#define SYSCFG_DEVICEID_DEV_ID_MASK    GENMASK(11, 0)
+#define SYSCFG_DEVICEID_DEV_ID_SHIFT   0
+#define SYSCFG_DEVICEID_REV_ID_MASK    GENMASK(31, 16)
+#define SYSCFG_DEVICEID_REV_ID_SHIFT   16
+
+/* Device Part Number (RPN) = OTP9 */
+#define RPN_SHIFT      0
+#define RPN_MASK       GENMASK(31, 0)
+
+/* Package = bit 0:2 of OTP122 => STM32MP25_PKG defines
+ * - 000: Custom package
+ * - 011: TFBGA361 => AL = 10x10, 361 balls pith 0.5mm
+ * - 100: TFBGA424 => AK = 14x14, 424 balls pith 0.5mm
+ * - 101: TFBGA436 => AI = 18x18, 436 balls pith 0.5mm
+ * - others: Reserved
+ */
+#define PKG_SHIFT      0
+#define PKG_MASK       GENMASK(2, 0)
+
+static u32 read_deviceid(void)
+{
+       void *syscfg = syscon_get_first_range(STM32MP_SYSCON_SYSCFG);
+
+       return readl(syscfg + SYSCFG_DEVICEID_OFFSET);
+}
+
+u32 get_cpu_dev(void)
+{
+       return (read_deviceid() & SYSCFG_DEVICEID_DEV_ID_MASK) >> SYSCFG_DEVICEID_DEV_ID_SHIFT;
+}
+
+u32 get_cpu_rev(void)
+{
+       return (read_deviceid() & SYSCFG_DEVICEID_REV_ID_MASK) >> SYSCFG_DEVICEID_REV_ID_SHIFT;
+}
+
+/* Get Device Part Number (RPN) from OTP */
+u32 get_cpu_type(void)
+{
+       return get_otp(BSEC_OTP_RPN, RPN_SHIFT, RPN_MASK);
+}
+
+/* Get Package options from OTP */
+u32 get_cpu_package(void)
+{
+       return get_otp(BSEC_OTP_PKG, PKG_SHIFT, PKG_MASK);
+}
+
+int get_eth_nb(void)
+{
+       int nb_eth;
+
+       switch (get_cpu_type()) {
+       case CPU_STM32MP257Fxx:
+               fallthrough;
+       case CPU_STM32MP257Dxx:
+               fallthrough;
+       case CPU_STM32MP257Cxx:
+               fallthrough;
+       case CPU_STM32MP257Axx:
+               nb_eth = 5; /* dual ETH with TSN support */
+               break;
+       case CPU_STM32MP253Fxx:
+               fallthrough;
+       case CPU_STM32MP253Dxx:
+               fallthrough;
+       case CPU_STM32MP253Cxx:
+               fallthrough;
+       case CPU_STM32MP253Axx:
+               nb_eth = 2; /* dual ETH */
+               break;
+       case CPU_STM32MP251Fxx:
+               fallthrough;
+       case CPU_STM32MP251Dxx:
+               fallthrough;
+       case CPU_STM32MP251Cxx:
+               fallthrough;
+       case CPU_STM32MP251Axx:
+               nb_eth = 1; /* single ETH */
+               break;
+       default:
+               nb_eth = 0;
+               break;
+       }
+
+       return nb_eth;
+}
+
+void get_soc_name(char name[SOC_NAME_SIZE])
+{
+       char *cpu_s, *cpu_r, *package;
+
+       cpu_s = "????";
+       cpu_r = "?";
+       package = "??";
+       if (get_cpu_dev() == CPU_DEV_STM32MP25) {
+               switch (get_cpu_type()) {
+               case CPU_STM32MP257Fxx:
+                       cpu_s = "257F";
+                       break;
+               case CPU_STM32MP257Dxx:
+                       cpu_s = "257D";
+                       break;
+               case CPU_STM32MP257Cxx:
+                       cpu_s = "257C";
+                       break;
+               case CPU_STM32MP257Axx:
+                       cpu_s = "257A";
+                       break;
+               case CPU_STM32MP255Fxx:
+                       cpu_s = "255F";
+                       break;
+               case CPU_STM32MP255Dxx:
+                       cpu_s = "255D";
+                       break;
+               case CPU_STM32MP255Cxx:
+                       cpu_s = "255C";
+                       break;
+               case CPU_STM32MP255Axx:
+                       cpu_s = "255A";
+                       break;
+               case CPU_STM32MP253Fxx:
+                       cpu_s = "253F";
+                       break;
+               case CPU_STM32MP253Dxx:
+                       cpu_s = "253D";
+                       break;
+               case CPU_STM32MP253Cxx:
+                       cpu_s = "253C";
+                       break;
+               case CPU_STM32MP253Axx:
+                       cpu_s = "253A";
+                       break;
+               case CPU_STM32MP251Fxx:
+                       cpu_s = "251F";
+                       break;
+               case CPU_STM32MP251Dxx:
+                       cpu_s = "251D";
+                       break;
+               case CPU_STM32MP251Cxx:
+                       cpu_s = "251C";
+                       break;
+               case CPU_STM32MP251Axx:
+                       cpu_s = "251A";
+                       break;
+               default:
+                       cpu_s = "25??";
+                       break;
+               }
+               /* REVISION */
+               switch (get_cpu_rev()) {
+               case CPU_REV1:
+                       cpu_r = "A";
+                       break;
+               default:
+                       break;
+               }
+               /* PACKAGE */
+               switch (get_cpu_package()) {
+               case STM32MP25_PKG_CUSTOM:
+                       package = "XX";
+                       break;
+               case STM32MP25_PKG_AL_TBGA361:
+                       package = "AL";
+                       break;
+               case STM32MP25_PKG_AK_TBGA424:
+                       package = "AK";
+                       break;
+               case STM32MP25_PKG_AI_TBGA436:
+                       package = "AI";
+                       break;
+               default:
+                       break;
+               }
+       }
+
+       snprintf(name, SOC_NAME_SIZE, "STM32MP%s%s Rev.%s", cpu_s, package, cpu_r);
+}
index a0e8e1dfdc504709dc6a24847ca554eed004a003..a2e351d74a7aa1dde520d0814ce6fa16539eb670 100644 (file)
@@ -10,8 +10,8 @@
 #include <asm/arch/stm32.h>
 
 static const struct udevice_id stm32mp_syscon_ids[] = {
-       { .compatible = "st,stm32mp157-syscfg",
-         .data = STM32MP_SYSCON_SYSCFG },
+       { .compatible = "st,stm32mp157-syscfg", .data = STM32MP_SYSCON_SYSCFG },
+       { .compatible = "st,stm32mp25-syscfg", .data = STM32MP_SYSCON_SYSCFG},
        { }
 };
 
index e3fd613f2be190c5d6331882e7156a5f1d3ec702..a576e6f61658155c76d53f4a63233188334e0b1a 100644 (file)
@@ -6,7 +6,6 @@
 #ifndef _TEGRA_XUSB_PADCTL_COMMON_H_
 #define _TEGRA_XUSB_PADCTL_COMMON_H_
 
-#include <common.h>
 #include <fdtdec.h>
 #include <dm/ofnode.h>
 
index 434a7fa20e43256d5645561e7918e5e084c2b10d..783d7c45c7bac18543ce2acf0a76c769aeeec485 100644 (file)
@@ -4,7 +4,6 @@
 #define _PSU_INIT_GPL_H_
 
 #include <asm/io.h>
-#include <common.h>
 
 int mask_pollonvalue(unsigned long add, u32 mask, u32 value);
 
diff --git a/arch/m68k/include/asm/fsl_mcdmafec.h b/arch/m68k/include/asm/fsl_mcdmafec.h
deleted file mode 100644 (file)
index de6c548..0000000
+++ /dev/null
@@ -1,151 +0,0 @@
-/* SPDX-License-Identifier: GPL-2.0+ */
-/*
- * fsl_mcdmafec.h -- Multi-channel DMA Fast Ethernet Controller definitions
- *
- * Copyright (C) 2004-2007 Freescale Semiconductor, Inc.
- * TsiChung Liew (Tsi-Chung.Liew@freescale.com)
- */
-
-#ifndef fsl_mcdmafec_h
-#define fsl_mcdmafec_h
-
-/* Re-use of the definitions */
-#include <asm/fec.h>
-
-typedef struct fecdma {
-       u32 rsvd0;              /* 0x000 */
-       u32 eir;                /* 0x004 */
-       u32 eimr;               /* 0x008 */
-       u32 rsvd1[6];           /* 0x00C - 0x023 */
-       u32 ecr;                /* 0x024 */
-       u32 rsvd2[6];           /* 0x028 - 0x03F */
-       u32 mmfr;               /* 0x040 */
-       u32 mscr;               /* 0x044 */
-       u32 rsvd3[7];           /* 0x048 - 0x063 */
-       u32 mibc;               /* 0x064 */
-       u32 rsvd4[7];           /* 0x068 - 0x083 */
-       u32 rcr;                /* 0x084 */
-       u32 rhr;                /* 0x088 */
-       u32 rsvd5[14];          /* 0x08C - 0x0C3 */
-       u32 tcr;                /* 0x0C4 */
-       u32 rsvd6[7];           /* 0x0C8 - 0x0E3 */
-       u32 palr;               /* 0x0E4 */
-       u32 paur;               /* 0x0E8 */
-       u32 opd;                /* 0x0EC */
-       u32 rsvd7[10];          /* 0x0F0 - 0x117 */
-       u32 iaur;               /* 0x118 */
-       u32 ialr;               /* 0x11C */
-       u32 gaur;               /* 0x120 */
-       u32 galr;               /* 0x124 */
-       u32 rsvd8[7];           /* 0x128 - 0x143 */
-       u32 tfwr;               /* 0x144 */
-       u32 rsvd9[14];          /* 0x148 - 0x17F */
-       u32 fmc;                /* 0x180 */
-       u32 rfdr;               /* 0x184 */
-       u32 rfsr;               /* 0x188 */
-       u32 rfcr;               /* 0x18C */
-       u32 rlrfp;              /* 0x190 */
-       u32 rlwfp;              /* 0x194 */
-       u32 rfar;               /* 0x198 */
-       u32 rfrp;               /* 0x19C */
-       u32 rfwp;               /* 0x1A0 */
-       u32 tfdr;               /* 0x1A4 */
-       u32 tfsr;               /* 0x1A8 */
-       u32 tfcr;               /* 0x1AC */
-       u32 tlrfp;              /* 0x1B0 */
-       u32 tlwfp;              /* 0x1B4 */
-       u32 tfar;               /* 0x1B8 */
-       u32 tfrp;               /* 0x1BC */
-       u32 tfwp;               /* 0x1C0 */
-       u32 frst;               /* 0x1C4 */
-       u32 ctcwr;              /* 0x1C8 */
-} fecdma_t;
-
-struct fec_info_dma {
-       int index;
-       u32 iobase;
-       u32 pinmux;
-       u32 miibase;
-       int phy_addr;
-       int dup_spd;
-       char *phy_name;
-       int phyname_init;
-       cbd_t *rxbd;            /* Rx BD */
-       cbd_t *txbd;            /* Tx BD */
-       uint rx_idx;
-       uint tx_idx;
-       char *txbuf;
-       int initialized;
-       struct fec_info_dma *next;
-       u16 rx_task;            /* DMA receive Task Number */
-       u16 tx_task;            /* DMA Transmit Task Number */
-       u16 rx_pri;             /* DMA Receive Priority */
-       u16 tx_pri;             /* DMA Transmit Priority */
-       u16 rx_init;            /* DMA Receive Initiator */
-       u16 tx_init;            /* DMA Transmit Initiator */
-       u16 used_tbd_idx;       /* next transmit BD to clean */
-       u16 clean_tbd_num;      /* the number of available transmit BDs */
-       int to_loop;
-       struct mii_dev *bus;
-};
-
-/* Bit definitions and macros for IEVENT */
-#define FEC_EIR_TXERR          (0x00040000)
-#define FEC_EIR_RXERR          (0x00020000)
-#undef FEC_EIR_CLEAR_ALL
-#define FEC_EIR_CLEAR_ALL      (0xFFFE0000)
-
-/* Bit definitions and macros for R_HASH */
-#define FEC_RHASH_FCE_DC       (0x80000000)
-#define FEC_RHASH_MULTCAST     (0x40000000)
-#define FEC_RHASH_HASH(x)      (((x)&0x0000003F)<<24)
-
-/* Bit definitions and macros for FEC_TFWR */
-#undef FEC_TFWR_X_WMRK
-#undef FEC_TFWR_X_WMRK_64
-#undef FEC_TFWR_X_WMRK_128
-#undef FEC_TFWR_X_WMRK_192
-
-#define FEC_TFWR_X_WMRK(x)     ((x)&0x0F)
-#define FEC_TFWR_X_WMRK_64     (0x00)
-#define FEC_TFWR_X_WMRK_128    (0x01)
-#define FEC_TFWR_X_WMRK_192    (0x02)
-#define FEC_TFWR_X_WMRK_256    (0x03)
-#define FEC_TFWR_X_WMRK_320    (0x04)
-#define FEC_TFWR_X_WMRK_384    (0x05)
-#define FEC_TFWR_X_WMRK_448    (0x06)
-#define FEC_TFWR_X_WMRK_512    (0x07)
-#define FEC_TFWR_X_WMRK_576    (0x08)
-#define FEC_TFWR_X_WMRK_640    (0x09)
-#define FEC_TFWR_X_WMRK_704    (0x0A)
-#define FEC_TFWR_X_WMRK_768    (0x0B)
-#define FEC_TFWR_X_WMRK_832    (0x0C)
-#define FEC_TFWR_X_WMRK_896    (0x0D)
-#define FEC_TFWR_X_WMRK_960    (0x0E)
-#define FEC_TFWR_X_WMRK_1024   (0x0F)
-
-/* FIFO definitions */
-/* Bit definitions and macros for FSTAT */
-#define FIFO_STAT_IP           (0x80000000)
-#define FIFO_STAT_FRAME(x)     (((x)&0x0000000F)<<24)
-#define FIFO_STAT_FAE          (0x00800000)
-#define FIFO_STAT_RXW          (0x00400000)
-#define FIFO_STAT_UF           (0x00200000)
-#define FIFO_STAT_OF           (0x00100000)
-#define FIFO_STAT_FR           (0x00080000)
-#define FIFO_STAT_FULL         (0x00040000)
-#define FIFO_STAT_ALARM                (0x00020000)
-#define FIFO_STAT_EMPTY                (0x00010000)
-
-/* Bit definitions and macros for FCTRL */
-#define FIFO_CTRL_WCTL         (0x40000000)
-#define FIFO_CTRL_WFR          (0x20000000)
-#define FIFO_CTRL_FRAME                (0x08000000)
-#define FIFO_CTRL_GR(x)                (((x)&0x00000007)<<24)
-#define FIFO_CTRL_IPMASK       (0x00800000)
-#define FIFO_CTRL_FAEMASK      (0x00400000)
-#define FIFO_CTRL_RXWMASK      (0x00200000)
-#define FIFO_CTRL_UFMASK       (0x00100000)
-#define FIFO_CTRL_OFMASK       (0x00080000)
-
-#endif                         /* fsl_mcdmafec_h */
index 411b00899c25813e3721ee5adfdef68d21e806c7..b118a917542855c34ed3f4529095b7eecd5a5523 100644 (file)
 #include <asm/immap_547x_8x.h>
 #include <asm/m547x_8x.h>
 
-#ifdef CONFIG_FSLDMAFEC
-#define FEC0_RX_TASK           0
-#define FEC0_TX_TASK           1
-#define FEC0_RX_PRIORITY       6
-#define FEC0_TX_PRIORITY       7
-#define FEC0_RX_INIT           16
-#define FEC0_TX_INIT           17
-#define FEC1_RX_TASK           2
-#define FEC1_TX_TASK           3
-#define FEC1_RX_PRIORITY       6
-#define FEC1_TX_PRIORITY       7
-#define FEC1_RX_INIT           30
-#define FEC1_TX_INIT           31
-#endif
-
 #define CFG_SYS_UART_BASE              (MMAP_UART0 + (CFG_SYS_UART_PORT * 0x100))
 
 #ifdef CONFIG_SLTTMR
index d6f238e4b347de5f8aed5565b94dfb77376369b2..ac36aec0ed78609c5892b8edc69ac72b8ca3feb3 100644 (file)
@@ -10,7 +10,7 @@
 
 DECLARE_GLOBAL_DATA_PTR;
 
-#if defined(CONFIG_MCFFEC) || defined(CONFIG_FSLDMAFEC)
+#if defined(CONFIG_MCFFEC)
 static int fec_get_node(int fec_idx)
 {
        char fec_alias[5] = {"fec"};
@@ -77,4 +77,4 @@ int fec_get_mii_base(int fec_idx, u32 *mii_base)
        return fec_get_fdt_prop(fec_idx, "mii-base", mii_base);
 }
 
-#endif //CONFIG_MCFFEC || CONFIG_FSLDMAFEC
+#endif //CONFIG_MCFFEC
index 1b179116c9b297f63042ff21afdc811967654e30..14fbce597b9ea3a32614f6259049655e4639ab97 100644 (file)
@@ -14,6 +14,7 @@ dtb-$(CONFIG_BOARD_COMTREND_CT5361) += comtrend,ct-5361.dtb
 dtb-$(CONFIG_BOARD_COMTREND_VR3032U) += comtrend,vr-3032u.dtb
 dtb-$(CONFIG_BOARD_COMTREND_WAP5813N) += comtrend,wap-5813n.dtb
 dtb-$(CONFIG_BOARD_HUAWEI_HG556A) += huawei,hg556a.dtb
+dtb-$(CONFIG_BOARD_INTENO_XG6846) += inteno,xg6846.dtb
 dtb-$(CONFIG_BOARD_MT7620_RFB) += mediatek,mt7620-rfb.dtb
 dtb-$(CONFIG_BOARD_MT7620_MT7530_RFB) += mediatek,mt7620-mt7530-rfb.dtb
 dtb-$(CONFIG_BOARD_MT7621_RFB) += mediatek,mt7621-rfb.dtb
diff --git a/arch/mips/dts/inteno,xg6846.dts b/arch/mips/dts/inteno,xg6846.dts
new file mode 100644 (file)
index 0000000..180cfdc
--- /dev/null
@@ -0,0 +1,57 @@
+// SPDX-License-Identifier: GPL-2.0+
+/*
+ * Copyright (C) 2023 Linus Walleij <linusw@kernel.org>
+ *
+ * This is a diet version of the device tree from Linux,
+ * suitable for U-Boot.
+ */
+
+/dts-v1/;
+
+#include "brcm,bcm6328.dtsi"
+
+/ {
+       model = "Inteno XG6846";
+       compatible = "inteno,xg6846", "brcm,bcm6328";
+
+       aliases {
+               serial0 = &uart0;
+       };
+
+       chosen {
+               stdout-path = "serial0:115200n8";
+       };
+};
+
+&leds {
+       status = "okay";
+
+       led@18 {
+               reg = <18>;
+               active-low;
+               label = "red:pwr";
+       };
+
+       led@20 {
+               reg = <20>;
+               active-low;
+               label = "green:pwr";
+       };
+};
+
+&spi {
+       status = "okay";
+
+       spi-flash@0 {
+               compatible = "jedec,spi-nor";
+               reg = <0>;
+               #address-cells = <1>;
+               #size-cells = <1>;
+               spi-max-frequency = <33333334>;
+       };
+};
+
+&uart0 {
+       bootph-all;
+       status = "okay";
+};
index 01d919f2dbe982d1881671ea705b1be08cf7790d..eb9ea34c52fe3a692c494869b10757c4083aec69 100644 (file)
@@ -203,6 +203,17 @@ config BOARD_HUAWEI_HG556A
          ethernet ports, 3 USB ports, 1 UART, GPIO buttons and LEDs, and
          a RT3062F/AR9223 (PCI).
 
+config BOARD_INTENO_XG6846
+       bool "Inteno XG6846"
+       depends on SOC_BMIPS_BCM6328
+       select BMIPS_SUPPORTS_BOOT_RAM
+       help
+         Inteno XG6846 boards have a BCM6328 SoC with 64 MB of RAM and 16
+         MB of flash (SPI).
+         Between its different peripherals there's an integrated switch with 4
+         ethernet ports, 1 UART, GPIO buttons and LEDs, and a Marvell
+         DSA switch connected to a fiber SFP.
+
 config BOARD_NETGEAR_CG3100D
        bool "Netgear CG3100D"
        depends on SOC_BMIPS_BCM3380
@@ -272,6 +283,7 @@ source "board/comtrend/ct5361/Kconfig"
 source "board/comtrend/vr3032u/Kconfig"
 source "board/comtrend/wap5813n/Kconfig"
 source "board/huawei/hg556a/Kconfig"
+source "board/inteno/xg6846/Kconfig"
 source "board/netgear/cg3100d/Kconfig"
 source "board/netgear/dgnd3700v2/Kconfig"
 source "board/sagem/f@st1704/Kconfig"
index f5cb000de6bfff53a512168fd7601b507327c728..340f9a0da56c49e513c8ef9774d7fd93c65bbfed 100644 (file)
@@ -3,7 +3,6 @@
  * Copyright (C) 2004-2009 Freescale Semiconductor, Inc.
  */
 
-#include <common.h>
 #include <asm-offsets.h>
 #include <mpc83xx.h>
 #include <system-constants.h>
@@ -19,6 +18,8 @@
 #ifdef CONFIG_QE
 #include <fsl_qe.h>
 #endif
+#include <asm/ppc.h>
+#include <asm/fsl_lbc.h>
 
 #include "lblaw/lblaw.h"
 #include "elbc/elbc.h"
index d72d3147f63d7e2bdbe4d3bce127d2b8d7047a8a..ceb548678946ffdfe698c64fc6ec106e27c298f2 100644 (file)
@@ -20,6 +20,7 @@
 
 #include <asm/cache.h>
 #include <asm/mmu.h>
+#include <asm/fsl_lbc.h>
 #include <asm/u-boot.h>
 
 #include "hrcw/hrcw.h"
index 96183ac2c84bdd9f0f9d59f68b89bf1b24df7372..b770d294e616c66bc0c1f05ebc9a59953134a21d 100644 (file)
@@ -9,7 +9,6 @@
  * Wolfgang Denk, DENX Software Engineering, wd@denx.de.
  */
 
-#include <common.h>
 #include <display_options.h>
 #include <env.h>
 #include <init.h>
index a03f091c3059c7325dfb16eccf5c960f3100f936..95f0f559b4cd49c967d35c97f8167eac0d215954 100644 (file)
@@ -6,9 +6,6 @@
 #ifndef __ASM_PPC_FSL_LBC_H
 #define __ASM_PPC_FSL_LBC_H
 
-#include <config.h>
-#include <common.h>
-
 #ifdef CONFIG_MPC85xx
 void lbc_sdram_init(void);
 #endif
index 6ed21c781fe4ca77b4c4ec8a655f8e28363ab356..43d71f5caec0b0e7755d0152dfaa6ab48b14693f 100644 (file)
@@ -9,7 +9,7 @@
 #define __ASM_GBL_DATA_H
 
 #include <config.h>
-#include "asm/types.h"
+#include <linux/types.h>
 
 /* Architecture-specific global data */
 struct arch_global_data {
diff --git a/arch/sandbox/include/asm/barrier.h b/arch/sandbox/include/asm/barrier.h
new file mode 100644 (file)
index 0000000..0928a78
--- /dev/null
@@ -0,0 +1,3 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
+
+#define nop()
index df7156fe31742cb79f0b8ee5bc7c4f5f27e0ccc9..2b7dbca8f75511af5c67f5f58ab478e96f9d1e06 100644 (file)
@@ -6,7 +6,6 @@
 #ifndef __SANDBOX_CLK_H
 #define __SANDBOX_CLK_H
 
-#include <common.h>
 #include <clk.h>
 #include <dt-structs.h>
 #include <linux/clk-provider.h>
index 70f36d7afef63d06528b442ebac8a6ced12c0d98..499e9a67f6ac31e0590d9871a5e3d17deb34569e 100644 (file)
@@ -6,8 +6,6 @@
 #ifndef __SANDBOX_MBOX_H
 #define __SANDBOX_MBOX_H
 
-#include <common.h>
-
 #define SANDBOX_MBOX_PING_XOR 0x12345678
 
 struct udevice;
index 1845bc8d3baf86d21893d0c00a5aece45b19405e..4d5e861dbce2b6434ac9bcffe5fc8f704d32e62d 100644 (file)
@@ -6,8 +6,6 @@
 #ifndef __SANDBOX_POWER_DOMAIN_H
 #define __SANDBOX_POWER_DOMAIN_H
 
-#include <common.h>
-
 struct udevice;
 
 int sandbox_power_domain_query(struct udevice *dev, unsigned long id);
index 40d3e61c110af742d996bfb5bb08afe84688242f..f0709b41c09ff5364623768ccfac7e4b7ca57d15 100644 (file)
@@ -6,8 +6,6 @@
 #ifndef __SANDBOX_RESET_H
 #define __SANDBOX_RESET_H
 
-#include <common.h>
-
 struct udevice;
 
 int sandbox_reset_query(struct udevice *dev, unsigned long id);
index 05dd1b2b4471d4ccd480448cc796f1a269692485..460bfc4f2d4fcbc98a90faf331172dad81045151 100644 (file)
@@ -6,7 +6,6 @@
 #ifndef __SLIMBOOTLOADER_ARCH_H__
 #define __SLIMBOOTLOADER_ARCH_H__
 
-#include <common.h>
 #include <asm/hob.h>
 
 /**
index 8be1003e6baf86fe4e55411f5af7b57ef8fc3450..c79ec64afd7aa269ec4b939e289e7fe2efc62838 100644 (file)
@@ -7,7 +7,6 @@
 #ifndef __ASM_X86_DMA_MAPPING_H
 #define __ASM_X86_DMA_MAPPING_H
 
-#include <common.h>
 #include <asm/cache.h>
 #include <cpu_func.h>
 #include <linux/dma-direction.h>
index 09c95413a54140b139a235e16eabf023aba13398..ac2d078f42a144206881dac06aaa6b3cd8c2b926 100644 (file)
@@ -5,8 +5,7 @@ config TEXT_BASE
 
 config BOARD_SPECIFIC_OPTIONS # dummy
        def_bool y
-       select CMD_QFW
-       select QFW_MMIO
+       select QFW_MMIO if CMD_QFW
        imply VIRTIO_MMIO
        imply VIRTIO_PCI
        imply VIRTIO_NET
index d56b4b5bc1ed4121be382874a5bc46bd04e36f31..108e9fdb00a9d037721910d7820f2f715eed9f5a 100644 (file)
@@ -59,7 +59,6 @@ config BOARD_SPECIFIC_OPTIONS # dummy
        imply PCIE_ECAM_GENERIC
        imply DM_RNG
        imply SCSI
-       imply DM_SCSI
        imply SYS_NS16550
        imply SIFIVE_SERIAL
        imply HTIF_CONSOLE if 64BIT
index 787751abba4fc185a88a6c80521e04737ff58279..01dc1d497aec8375cbf481c768db68fe25a5482e 100644 (file)
@@ -20,7 +20,7 @@ config BOARD_SPECIFIC_OPTIONS # dummy
        def_bool y
        select X86_RESET_VECTOR
        select QEMU
-       select QFW_PIO
+       select QFW_PIO if CMD_QFW
        select BOARD_ROMSIZE_KB_1024
        imply VIRTIO_PCI
        imply VIRTIO_NET
index 46ffd817b44b3a7a537d1b9c0f341e3a6a859526..228f07502f7a1bf0e837755eef47e35890388bed 100644 (file)
@@ -3,7 +3,6 @@
  * Copyright 2014 Freescale Semiconductor, Inc.
  */
 
-#include <common.h>
 #include <log.h>
 #include <asm/global_data.h>
 #include <asm/io.h>
index d3323b9ec1e5a6328d682f1d044e58cf7b9f4350..d4ca278e883163866a1841ebb16754a6f693869d 100644 (file)
@@ -3,8 +3,8 @@
  * Copyright 2014 Freescale Semiconductor, Inc.
  */
 
-#include <common.h>
 #include <log.h>
+#include <asm/cache.h>
 #include <asm/global_data.h>
 #include <asm/immap_85xx.h>
 #include "sleep.h"
index a618ce11a584a432b21fb94be6c24aaf73fd72be..930ef6be3850ba2dd844a81cc52c9ff07250938d 100644 (file)
@@ -4,7 +4,6 @@
  * Copyright 2019, 2021 NXP
  */
 
-#include <common.h>
 #include <clock_legacy.h>
 #include <fdt_support.h>
 #include <i2c.h>
index d0e4e796c6062ba65c0f9bf4806638cd0494adcc..b7e043b2e62f577c376697bcf48f9129b7545274 100644 (file)
@@ -1,7 +1,6 @@
 // SPDX-License-Identifier: GPL-2.0
 /* Copyright 2016-2019, 2021 NXP
  */
-#include <common.h>
 #include <clock_legacy.h>
 #include <fdt_support.h>
 #include <init.h>
index 27b9d79e5f0bb874f3df05fa3f8d12b54757fc0f..78006afce8698e8b70c26e4b334bba3cbf2cae0b 100644 (file)
@@ -4,7 +4,6 @@
  * Copyright 2019, 2021-2022 NXP
  */
 
-#include <common.h>
 #include <clock_legacy.h>
 #include <command.h>
 #include <fdt_support.h>
index 18869d8c1df579e2a62be3855e272125c3a75a3a..cf84ff9e638ebd710b60e8ef2a9d80c41df8aeb6 100644 (file)
@@ -4,7 +4,6 @@
  * Copyright 2021-2022 NXP
  */
 
-#include <common.h>
 #include <i2c.h>
 #include <init.h>
 #include <asm/global_data.h>
index f62f5fd274508bfce398022d4c11273bcdb2228b..2fece3a1b09b989f56ffc61be89d87e2ba10777f 100644 (file)
@@ -3,6 +3,8 @@
  * Copyright 2017 NXP
  */
 
+#include <vsprintf.h>
+#include <linux/string.h>
 #include <asm/io.h>
 #include <asm/arch/fsl_serdes.h>
 #include <fsl-mc/fsl_mc.h>
index 0d0d5de15623b0b75c88178f7918065c78e94c9d..048ab44c5919f6b98ef275b3501729fe238b6d59 100644 (file)
@@ -3,6 +3,8 @@
  * Copyright 2015 Freescale Semiconductor, Inc.
  */
 
+#include <vsprintf.h>
+#include <linux/string.h>
 #include <asm/io.h>
 #include <asm/arch/fsl_serdes.h>
 #include <fsl-mc/fsl_mc.h>
index b5fa5101e881aa7a885d47ced1871f989c67bb32..7f67d1e45308531d94d099d959e442d6177e7a7f 100644 (file)
@@ -52,19 +52,6 @@ int board_init(void)
        return 0;
 }
 
-#ifdef CONFIG_SCSI_AHCI_PLAT
-void scsi_init(void)
-{
-       u32 reg = readl(HB_SREG_A9_PWRDOM_STAT);
-
-       cphy_disable_overrides();
-       if (reg & PWRDOM_STAT_SATA) {
-               ahci_init((void __iomem *)HB_AHCI_BASE);
-               scsi_scan(true);
-       }
-}
-#endif
-
 #ifdef CONFIG_MISC_INIT_R
 int misc_init_r(void)
 {
diff --git a/board/inteno/xg6846/Kconfig b/board/inteno/xg6846/Kconfig
new file mode 100644 (file)
index 0000000..4dd78b3
--- /dev/null
@@ -0,0 +1,12 @@
+if BOARD_INTENO_XG6846
+
+config SYS_BOARD
+       default "xg6846"
+
+config SYS_VENDOR
+       default "inteno"
+
+config SYS_CONFIG_NAME
+       default "inteno_xg6846"
+
+endif
diff --git a/board/inteno/xg6846/MAINTAINERS b/board/inteno/xg6846/MAINTAINERS
new file mode 100644 (file)
index 0000000..ca41730
--- /dev/null
@@ -0,0 +1,6 @@
+INTENO XG6846 BOARD
+M:     Linus Walleij <linusw@kernel.org>
+S:     Maintained
+F:     board/inteno/xg6846
+F:     include/configs/inteno_xg6846.h
+F:     configs/inteno_xg6846_ram_defconfig
index 21c21aac221f907f5fd2821c1f233140f380d465..cc3611e2dec1093e85522deaa37098a283c05366 100644 (file)
@@ -3,7 +3,7 @@
  * Copyright 2020 Hitachi Power Grids. All rights reserved.
  */
 
-#include <common.h>
+#include <config.h>
 #include <event.h>
 #include <i2c.h>
 #include <asm/io.h>
diff --git a/board/st/stm32mp2/Kconfig b/board/st/stm32mp2/Kconfig
new file mode 100644 (file)
index 0000000..89039f0
--- /dev/null
@@ -0,0 +1,13 @@
+if TARGET_ST_STM32MP25X
+
+config SYS_BOARD
+       default "stm32mp2"
+
+config SYS_VENDOR
+       default "st"
+
+config SYS_CONFIG_NAME
+       default "stm32mp25_common"
+
+source "board/st/common/Kconfig"
+endif
diff --git a/board/st/stm32mp2/MAINTAINERS b/board/st/stm32mp2/MAINTAINERS
new file mode 100644 (file)
index 0000000..e6bea91
--- /dev/null
@@ -0,0 +1,9 @@
+STM32MP2 BOARD
+M:     Patrice Chotard <patrice.chotard@st.com>
+M:     Patrick Delaunay <patrick.delaunay@st.com>
+L:     uboot-stm32@st-md-mailman.stormreply.com (moderated for non-subscribers)
+S:     Maintained
+F:     arch/arm/dts/stm32mp25*
+F:     board/st/stm32mp2/
+F:     configs/stm32mp25_defconfig
+F:     include/configs/stm32mp25_common.h
diff --git a/board/st/stm32mp2/Makefile b/board/st/stm32mp2/Makefile
new file mode 100644 (file)
index 0000000..50352fb
--- /dev/null
@@ -0,0 +1,6 @@
+# SPDX-License-Identifier: GPL-2.0-or-later OR BSD-3-Clause
+#
+# Copyright (C) 2023, STMicroelectronics - All Rights Reserved
+#
+
+obj-y += stm32mp2.o
diff --git a/board/st/stm32mp2/stm32mp2.c b/board/st/stm32mp2/stm32mp2.c
new file mode 100644 (file)
index 0000000..c97a7ef
--- /dev/null
@@ -0,0 +1,51 @@
+// SPDX-License-Identifier: GPL-2.0-or-later OR BSD-3-Clause
+/*
+ * Copyright (C) 2023, STMicroelectronics - All Rights Reserved
+ */
+
+#define LOG_CATEGORY LOGC_BOARD
+
+#include <config.h>
+#include <env.h>
+#include <fdt_support.h>
+#include <asm/global_data.h>
+#include <asm/arch/sys_proto.h>
+
+/*
+ * Get a global data pointer
+ */
+DECLARE_GLOBAL_DATA_PTR;
+
+/* board dependent setup after realloc */
+int board_init(void)
+{
+       return 0;
+}
+
+int board_late_init(void)
+{
+       const void *fdt_compat;
+       int fdt_compat_len;
+       char dtb_name[256];
+       int buf_len;
+
+       if (IS_ENABLED(CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG)) {
+               fdt_compat = fdt_getprop(gd->fdt_blob, 0, "compatible",
+                                        &fdt_compat_len);
+               if (fdt_compat && fdt_compat_len) {
+                       if (strncmp(fdt_compat, "st,", 3) != 0) {
+                               env_set("board_name", fdt_compat);
+                       } else {
+                               env_set("board_name", fdt_compat + 3);
+
+                               buf_len = sizeof(dtb_name);
+                               strlcpy(dtb_name, fdt_compat + 3, buf_len);
+                               buf_len -= strlen(fdt_compat + 3);
+                               strlcat(dtb_name, ".dtb", buf_len);
+                               env_set("fdtfile", dtb_name);
+                       }
+               }
+       }
+
+       return 0;
+}
index f2dd3b4192ee0f60c0df8f037a5db5d741545f4d..cd3360a43029b03902a2bd77abf76a04f4a33d4f 100644 (file)
@@ -8,7 +8,6 @@
 
 #include <asm/arch/hardware.h>
 #include <asm/io.h>
-#include <common.h>
 #include <dm/uclass.h>
 #include <env.h>
 #include <fdt_support.h>
index a080b2b0d2588642ccb24c559145f7437a6700dc..a6dcff2eb434db80b0994d910323175bc5c8fce4 100644 (file)
@@ -7,7 +7,6 @@
  *
  */
 
-#include <common.h>
 #include <asm/io.h>
 #include <dm/uclass.h>
 #include <k3-ddrss.h>
index 8bb13ef5b2b3c2dbe31ccbe3acc809608b3bb502..97a70954b232286d9c5aad182a9974ac7af5b2ea 100644 (file)
@@ -7,7 +7,6 @@
  *
  */
 
-#include <common.h>
 #include <dm.h>
 #include <fdt_support.h>
 #include <image.h>
index d4f7c1d9f938ac010718967f142b2a2f4c97e83a..de9034206ae9ccbc5c8c4a5306f08613982559cd 100644 (file)
@@ -7,7 +7,6 @@
  *
  */
 
-#include <common.h>
 #include <env.h>
 #include <fdt_support.h>
 #include <generic-phy.h>
index 7795300abc80f35c3d9352abccf78ba408df77c6..7a911381094a5dc33188d300e0a6bf9c7928bf16 100644 (file)
@@ -7,7 +7,6 @@
  *
  */
 
-#include <common.h>
 #include <env.h>
 #include <fdt_support.h>
 #include <generic-phy.h>
index fbc49c5bca47b84ad0c3aaf62d9ca3c0be2ef5b7..ef71883a5026c47a744ce1403d00bb01335a3c78 100644 (file)
@@ -346,8 +346,16 @@ config PXE_UTILS
        help
          Utilities for parsing PXE file formats.
 
-config BOOT_DEFAULTS
-       bool  # Common defaults for standard boot and distroboot
+config BOOT_DEFAULTS_FEATURES
+       bool
+       select SUPPORT_RAW_INITRD
+       select ENV_VARS_UBOOT_CONFIG
+       imply USB_STORAGE
+       imply EFI_PARTITION
+       imply ISO_PARTITION
+
+config BOOT_DEFAULTS_CMDS
+       bool
        imply USE_BOOTCOMMAND
        select CMD_ENV_EXISTS
        select CMD_EXT2
@@ -358,14 +366,14 @@ config BOOT_DEFAULTS
        select CMD_DHCP if CMD_NET
        select CMD_PING if CMD_NET
        select CMD_PXE if CMD_NET
-       select SUPPORT_RAW_INITRD
-       select ENV_VARS_UBOOT_CONFIG
        select CMD_BOOTI if ARM64
        select CMD_BOOTZ if ARM && !ARM64
        imply CMD_MII if NET
-       imply USB_STORAGE
-       imply EFI_PARTITION
-       imply ISO_PARTITION
+
+config BOOT_DEFAULTS
+       bool  # Common defaults for standard boot and distroboot
+       select BOOT_DEFAULTS_FEATURES
+       select BOOT_DEFAULTS_CMDS if CMDLINE
        help
          These are not required but are commonly needed to support a good
          selection of booting methods. Enable this to improve the capability
@@ -431,7 +439,6 @@ config BOOTSTD_FULL
 config BOOTSTD_DEFAULTS
        bool "Select some common defaults for standard boot"
        depends on BOOTSTD
-       imply USE_BOOTCOMMAND
        select BOOT_DEFAULTS
        select BOOTMETH_DISTRO
        help
@@ -504,7 +511,7 @@ config BOOTMETH_EXTLINUX_PXE
 
 config BOOTMETH_EFILOADER
        bool "Bootdev support for EFI boot"
-       depends on EFI_LOADER
+       depends on CMD_BOOTEFI
        default y
        help
          Enables support for EFI boot using bootdevs. This makes the
@@ -536,10 +543,10 @@ config BOOTMETH_VBE
 
 config BOOTMETH_DISTRO
        bool  # Options needed to boot any distro
-       select BOOTMETH_SCRIPT  # E.g. Armbian uses scripts
+       select BOOTMETH_SCRIPT if CMDLINE # E.g. Armbian uses scripts
        select BOOTMETH_EXTLINUX  # E.g. Debian uses these
        select BOOTMETH_EXTLINUX_PXE if CMD_PXE && CMD_NET && DM_ETH
-       select BOOTMETH_EFILOADER if EFI_LOADER # E.g. Ubuntu uses this
+       select BOOTMETH_EFILOADER if CMD_BOOTEFI # E.g. Ubuntu uses this
 
 config SPL_BOOTMETH_VBE
        bool "Bootdev support for Verified Boot for Embedded (SPL)"
@@ -664,6 +671,7 @@ config BOOTMETH_SANDBOX
 config BOOTMETH_SCRIPT
        bool "Bootdev support for U-Boot scripts"
        default y if BOOTSTD_FULL
+       depends on CMDLINE
        select HUSH_PARSER
        help
          Enables support for booting a distro via a U-Boot script. This makes
@@ -717,6 +725,17 @@ if MEASURED_BOOT
          event log memory region.
 endif # MEASURED_BOOT
 
+config SYS_BOOTM_LEN
+       hex "Maximum size of a decompresed OS image"
+       depends on CMD_BOOTM || CMD_BOOTI || CMD_BOOTZ || \
+               LEGACY_IMAGE_FORMAT || SPL_LEGACY_IMAGE_FORMAT
+       default 0x4000000 if PPC || ARM64
+       default 0x1000000 if X86 || ARCH_MX6 || ARCH_MX7
+       default 0x800000
+       help
+         This is the maximum size of the buffer that is used to decompress the OS
+         image in to if attempting to boot a compressed image.
+
 config SUPPORT_RAW_INITRD
        bool "Enable raw initrd images"
        help
@@ -809,6 +828,7 @@ endmenu             # Boot images
 
 config DISTRO_DEFAULTS
        bool "(deprecated) Script-based booting of Linux distributions"
+       select CMDLINE
        select BOOT_DEFAULTS
        select AUTO_COMPLETE
        select CMDLINE_EDITING
@@ -1194,14 +1214,16 @@ menu "Autoboot options"
 
 config AUTOBOOT
        bool "Autoboot"
+       depends on CMDLINE
        default y
        help
          This enables the autoboot.  See doc/README.autoboot for detail.
 
+if AUTOBOOT
+
 config BOOTDELAY
        int "delay in seconds before automatically booting"
        default 2
-       depends on AUTOBOOT
        help
          Delay before automatically running bootcmd;
          set to 0 to autoboot with no delay, but you can stop it by key input.
@@ -1223,9 +1245,11 @@ config AUTOBOOT_KEYED
          U-Boot automatic booting process and bring the device
          to the U-Boot prompt for user input.
 
+if AUTOBOOT_KEYED
+
 config AUTOBOOT_FLUSH_STDIN
        bool "Enable flushing stdin before starting to read the password"
-       depends on AUTOBOOT_KEYED && !SANDBOX
+       depends on !SANDBOX
        help
          When this option is enabled stdin buffer will be flushed before
          starting to read the password.
@@ -1234,7 +1258,6 @@ config AUTOBOOT_FLUSH_STDIN
 
 config AUTOBOOT_PROMPT
        string "Autoboot stop prompt"
-       depends on AUTOBOOT_KEYED
        default "Autoboot in %d seconds\\n"
        help
          This string is displayed before the boot delay selected by
@@ -1250,7 +1273,6 @@ config AUTOBOOT_PROMPT
 
 config AUTOBOOT_ENCRYPTION
        bool "Enable encryption in autoboot stopping"
-       depends on AUTOBOOT_KEYED
        help
          This option allows a string to be entered into U-Boot to stop the
          autoboot.
@@ -1277,7 +1299,7 @@ config AUTOBOOT_SHA256_FALLBACK
 
 config AUTOBOOT_DELAY_STR
        string "Delay autobooting via specific input key / string"
-       depends on AUTOBOOT_KEYED && !AUTOBOOT_ENCRYPTION
+       depends on !AUTOBOOT_ENCRYPTION
        help
          This option delays the automatic boot feature by issuing
          a specific input key or string. If CONFIG_AUTOBOOT_DELAY_STR
@@ -1289,7 +1311,7 @@ config AUTOBOOT_DELAY_STR
 
 config AUTOBOOT_STOP_STR
        string "Stop autobooting via specific input key / string"
-       depends on AUTOBOOT_KEYED && !AUTOBOOT_ENCRYPTION
+       depends on !AUTOBOOT_ENCRYPTION
        help
          This option enables stopping (aborting) of the automatic
          boot feature only by issuing a specific input key or
@@ -1301,7 +1323,7 @@ config AUTOBOOT_STOP_STR
 
 config AUTOBOOT_KEYED_CTRLC
        bool "Enable Ctrl-C autoboot interruption"
-       depends on AUTOBOOT_KEYED && !AUTOBOOT_ENCRYPTION
+       depends on !AUTOBOOT_ENCRYPTION
        help
          This option allows for the boot sequence to be interrupted
          by ctrl-c, in addition to the "bootdelaykey" and "bootstopkey".
@@ -1310,7 +1332,7 @@ config AUTOBOOT_KEYED_CTRLC
 
 config AUTOBOOT_NEVER_TIMEOUT
        bool "Make the password entry never time-out"
-       depends on AUTOBOOT_KEYED && AUTOBOOT_ENCRYPTION && CRYPT_PW
+       depends on AUTOBOOT_ENCRYPTION && CRYPT_PW
        help
          This option removes the timeout from the password entry
          when the user first presses the <Enter> key before entering
@@ -1318,7 +1340,7 @@ config AUTOBOOT_NEVER_TIMEOUT
 
 config AUTOBOOT_STOP_STR_ENABLE
        bool "Enable fixed string to stop autobooting"
-       depends on AUTOBOOT_KEYED && AUTOBOOT_ENCRYPTION
+       depends on AUTOBOOT_ENCRYPTION
        help
          This option enables the feature to add a fixed stop
          string that is defined at compile time.
@@ -1349,9 +1371,12 @@ config AUTOBOOT_STOP_STR_SHA256
          includes a ":", the portion prior to the ":" will be treated
          as a salt value.
 
+endif  # AUTOBOOT_KEYED
+
+if !AUTOBOOT_KEYED
+
 config AUTOBOOT_USE_MENUKEY
        bool "Allow a specify key to run a menu from the environment"
-       depends on !AUTOBOOT_KEYED
        help
          If a specific key is pressed to stop autoboot, then the commands in
          the environment variable 'menucmd' are executed before boot starts.
@@ -1366,6 +1391,10 @@ config AUTOBOOT_MENUKEY
          For example, 33 means "!" in ASCII, so pressing ! at boot would take
          this action.
 
+endif
+
+endif  # AUTOBOOT
+
 config AUTOBOOT_MENU_SHOW
        bool "Show a menu on boot"
        depends on CMD_BOOTMENU
@@ -1561,6 +1590,7 @@ config BOOTARGS_SUBST
 
 config USE_BOOTCOMMAND
        bool "Enable a default value for bootcmd"
+       depends on CMDLINE
        help
          Provide a default value for the bootcmd entry in the environment.  If
          autoboot is enabled this is what will be run automatically.  Enable
@@ -1580,6 +1610,7 @@ config BOOTCOMMAND
 
 config USE_PREBOOT
        bool "Enable preboot"
+       depends on CMDLINE
        help
          When this option is enabled, the existence of the environment
          variable "preboot" will be checked immediately before starting the
index ad608598d29887bb21cb0b779cd71494f668b399..3fd048bb41abb47edd5a5acb86a3e295ad1ab89a 100644 (file)
@@ -28,7 +28,7 @@ obj-$(CONFIG_$(SPL_TPL_)BOOTSTD) += bootstd-uclass.o
 obj-$(CONFIG_$(SPL_TPL_)BOOTMETH_EXTLINUX) += bootmeth_extlinux.o
 obj-$(CONFIG_$(SPL_TPL_)BOOTMETH_EXTLINUX_PXE) += bootmeth_pxe.o
 obj-$(CONFIG_$(SPL_TPL_)BOOTMETH_EFILOADER) += bootmeth_efi.o
-obj-$(CONFIG_$(SPL_TPL_)BOOTMETH_CROS) += bootmeth_cros.o
+obj-$(CONFIG_$(SPL_TPL_)BOOTMETH_CROS) += bootm.o bootm_os.o bootmeth_cros.o
 obj-$(CONFIG_$(SPL_TPL_)BOOTMETH_SANDBOX) += bootmeth_sandbox.o
 obj-$(CONFIG_$(SPL_TPL_)BOOTMETH_SCRIPT) += bootmeth_script.o
 ifdef CONFIG_$(SPL_TPL_)BOOTSTD_FULL
index fd16c3a48e5c5032ab1cd69c9368da515f92201a..629a90afb7b5240f1f517723dc2817c6e9de19af 100644 (file)
@@ -1,7 +1,5 @@
-menu "Command line interface"
-
-config CMDLINE
-       bool "Support U-Boot commands"
+menuconfig CMDLINE
+       bool "Command line interface"
        default y
        help
          Enable U-Boot's command-line functions. This provides a means
@@ -11,9 +9,10 @@ config CMDLINE
          Depending on the number of commands enabled, this can add
          substantially to the size of U-Boot.
 
+if CMDLINE
+
 config HUSH_PARSER
        bool "Use hush shell"
-       depends on CMDLINE
        help
          This option enables the "hush" shell (from Busybox) as command line
          interpreter, thus enabling powerful command line syntax like
@@ -25,7 +24,6 @@ config HUSH_PARSER
 
 config CMDLINE_EDITING
        bool "Enable command line editing"
-       depends on CMDLINE
        default y
        help
          Enable editing and History functions for interactive command line
@@ -40,15 +38,13 @@ config CMDLINE_PS_SUPPORT
 
 config AUTO_COMPLETE
        bool "Enable auto complete using TAB"
-       depends on CMDLINE
        default y
        help
          Enable auto completion of commands using TAB.
 
 config SYS_LONGHELP
        bool "Enable long help messages"
-       depends on CMDLINE
-       default y if CMDLINE
+       default y
        help
          Defined when you want long help messages included
          Do not set this option when short of memory.
@@ -75,24 +71,9 @@ config SYS_MAXARGS
        int "Maximum number arguments accepted by commands"
        default 16
 
-config SYS_CBSIZE
-       int "Console input buffer size"
-       default 2048 if ARCH_TEGRA || ARCH_VERSAL || ARCH_ZYNQ || ARCH_ZYNQMP || \
-               RCAR_GEN3 || TARGET_SOCFPGA_SOC64
-       default 512 if ARCH_MX5 || ARCH_MX6 || ARCH_MX7 || FSL_LSCH2 || \
-               FSL_LSCH3 || X86
-       default 256 if M68K || PPC
-       default 1024
-
-config SYS_PBSIZE
-       int "Buffer size for console output"
-       default 1024 if ARCH_SUNXI
-       default 1044
-
 config SYS_XTRACE
        bool "Command execution tracer"
-       depends on CMDLINE
-       default y if CMDLINE
+       default y
        help
          This option enables the possiblity to print all commands before
          executing them and after all variables are evaluated (similar
@@ -374,17 +355,6 @@ config BOOTM_VXWORKS
        help
          Support booting VxWorks images via the bootm command.
 
-config SYS_BOOTM_LEN
-       hex "Maximum size of a decompresed OS image"
-       depends on CMD_BOOTM || CMD_BOOTI || CMD_BOOTZ || \
-                  LEGACY_IMAGE_FORMAT || SPL_LEGACY_IMAGE_FORMAT
-       default 0x4000000 if PPC || ARM64
-       default 0x1000000 if X86 || ARCH_MX6 || ARCH_MX7
-       default 0x800000
-       help
-         This is the maximum size of the buffer that is used to decompress the OS
-         image in to, if passing a compressed image to bootm/booti/bootz.
-
 config CMD_BOOTEFI
        bool "bootefi"
        depends on EFI_LOADER
@@ -392,6 +362,15 @@ config CMD_BOOTEFI
        help
          Boot an EFI image from memory.
 
+config CMD_BOOTEFI_BOOTMGR
+       bool "UEFI Boot Manager command"
+       depends on BOOTEFI_BOOTMGR && CMD_BOOTEFI
+       default y
+       help
+         Select this option to enable the 'bootmgr' subcommand of 'bootefi'.
+         This subcommand will allow you to select the UEFI binary to be booted
+         via UEFI variables Boot####, BootOrder, and BootNext.
+
 config CMD_BOOTEFI_HELLO_COMPILE
        bool "Compile a standard EFI hello world binary for testing"
        depends on CMD_BOOTEFI && !CPU_V7M
@@ -1152,13 +1131,6 @@ config CMD_GPT
          Enable the 'gpt' command to ready and write GPT style partition
          tables.
 
-config RANDOM_UUID
-       bool "GPT Random UUID generation"
-       select LIB_UUID
-       help
-         Enable the generation of partitions with random UUIDs if none
-         are provided.
-
 config CMD_GPT_RENAME
        bool "GPT partition renaming commands"
        depends on CMD_GPT
@@ -1840,6 +1812,10 @@ config BOOTP_PXE_CLIENTARCH
        default 0x15 if ARM
        default 0x0 if X86
 
+config BOOTP_PXE_DHCP_OPTION
+       bool "Request & store 'pxe_configfile' from BOOTP/DHCP server"
+       depends on BOOTP_PXE
+
 config BOOTP_VCI_STRING
        string
        depends on CMD_BOOTP
@@ -2138,7 +2114,7 @@ config CMD_EFIDEBUG
 config CMD_EFICONFIG
        bool "eficonfig - provide menu-driven uefi variables maintenance interface"
        default y if !HAS_BOARD_SIZE_LIMIT
-       depends on CMD_BOOTEFI_BOOTMGR
+       depends on BOOTEFI_BOOTMGR
        select MENU
        help
          Enable the 'eficonfig' command which provides the menu-driven UEFI
@@ -2253,6 +2229,8 @@ config CMD_SYSBOOT
 config CMD_QFW
        bool "qfw"
        select QFW
+       default y if TARGET_QEMU_ARM_32BIT || TARGET_QEMU_ARM_64BIT || \
+               TARGET_QEMU_X86 || TARGET_QEMU_X86_64
        help
          This provides access to the QEMU firmware interface.  The main
          feature is to allow easy loading of files passed to qemu-system
@@ -2366,6 +2344,7 @@ config CMD_VIDCONSOLE
 config CMD_SELECT_FONT
        bool "select font size"
        depends on VIDEO
+       default y if CONSOLE_TRUETYPE
        help
          Enabling this will provide 'font' command.
          Allows font selection at runtime.
@@ -2898,4 +2877,5 @@ config CMD_MESON
        default y
        help
          Enable useful commands for the Meson Soc family developed by Amlogic Inc.
-endmenu
+
+endif
index 9a6790cc170850931a6026017e7645a28537128f..dbeeebe2c4b1938df730a3223fdee515046c7790 100644 (file)
@@ -128,6 +128,7 @@ endif
 obj-$(CONFIG_CMD_MUX) += mux.o
 obj-$(CONFIG_CMD_NAND) += nand.o
 obj-$(CONFIG_CMD_NET) += net.o
+obj-$(CONFIG_ENV_SUPPORT) += nvedit.o
 obj-$(CONFIG_CMD_NVEDIT_EFI) += nvedit_efi.o
 obj-$(CONFIG_CMD_ONENAND) += onenand.o
 obj-$(CONFIG_CMD_OSD) += osd.o
@@ -245,9 +246,6 @@ endif # !CONFIG_SPL_BUILD
 
 obj-$(CONFIG_$(SPL_)CMD_TLV_EEPROM) += tlv_eeprom.o
 
-# core command
-obj-y += nvedit.o
-
 obj-$(CONFIG_CMD_BCM_EXT_UTILS) += broadcom/
 
 filechk_data_gz = (echo "static const char data_gz[] ="; cat $< | scripts/bin2c; echo ";")
index daf1ad37f9be25477e63e058061395922c55b12b..e77338f81394b3f92fb23779bd7dfc30266e7f7f 100644 (file)
@@ -49,20 +49,6 @@ DECLARE_GLOBAL_DATA_PTR;
  */
 #define        MAX_ENV_SIZE    (1 << 20)       /* 1 MiB */
 
-/*
- * This variable is incremented on each do_env_set(), so it can
- * be used via env_get_id() as an indication, if the environment
- * has changed or not. So it is possible to reread an environment
- * variable only if the environment was changed ... done so for
- * example in NetInitLoop()
- */
-static int env_id = 1;
-
-int env_get_id(void)
-{
-       return env_id;
-}
-
 #ifndef CONFIG_SPL_BUILD
 /*
  * Command interface: print one or all environment variables
@@ -198,104 +184,6 @@ DONE:
 #endif
 #endif /* CONFIG_SPL_BUILD */
 
-/*
- * Set a new environment variable,
- * or replace or delete an existing one.
- */
-static int _do_env_set(int flag, int argc, char *const argv[], int env_flag)
-{
-       int   i, len;
-       char  *name, *value, *s;
-       struct env_entry e, *ep;
-
-       debug("Initial value for argc=%d\n", argc);
-
-#if !IS_ENABLED(CONFIG_SPL_BUILD) && IS_ENABLED(CONFIG_CMD_NVEDIT_EFI)
-       if (argc > 1 && argv[1][0] == '-' && argv[1][1] == 'e')
-               return do_env_set_efi(NULL, flag, --argc, ++argv);
-#endif
-
-       while (argc > 1 && **(argv + 1) == '-') {
-               char *arg = *++argv;
-
-               --argc;
-               while (*++arg) {
-                       switch (*arg) {
-                       case 'f':               /* force */
-                               env_flag |= H_FORCE;
-                               break;
-                       default:
-                               return CMD_RET_USAGE;
-                       }
-               }
-       }
-       debug("Final value for argc=%d\n", argc);
-       name = argv[1];
-
-       if (strchr(name, '=')) {
-               printf("## Error: illegal character '='"
-                      "in variable name \"%s\"\n", name);
-               return 1;
-       }
-
-       env_id++;
-
-       /* Delete only ? */
-       if (argc < 3 || argv[2] == NULL) {
-               int rc = hdelete_r(name, &env_htab, env_flag);
-
-               /* If the variable didn't exist, don't report an error */
-               return rc && rc != -ENOENT ? 1 : 0;
-       }
-
-       /*
-        * Insert / replace new value
-        */
-       for (i = 2, len = 0; i < argc; ++i)
-               len += strlen(argv[i]) + 1;
-
-       value = malloc(len);
-       if (value == NULL) {
-               printf("## Can't malloc %d bytes\n", len);
-               return 1;
-       }
-       for (i = 2, s = value; i < argc; ++i) {
-               char *v = argv[i];
-
-               while ((*s++ = *v++) != '\0')
-                       ;
-               *(s - 1) = ' ';
-       }
-       if (s != value)
-               *--s = '\0';
-
-       e.key   = name;
-       e.data  = value;
-       hsearch_r(e, ENV_ENTER, &ep, &env_htab, env_flag);
-       free(value);
-       if (!ep) {
-               printf("## Error inserting \"%s\" variable, errno=%d\n",
-                       name, errno);
-               return 1;
-       }
-
-       return 0;
-}
-
-int env_set(const char *varname, const char *varvalue)
-{
-       const char * const argv[4] = { "setenv", varname, varvalue, NULL };
-
-       /* before import into hashtable */
-       if (!(gd->flags & GD_FLG_ENV_READY))
-               return 1;
-
-       if (varvalue == NULL || varvalue[0] == '\0')
-               return _do_env_set(0, 2, (char * const *)argv, H_PROGRAMMATIC);
-       else
-               return _do_env_set(0, 3, (char * const *)argv, H_PROGRAMMATIC);
-}
-
 #ifndef CONFIG_SPL_BUILD
 static int do_env_set(struct cmd_tbl *cmdtp, int flag, int argc,
                      char *const argv[])
@@ -303,7 +191,7 @@ static int do_env_set(struct cmd_tbl *cmdtp, int flag, int argc,
        if (argc < 2)
                return CMD_RET_USAGE;
 
-       return _do_env_set(flag, argc, argv, H_INTERACTIVE);
+       return env_do_env_set(flag, argc, argv, H_INTERACTIVE);
 }
 
 /*
@@ -381,7 +269,7 @@ int do_env_ask(struct cmd_tbl *cmdtp, int flag, int argc, char *const argv[])
        }
 
        /* Continue calling setenv code */
-       return _do_env_set(flag, len, local_args, H_INTERACTIVE);
+       return env_do_env_set(flag, len, local_args, H_INTERACTIVE);
 }
 #endif
 
@@ -561,12 +449,12 @@ static int do_env_edit(struct cmd_tbl *cmdtp, int flag, int argc,
        if (buffer[0] == '\0') {
                const char * const _argv[3] = { "setenv", argv[1], NULL };
 
-               return _do_env_set(0, 2, (char * const *)_argv, H_INTERACTIVE);
+               return env_do_env_set(0, 2, (char * const *)_argv, H_INTERACTIVE);
        } else {
                const char * const _argv[4] = { "setenv", argv[1], buffer,
                        NULL };
 
-               return _do_env_set(0, 3, (char * const *)_argv, H_INTERACTIVE);
+               return env_do_env_set(0, 3, (char * const *)_argv, H_INTERACTIVE);
        }
 }
 #endif /* CONFIG_CMD_EDITENV */
@@ -679,7 +567,7 @@ static int do_env_delete(struct cmd_tbl *cmdtp, int flag,
        }
        debug("Final value for argc=%d\n", argc);
 
-       env_id++;
+       env_inc_id();
 
        while (--argc > 0) {
                char *name = *++argv;
index 704589702f23f343f8cc78c4df69b96b81d84578..21134eb7a304646ad305eaac48bd289b8be5a8d8 100644 (file)
--- a/cmd/pxe.c
+++ b/cmd/pxe.c
@@ -141,6 +141,14 @@ int pxe_get(ulong pxefile_addr_r, char **bootdirp, ulong *sizep, bool use_ipv6)
                          env_get("bootfile"), use_ipv6))
                return -ENOMEM;
 
+       if (IS_ENABLED(CONFIG_BOOTP_PXE_DHCP_OPTION) &&
+           pxelinux_configfile && !use_ipv6) {
+               if (pxe_dhcp_option_path(&ctx, pxefile_addr_r) > 0)
+                       goto done;
+
+               goto error_exit;
+       }
+
        if (IS_ENABLED(CONFIG_DHCP6_PXE_DHCP_OPTION) &&
            pxelinux_configfile && use_ipv6) {
                if (pxe_dhcp_option_path(&ctx, pxefile_addr_r) > 0)
index 4549995ba73c4b5f2bf5034442d79c18ce47f256..c501d7f456d7eba9af7701e6e679db326419a179 100644 (file)
@@ -34,9 +34,6 @@ static int do_scsi(struct cmd_tbl *cmdtp, int flag, int argc,
        if (argc == 2) {
                if (strncmp(argv[1], "res", 3) == 0) {
                        printf("\nReset SCSI\n");
-#ifndef CONFIG_DM_SCSI
-                       scsi_bus_reset(NULL);
-#endif
                        ret = scsi_scan(true);
                        if (ret)
                                return CMD_RET_FAILURE;
index 87e1fa4159c1c4524d7c09a652f4348947c5bb77..d99a44f19fb378f99e96a656f8410a3e85b64265 100644 (file)
@@ -7,21 +7,12 @@
 #include <common.h>
 #include <command.h>
 #include <display_options.h>
-#include <timestamp.h>
-#include <version.h>
 #include <version_string.h>
 #include <linux/compiler.h>
 #ifdef CONFIG_SYS_COREBOOT
 #include <asm/cb_sysinfo.h>
 #endif
 
-#define U_BOOT_VERSION_STRING U_BOOT_VERSION " (" U_BOOT_DATE " - " \
-       U_BOOT_TIME " " U_BOOT_TZ ")" CONFIG_IDENT_STRING
-
-const char version_string[] = U_BOOT_VERSION_STRING;
-const unsigned short version_num = U_BOOT_VERSION_NUM;
-const unsigned char version_num_patch = U_BOOT_VERSION_NUM_PATCH;
-
 static int do_version(struct cmd_tbl *cmdtp, int flag, int argc,
                      char *const argv[])
 {
index 0f548195197df7cfa8b75ee97b44eb2a2ae795b4..0283701f1d059fbca93bf11ddb8af0b77ac5f89b 100644 (file)
@@ -52,6 +52,29 @@ config CONSOLE_RECORD_IN_SIZE
          The buffer is allocated immediately after the malloc() region is
          ready.
 
+config SYS_CBSIZE
+       int "Console input buffer size"
+       default 2048 if ARCH_TEGRA || ARCH_VERSAL || ARCH_ZYNQ || ARCH_ZYNQMP || \
+               RCAR_GEN3 || TARGET_SOCFPGA_SOC64
+       default 512 if ARCH_MX5 || ARCH_MX6 || ARCH_MX7 || FSL_LSCH2 || \
+               FSL_LSCH3 || X86
+       default 256 if M68K || PPC
+       default 1024
+       help
+         Set the size of the console input buffer. This is used both in the
+         case of reading input literally from the user in some manner as well
+         as when we need to construct or modify that type of input, for
+         example when constructing "bootargs" for the OS.
+
+config SYS_PBSIZE
+       int "Console output buffer size"
+       default 1024 if ARCH_SUNXI
+       default 1044
+       help
+         Set the size of the console output buffer. This is used when we need
+         to work with some form of a buffer while providing output in some
+         form to the user.
+
 config DISABLE_CONSOLE
        bool "Add functionality to disable console completely"
        help
index cdeadf72026c61be90a00c3033b22d0fc4f10093..1495436d5d45567d7d51529a485e12621242d22b 100644 (file)
@@ -8,8 +8,10 @@ ifndef CONFIG_SPL_BUILD
 obj-y += init/
 obj-y += main.o
 obj-y += exports.o
+obj-y += cli_getch.o cli_simple.o cli_readline.o
 obj-$(CONFIG_HUSH_PARSER) += cli_hush.o
 obj-$(CONFIG_AUTOBOOT) += autoboot.o
+obj-y += version.o
 
 # # boards
 obj-y += board_f.o
@@ -37,7 +39,6 @@ obj-$(CONFIG_SPLASH_SOURCE) += splash_source.o
 obj-$(CONFIG_MENU) += menu.o
 obj-$(CONFIG_UPDATE_COMMON) += update.o
 obj-$(CONFIG_USB_KEYBOARD) += usb_kbd.o
-obj-$(CONFIG_CMDLINE) += cli_getch.o cli_readline.o cli_simple.o
 
 endif # !CONFIG_SPL_BUILD
 
index a7967849dc0c601a50a7a5765cca1b700b0c08db..da0b80f24ff07b6ae767704df2a64505edc457a8 100644 (file)
@@ -472,17 +472,6 @@ static int initr_status_led(void)
 }
 #endif
 
-#if defined(CONFIG_SCSI) && !defined(CONFIG_DM_SCSI)
-static int initr_scsi(void)
-{
-       puts("SCSI:  ");
-       scsi_init();
-       puts("\n");
-
-       return 0;
-}
-#endif
-
 #ifdef CONFIG_CMD_NET
 static int initr_net(void)
 {
@@ -732,10 +721,6 @@ static init_fnc_t init_sequence_r[] = {
 #ifdef CONFIG_BOARD_LATE_INIT
        board_late_init,
 #endif
-#if defined(CONFIG_SCSI) && !defined(CONFIG_DM_SCSI)
-       INIT_FUNC_WATCHDOG_RESET
-       initr_scsi,
-#endif
 #ifdef CONFIG_BITBANGMII
        bb_miiphy_init,
 #endif
index e80ba488a5eb0f4234a920a404465471e353c558..f89ba92d1b05c50bfa01a52498de5b7a5558e1c9 100644 (file)
 #define debug_parser(fmt, args...)             \
        debug_cond(DEBUG_PARSER, fmt, ##args)
 
-
-int cli_simple_parse_line(char *line, char *argv[])
-{
-       int nargs = 0;
-
-       debug_parser("%s: \"%s\"\n", __func__, line);
-       while (nargs < CONFIG_SYS_MAXARGS) {
-               /* skip any white space */
-               while (isblank(*line))
-                       ++line;
-
-               if (*line == '\0') {    /* end of line, no more args    */
-                       argv[nargs] = NULL;
-                       debug_parser("%s: nargs=%d\n", __func__, nargs);
-                       return nargs;
-               }
-
-               argv[nargs++] = line;   /* begin of argument string     */
-
-               /* find end of string */
-               while (*line && !isblank(*line))
-                       ++line;
-
-               if (*line == '\0') {    /* end of line, no more args    */
-                       argv[nargs] = NULL;
-                       debug_parser("parse_line: nargs=%d\n", nargs);
-                       return nargs;
-               }
-
-               *line++ = '\0';         /* terminate current arg         */
-       }
-
-       printf("** Too many args (max. %d) **\n", CONFIG_SYS_MAXARGS);
-
-       debug_parser("%s: nargs=%d\n", __func__, nargs);
-       return nargs;
-}
-
 int cli_simple_process_macros(const char *input, char *output, int max_size)
 {
        char c, prev;
@@ -172,6 +134,44 @@ int cli_simple_process_macros(const char *input, char *output, int max_size)
        return ret;
 }
 
+#ifdef CONFIG_CMDLINE
+int cli_simple_parse_line(char *line, char *argv[])
+{
+       int nargs = 0;
+
+       debug_parser("%s: \"%s\"\n", __func__, line);
+       while (nargs < CONFIG_SYS_MAXARGS) {
+               /* skip any white space */
+               while (isblank(*line))
+                       ++line;
+
+               if (*line == '\0') {    /* end of line, no more args    */
+                       argv[nargs] = NULL;
+                       debug_parser("%s: nargs=%d\n", __func__, nargs);
+                       return nargs;
+               }
+
+               argv[nargs++] = line;   /* begin of argument string     */
+
+               /* find end of string */
+               while (*line && !isblank(*line))
+                       ++line;
+
+               if (*line == '\0') {    /* end of line, no more args    */
+                       argv[nargs] = NULL;
+                       debug_parser("parse_line: nargs=%d\n", nargs);
+                       return nargs;
+               }
+
+               *line++ = '\0';         /* terminate current arg         */
+       }
+
+       printf("** Too many args (max. %d) **\n", CONFIG_SYS_MAXARGS);
+
+       debug_parser("%s: nargs=%d\n", __func__, nargs);
+       return nargs;
+}
+
  /*
  * WARNING:
  *
@@ -346,3 +346,4 @@ int cli_simple_run_command_list(char *cmd, int flag)
 
        return rcode;
 }
+#endif
diff --git a/common/version.c b/common/version.c
new file mode 100644 (file)
index 0000000..6e27bb8
--- /dev/null
@@ -0,0 +1,16 @@
+// SPDX-License-Identifier: GPL-2.0+
+/*
+ * Copyright 2000-2009
+ * Wolfgang Denk, DENX Software Engineering, wd@denx.de.
+ */
+
+#include <timestamp.h>
+#include <version.h>
+#include <version_string.h>
+
+#define U_BOOT_VERSION_STRING U_BOOT_VERSION " (" U_BOOT_DATE " - " \
+       U_BOOT_TIME " " U_BOOT_TZ ")" CONFIG_IDENT_STRING
+
+const char version_string[] = U_BOOT_VERSION_STRING;
+const unsigned short version_num = U_BOOT_VERSION_NUM;
+const unsigned char version_num_patch = U_BOOT_VERSION_NUM_PATCH;
index aa9cf77960bb8fd352a34aa351e9bd74ca6720fb..cf2af5797f3e6e33ff9de32218a52c180fd4b245 100644 (file)
@@ -59,6 +59,7 @@ CONFIG_CMD_I2C=y
 # CONFIG_CMD_LOADB is not set
 # CONFIG_CMD_LOADS is not set
 CONFIG_CMD_MMC=y
+# CONFIG_CMD_SCSI is not set
 CONFIG_CMD_USB=y
 CONFIG_CMD_USB_SDP=y
 CONFIG_CMD_USB_MASS_STORAGE=y
@@ -105,7 +106,7 @@ CONFIG_DM_PMIC_PFUZE100=y
 CONFIG_DM_REGULATOR=y
 CONFIG_DM_REGULATOR_PFUZE100=y
 CONFIG_DM_REGULATOR_FIXED=y
-CONFIG_DM_SCSI=y
+CONFIG_SCSI=y
 CONFIG_MXC_UART=y
 CONFIG_IMX_THERMAL=y
 CONFIG_USB=y
index cb06db61fbaeaea4c9df7b5065154f970b9516fd..3c3f6d55d50a11f9ed82f13543c58642a94a4872 100644 (file)
@@ -96,7 +96,6 @@ CONFIG_NETCONSOLE=y
 CONFIG_SPL_DM=y
 CONFIG_SPL_DM_SEQ_ALIAS=y
 # CONFIG_OF_TRANSLATE is not set
-# CONFIG_SPL_BLK is not set
 CONFIG_DM_I2C=y
 CONFIG_MISC=y
 CONFIG_MMC_OMAP_HS=y
index 5a83b6a08a2603807a86f574bf8dd6feb5292900..154131e62e09a0822bc40ca65f1b7183a64cdeb8 100644 (file)
@@ -52,6 +52,7 @@ CONFIG_CMD_GPIO=y
 CONFIG_CMD_I2C=y
 CONFIG_CMD_MMC=y
 CONFIG_CMD_SATA=y
+# CONFIG_CMD_SCSI is not set
 CONFIG_CMD_USB=y
 CONFIG_CMD_USB_MASS_STORAGE=y
 CONFIG_CMD_WDT=y
@@ -99,7 +100,7 @@ CONFIG_PINCTRL=y
 CONFIG_PINCTRL_IMX6=y
 CONFIG_DM_REGULATOR=y
 CONFIG_DM_REGULATOR_FIXED=y
-CONFIG_DM_SCSI=y
+CONFIG_SCSI=y
 CONFIG_DM_SERIAL=y
 CONFIG_MXC_UART=y
 CONFIG_SPI=y
index f134680e4122678405dd6d3683ce90fd4e7ce7a7..db2e35f388b7bef0529fcd74fbccfcc84d9207e7 100644 (file)
@@ -27,6 +27,7 @@ CONFIG_CMD_DFU=y
 CONFIG_CMD_GPT=y
 CONFIG_CMD_MMC=y
 CONFIG_CMD_PART=y
+# CONFIG_CMD_SCSI is not set
 CONFIG_CMD_TIMER=y
 CONFIG_CMD_HASH=y
 CONFIG_CMD_EXT4=y
index dfc315774a50b1529e44f3419bb29bd5de11a883..682ba5b895760cb382e8991f62e7cb729dc548ba 100644 (file)
@@ -20,6 +20,7 @@ CONFIG_HUSH_PARSER=y
 CONFIG_SYS_PBSIZE=532
 CONFIG_CMD_BOOTZ=y
 CONFIG_CMD_PART=y
+# CONFIG_CMD_SCSI is not set
 # CONFIG_CMD_NET is not set
 CONFIG_CMD_TIME=y
 CONFIG_CMD_EXT2=y
index e0cfe3ee243a672f39c378ea80c85b66e9b1d005..d6b6c3d82995a808e0f90d0b3ac6189edc346e6b 100644 (file)
@@ -21,6 +21,7 @@ CONFIG_HUSH_PARSER=y
 CONFIG_SYS_PBSIZE=532
 CONFIG_CMD_BOOTZ=y
 CONFIG_CMD_PART=y
+# CONFIG_CMD_SCSI is not set
 # CONFIG_CMD_NET is not set
 CONFIG_CMD_CACHE=y
 CONFIG_CMD_TIME=y
index 02254ef7088681f17ab35273fa2b7a6bb8d02d56..21c657a441c24802fc3c871f6c42a467914e4bd5 100644 (file)
@@ -41,7 +41,6 @@ CONFIG_CMD_TIME=y
 CONFIG_SYS_RELOC_GD_ENV_ADDR=y
 CONFIG_REGMAP=y
 CONFIG_SYSCON=y
-# CONFIG_SPL_BLK is not set
 CONFIG_CLK=y
 CONFIG_FASTBOOT_CMD_OEM_FORMAT=y
 CONFIG_ROCKCHIP_GPIO=y
index 3eb1917454d521ce03aa5077a9148c5ee7a3981b..35f7fb77e634df879ad433698fe497183e27230f 100644 (file)
@@ -23,6 +23,7 @@ CONFIG_CMD_CPU=y
 CONFIG_CMD_GPIO=y
 CONFIG_CMD_MMC=y
 CONFIG_CMD_PART=y
+# CONFIG_CMD_SCSI is not set
 CONFIG_CMD_SPI=y
 CONFIG_CMD_USB=y
 # CONFIG_CMD_SETEXPR is not set
index ed53c11ad036045fb6ca73d38ae25e3accc81e0b..0b3259866e7d8b9df70f579c62f006e8f421b6f9 100644 (file)
@@ -68,7 +68,6 @@ CONFIG_HOSTNAME="xea"
 CONFIG_NET_RANDOM_ETHADDR=y
 CONFIG_SPL_DM=y
 CONFIG_DEVRES=y
-# CONFIG_SPL_BLK is not set
 CONFIG_MXS_GPIO=y
 CONFIG_SUPPORT_EMMC_BOOT=y
 CONFIG_MMC_MXS=y
diff --git a/configs/inteno_xg6846_ram_defconfig b/configs/inteno_xg6846_ram_defconfig
new file mode 100644 (file)
index 0000000..00fe36d
--- /dev/null
@@ -0,0 +1,73 @@
+CONFIG_MIPS=y
+CONFIG_SKIP_LOWLEVEL_INIT=y
+CONFIG_TEXT_BASE=0x81c00000
+CONFIG_NR_DRAM_BANKS=1
+CONFIG_ENV_SIZE=0x2000
+CONFIG_DM_GPIO=y
+CONFIG_DEFAULT_DEVICE_TREE="inteno,xg6846"
+CONFIG_DM_RESET=y
+CONFIG_IDENT_STRING="Inteno XG6846"
+CONFIG_SYS_LOAD_ADDR=0x81000000
+CONFIG_ARCH_BMIPS=y
+CONFIG_SOC_BMIPS_BCM6328=y
+CONFIG_SYS_MIPS_TIMER_FREQ=160000000
+CONFIG_MIPS_CACHE_SETUP=y
+CONFIG_MIPS_CACHE_DISABLE=y
+# CONFIG_MIPS_BOOT_CMDLINE_LEGACY is not set
+# CONFIG_MIPS_BOOT_ENV_LEGACY is not set
+CONFIG_MIPS_BOOT_FDT=y
+# CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
+CONFIG_REMAKE_ELF=y
+CONFIG_BOOTDELAY=1
+CONFIG_AUTOBOOT_KEYED=y
+CONFIG_AUTOBOOT_PROMPT="Boot XG6846 in %d seconds\n"
+CONFIG_OF_STDOUT_VIA_ALIAS=y
+CONFIG_USE_BOOTCOMMAND=y
+CONFIG_BOOTCOMMAND="sf probe; sf read 0x81000000 0x40000 0x500000; bootm 0x81000000"
+CONFIG_DISPLAY_CPUINFO=y
+CONFIG_SYS_MALLOC_BOOTPARAMS=y
+CONFIG_HUSH_PARSER=y
+CONFIG_SYS_PROMPT="XG6846 # "
+CONFIG_SYS_MAXARGS=24
+CONFIG_SYS_CBSIZE=512
+CONFIG_SYS_PBSIZE=541
+CONFIG_CMD_CPU=y
+CONFIG_CMD_LICENSE=y
+# CONFIG_CMD_BOOTD is not set
+CONFIG_SYS_BOOTM_LEN=0x1000000
+# CONFIG_CMD_ELF is not set
+# CONFIG_CMD_XIMG is not set
+# CONFIG_CMD_EXPORTENV is not set
+# CONFIG_CMD_IMPORTENV is not set
+# CONFIG_CMD_EDITENV is not set
+# CONFIG_CMD_SAVEENV is not set
+# CONFIG_CMD_ENV_EXISTS is not set
+# CONFIG_CMD_CRC32 is not set
+CONFIG_CMD_MEMINFO=y
+# CONFIG_CMD_FLASH is not set
+# CONFIG_CMD_LOADS is not set
+CONFIG_CMD_SPI=y
+# CONFIG_CMD_SLEEP is not set
+CONFIG_SYS_RELOC_GD_ENV_ADDR=y
+# CONFIG_DM_DEVICE_REMOVE is not set
+CONFIG_DMA=y
+CONFIG_BCM6348_IUDMA=y
+CONFIG_LED=y
+CONFIG_LED_BCM6328=y
+CONFIG_LED_BLINK=y
+CONFIG_MTD=y
+CONFIG_DM_SPI_FLASH=y
+CONFIG_SPI_FLASH_MACRONIX=y
+CONFIG_SPI_FLASH_SPANSION=y
+CONFIG_SPI_FLASH_WINBOND=y
+CONFIG_SPI_FLASH_MTD=y
+CONFIG_PHY_RESET_DELAY=20
+CONFIG_POWER_DOMAIN=y
+CONFIG_BCM6328_POWER_DOMAIN=y
+CONFIG_RESET_BCM6345=y
+CONFIG_DM_SERIAL=y
+CONFIG_BCM6345_SERIAL=y
+CONFIG_SPI=y
+CONFIG_DM_SPI=y
+CONFIG_BCM63XX_HSSPI=y
+CONFIG_LZMA=y
index 1aab1575911f3ec5e27a336fec691d557add4461..8d3f1a7b0983ee4ed3ac1bbbf1cce4cd4eef2a1a 100644 (file)
@@ -45,7 +45,6 @@ CONFIG_ENV_IS_IN_MMC=y
 CONFIG_SYS_RELOC_GD_ENV_ADDR=y
 CONFIG_REGMAP=y
 CONFIG_SYSCON=y
-# CONFIG_SPL_BLK is not set
 CONFIG_CLK=y
 CONFIG_FASTBOOT_CMD_OEM_FORMAT=y
 CONFIG_ROCKCHIP_GPIO=y
index fe57fd1892db23c4ed7a4018fed4f3fb462106f4..954870bff823cedc689bfdd99c0e9bf99fffd702 100644 (file)
@@ -54,7 +54,6 @@ CONFIG_NET_RANDOM_ETHADDR=y
 CONFIG_SPL_DM=y
 # CONFIG_SIMPLE_BUS is not set
 # CONFIG_SPL_SIMPLE_BUS is not set
-# CONFIG_SPL_BLK is not set
 CONFIG_GPIO_HOG=y
 # CONFIG_INPUT is not set
 CONFIG_MMC=y
index e8fa22b648be430f69d1f3b2a435e5ffc0433083..0a9adcc0399957600c0d81ea5734eb07051451f7 100644 (file)
@@ -28,6 +28,7 @@ CONFIG_CMD_GPIO=y
 CONFIG_CMD_I2C=y
 CONFIG_CMD_MMC=y
 CONFIG_CMD_PCI=y
+# CONFIG_CMD_SCSI is not set
 CONFIG_CMD_SPI=y
 CONFIG_CMD_USB=y
 # CONFIG_CMD_SETEXPR is not set
@@ -72,7 +73,7 @@ CONFIG_PINCTRL_ARMADA_8K=y
 CONFIG_DM_REGULATOR_FIXED=y
 CONFIG_DM_REGULATOR_GPIO=y
 CONFIG_DM_RTC=y
-CONFIG_DM_SCSI=y
+CONFIG_SCSI=y
 CONFIG_SYS_NS16550=y
 CONFIG_MVEBU_A3700_SPI=y
 CONFIG_DM_THERMAL=y
index 278e3fd8adb11298085729e8ba30d1569ba8c164..2389991188260b1b08c2ee617061cee12fad134a 100644 (file)
@@ -48,6 +48,7 @@ CONFIG_CMD_I2C=y
 CONFIG_CMD_MMC=y
 CONFIG_CMD_PCI=y
 CONFIG_CMD_SATA=y
+# CONFIG_CMD_SCSI is not set
 CONFIG_CMD_USB=y
 CONFIG_CMD_CACHE=y
 CONFIG_CMD_TIME=y
index d4e5eb3000b441711ba446b9e258a1c2cef258ba..e3f7f11a21425015e3bd5a48062b0b3ed4c18872 100644 (file)
@@ -15,7 +15,6 @@ CONFIG_FIT=y
 CONFIG_FIT_SIGNATURE=y
 CONFIG_FIT_VERBOSE=y
 CONFIG_LEGACY_IMAGE_FORMAT=y
-CONFIG_DISTRO_DEFAULTS=y
 CONFIG_BOOTSTAGE=y
 CONFIG_BOOTSTAGE_REPORT=y
 CONFIG_BOOTSTAGE_FDT=y
index 04b8376bb026d00f4c158426640f8a21334a866a..b7ae1f07c71561e87442b255ff821fa1074b3ec2 100644 (file)
@@ -16,7 +16,6 @@ CONFIG_FIT_CIPHER=y
 CONFIG_FIT_VERBOSE=y
 CONFIG_LEGACY_IMAGE_FORMAT=y
 CONFIG_MEASURED_BOOT=y
-CONFIG_DISTRO_DEFAULTS=y
 CONFIG_BOOTSTAGE=y
 CONFIG_BOOTSTAGE_REPORT=y
 CONFIG_BOOTSTAGE_FDT=y
@@ -347,7 +346,6 @@ CONFIG_CMD_DHRYSTONE=y
 CONFIG_ECDSA=y
 CONFIG_ECDSA_VERIFY=y
 CONFIG_TPM=y
-CONFIG_SHA384=y
 CONFIG_ERRNO_STR=y
 CONFIG_EFI_RUNTIME_UPDATE_CAPSULE=y
 CONFIG_EFI_CAPSULE_ON_DISK=y
index 44ab80725fc70cbde9b36505d7f1366f85051c73..9c774bb684ac4b12e6b94ef485506fefdbf03990 100644 (file)
@@ -12,7 +12,6 @@ CONFIG_FIT=y
 CONFIG_FIT_SIGNATURE=y
 CONFIG_FIT_VERBOSE=y
 CONFIG_LEGACY_IMAGE_FORMAT=y
-CONFIG_DISTRO_DEFAULTS=y
 CONFIG_BOOTSTAGE=y
 CONFIG_BOOTSTAGE_REPORT=y
 CONFIG_BOOTSTAGE_FDT=y
@@ -43,8 +42,6 @@ CONFIG_CMD_GPIO=y
 CONFIG_CMD_GPT=y
 CONFIG_CMD_IDE=y
 CONFIG_CMD_I2C=y
-CONFIG_CMD_MBR=y
-CONFIG_CMD_MMC=y
 CONFIG_CMD_OSD=y
 CONFIG_CMD_PCI=y
 CONFIG_CMD_READ=y
index 0e5f84abbd895dd668dec871d133f90b9c4e1f36..8cfe30bd01bfaefab9c576ce7fcc9bbd4dfdbf1f 100644 (file)
@@ -25,7 +25,6 @@ CONFIG_FIT=y
 CONFIG_FIT_SIGNATURE=y
 CONFIG_FIT_VERBOSE=y
 CONFIG_SPL_LOAD_FIT=y
-CONFIG_DISTRO_DEFAULTS=y
 CONFIG_BOOTSTAGE=y
 CONFIG_BOOTSTAGE_REPORT=y
 CONFIG_BOOTSTAGE_FDT=y
index 56072b15ad2dd0b3e7c513fe7e9f44ecc2bf0e72..f1cca13d5f38bd93d8af46bff473326ef99658f5 100644 (file)
@@ -20,7 +20,6 @@ CONFIG_FIT=y
 CONFIG_FIT_SIGNATURE=y
 CONFIG_FIT_VERBOSE=y
 CONFIG_SPL_LOAD_FIT=y
-CONFIG_DISTRO_DEFAULTS=y
 CONFIG_BOOTSTAGE=y
 CONFIG_BOOTSTAGE_REPORT=y
 CONFIG_BOOTSTAGE_FDT=y
@@ -66,7 +65,6 @@ CONFIG_CMD_GPIO=y
 CONFIG_CMD_GPT=y
 CONFIG_CMD_IDE=y
 CONFIG_CMD_I2C=y
-CONFIG_CMD_MBR=y
 CONFIG_CMD_OSD=y
 CONFIG_CMD_PCI=y
 CONFIG_CMD_REMOTEPROC=y
index 5bd0281796d47ce286412ffa2b1b1a734919c2a8..62df03e7bf7ba679d574e4e4bbfc98ba04ce2061 100644 (file)
@@ -27,7 +27,6 @@ CONFIG_FIT=y
 CONFIG_FIT_VERBOSE=y
 CONFIG_FIT_BEST_MATCH=y
 CONFIG_SPL_LOAD_FIT=y
-CONFIG_DISTRO_DEFAULTS=y
 CONFIG_BOOTSTAGE=y
 CONFIG_BOOTSTAGE_REPORT=y
 CONFIG_BOOTSTAGE_FDT=y
@@ -74,7 +73,6 @@ CONFIG_CMD_GPIO=y
 CONFIG_CMD_GPT=y
 CONFIG_CMD_IDE=y
 CONFIG_CMD_I2C=y
-CONFIG_CMD_MBR=y
 CONFIG_CMD_OSD=y
 CONFIG_CMD_PCI=y
 CONFIG_CMD_REMOTEPROC=y
index 09a7a3453e805311aa07246e0fbdcc2377921571..6a4106a559e2b79334318bb942ff7505f05f8429 100644 (file)
@@ -73,7 +73,6 @@ CONFIG_USE_BOOTFILE=y
 CONFIG_BOOTFILE="zImage"
 CONFIG_VERSION_VARIABLE=y
 CONFIG_SPL_DM_SEQ_ALIAS=y
-# CONFIG_SPL_BLK is not set
 CONFIG_BOOTCOUNT_LIMIT=y
 CONFIG_DM_BOOTCOUNT=y
 CONFIG_DM_BOOTCOUNT_RTC=y
diff --git a/configs/stm32mp25_defconfig b/configs/stm32mp25_defconfig
new file mode 100644 (file)
index 0000000..8423943
--- /dev/null
@@ -0,0 +1,52 @@
+CONFIG_ARM=y
+CONFIG_ARCH_STM32MP=y
+CONFIG_SYS_MALLOC_F_LEN=0x400000
+CONFIG_CUSTOM_SYS_INIT_SP_ADDR=0x90000000
+CONFIG_DEFAULT_DEVICE_TREE="stm32mp257f-ev1"
+CONFIG_STM32MP25X=y
+CONFIG_DDR_CACHEABLE_SIZE=0x10000000
+CONFIG_TARGET_ST_STM32MP25X=y
+CONFIG_SYS_LOAD_ADDR=0x84000000
+CONFIG_SYS_MEMTEST_START=0x84000000
+CONFIG_SYS_MEMTEST_END=0x88000000
+CONFIG_FIT=y
+CONFIG_SYS_BOOTM_LEN=0x2000000
+CONFIG_BOOTDELAY=1
+CONFIG_LAST_STAGE_INIT=y
+CONFIG_SYS_PROMPT="STM32MP> "
+# CONFIG_CMD_BDI is not set
+CONFIG_CMD_BOOTZ=y
+CONFIG_CMD_ADTIMG=y
+# CONFIG_CMD_ELF is not set
+CONFIG_CMD_MEMINFO=y
+CONFIG_CMD_MEMTEST=y
+CONFIG_CMD_CLK=y
+CONFIG_CMD_GPIO=y
+# CONFIG_CMD_LOADB is not set
+# CONFIG_CMD_NET is not set
+CONFIG_CMD_CACHE=y
+CONFIG_CMD_TIME=y
+CONFIG_CMD_RNG=y
+CONFIG_CMD_TIMER=y
+CONFIG_CMD_REGULATOR=y
+CONFIG_CMD_LOG=y
+CONFIG_OF_LIVE=y
+CONFIG_GPIO_HOG=y
+CONFIG_DM_I2C=y
+CONFIG_SYS_I2C_STM32F7=y
+# CONFIG_MMC is not set
+CONFIG_PINCONF=y
+CONFIG_DM_REGULATOR_FIXED=y
+CONFIG_DM_REGULATOR_GPIO=y
+CONFIG_RAM=y
+# CONFIG_STM32MP1_DDR is not set
+CONFIG_DM_RNG=y
+CONFIG_SERIAL_RX_BUFFER=y
+# CONFIG_OPTEE_TA_AVB is not set
+CONFIG_WDT=y
+CONFIG_WDT_STM32MP=y
+CONFIG_WDT_ARM_SMC=y
+CONFIG_ERRNO_STR=y
+# CONFIG_LMB_USE_MAX_REGIONS is not set
+CONFIG_LMB_MEMORY_REGIONS=2
+CONFIG_LMB_RESERVED_REGIONS=32
index e128a62cd005aad121dc55eee8b9f9c40135a04f..f89b163ddf562b0fef501ce49e454ac986d5b300 100644 (file)
@@ -34,6 +34,7 @@ CONFIG_CMD_GPIO=y
 CONFIG_CMD_MMC=y
 # CONFIG_CMD_PINMUX is not set
 CONFIG_CMD_SATA=y
+# CONFIG_CMD_SCSI is not set
 CONFIG_CMD_CACHE=y
 CONFIG_CMD_EXT4_WRITE=y
 CONFIG_OF_CONTROL=y
@@ -54,7 +55,7 @@ CONFIG_FEC_MXC=y
 CONFIG_MII=y
 CONFIG_PINCTRL=y
 CONFIG_PINCTRL_IMX6=y
-CONFIG_DM_SCSI=y
+CONFIG_SCSI=y
 CONFIG_DM_SERIAL=y
 CONFIG_MXC_UART=y
 CONFIG_DM_THERMAL=y
index 7c1727f8b12b89635ecf246264dc9200bf9a1c1a..c9ec962201b4abf6997db188c09037c132e80e4f 100644 (file)
@@ -45,6 +45,7 @@ CONFIG_CMD_GPIO=y
 CONFIG_CMD_I2C=y
 CONFIG_CMD_MMC=y
 CONFIG_CMD_SATA=y
+# CONFIG_CMD_SCSI is not set
 CONFIG_CMD_USB=y
 CONFIG_CMD_BMP=y
 CONFIG_CMD_CACHE=y
@@ -71,7 +72,7 @@ CONFIG_PINCTRL=y
 CONFIG_PINCTRL_IMX6=y
 CONFIG_DM_PMIC=y
 CONFIG_DM_PMIC_PFUZE100=y
-CONFIG_DM_SCSI=y
+CONFIG_SCSI=y
 CONFIG_DM_SERIAL=y
 CONFIG_MXC_UART=y
 CONFIG_DM_THERMAL=y
index 4b1a761a9086f2fa4d05c0486334c591b7c85fff..152413de0e50f50bcd82b4af55d91226eb9c118f 100644 (file)
@@ -24,6 +24,7 @@ CONFIG_CMD_GPIO=y
 CONFIG_CMD_I2C=y
 CONFIG_CMD_MTD=y
 CONFIG_CMD_PCI=y
+# CONFIG_CMD_SCSI is not set
 CONFIG_CMD_SPI=y
 CONFIG_CMD_USB=y
 # CONFIG_CMD_SETEXPR is not set
@@ -68,7 +69,7 @@ CONFIG_DM_REGULATOR_FIXED=y
 CONFIG_DM_REGULATOR_GPIO=y
 CONFIG_DM_RTC=y
 CONFIG_RTC_MAX313XX=y
-CONFIG_DM_SCSI=y
+CONFIG_SCSI=y
 CONFIG_SYS_NS16550=y
 CONFIG_MVEBU_A3700_SPI=y
 CONFIG_DM_THERMAL=y
index 29aff8df89100e36c14a063f74e07b7c76a6f681..0e753453b69cd24e8c13285151999f0114f4398d 100644 (file)
@@ -66,7 +66,7 @@ For the next scheduled release, release candidates were made on::
 
 * U-Boot v2024.01-rc1 was released on Mon 23 October 2023.
 
-.. * U-Boot v2024.01-rc2 was released on Mon 06 November 2023.
+* U-Boot v2024.01-rc2 was released on Mon 06 November 2023.
 
 .. * U-Boot v2024.01-rc3 was released on Mon 20 November 2023.
 
index 049f7efd10b85875ee9a8d761fd318a59a7493f2..9bc5283c268846a51d60f1afe4926d6367f54117 100644 (file)
@@ -20,14 +20,6 @@ config SATA
 
          See also CMD_SATA which provides command-line support.
 
-config SYS_SATA_MAX_PORTS
-       int "Maximum supported SATA ports"
-       depends on SCSI_AHCI && !DM_SCSI
-       default 1
-       help
-         Sets the maximum number of ports to scan when looking for devices.
-         Ports from 0 to (this value - 1) are scanned.
-
 config LIBATA
        bool
        help
@@ -44,7 +36,7 @@ menu "SATA/SCSI device support"
 config AHCI_PCI
        bool "Support for PCI-based AHCI controller"
        depends on PCI
-       depends on DM_SCSI
+       depends on SCSI
        depends on SCSI_AHCI
        help
          Enables support for the PCI-based AHCI controller.
@@ -55,13 +47,13 @@ config SPL_AHCI_PCI
        bool "Support for PCI-based AHCI controller for SPL"
        depends on SPL
        depends on SPL_PCI
-       depends on SPL_SATA && DM_SCSI
+       depends on SPL_SATA && SCSI
 
 config DWC_AHCI
        bool "Enable Synopsys DWC AHCI driver support"
        select SCSI_AHCI
        select PHY
-       depends on DM_SCSI
+       depends on SCSI
        help
          Enable this driver to support Sata devices through
          Synopsys DWC AHCI module.
@@ -91,7 +83,7 @@ config AHCI_MVEBU
        bool "Marvell EBU AHCI SATA support"
        depends on ARCH_MVEBU || ARCH_OCTEON
        select SCSI_AHCI
-       select DM_SCSI
+       select SCSI
        help
          This option enables support for the Marvell EBU SoC's
          onboard AHCI SATA.
@@ -112,7 +104,7 @@ if SATA
 config SATA_CEVA
        bool "Ceva Sata controller"
        depends on AHCI
-       depends on DM_SCSI
+       depends on SCSI
        help
          This option enables Ceva Sata controller hard IP available on Xilinx
          ZynqMP. Support up to 2 external devices. Compliant with SATA 3.1 and
index 0b6f91098a39469cd3157353eaaf025469bd1418..af6f0bf2780c196b6294994c5b2ac02fce12e1e2 100644 (file)
@@ -14,7 +14,6 @@ obj-$(CONFIG_SATA) += sata.o sata_bootdev.o
 obj-$(CONFIG_SATA_CEVA) += sata_ceva.o
 obj-$(CONFIG_SATA_MV) += sata_mv.o
 obj-$(CONFIG_SATA_SIL) += sata_sil.o
-obj-$(CONFIG_SANDBOX) += sata_sandbox.o
 obj-$(CONFIG_AHCI_MVEBU) += ahci_mvebu.o
 obj-$(CONFIG_SUNXI_AHCI) += ahci_sunxi.o
 obj-$(CONFIG_MTK_AHCI) += mtk_ahci.o
index cb2c648a91fd73d8b92cae22f2fb3bf54a9a5801..04ddc3394648e38229d97a3dd05f2aafe01019a6 100644 (file)
 
 static int ata_io_flush(struct ahci_uc_priv *uc_priv, u8 port);
 
-#ifndef CONFIG_DM_SCSI
-struct ahci_uc_priv *probe_ent = NULL;
-#endif
-
 #define writel_with_flush(a,b) do { writel(a,b); readl(b); } while (0)
 
 /*
@@ -169,11 +165,6 @@ int ahci_reset(void __iomem *base)
 
 static int ahci_host_init(struct ahci_uc_priv *uc_priv)
 {
-#if !defined(CONFIG_SCSI_AHCI_PLAT) && !defined(CONFIG_DM_SCSI)
-       struct udevice *dev = uc_priv->dev;
-       struct pci_child_plat *pplat = dev_get_parent_plat(dev);
-       u16 tmp16;
-#endif
        void __iomem *mmio = uc_priv->mmio_base;
        u32 tmp, cap_save, cmd;
        int i, j, ret;
@@ -194,14 +185,6 @@ static int ahci_host_init(struct ahci_uc_priv *uc_priv)
        writel(cap_save, mmio + HOST_CAP);
        writel_with_flush(0xf, mmio + HOST_PORTS_IMPL);
 
-#if !defined(CONFIG_SCSI_AHCI_PLAT) && !defined(CONFIG_DM_SCSI)
-       if (pplat->vendor == PCI_VENDOR_ID_INTEL) {
-               u16 tmp16;
-
-               dm_pci_read_config16(dev, 0x92, &tmp16);
-               dm_pci_write_config16(dev, 0x92, tmp16 | 0xf);
-       }
-#endif
        uc_priv->cap = readl(mmio + HOST_CAP);
        uc_priv->port_map = readl(mmio + HOST_PORTS_IMPL);
        port_map = uc_priv->port_map;
@@ -210,11 +193,6 @@ static int ahci_host_init(struct ahci_uc_priv *uc_priv)
        debug("cap 0x%x  port_map 0x%x  n_ports %d\n",
              uc_priv->cap, uc_priv->port_map, uc_priv->n_ports);
 
-#if !defined(CONFIG_DM_SCSI)
-       if (uc_priv->n_ports > CONFIG_SYS_SATA_MAX_PORTS)
-               uc_priv->n_ports = CONFIG_SYS_SATA_MAX_PORTS;
-#endif
-
        for (i = 0; i < uc_priv->n_ports; i++) {
                if (!(port_map & (1 << i)))
                        continue;
@@ -313,23 +291,12 @@ static int ahci_host_init(struct ahci_uc_priv *uc_priv)
        writel(tmp | HOST_IRQ_EN, mmio + HOST_CTL);
        tmp = readl(mmio + HOST_CTL);
        debug("HOST_CTL 0x%x\n", tmp);
-#if !defined(CONFIG_DM_SCSI)
-#ifndef CONFIG_SCSI_AHCI_PLAT
-       dm_pci_read_config16(dev, PCI_COMMAND, &tmp16);
-       tmp |= PCI_COMMAND_MASTER;
-       dm_pci_write_config16(dev, PCI_COMMAND, tmp16);
-#endif
-#endif
        return 0;
 }
 
 
 static void ahci_print_info(struct ahci_uc_priv *uc_priv)
 {
-#if !defined(CONFIG_SCSI_AHCI_PLAT) && !defined(CONFIG_DM_SCSI)
-       struct udevice *dev = uc_priv->dev;
-       u16 cc;
-#endif
        void __iomem *mmio = uc_priv->mmio_base;
        u32 vers, cap, cap2, impl, speed;
        const char *speed_s;
@@ -350,19 +317,7 @@ static void ahci_print_info(struct ahci_uc_priv *uc_priv)
        else
                speed_s = "?";
 
-#if defined(CONFIG_SCSI_AHCI_PLAT) || defined(CONFIG_DM_SCSI)
        scc_s = "SATA";
-#else
-       dm_pci_read_config16(dev, 0x0a, &cc);
-       if (cc == 0x0101)
-               scc_s = "IDE";
-       else if (cc == 0x0106)
-               scc_s = "SATA";
-       else if (cc == 0x0104)
-               scc_s = "RAID";
-       else
-               scc_s = "unknown";
-#endif
        printf("AHCI %02x%02x.%02x%02x "
               "%u slots %u ports %s Gbps 0x%x impl %s mode\n",
               (vers >> 24) & 0xff,
@@ -397,12 +352,8 @@ static void ahci_print_info(struct ahci_uc_priv *uc_priv)
               cap2 & (1 << 0) ? "boh " : "");
 }
 
-#if defined(CONFIG_DM_SCSI) || !defined(CONFIG_SCSI_AHCI_PLAT)
 static int ahci_init_one(struct ahci_uc_priv *uc_priv, struct udevice *dev)
 {
-#if !defined(CONFIG_DM_SCSI)
-       u16 vendor;
-#endif
        int rc;
 
        uc_priv->dev = dev;
@@ -415,21 +366,8 @@ static int ahci_init_one(struct ahci_uc_priv *uc_priv, struct udevice *dev)
        uc_priv->pio_mask = 0x1f;
        uc_priv->udma_mask = 0x7f;      /*Fixme,assume to support UDMA6 */
 
-#if !defined(CONFIG_DM_SCSI)
-       uc_priv->mmio_base = dm_pci_map_bar(dev, PCI_BASE_ADDRESS_5, 0, 0,
-                                           PCI_REGION_TYPE, PCI_REGION_MEM);
-
-       /* Take from kernel:
-        * JMicron-specific fixup:
-        * make sure we're in AHCI mode
-        */
-       dm_pci_read_config16(dev, PCI_VENDOR_ID, &vendor);
-       if (vendor == 0x197b)
-               dm_pci_write_config8(dev, 0x41, 0xa1);
-#else
        struct scsi_plat *plat = dev_get_uclass_plat(dev);
        uc_priv->mmio_base = (void *)plat->base;
-#endif
 
        debug("ahci mmio_base=0x%p\n", uc_priv->mmio_base);
        /* initialize adapter */
@@ -444,7 +382,6 @@ static int ahci_init_one(struct ahci_uc_priv *uc_priv, struct udevice *dev)
       err_out:
        return rc;
 }
-#endif
 
 #define MAX_DATA_BYTE_COUNT  (4*1024*1024)
 
@@ -893,12 +830,7 @@ static int ata_scsiop_test_unit_ready(struct ahci_uc_priv *uc_priv,
 
 static int ahci_scsi_exec(struct udevice *dev, struct scsi_cmd *pccb)
 {
-       struct ahci_uc_priv *uc_priv;
-#ifdef CONFIG_DM_SCSI
-       uc_priv = dev_get_uclass_priv(dev->parent);
-#else
-       uc_priv = probe_ent;
-#endif
+       struct ahci_uc_priv *uc_priv = dev_get_uclass_priv(dev->parent);
        int ret;
 
        switch (pccb->cmd[0]) {
@@ -953,41 +885,12 @@ static int ahci_start_ports(struct ahci_uc_priv *uc_priv)
        return 0;
 }
 
-#ifndef CONFIG_DM_SCSI
-void scsi_low_level_init(int busdevfunc)
-{
-       struct ahci_uc_priv *uc_priv;
-
-#ifndef CONFIG_SCSI_AHCI_PLAT
-       probe_ent = calloc(1, sizeof(struct ahci_uc_priv));
-       if (!probe_ent) {
-               printf("%s: No memory for uc_priv\n", __func__);
-               return;
-       }
-       uc_priv = probe_ent;
-       struct udevice *dev;
-       int ret;
-
-       ret = dm_pci_bus_find_bdf(busdevfunc, &dev);
-       if (ret)
-               return;
-       ahci_init_one(uc_priv, dev);
-#else
-       uc_priv = probe_ent;
-#endif
-
-       ahci_start_ports(uc_priv);
-}
-#endif
-
-#ifndef CONFIG_SCSI_AHCI_PLAT
 int ahci_init_one_dm(struct udevice *dev)
 {
        struct ahci_uc_priv *uc_priv = dev_get_uclass_priv(dev);
 
        return ahci_init_one(uc_priv, dev);
 }
-#endif
 
 int ahci_start_ports_dm(struct udevice *dev)
 {
@@ -996,65 +899,6 @@ int ahci_start_ports_dm(struct udevice *dev)
        return ahci_start_ports(uc_priv);
 }
 
-#ifdef CONFIG_SCSI_AHCI_PLAT
-static int ahci_init_common(struct ahci_uc_priv *uc_priv, void __iomem *base)
-{
-       int rc;
-
-       uc_priv->host_flags = ATA_FLAG_SATA
-                               | ATA_FLAG_NO_LEGACY
-                               | ATA_FLAG_MMIO
-                               | ATA_FLAG_PIO_DMA
-                               | ATA_FLAG_NO_ATAPI;
-       uc_priv->pio_mask = 0x1f;
-       uc_priv->udma_mask = 0x7f;      /*Fixme,assume to support UDMA6 */
-
-       uc_priv->mmio_base = base;
-
-       /* initialize adapter */
-       rc = ahci_host_init(uc_priv);
-       if (rc)
-               goto err_out;
-
-       ahci_print_info(uc_priv);
-
-       rc = ahci_start_ports(uc_priv);
-
-err_out:
-       return rc;
-}
-
-#ifndef CONFIG_DM_SCSI
-int ahci_init(void __iomem *base)
-{
-       struct ahci_uc_priv *uc_priv;
-
-       probe_ent = malloc(sizeof(struct ahci_uc_priv));
-       if (!probe_ent) {
-               printf("%s: No memory for uc_priv\n", __func__);
-               return -ENOMEM;
-       }
-
-       uc_priv = probe_ent;
-       memset(uc_priv, 0, sizeof(struct ahci_uc_priv));
-
-       return ahci_init_common(uc_priv, base);
-}
-#endif
-
-int ahci_init_dm(struct udevice *dev, void __iomem *base)
-{
-       struct ahci_uc_priv *uc_priv = dev_get_uclass_priv(dev);
-
-       return ahci_init_common(uc_priv, base);
-}
-
-void __weak scsi_init(void)
-{
-}
-
-#endif /* CONFIG_SCSI_AHCI_PLAT */
-
 /*
  * In the general case of generic rotating media it makes sense to have a
  * flush capability. It probably even makes sense in the case of SSDs because
@@ -1098,7 +942,6 @@ static int ahci_scsi_bus_reset(struct udevice *dev)
        return 0;
 }
 
-#ifdef CONFIG_DM_SCSI
 int ahci_bind_scsi(struct udevice *ahci_dev, struct udevice **devp)
 {
        struct udevice *dev;
@@ -1190,16 +1033,3 @@ U_BOOT_DRIVER(ahci_scsi) = {
        .id             = UCLASS_SCSI,
        .ops            = &scsi_ops,
 };
-#else
-int scsi_exec(struct udevice *dev, struct scsi_cmd *pccb)
-{
-       return ahci_scsi_exec(dev, pccb);
-}
-
-__weak int scsi_bus_reset(struct udevice *dev)
-{
-       return ahci_scsi_bus_reset(dev);
-
-       return 0;
-}
-#endif
index dcb5fcf476b5323be89bce5fe0a1bf0109811011..be1ee01b296f4e48ba43f3a1993db11227521c0c 100644 (file)
 #include <dm/device-internal.h>
 #include <dm/uclass-internal.h>
 
-#ifndef CONFIG_AHCI
-struct blk_desc sata_dev_desc[CONFIG_SYS_SATA_MAX_DEVICE];
-#endif
-
 int sata_reset(struct udevice *dev)
 {
        struct ahci_ops *ops = ahci_get_ops(dev);
@@ -88,15 +84,6 @@ int sata_rescan(bool verbose)
        return ret;
 }
 
-#ifndef CONFIG_AHCI
-#ifdef CONFIG_PARTITIONS
-struct blk_desc *sata_get_dev(int dev)
-{
-       return (dev < CONFIG_SYS_SATA_MAX_DEVICE) ? &sata_dev_desc[dev] : NULL;
-}
-#endif
-#endif
-
 static unsigned long sata_bread(struct udevice *dev, lbaint_t start,
                                lbaint_t blkcnt, void *dst)
 {
@@ -109,51 +96,6 @@ static unsigned long sata_bwrite(struct udevice *dev, lbaint_t start,
        return -ENOSYS;
 }
 
-#ifndef CONFIG_AHCI
-int __sata_initialize(void)
-{
-       int rc, ret = -1;
-       int i;
-
-       for (i = 0; i < CONFIG_SYS_SATA_MAX_DEVICE; i++) {
-               memset(&sata_dev_desc[i], 0, sizeof(struct blk_desc));
-               sata_dev_desc[i].uclass_id = UCLASS_AHCI;
-               sata_dev_desc[i].devnum = i;
-               sata_dev_desc[i].part_type = PART_TYPE_UNKNOWN;
-               sata_dev_desc[i].type = DEV_TYPE_HARDDISK;
-               sata_dev_desc[i].lba = 0;
-               sata_dev_desc[i].blksz = 512;
-               sata_dev_desc[i].log2blksz = LOG2(sata_dev_desc[i].blksz);
-               rc = init_sata(i);
-               if (!rc) {
-                       rc = scan_sata(i);
-                       if (!rc && sata_dev_desc[i].lba > 0 &&
-                           sata_dev_desc[i].blksz > 0) {
-                               part_init(&sata_dev_desc[i]);
-                               ret = i;
-                       }
-               }
-       }
-
-       return ret;
-}
-int sata_initialize(void) __attribute__((weak, alias("__sata_initialize")));
-
-__weak int __sata_stop(void)
-{
-       int i, err = 0;
-
-       for (i = 0; i < CONFIG_SYS_SATA_MAX_DEVICE; i++)
-               err |= reset_sata(i);
-
-       if (err)
-               printf("Could not reset some SATA devices\n");
-
-       return err;
-}
-int sata_stop(void) __attribute__((weak, alias("__sata_stop")));
-#endif
-
 static const struct blk_ops sata_blk_ops = {
        .read   = sata_bread,
        .write  = sata_bwrite,
diff --git a/drivers/ata/sata_sandbox.c b/drivers/ata/sata_sandbox.c
deleted file mode 100644 (file)
index e64cc4a..0000000
+++ /dev/null
@@ -1,33 +0,0 @@
-// SPDX-License-Identifier: GPL-2.0+
-/*
- * Copyright (C) 2015 Google, Inc
- * Written by Simon Glass <sjg@chromium.org>
- */
-
-#include <common.h>
-#include <blk.h>
-
-int init_sata(int dev)
-{
-       return 0;
-}
-
-int reset_sata(int dev)
-{
-       return 0;
-}
-
-int scan_sata(int dev)
-{
-       return 0;
-}
-
-ulong sata_read(int dev, ulong blknr, lbaint_t blkcnt, void *buffer)
-{
-       return 0;
-}
-
-ulong sata_write(int dev, ulong blknr, lbaint_t blkcnt, const void *buffer)
-{
-       return 0;
-}
index 048a6caef00f24ca72f672673f49a07497f3498a..b897cf1a3d1bebda296730a1bf46d68852c76213 100644 (file)
@@ -265,6 +265,7 @@ config SYS_64BIT_LBA
 
 config RKMTD
        bool "Rockchip rkmtd virtual block device"
+       select RANDOM_UUID
        help
          Enable "rkmtd" class and driver to create a virtual block device
          to transfer Rockchip boot block data to and from NAND with block
index c534cc07e09275f2eb96249d638ea2b5c3211b2c..b9469b93853ba2a8b2a82c5b6f41b24b5390d7c5 100644 (file)
@@ -16,6 +16,7 @@
 #include <dt-bindings/mfd/k210-sysctl.h>
 #include <k210/pll.h>
 #include <linux/bitfield.h>
+#include <asm/barrier.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
index 1075ba73339977a386ec37f563cad71ac36c5663..d0f5bb375300a7b73d0d7760fa8d517675000a83 100644 (file)
@@ -241,6 +241,12 @@ static const struct meson_clk_info *meson_clocks[] = {
        [CLKID_USB_PHY_IN] = CLK_GATE("usb_phy_in", A1_SYS_OSCIN_CTRL, 2,
                EXTERNAL_XTAL
        ),
+       [CLKID_USB_CTRL_IN] = CLK_GATE("usb_ctrl_in", A1_SYS_OSCIN_CTRL, 3,
+               EXTERNAL_XTAL
+       ),
+       [CLKID_USB_CTRL] = CLK_GATE("usb_ctrl", A1_SYS_CLK_EN0, 28,
+               CLKID_SYS
+       ),
        [CLKID_USB_PHY] = CLK_GATE("usb_phy", A1_SYS_CLK_EN0, 27,
                CLKID_SYS
        ),
index 4e80e85d10d71cc9aedb40c332aebd9f79497454..8771678ca5a0da5d22a484eb3e69d5e7576741e2 100644 (file)
@@ -19,6 +19,7 @@ config DFU_WRITE_ALT
 
 config DFU_TFTP
        bool "DFU via TFTP"
+       depends on NETDEVICES
        select UPDATE_COMMON
        select DFU_OVER_TFTP
        help
index 0af5460421193b035215ffc693890d72f8e60afe..3c64e8946466cab45d528720369d9467ffd36f9f 100644 (file)
@@ -87,7 +87,6 @@ endif
 
 config DMA_LEGACY
        bool "Legacy DMA support"
-       default y if FSLDMAFEC
        help
          Enable legacy DMA support. This does not use driver model and should
          be migrated to the new API.
diff --git a/drivers/dma/MCD_dmaApi.c b/drivers/dma/MCD_dmaApi.c
deleted file mode 100644 (file)
index af0e134..0000000
+++ /dev/null
@@ -1,1010 +0,0 @@
-// SPDX-License-Identifier: GPL-2.0+
-/*
- * Copyright (C) 2004-2007 Freescale Semiconductor, Inc.
- */
-
-/*Main C file for multi-channel DMA API. */
-
-#include <common.h>
-
-#include <MCD_dma.h>
-#include <MCD_tasksInit.h>
-#include <MCD_progCheck.h>
-
-/********************************************************************/
-/* This is an API-internal pointer to the DMA's registers */
-dmaRegs *MCD_dmaBar;
-
-/*
- * These are the real and model task tables as generated by the
- * build process
- */
-extern TaskTableEntry MCD_realTaskTableSrc[NCHANNELS];
-extern TaskTableEntry MCD_modelTaskTableSrc[NUMOFVARIANTS];
-
-/*
- * However, this (usually) gets relocated to on-chip SRAM, at which
- * point we access them as these tables
- */
-volatile TaskTableEntry *MCD_taskTable;
-TaskTableEntry *MCD_modelTaskTable;
-
-/*
- * MCD_chStatus[] is an array of status indicators for remembering
- * whether a DMA has ever been attempted on each channel, pausing
- * status, etc.
- */
-static int MCD_chStatus[NCHANNELS] = {
-       MCD_NO_DMA, MCD_NO_DMA, MCD_NO_DMA, MCD_NO_DMA,
-       MCD_NO_DMA, MCD_NO_DMA, MCD_NO_DMA, MCD_NO_DMA,
-       MCD_NO_DMA, MCD_NO_DMA, MCD_NO_DMA, MCD_NO_DMA,
-       MCD_NO_DMA, MCD_NO_DMA, MCD_NO_DMA, MCD_NO_DMA
-};
-
-/* Prototypes for local functions */
-static void MCD_memcpy(int *dest, int *src, u32 size);
-static void MCD_resmActions(int channel);
-
-/*
- * Buffer descriptors used for storage of progress info for single Dmas
- * Also used as storage for the DMA for CRCs for single DMAs
- * Otherwise, the DMA does not parse these buffer descriptors
- */
-#ifdef MCD_INCLUDE_EU
-extern MCD_bufDesc MCD_singleBufDescs[NCHANNELS];
-#else
-MCD_bufDesc MCD_singleBufDescs[NCHANNELS];
-#endif
-MCD_bufDesc *MCD_relocBuffDesc;
-
-/* Defines for the debug control register's functions */
-#define DBG_CTL_COMP1_TASK     (0x00002000)
-#define DBG_CTL_ENABLE         (DBG_CTL_AUTO_ARM       | \
-                                DBG_CTL_BREAK          | \
-                                DBG_CTL_INT_BREAK      | \
-                                DBG_CTL_COMP1_TASK)
-#define DBG_CTL_DISABLE                (DBG_CTL_AUTO_ARM       | \
-                                DBG_CTL_INT_BREAK      | \
-                                DBG_CTL_COMP1_TASK)
-#define DBG_KILL_ALL_STAT      (0xFFFFFFFF)
-
-/* Offset to context save area where progress info is stored */
-#define CSAVE_OFFSET           10
-
-/* Defines for Byte Swapping */
-#define MCD_BYTE_SWAP_KILLER   0xFFF8888F
-#define MCD_NO_BYTE_SWAP_ATALL 0x00040000
-
-/* Execution Unit Identifiers */
-#define MAC                    0       /* legacy - not used */
-#define LUAC                   1       /* legacy - not used */
-#define CRC                    2       /* legacy - not used */
-#define LURC                   3       /* Logic Unit with CRC */
-
-/* Task Identifiers */
-#define TASK_CHAINNOEU         0
-#define TASK_SINGLENOEU                1
-#ifdef MCD_INCLUDE_EU
-#define TASK_CHAINEU           2
-#define TASK_SINGLEEU          3
-#define TASK_FECRX             4
-#define TASK_FECTX             5
-#else
-#define TASK_CHAINEU           0
-#define TASK_SINGLEEU          1
-#define TASK_FECRX             2
-#define TASK_FECTX             3
-#endif
-
-/*
- * Structure to remember which variant is on which channel
- * TBD- need this?
- */
-typedef struct MCD_remVariants_struct MCD_remVariant;
-struct MCD_remVariants_struct {
-       int remDestRsdIncr[NCHANNELS];  /* -1,0,1 */
-       int remSrcRsdIncr[NCHANNELS];   /* -1,0,1 */
-       s16 remDestIncr[NCHANNELS];     /* DestIncr */
-       s16 remSrcIncr[NCHANNELS];      /* srcIncr */
-       u32 remXferSize[NCHANNELS];     /* xferSize */
-};
-
-/* Structure to remember the startDma parameters for each channel */
-MCD_remVariant MCD_remVariants;
-/********************************************************************/
-/* Function: MCD_initDma
- * Purpose:  Initializes the DMA API by setting up a pointer to the DMA
- *           registers, relocating and creating the appropriate task
- *           structures, and setting up some global settings
- * Arguments:
- *  dmaBarAddr    - pointer to the multichannel DMA registers
- *  taskTableDest - location to move DMA task code and structs to
- *  flags         - operational parameters
- * Return Value:
- *  MCD_TABLE_UNALIGNED if taskTableDest is not 512-byte aligned
- *  MCD_OK otherwise
- */
-extern u32 MCD_funcDescTab0[];
-
-int MCD_initDma(dmaRegs * dmaBarAddr, void *taskTableDest, u32 flags)
-{
-       int i;
-       TaskTableEntry *entryPtr;
-
-       /* setup the local pointer to register set */
-       MCD_dmaBar = dmaBarAddr;
-
-       /* do we need to move/create a task table */
-       if ((flags & MCD_RELOC_TASKS) != 0) {
-               int fixedSize;
-               u32 *fixedPtr;
-               /*int *tablePtr = taskTableDest;TBD */
-               int varTabsOffset, funcDescTabsOffset, contextSavesOffset;
-               int taskDescTabsOffset;
-               int taskTableSize, varTabsSize, funcDescTabsSize,
-                   contextSavesSize;
-               int taskDescTabSize;
-
-               int i;
-
-               /* check if physical address is aligned on 512 byte boundary */
-               if (((u32) taskTableDest & 0x000001ff) != 0)
-                       return (MCD_TABLE_UNALIGNED);
-
-               /* set up local pointer to task Table */
-               MCD_taskTable = taskTableDest;
-
-               /*
-                * Create a task table:
-                * - compute aligned base offsets for variable tables and
-                *   function descriptor tables, then
-                * - loop through the task table and setup the pointers
-                * - copy over model task table with the the actual task
-                *   descriptor tables
-                */
-
-               taskTableSize = NCHANNELS * sizeof(TaskTableEntry);
-               /* align variable tables to size */
-               varTabsOffset = taskTableSize + (u32) taskTableDest;
-               if ((varTabsOffset & (VAR_TAB_SIZE - 1)) != 0)
-                       varTabsOffset =
-                           (varTabsOffset + VAR_TAB_SIZE) & (~VAR_TAB_SIZE);
-               /* align function descriptor tables */
-               varTabsSize = NCHANNELS * VAR_TAB_SIZE;
-               funcDescTabsOffset = varTabsOffset + varTabsSize;
-
-               if ((funcDescTabsOffset & (FUNCDESC_TAB_SIZE - 1)) != 0)
-                       funcDescTabsOffset =
-                           (funcDescTabsOffset +
-                            FUNCDESC_TAB_SIZE) & (~FUNCDESC_TAB_SIZE);
-
-               funcDescTabsSize = FUNCDESC_TAB_NUM * FUNCDESC_TAB_SIZE;
-               contextSavesOffset = funcDescTabsOffset + funcDescTabsSize;
-               contextSavesSize = (NCHANNELS * CONTEXT_SAVE_SIZE);
-               fixedSize =
-                   taskTableSize + varTabsSize + funcDescTabsSize +
-                   contextSavesSize;
-
-               /* zero the thing out */
-               fixedPtr = (u32 *) taskTableDest;
-               for (i = 0; i < (fixedSize / 4); i++)
-                       fixedPtr[i] = 0;
-
-               entryPtr = (TaskTableEntry *) MCD_taskTable;
-               /* set up fixed pointers */
-               for (i = 0; i < NCHANNELS; i++) {
-                       /* update ptr to local value */
-                       entryPtr[i].varTab = (u32) varTabsOffset;
-                       entryPtr[i].FDTandFlags =
-                           (u32) funcDescTabsOffset | MCD_TT_FLAGS_DEF;
-                       entryPtr[i].contextSaveSpace = (u32) contextSavesOffset;
-                       varTabsOffset += VAR_TAB_SIZE;
-#ifdef MCD_INCLUDE_EU
-                       /* if not there is only one, just point to the
-                          same one */
-                       funcDescTabsOffset += FUNCDESC_TAB_SIZE;
-#endif
-                       contextSavesOffset += CONTEXT_SAVE_SIZE;
-               }
-               /* copy over the function descriptor table */
-               for (i = 0; i < FUNCDESC_TAB_NUM; i++) {
-                       MCD_memcpy((void *)(entryPtr[i].
-                                           FDTandFlags & ~MCD_TT_FLAGS_MASK),
-                                  (void *)MCD_funcDescTab0, FUNCDESC_TAB_SIZE);
-               }
-
-               /* copy model task table to where the context saves stuff
-                  leaves off */
-               MCD_modelTaskTable = (TaskTableEntry *) contextSavesOffset;
-
-               MCD_memcpy((void *)MCD_modelTaskTable,
-                          (void *)MCD_modelTaskTableSrc,
-                          NUMOFVARIANTS * sizeof(TaskTableEntry));
-
-               /* point to local version of model task table */
-               entryPtr = MCD_modelTaskTable;
-               taskDescTabsOffset = (u32) MCD_modelTaskTable +
-                   (NUMOFVARIANTS * sizeof(TaskTableEntry));
-
-               /* copy actual task code and update TDT ptrs in local
-                  model task table */
-               for (i = 0; i < NUMOFVARIANTS; i++) {
-                       taskDescTabSize =
-                           entryPtr[i].TDTend - entryPtr[i].TDTstart + 4;
-                       MCD_memcpy((void *)taskDescTabsOffset,
-                                  (void *)entryPtr[i].TDTstart,
-                                  taskDescTabSize);
-                       entryPtr[i].TDTstart = (u32) taskDescTabsOffset;
-                       taskDescTabsOffset += taskDescTabSize;
-                       entryPtr[i].TDTend = (u32) taskDescTabsOffset - 4;
-               }
-#ifdef MCD_INCLUDE_EU
-               /* Tack single DMA BDs onto end of code so API controls
-                  where they are since DMA might write to them */
-               MCD_relocBuffDesc =
-                   (MCD_bufDesc *) (entryPtr[NUMOFVARIANTS - 1].TDTend + 4);
-#else
-               /* DMA does not touch them so they can be wherever and we
-                  don't need to waste SRAM on them */
-               MCD_relocBuffDesc = MCD_singleBufDescs;
-#endif
-       } else {
-               /* point the would-be relocated task tables and the
-                  buffer descriptors to the ones the linker generated */
-
-               if (((u32) MCD_realTaskTableSrc & 0x000001ff) != 0)
-                       return (MCD_TABLE_UNALIGNED);
-
-               /* need to add code to make sure that every thing else is
-                  aligned properly TBD. this is problematic if we init
-                  more than once or after running tasks, need to add
-                  variable to see if we have aleady init'd */
-               entryPtr = MCD_realTaskTableSrc;
-               for (i = 0; i < NCHANNELS; i++) {
-                       if (((entryPtr[i].varTab & (VAR_TAB_SIZE - 1)) != 0) ||
-                           ((entryPtr[i].
-                             FDTandFlags & (FUNCDESC_TAB_SIZE - 1)) != 0))
-                               return (MCD_TABLE_UNALIGNED);
-               }
-
-               MCD_taskTable = MCD_realTaskTableSrc;
-               MCD_modelTaskTable = MCD_modelTaskTableSrc;
-               MCD_relocBuffDesc = MCD_singleBufDescs;
-       }
-
-       /* Make all channels as totally inactive, and remember them as such: */
-
-       MCD_dmaBar->taskbar = (u32) MCD_taskTable;
-       for (i = 0; i < NCHANNELS; i++) {
-               MCD_dmaBar->taskControl[i] = 0x0;
-               MCD_chStatus[i] = MCD_NO_DMA;
-       }
-
-       /* Set up pausing mechanism to inactive state: */
-       /* no particular values yet for either comparator registers */
-       MCD_dmaBar->debugComp1 = 0;
-       MCD_dmaBar->debugComp2 = 0;
-       MCD_dmaBar->debugControl = DBG_CTL_DISABLE;
-       MCD_dmaBar->debugStatus = DBG_KILL_ALL_STAT;
-
-       /* enable or disable commbus prefetch, really need an ifdef or
-          something to keep from trying to set this in the 8220 */
-       if ((flags & MCD_COMM_PREFETCH_EN) != 0)
-               MCD_dmaBar->ptdControl &= ~PTD_CTL_COMM_PREFETCH;
-       else
-               MCD_dmaBar->ptdControl |= PTD_CTL_COMM_PREFETCH;
-
-       return (MCD_OK);
-}
-
-/*********************** End of MCD_initDma() ***********************/
-
-/********************************************************************/
-/* Function:   MCD_dmaStatus
- * Purpose:    Returns the status of the DMA on the requested channel
- * Arguments:  channel - channel number
- * Returns:    Predefined status indicators
- */
-int MCD_dmaStatus(int channel)
-{
-       u16 tcrValue;
-
-       if ((channel < 0) || (channel >= NCHANNELS))
-               return (MCD_CHANNEL_INVALID);
-
-       tcrValue = MCD_dmaBar->taskControl[channel];
-       if ((tcrValue & TASK_CTL_EN) == 0) {    /* nothing running */
-               /* if last reported with task enabled */
-               if (MCD_chStatus[channel] == MCD_RUNNING
-                   || MCD_chStatus[channel] == MCD_IDLE)
-                       MCD_chStatus[channel] = MCD_DONE;
-       } else {                /* something is running */
-
-               /* There are three possibilities: paused, running or idle. */
-               if (MCD_chStatus[channel] == MCD_RUNNING
-                   || MCD_chStatus[channel] == MCD_IDLE) {
-                       MCD_dmaBar->ptdDebug = PTD_DBG_TSK_VLD_INIT;
-                       /* This register is selected to know which initiator is
-                          actually asserted. */
-                       if ((MCD_dmaBar->ptdDebug >> channel) & 0x1)
-                               MCD_chStatus[channel] = MCD_RUNNING;
-                       else
-                               MCD_chStatus[channel] = MCD_IDLE;
-                       /* do not change the status if it is already paused. */
-               }
-       }
-       return MCD_chStatus[channel];
-}
-
-/******************** End of MCD_dmaStatus() ************************/
-
-/********************************************************************/
-/* Function:    MCD_startDma
- * Ppurpose:    Starts a particular kind of DMA
- * Arguments:
- * srcAddr     - the channel on which to run the DMA
- * srcIncr     - the address to move data from, or buffer-descriptor address
- * destAddr    - the amount to increment the source address per transfer
- * destIncr    - the address to move data to
- * dmaSize     - the amount to increment the destination address per transfer
- * xferSize    - the number bytes in of each data movement (1, 2, or 4)
- * initiator   - what device initiates the DMA
- * priority    - priority of the DMA
- * flags       - flags describing the DMA
- * funcDesc    - description of byte swapping, bit swapping, and CRC actions
- * srcAddrVirt - virtual buffer descriptor address TBD
- * Returns:     MCD_CHANNEL_INVALID if channel is invalid, else MCD_OK
- */
-
-int MCD_startDma(int channel, s8 * srcAddr, s16 srcIncr, s8 * destAddr,
-                s16 destIncr, u32 dmaSize, u32 xferSize, u32 initiator,
-                int priority, u32 flags, u32 funcDesc
-#ifdef MCD_NEED_ADDR_TRANS
-                s8 * srcAddrVirt
-#endif
-    )
-{
-       int srcRsdIncr, destRsdIncr;
-       int *cSave;
-       short xferSizeIncr;
-       int tcrCount = 0;
-#ifdef MCD_INCLUDE_EU
-       u32 *realFuncArray;
-#endif
-
-       if ((channel < 0) || (channel >= NCHANNELS))
-               return (MCD_CHANNEL_INVALID);
-
-       /* tbd - need to determine the proper response to a bad funcDesc when
-          not including EU functions, for now, assign a benign funcDesc, but
-          maybe should return an error */
-#ifndef MCD_INCLUDE_EU
-       funcDesc = MCD_FUNC_NOEU1;
-#endif
-
-#ifdef MCD_DEBUG
-       printf("startDma:Setting up params\n");
-#endif
-       /* Set us up for task-wise priority.  We don't technically need to do
-          this on every start, but since the register involved is in the same
-          longword as other registers that users are in control of, setting
-          it more than once is probably preferable.  That since the
-          documentation doesn't seem to be completely consistent about the
-          nature of the PTD control register. */
-       MCD_dmaBar->ptdControl |= (u16) 0x8000;
-
-       /* Not sure what we need to keep here rtm TBD */
-#if 1
-       /* Calculate additional parameters to the regular DMA calls. */
-       srcRsdIncr = srcIncr < 0 ? -1 : (srcIncr > 0 ? 1 : 0);
-       destRsdIncr = destIncr < 0 ? -1 : (destIncr > 0 ? 1 : 0);
-
-       xferSizeIncr = (xferSize & 0xffff) | 0x20000000;
-
-       /* Remember for each channel which variant is running. */
-       MCD_remVariants.remSrcRsdIncr[channel] = srcRsdIncr;
-       MCD_remVariants.remDestRsdIncr[channel] = destRsdIncr;
-       MCD_remVariants.remDestIncr[channel] = destIncr;
-       MCD_remVariants.remSrcIncr[channel] = srcIncr;
-       MCD_remVariants.remXferSize[channel] = xferSize;
-#endif
-
-       cSave =
-           (int *)(MCD_taskTable[channel].contextSaveSpace) + CSAVE_OFFSET +
-           CURRBD;
-
-#ifdef MCD_INCLUDE_EU
-       /* may move this to EU specific calls */
-       realFuncArray =
-           (u32 *) (MCD_taskTable[channel].FDTandFlags & 0xffffff00);
-       /* Modify the LURC's normal and byte-residue-loop functions according
-          to parameter. */
-       realFuncArray[(LURC * 16)] = xferSize == 4 ?
-           funcDesc : xferSize == 2 ?
-           funcDesc & 0xfffff00f : funcDesc & 0xffff000f;
-       realFuncArray[(LURC * 16 + 1)] =
-           (funcDesc & MCD_BYTE_SWAP_KILLER) | MCD_NO_BYTE_SWAP_ATALL;
-#endif
-       /* Write the initiator field in the TCR, and also set the
-          initiator-hold bit. Note that,due to a hardware quirk, this could
-          collide with an MDE access to the initiator-register file, so we
-          have to verify that the write reads back correctly. */
-
-       MCD_dmaBar->taskControl[channel] =
-           (initiator << 8) | TASK_CTL_HIPRITSKEN | TASK_CTL_HLDINITNUM;
-
-       while (((MCD_dmaBar->taskControl[channel] & 0x1fff) !=
-               ((initiator << 8) | TASK_CTL_HIPRITSKEN | TASK_CTL_HLDINITNUM))
-              && (tcrCount < 1000)) {
-               tcrCount++;
-               /*MCD_dmaBar->ptd_tcr[channel] = (initiator << 8) | 0x0020; */
-               MCD_dmaBar->taskControl[channel] =
-                   (initiator << 8) | TASK_CTL_HIPRITSKEN |
-                   TASK_CTL_HLDINITNUM;
-       }
-
-       MCD_dmaBar->priority[channel] = (u8) priority & PRIORITY_PRI_MASK;
-       /* should be albe to handle this stuff with only one write to ts reg
-          - tbd */
-       if (channel < 8 && channel >= 0) {
-               MCD_dmaBar->taskSize0 &= ~(0xf << (7 - channel) * 4);
-               MCD_dmaBar->taskSize0 |=
-                   (xferSize & 3) << (((7 - channel) * 4) + 2);
-               MCD_dmaBar->taskSize0 |= (xferSize & 3) << ((7 - channel) * 4);
-       } else {
-               MCD_dmaBar->taskSize1 &= ~(0xf << (15 - channel) * 4);
-               MCD_dmaBar->taskSize1 |=
-                   (xferSize & 3) << (((15 - channel) * 4) + 2);
-               MCD_dmaBar->taskSize1 |= (xferSize & 3) << ((15 - channel) * 4);
-       }
-
-       /* setup task table flags/options which mostly control the line
-          buffers */
-       MCD_taskTable[channel].FDTandFlags &= ~MCD_TT_FLAGS_MASK;
-       MCD_taskTable[channel].FDTandFlags |= (MCD_TT_FLAGS_MASK & flags);
-
-       if (flags & MCD_FECTX_DMA) {
-               /* TDTStart and TDTEnd */
-               MCD_taskTable[channel].TDTstart =
-                   MCD_modelTaskTable[TASK_FECTX].TDTstart;
-               MCD_taskTable[channel].TDTend =
-                   MCD_modelTaskTable[TASK_FECTX].TDTend;
-               MCD_startDmaENetXmit((char *)srcAddr, (char *)srcAddr,
-                                    (char *)destAddr, MCD_taskTable,
-                                    channel);
-       } else if (flags & MCD_FECRX_DMA) {
-               /* TDTStart and TDTEnd */
-               MCD_taskTable[channel].TDTstart =
-                   MCD_modelTaskTable[TASK_FECRX].TDTstart;
-               MCD_taskTable[channel].TDTend =
-                   MCD_modelTaskTable[TASK_FECRX].TDTend;
-               MCD_startDmaENetRcv((char *)srcAddr, (char *)srcAddr,
-                                   (char *)destAddr, MCD_taskTable,
-                                   channel);
-       } else if (flags & MCD_SINGLE_DMA) {
-               /* this buffer descriptor is used for storing off initial
-                  parameters for later progress query calculation and for the
-                  DMA to write the resulting checksum. The DMA does not use
-                  this to determine how to operate, that info is passed with
-                  the init routine */
-               MCD_relocBuffDesc[channel].srcAddr = srcAddr;
-               MCD_relocBuffDesc[channel].destAddr = destAddr;
-
-               /* definitely not its final value */
-               MCD_relocBuffDesc[channel].lastDestAddr = destAddr;
-
-               MCD_relocBuffDesc[channel].dmaSize = dmaSize;
-               MCD_relocBuffDesc[channel].flags = 0;   /* not used */
-               MCD_relocBuffDesc[channel].csumResult = 0;      /* not used */
-               MCD_relocBuffDesc[channel].next = 0;    /* not used */
-
-               /* Initialize the progress-querying stuff to show no
-                  progress: */
-               ((volatile int *)MCD_taskTable[channel].
-                contextSaveSpace)[SRCPTR + CSAVE_OFFSET] = (int)srcAddr;
-               ((volatile int *)MCD_taskTable[channel].
-                contextSaveSpace)[DESTPTR + CSAVE_OFFSET] = (int)destAddr;
-               ((volatile int *)MCD_taskTable[channel].
-                contextSaveSpace)[DCOUNT + CSAVE_OFFSET] = 0;
-               ((volatile int *)MCD_taskTable[channel].
-                contextSaveSpace)[CURRBD + CSAVE_OFFSET] =
-(u32) & (MCD_relocBuffDesc[channel]);
-               /* tbd - need to keep the user from trying to call the EU
-                  routine when MCD_INCLUDE_EU is not defined */
-               if (funcDesc == MCD_FUNC_NOEU1 || funcDesc == MCD_FUNC_NOEU2) {
-                       /* TDTStart and TDTEnd */
-                       MCD_taskTable[channel].TDTstart =
-                           MCD_modelTaskTable[TASK_SINGLENOEU].TDTstart;
-                       MCD_taskTable[channel].TDTend =
-                           MCD_modelTaskTable[TASK_SINGLENOEU].TDTend;
-                       MCD_startDmaSingleNoEu((char *)srcAddr, srcIncr,
-                                              (char *)destAddr, destIncr,
-                                              (int)dmaSize, xferSizeIncr,
-                                              flags, (int *)
-                                              &(MCD_relocBuffDesc[channel]),
-                                              cSave, MCD_taskTable, channel);
-               } else {
-                       /* TDTStart and TDTEnd */
-                       MCD_taskTable[channel].TDTstart =
-                           MCD_modelTaskTable[TASK_SINGLEEU].TDTstart;
-                       MCD_taskTable[channel].TDTend =
-                           MCD_modelTaskTable[TASK_SINGLEEU].TDTend;
-                       MCD_startDmaSingleEu((char *)srcAddr, srcIncr,
-                                            (char *)destAddr, destIncr,
-                                            (int)dmaSize, xferSizeIncr,
-                                            flags, (int *)
-                                            &(MCD_relocBuffDesc[channel]),
-                                            cSave, MCD_taskTable, channel);
-               }
-       } else {                /* chained DMAS */
-               /* Initialize the progress-querying stuff to show no
-                  progress: */
-#if 1
-               /* (!defined(MCD_NEED_ADDR_TRANS)) */
-               ((volatile int *)MCD_taskTable[channel].
-                contextSaveSpace)[SRCPTR + CSAVE_OFFSET]
-                   = (int)((MCD_bufDesc *) srcAddr)->srcAddr;
-               ((volatile int *)MCD_taskTable[channel].
-                contextSaveSpace)[DESTPTR + CSAVE_OFFSET]
-                   = (int)((MCD_bufDesc *) srcAddr)->destAddr;
-#else
-               /* if using address translation, need the virtual addr of the
-                  first buffdesc */
-               ((volatile int *)MCD_taskTable[channel].
-                contextSaveSpace)[SRCPTR + CSAVE_OFFSET]
-                   = (int)((MCD_bufDesc *) srcAddrVirt)->srcAddr;
-               ((volatile int *)MCD_taskTable[channel].
-                contextSaveSpace)[DESTPTR + CSAVE_OFFSET]
-                   = (int)((MCD_bufDesc *) srcAddrVirt)->destAddr;
-#endif
-               ((volatile int *)MCD_taskTable[channel].
-                contextSaveSpace)[DCOUNT + CSAVE_OFFSET] = 0;
-               ((volatile int *)MCD_taskTable[channel].
-                contextSaveSpace)[CURRBD + CSAVE_OFFSET] = (u32) srcAddr;
-
-               if (funcDesc == MCD_FUNC_NOEU1 || funcDesc == MCD_FUNC_NOEU2) {
-                       /*TDTStart and TDTEnd */
-                       MCD_taskTable[channel].TDTstart =
-                           MCD_modelTaskTable[TASK_CHAINNOEU].TDTstart;
-                       MCD_taskTable[channel].TDTend =
-                           MCD_modelTaskTable[TASK_CHAINNOEU].TDTend;
-                       MCD_startDmaChainNoEu((int *)srcAddr, srcIncr,
-                                             destIncr, xferSize,
-                                             xferSizeIncr, cSave,
-                                             MCD_taskTable, channel);
-               } else {
-                       /*TDTStart and TDTEnd */
-                       MCD_taskTable[channel].TDTstart =
-                           MCD_modelTaskTable[TASK_CHAINEU].TDTstart;
-                       MCD_taskTable[channel].TDTend =
-                           MCD_modelTaskTable[TASK_CHAINEU].TDTend;
-                       MCD_startDmaChainEu((int *)srcAddr, srcIncr, destIncr,
-                                           xferSize, xferSizeIncr, cSave,
-                                           MCD_taskTable, channel);
-               }
-       }
-       MCD_chStatus[channel] = MCD_IDLE;
-       return (MCD_OK);
-}
-
-/************************ End of MCD_startDma() *********************/
-
-/********************************************************************/
-/* Function:    MCD_XferProgrQuery
- * Purpose:     Returns progress of DMA on requested channel
- * Arguments:   channel - channel to retrieve progress for
- *              progRep - pointer to user supplied MCD_XferProg struct
- * Returns:     MCD_CHANNEL_INVALID if channel is invalid, else MCD_OK
- *
- * Notes:
- *  MCD_XferProgrQuery() upon completing or after aborting a DMA, or
- *  while the DMA is in progress, this function returns the first
- *  DMA-destination address not (or not yet) used in the DMA. When
- *  encountering a non-ready buffer descriptor, the information for
- *  the last completed descriptor is returned.
- *
- *  MCD_XferProgQuery() has to avoid the possibility of getting
- *  partially-updated information in the event that we should happen
- *  to query DMA progress just as the DMA is updating it. It does that
- *  by taking advantage of the fact context is not saved frequently for
- *  the most part. We therefore read it at least twice until we get the
- *  same information twice in a row.
- *
- *  Because a small, but not insignificant, amount of time is required
- *  to write out the progress-query information, especially upon
- *  completion of the DMA, it would be wise to guarantee some time lag
- *  between successive readings of the progress-query information.
- */
-
-/* How many iterations of the loop below to execute to stabilize values */
-#define STABTIME 0
-
-int MCD_XferProgrQuery(int channel, MCD_XferProg * progRep)
-{
-       MCD_XferProg prevRep;
-       int again;              /* true if we are to try again to ge
-                                  consistent results */
-       int i;                  /* used as a time-waste counter */
-       int destDiffBytes;      /* Total no of bytes that we think actually
-                                  got xfered. */
-       int numIterations;      /* number of iterations */
-       int bytesNotXfered;     /* bytes that did not get xfered. */
-       s8 *LWAlignedInitDestAddr, *LWAlignedCurrDestAddr;
-       int subModVal, addModVal;       /* Mode values to added and subtracted
-                                          from the final destAddr */
-
-       if ((channel < 0) || (channel >= NCHANNELS))
-               return (MCD_CHANNEL_INVALID);
-
-       /* Read a trial value for the progress-reporting values */
-       prevRep.lastSrcAddr =
-           (s8 *) ((volatile int *)MCD_taskTable[channel].
-                   contextSaveSpace)[SRCPTR + CSAVE_OFFSET];
-       prevRep.lastDestAddr =
-           (s8 *) ((volatile int *)MCD_taskTable[channel].
-                   contextSaveSpace)[DESTPTR + CSAVE_OFFSET];
-       prevRep.dmaSize =
-           ((volatile int *)MCD_taskTable[channel].contextSaveSpace)[DCOUNT +
-                                                                     CSAVE_OFFSET];
-       prevRep.currBufDesc =
-           (MCD_bufDesc *) ((volatile int *)MCD_taskTable[channel].
-                            contextSaveSpace)[CURRBD + CSAVE_OFFSET];
-       /* Repeatedly reread those values until they match previous values: */
-       do {
-               /* Waste a little bit of time to ensure stability: */
-               for (i = 0; i < STABTIME; i++) {
-                       /* make sure this loop does something so that it
-                          doesn't get optimized out */
-                       i += i >> 2;
-               }
-               /* Check them again: */
-               progRep->lastSrcAddr =
-                   (s8 *) ((volatile int *)MCD_taskTable[channel].
-                           contextSaveSpace)[SRCPTR + CSAVE_OFFSET];
-               progRep->lastDestAddr =
-                   (s8 *) ((volatile int *)MCD_taskTable[channel].
-                           contextSaveSpace)[DESTPTR + CSAVE_OFFSET];
-               progRep->dmaSize =
-                   ((volatile int *)MCD_taskTable[channel].
-                    contextSaveSpace)[DCOUNT + CSAVE_OFFSET];
-               progRep->currBufDesc =
-                   (MCD_bufDesc *) ((volatile int *)MCD_taskTable[channel].
-                                    contextSaveSpace)[CURRBD + CSAVE_OFFSET];
-               /* See if they match: */
-               if (prevRep.lastSrcAddr != progRep->lastSrcAddr
-                   || prevRep.lastDestAddr != progRep->lastDestAddr
-                   || prevRep.dmaSize != progRep->dmaSize
-                   || prevRep.currBufDesc != progRep->currBufDesc) {
-                       /* If they don't match, remember previous values and
-                          try again: */
-                       prevRep.lastSrcAddr = progRep->lastSrcAddr;
-                       prevRep.lastDestAddr = progRep->lastDestAddr;
-                       prevRep.dmaSize = progRep->dmaSize;
-                       prevRep.currBufDesc = progRep->currBufDesc;
-                       again = MCD_TRUE;
-               } else
-                       again = MCD_FALSE;
-       } while (again == MCD_TRUE);
-
-       /* Update the dCount, srcAddr and destAddr */
-       /* To calculate dmaCount, we consider destination address. C
-          overs M1,P1,Z for destination */
-       switch (MCD_remVariants.remDestRsdIncr[channel]) {
-       case MINUS1:
-               subModVal =
-                   ((int)progRep->
-                    lastDestAddr) & ((MCD_remVariants.remXferSize[channel]) -
-                                     1);
-               addModVal =
-                   ((int)progRep->currBufDesc->
-                    destAddr) & ((MCD_remVariants.remXferSize[channel]) - 1);
-               LWAlignedInitDestAddr =
-                   (progRep->currBufDesc->destAddr) - addModVal;
-               LWAlignedCurrDestAddr = (progRep->lastDestAddr) - subModVal;
-               destDiffBytes = LWAlignedInitDestAddr - LWAlignedCurrDestAddr;
-               bytesNotXfered =
-                   (destDiffBytes / MCD_remVariants.remDestIncr[channel]) *
-                   (MCD_remVariants.remDestIncr[channel]
-                    + MCD_remVariants.remXferSize[channel]);
-               progRep->dmaSize =
-                   destDiffBytes - bytesNotXfered + addModVal - subModVal;
-               break;
-       case ZERO:
-               progRep->lastDestAddr = progRep->currBufDesc->destAddr;
-               break;
-       case PLUS1:
-               /* This value has to be subtracted from the final
-                  calculated dCount. */
-               subModVal =
-                   ((int)progRep->currBufDesc->
-                    destAddr) & ((MCD_remVariants.remXferSize[channel]) - 1);
-               /* These bytes are already in lastDestAddr. */
-               addModVal =
-                   ((int)progRep->
-                    lastDestAddr) & ((MCD_remVariants.remXferSize[channel]) -
-                                     1);
-               LWAlignedInitDestAddr =
-                   (progRep->currBufDesc->destAddr) - subModVal;
-               LWAlignedCurrDestAddr = (progRep->lastDestAddr) - addModVal;
-               destDiffBytes = (progRep->lastDestAddr - LWAlignedInitDestAddr);
-               numIterations =
-                   (LWAlignedCurrDestAddr -
-                    LWAlignedInitDestAddr) /
-                   MCD_remVariants.remDestIncr[channel];
-               bytesNotXfered =
-                   numIterations * (MCD_remVariants.remDestIncr[channel]
-                                    - MCD_remVariants.remXferSize[channel]);
-               progRep->dmaSize = destDiffBytes - bytesNotXfered - subModVal;
-               break;
-       default:
-               break;
-       }
-
-       /* This covers M1,P1,Z for source */
-       switch (MCD_remVariants.remSrcRsdIncr[channel]) {
-       case MINUS1:
-               progRep->lastSrcAddr =
-                   progRep->currBufDesc->srcAddr +
-                   (MCD_remVariants.remSrcIncr[channel] *
-                    (progRep->dmaSize / MCD_remVariants.remXferSize[channel]));
-               break;
-       case ZERO:
-               progRep->lastSrcAddr = progRep->currBufDesc->srcAddr;
-               break;
-       case PLUS1:
-               progRep->lastSrcAddr =
-                   progRep->currBufDesc->srcAddr +
-                   (MCD_remVariants.remSrcIncr[channel] *
-                    (progRep->dmaSize / MCD_remVariants.remXferSize[channel]));
-               break;
-       default:
-               break;
-       }
-
-       return (MCD_OK);
-}
-
-/******************* End of MCD_XferProgrQuery() ********************/
-
-/********************************************************************/
-/* MCD_resmActions() does the majority of the actions of a DMA resume.
- * It is called from MCD_killDma() and MCD_resumeDma().  It has to be
- * a separate function because the kill function has to negate the task
- * enable before resuming it, but the resume function has to do nothing
- * if there is no DMA on that channel (i.e., if the enable bit is 0).
- */
-static void MCD_resmActions(int channel)
-{
-       MCD_dmaBar->debugControl = DBG_CTL_DISABLE;
-       MCD_dmaBar->debugStatus = MCD_dmaBar->debugStatus;
-       /* This register is selected to know which initiator is
-          actually asserted. */
-       MCD_dmaBar->ptdDebug = PTD_DBG_TSK_VLD_INIT;
-
-       if ((MCD_dmaBar->ptdDebug >> channel) & 0x1)
-               MCD_chStatus[channel] = MCD_RUNNING;
-       else
-               MCD_chStatus[channel] = MCD_IDLE;
-}
-
-/********************* End of MCD_resmActions() *********************/
-
-/********************************************************************/
-/* Function:    MCD_killDma
- * Purpose:     Halt the DMA on the requested channel, without any
- *              intention of resuming the DMA.
- * Arguments:   channel - requested channel
- * Returns:     MCD_CHANNEL_INVALID if channel is invalid, else MCD_OK
- *
- * Notes:
- *  A DMA may be killed from any state, including paused state, and it
- *  always goes to the MCD_HALTED state even if it is killed while in
- *  the MCD_NO_DMA or MCD_IDLE states.
- */
-int MCD_killDma(int channel)
-{
-       /* MCD_XferProg progRep; */
-
-       if ((channel < 0) || (channel >= NCHANNELS))
-               return (MCD_CHANNEL_INVALID);
-
-       MCD_dmaBar->taskControl[channel] = 0x0;
-       MCD_resumeDma(channel);
-       /*
-        * This must be after the write to the TCR so that the task doesn't
-        * start up again momentarily, and before the status assignment so
-        * as to override whatever MCD_resumeDma() may do to the channel
-        * status.
-        */
-       MCD_chStatus[channel] = MCD_HALTED;
-
-       /*
-        * Update the current buffer descriptor's lastDestAddr field
-        *
-        * MCD_XferProgrQuery (channel, &progRep);
-        * progRep.currBufDesc->lastDestAddr = progRep.lastDestAddr;
-        */
-       return (MCD_OK);
-}
-
-/************************ End of MCD_killDma() **********************/
-
-/********************************************************************/
-/* Function:    MCD_continDma
- * Purpose:     Continue a DMA which as stopped due to encountering an
- *              unready buffer descriptor.
- * Arguments:   channel - channel to continue the DMA on
- * Returns:     MCD_CHANNEL_INVALID if channel is invalid, else MCD_OK
- *
- * Notes:
- *  This routine does not check to see if there is a task which can
- *  be continued. Also this routine should not be used with single DMAs.
- */
-int MCD_continDma(int channel)
-{
-       if ((channel < 0) || (channel >= NCHANNELS))
-               return (MCD_CHANNEL_INVALID);
-
-       MCD_dmaBar->taskControl[channel] |= TASK_CTL_EN;
-       MCD_chStatus[channel] = MCD_RUNNING;
-
-       return (MCD_OK);
-}
-
-/********************** End of MCD_continDma() **********************/
-
-/*********************************************************************
- * MCD_pauseDma() and MCD_resumeDma() below use the DMA's debug unit
- * to freeze a task and resume it.  We freeze a task by breakpointing
- * on the stated task.  That is, not any specific place in the task,
- * but any time that task executes.  In particular, when that task
- * executes, we want to freeze that task and only that task.
- *
- * The bits of the debug control register influence interrupts vs.
- * breakpoints as follows:
- * - Bits 14 and 0 enable or disable debug functions.  If enabled, you
- *   will get the interrupt but you may or may not get a breakpoint.
- * - Bits 2 and 1 decide whether you also get a breakpoint in addition
- *   to an interrupt.
- *
- * The debug unit can do these actions in response to either internally
- * detected breakpoint conditions from the comparators, or in response
- * to the external breakpoint pin, or both.
- * - Bits 14 and 1 perform the above-described functions for
- *   internally-generated conditions, i.e., the debug comparators.
- * - Bits 0 and 2 perform the above-described functions for external
- *   conditions, i.e., the breakpoint external pin.
- *
- * Note that, although you "always" get the interrupt when you turn
- * the debug functions, the interrupt can nevertheless, if desired, be
- * masked by the corresponding bit in the PTD's IMR. Note also that
- * this means that bits 14 and 0 must enable debug functions before
- * bits 1 and 2, respectively, have any effect.
- *
- * NOTE: It's extremely important to not pause more than one DMA channel
- *  at a time.
- ********************************************************************/
-
-/********************************************************************/
-/* Function:    MCD_pauseDma
- * Purpose:     Pauses the DMA on a given channel (if any DMA is running
- *              on that channel).
- * Arguments:   channel
- * Returns:     MCD_CHANNEL_INVALID if channel is invalid, else MCD_OK
- */
-int MCD_pauseDma(int channel)
-{
-       /* MCD_XferProg progRep; */
-
-       if ((channel < 0) || (channel >= NCHANNELS))
-               return (MCD_CHANNEL_INVALID);
-
-       if (MCD_dmaBar->taskControl[channel] & TASK_CTL_EN) {
-               MCD_dmaBar->debugComp1 = channel;
-               MCD_dmaBar->debugControl =
-                   DBG_CTL_ENABLE | (1 << (channel + 16));
-               MCD_chStatus[channel] = MCD_PAUSED;
-
-               /*
-                * Update the current buffer descriptor's lastDestAddr field
-                *
-                * MCD_XferProgrQuery (channel, &progRep);
-                * progRep.currBufDesc->lastDestAddr = progRep.lastDestAddr;
-                */
-       }
-       return (MCD_OK);
-}
-
-/************************* End of MCD_pauseDma() ********************/
-
-/********************************************************************/
-/* Function:    MCD_resumeDma
- * Purpose:     Resumes the DMA on a given channel (if any DMA is
- *              running on that channel).
- * Arguments:   channel - channel on which to resume DMA
- * Returns:     MCD_CHANNEL_INVALID if channel is invalid, else MCD_OK
- */
-int MCD_resumeDma(int channel)
-{
-       if ((channel < 0) || (channel >= NCHANNELS))
-               return (MCD_CHANNEL_INVALID);
-
-       if (MCD_dmaBar->taskControl[channel] & TASK_CTL_EN)
-               MCD_resmActions(channel);
-
-       return (MCD_OK);
-}
-
-/************************ End of MCD_resumeDma() ********************/
-
-/********************************************************************/
-/* Function:    MCD_csumQuery
- * Purpose:     Provide the checksum after performing a non-chained DMA
- * Arguments:   channel - channel to report on
- *              csum - pointer to where to write the checksum/CRC
- * Returns:     MCD_ERROR if the channel is invalid, else MCD_OK
- *
- * Notes:
- *
- */
-int MCD_csumQuery(int channel, u32 * csum)
-{
-#ifdef MCD_INCLUDE_EU
-       if ((channel < 0) || (channel >= NCHANNELS))
-               return (MCD_CHANNEL_INVALID);
-
-       *csum = MCD_relocBuffDesc[channel].csumResult;
-       return (MCD_OK);
-#else
-       return (MCD_ERROR);
-#endif
-}
-
-/*********************** End of MCD_resumeDma() *********************/
-
-/********************************************************************/
-/* Function:    MCD_getCodeSize
- * Purpose:     Provide the size requirements of the microcoded tasks
- * Returns:     Size in bytes
- */
-int MCD_getCodeSize(void)
-{
-#ifdef MCD_INCLUDE_EU
-       return (0x2b5c);
-#else
-       return (0x173c);
-#endif
-}
-
-/********************** End of MCD_getCodeSize() ********************/
-
-/********************************************************************/
-/* Function:    MCD_getVersion
- * Purpose:     Provide the version string and number
- * Arguments:   longVersion - user supplied pointer to a pointer to a char
- *                    which points to the version string
- * Returns:     Version number and version string (by reference)
- */
-char MCD_versionString[] = "Multi-channel DMA API Alpha v0.3 (2004-04-26)";
-#define MCD_REV_MAJOR   0x00
-#define MCD_REV_MINOR   0x03
-
-int MCD_getVersion(char **longVersion)
-{
-       *longVersion = MCD_versionString;
-       return ((MCD_REV_MAJOR << 8) | MCD_REV_MINOR);
-}
-
-/********************** End of MCD_getVersion() *********************/
-
-/********************************************************************/
-/* Private version of memcpy()
- * Note that everything this is used for is longword-aligned.
- */
-static void MCD_memcpy(int *dest, int *src, u32 size)
-{
-       u32 i;
-
-       for (i = 0; i < size; i += sizeof(int), dest++, src++)
-               *dest = *src;
-}
diff --git a/drivers/dma/MCD_tasks.c b/drivers/dma/MCD_tasks.c
deleted file mode 100644 (file)
index 453d954..0000000
+++ /dev/null
@@ -1,2413 +0,0 @@
-// SPDX-License-Identifier: GPL-2.0+
-/*
- * Copyright (C) 2004-2007 Freescale Semiconductor, Inc.
- */
-
-/* Contains task code and structures for Multi-channel DMA */
-
-#include <common.h>
-
-#include <MCD_dma.h>
-
-u32 MCD_varTab0[];
-u32 MCD_varTab1[];
-u32 MCD_varTab2[];
-u32 MCD_varTab3[];
-u32 MCD_varTab4[];
-u32 MCD_varTab5[];
-u32 MCD_varTab6[];
-u32 MCD_varTab7[];
-u32 MCD_varTab8[];
-u32 MCD_varTab9[];
-u32 MCD_varTab10[];
-u32 MCD_varTab11[];
-u32 MCD_varTab12[];
-u32 MCD_varTab13[];
-u32 MCD_varTab14[];
-u32 MCD_varTab15[];
-
-u32 MCD_funcDescTab0[];
-#ifdef MCD_INCLUDE_EU
-u32 MCD_funcDescTab1[];
-u32 MCD_funcDescTab2[];
-u32 MCD_funcDescTab3[];
-u32 MCD_funcDescTab4[];
-u32 MCD_funcDescTab5[];
-u32 MCD_funcDescTab6[];
-u32 MCD_funcDescTab7[];
-u32 MCD_funcDescTab8[];
-u32 MCD_funcDescTab9[];
-u32 MCD_funcDescTab10[];
-u32 MCD_funcDescTab11[];
-u32 MCD_funcDescTab12[];
-u32 MCD_funcDescTab13[];
-u32 MCD_funcDescTab14[];
-u32 MCD_funcDescTab15[];
-#endif
-
-u32 MCD_contextSave0[];
-u32 MCD_contextSave1[];
-u32 MCD_contextSave2[];
-u32 MCD_contextSave3[];
-u32 MCD_contextSave4[];
-u32 MCD_contextSave5[];
-u32 MCD_contextSave6[];
-u32 MCD_contextSave7[];
-u32 MCD_contextSave8[];
-u32 MCD_contextSave9[];
-u32 MCD_contextSave10[];
-u32 MCD_contextSave11[];
-u32 MCD_contextSave12[];
-u32 MCD_contextSave13[];
-u32 MCD_contextSave14[];
-u32 MCD_contextSave15[];
-
-u32 MCD_realTaskTableSrc[] = {
-       0x00000000,
-       0x00000000,
-       (u32) MCD_varTab0,      /* Task 0 Variable Table */
-       (u32) MCD_funcDescTab0, /* Task 0 Fn Desc. Table & Flags */
-       0x00000000,
-       0x00000000,
-       (u32) MCD_contextSave0, /* Task 0 context save space */
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       (u32) MCD_varTab1,      /* Task 1 Variable Table */
-#ifdef MCD_INCLUDE_EU
-       (u32) MCD_funcDescTab1, /* Task 1 Fn Desc. Table & Flags */
-#else
-       (u32) MCD_funcDescTab0, /* Task 0 Fn Desc. Table & Flags */
-#endif
-       0x00000000,
-       0x00000000,
-       (u32) MCD_contextSave1, /* Task 1 context save space */
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       (u32) MCD_varTab2,      /* Task 2 Variable Table */
-#ifdef MCD_INCLUDE_EU
-       (u32) MCD_funcDescTab2, /* Task 2 Fn Desc. Table & Flags */
-#else
-       (u32) MCD_funcDescTab0, /* Task 0 Fn Desc. Table & Flags */
-#endif
-       0x00000000,
-       0x00000000,
-       (u32) MCD_contextSave2, /* Task 2 context save space */
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       (u32) MCD_varTab3,      /* Task 3 Variable Table */
-#ifdef MCD_INCLUDE_EU
-       (u32) MCD_funcDescTab3, /* Task 3 Fn Desc. Table & Flags */
-#else
-       (u32) MCD_funcDescTab0, /* Task 0 Fn Desc. Table & Flags */
-#endif
-       0x00000000,
-       0x00000000,
-       (u32) MCD_contextSave3, /* Task 3 context save space */
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       (u32) MCD_varTab4,      /* Task 4 Variable Table */
-#ifdef MCD_INCLUDE_EU
-       (u32) MCD_funcDescTab4, /* Task 4 Fn Desc. Table & Flags */
-#else
-       (u32) MCD_funcDescTab0, /* Task 0 Fn Desc. Table & Flags */
-#endif
-       0x00000000,
-       0x00000000,
-       (u32) MCD_contextSave4, /* Task 4 context save space */
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       (u32) MCD_varTab5,      /* Task 5 Variable Table */
-#ifdef MCD_INCLUDE_EU
-       (u32) MCD_funcDescTab5, /* Task 5 Fn Desc. Table & Flags */
-#else
-       (u32) MCD_funcDescTab0, /* Task 0 Fn Desc. Table & Flags */
-#endif
-       0x00000000,
-       0x00000000,
-       (u32) MCD_contextSave5, /* Task 5 context save space */
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       (u32) MCD_varTab6,      /* Task 6 Variable Table */
-#ifdef MCD_INCLUDE_EU
-       (u32) MCD_funcDescTab6, /* Task 6 Fn Desc. Table & Flags */
-#else
-       (u32) MCD_funcDescTab0, /* Task 0 Fn Desc. Table & Flags */
-#endif
-       0x00000000,
-       0x00000000,
-       (u32) MCD_contextSave6, /* Task 6 context save space */
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       (u32) MCD_varTab7,      /* Task 7 Variable Table */
-#ifdef MCD_INCLUDE_EU
-       (u32) MCD_funcDescTab7, /* Task 7 Fn Desc. Table & Flags */
-#else
-       (u32) MCD_funcDescTab0, /* Task 0 Fn Desc. Table & Flags */
-#endif
-       0x00000000,
-       0x00000000,
-       (u32) MCD_contextSave7, /* Task 7 context save space */
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       (u32) MCD_varTab8,      /* Task 8 Variable Table */
-#ifdef MCD_INCLUDE_EU
-       (u32) MCD_funcDescTab8, /* Task 8 Fn Desc. Table & Flags */
-#else
-       (u32) MCD_funcDescTab0, /* Task 0 Fn Desc. Table & Flags */
-#endif
-       0x00000000,
-       0x00000000,
-       (u32) MCD_contextSave8, /* Task 8 context save space */
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       (u32) MCD_varTab9,      /* Task 9 Variable Table */
-#ifdef MCD_INCLUDE_EU
-       (u32) MCD_funcDescTab9, /* Task 9 Fn Desc. Table & Flags */
-#else
-       (u32) MCD_funcDescTab0, /* Task 0 Fn Desc. Table & Flags */
-#endif
-       0x00000000,
-       0x00000000,
-       (u32) MCD_contextSave9, /* Task 9 context save space */
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       (u32) MCD_varTab10,     /* Task 10 Variable Table */
-#ifdef MCD_INCLUDE_EU
-       (u32) MCD_funcDescTab10,        /* Task 10 Fn Desc. Table & Flags */
-#else
-       (u32) MCD_funcDescTab0, /* Task 0 Fn Desc. Table & Flags */
-#endif
-       0x00000000,
-       0x00000000,
-       (u32) MCD_contextSave10,        /* Task 10 context save space */
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       (u32) MCD_varTab11,     /* Task 11 Variable Table */
-#ifdef MCD_INCLUDE_EU
-       (u32) MCD_funcDescTab11,        /* Task 11 Fn Desc. Table & Flags */
-#else
-       (u32) MCD_funcDescTab0, /* Task 0 Fn Desc. Table & Flags */
-#endif
-       0x00000000,
-       0x00000000,
-       (u32) MCD_contextSave11,        /* Task 11 context save space */
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       (u32) MCD_varTab12,     /* Task 12 Variable Table */
-#ifdef MCD_INCLUDE_EU
-       (u32) MCD_funcDescTab12,        /* Task 12 Fn Desc. Table & Flags */
-#else
-       (u32) MCD_funcDescTab0, /* Task 0 Fn Desc. Table & Flags */
-#endif
-       0x00000000,
-       0x00000000,
-       (u32) MCD_contextSave12,        /* Task 12 context save space */
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       (u32) MCD_varTab13,     /* Task 13 Variable Table */
-#ifdef MCD_INCLUDE_EU
-       (u32) MCD_funcDescTab13,        /* Task 13 Fn Desc. Table & Flags */
-#else
-       (u32) MCD_funcDescTab0, /* Task 0 Fn Desc. Table & Flags */
-#endif
-       0x00000000,
-       0x00000000,
-       (u32) MCD_contextSave13,        /* Task 13 context save space */
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       (u32) MCD_varTab14,     /* Task 14 Variable Table */
-#ifdef MCD_INCLUDE_EU
-       (u32) MCD_funcDescTab14,        /* Task 14 Fn Desc. Table & Flags */
-#else
-       (u32) MCD_funcDescTab0, /* Task 0 Fn Desc. Table & Flags */
-#endif
-       0x00000000,
-       0x00000000,
-       (u32) MCD_contextSave14,        /* Task 14 context save space */
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       (u32) MCD_varTab15,     /* Task 15 Variable Table */
-#ifdef MCD_INCLUDE_EU
-       (u32) MCD_funcDescTab15,        /* Task 15 Fn Desc. Table & Flags */
-#else
-       (u32) MCD_funcDescTab0, /* Task 0 Fn Desc. Table & Flags */
-#endif
-       0x00000000,
-       0x00000000,
-       (u32) MCD_contextSave15,        /* Task 15 context save space */
-       0x00000000,
-};
-
-u32 MCD_varTab0[] = {          /* Task 0 Variable Table */
-       0x00000000,             /* var[0] */
-       0x00000000,             /* var[1] */
-       0x00000000,             /* var[2] */
-       0x00000000,             /* var[3] */
-       0x00000000,             /* var[4] */
-       0x00000000,             /* var[5] */
-       0x00000000,             /* var[6] */
-       0x00000000,             /* var[7] */
-       0x00000000,             /* var[8] */
-       0x00000000,             /* var[9] */
-       0x00000000,             /* var[10] */
-       0x00000000,             /* var[11] */
-       0x00000000,             /* var[12] */
-       0x00000000,             /* var[13] */
-       0x00000000,             /* var[14] */
-       0x00000000,             /* var[15] */
-       0x00000000,             /* var[16] */
-       0x00000000,             /* var[17] */
-       0x00000000,             /* var[18] */
-       0x00000000,             /* var[19] */
-       0x00000000,             /* var[20] */
-       0x00000000,             /* var[21] */
-       0x00000000,             /* var[22] */
-       0x00000000,             /* var[23] */
-       0xe0000000,             /* inc[0] */
-       0x20000000,             /* inc[1] */
-       0x2000ffff,             /* inc[2] */
-       0x00000000,             /* inc[3] */
-       0x00000000,             /* inc[4] */
-       0x00000000,             /* inc[5] */
-       0x00000000,             /* inc[6] */
-       0x00000000,             /* inc[7] */
-};
-
-u32 MCD_varTab1[] = {
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0xe0000000,
-       0x20000000,
-       0x2000ffff,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-};
-
-u32 MCD_varTab2[] = {
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0xe0000000,
-       0x20000000,
-       0x2000ffff,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-};
-
-u32 MCD_varTab3[] = {
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0xe0000000,
-       0x20000000,
-       0x2000ffff,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-};
-
-u32 MCD_varTab4[] = {
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0xe0000000,
-       0x20000000,
-       0x2000ffff,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-};
-
-u32 MCD_varTab5[] = {
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0xe0000000,
-       0x20000000,
-       0x2000ffff,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-};
-
-u32 MCD_varTab6[] = {
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0xe0000000,
-       0x20000000,
-       0x2000ffff,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-};
-
-u32 MCD_varTab7[] = {
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0xe0000000,
-       0x20000000,
-       0x2000ffff,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-};
-
-u32 MCD_varTab8[] = {
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0xe0000000,
-       0x20000000,
-       0x2000ffff,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-};
-
-u32 MCD_varTab9[] = {
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0xe0000000,
-       0x20000000,
-       0x2000ffff,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-};
-
-u32 MCD_varTab10[] = {
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0xe0000000,
-       0x20000000,
-       0x2000ffff,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-};
-
-u32 MCD_varTab11[] = {
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0xe0000000,
-       0x20000000,
-       0x2000ffff,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-};
-
-u32 MCD_varTab12[] = {
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0xe0000000,
-       0x20000000,
-       0x2000ffff,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-};
-
-u32 MCD_varTab13[] = {
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0xe0000000,
-       0x20000000,
-       0x2000ffff,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-};
-
-u32 MCD_varTab14[] = {
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0xe0000000,
-       0x20000000,
-       0x2000ffff,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-};
-
-u32 MCD_varTab15[] = {
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0xe0000000,
-       0x20000000,
-       0x2000ffff,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-};
-
-u32 MCD_funcDescTab0[] = {
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0xa0045670,
-       0xa0000000,
-       0xa0000000,
-       0x20000000,
-       0x21800000,
-       0x21e00000,
-       0x20400000,
-       0x20500000,
-       0x205a0000,
-       0x20a00000,
-       0x202fa000,
-       0x202f9000,
-       0x202ea000,
-       0x202da000,
-       0x202e2000,
-       0x202f2000,
-};
-
-#ifdef MCD_INCLUDE_EU
-u32 MCD_funcDescTab1[] = {
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0xa0045670,
-       0xa0000000,
-       0xa0000000,
-       0x20000000,
-       0x21800000,
-       0x21e00000,
-       0x20400000,
-       0x20500000,
-       0x205a0000,
-       0x20a00000,
-       0x202fa000,
-       0x202f9000,
-       0x202ea000,
-       0x202da000,
-       0x202e2000,
-       0x202f2000,
-};
-
-u32 MCD_funcDescTab2[] = {
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0xa0045670,
-       0xa0000000,
-       0xa0000000,
-       0x20000000,
-       0x21800000,
-       0x21e00000,
-       0x20400000,
-       0x20500000,
-       0x205a0000,
-       0x20a00000,
-       0x202fa000,
-       0x202f9000,
-       0x202ea000,
-       0x202da000,
-       0x202e2000,
-       0x202f2000,
-};
-
-u32 MCD_funcDescTab3[] = {
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0xa0045670,
-       0xa0000000,
-       0xa0000000,
-       0x20000000,
-       0x21800000,
-       0x21e00000,
-       0x20400000,
-       0x20500000,
-       0x205a0000,
-       0x20a00000,
-       0x202fa000,
-       0x202f9000,
-       0x202ea000,
-       0x202da000,
-       0x202e2000,
-       0x202f2000,
-};
-
-u32 MCD_funcDescTab4[] = {
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0xa0045670,
-       0xa0000000,
-       0xa0000000,
-       0x20000000,
-       0x21800000,
-       0x21e00000,
-       0x20400000,
-       0x20500000,
-       0x205a0000,
-       0x20a00000,
-       0x202fa000,
-       0x202f9000,
-       0x202ea000,
-       0x202da000,
-       0x202e2000,
-       0x202f2000,
-};
-
-u32 MCD_funcDescTab5[] = {
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0xa0045670,
-       0xa0000000,
-       0xa0000000,
-       0x20000000,
-       0x21800000,
-       0x21e00000,
-       0x20400000,
-       0x20500000,
-       0x205a0000,
-       0x20a00000,
-       0x202fa000,
-       0x202f9000,
-       0x202ea000,
-       0x202da000,
-       0x202e2000,
-       0x202f2000,
-};
-
-u32 MCD_funcDescTab6[] = {
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0xa0045670,
-       0xa0000000,
-       0xa0000000,
-       0x20000000,
-       0x21800000,
-       0x21e00000,
-       0x20400000,
-       0x20500000,
-       0x205a0000,
-       0x20a00000,
-       0x202fa000,
-       0x202f9000,
-       0x202ea000,
-       0x202da000,
-       0x202e2000,
-       0x202f2000,
-};
-
-u32 MCD_funcDescTab7[] = {
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0xa0045670,
-       0xa0000000,
-       0xa0000000,
-       0x20000000,
-       0x21800000,
-       0x21e00000,
-       0x20400000,
-       0x20500000,
-       0x205a0000,
-       0x20a00000,
-       0x202fa000,
-       0x202f9000,
-       0x202ea000,
-       0x202da000,
-       0x202e2000,
-       0x202f2000,
-};
-
-u32 MCD_funcDescTab8[] = {
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0xa0045670,
-       0xa0000000,
-       0xa0000000,
-       0x20000000,
-       0x21800000,
-       0x21e00000,
-       0x20400000,
-       0x20500000,
-       0x205a0000,
-       0x20a00000,
-       0x202fa000,
-       0x202f9000,
-       0x202ea000,
-       0x202da000,
-       0x202e2000,
-       0x202f2000,
-};
-
-u32 MCD_funcDescTab9[] = {
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0xa0045670,
-       0xa0000000,
-       0xa0000000,
-       0x20000000,
-       0x21800000,
-       0x21e00000,
-       0x20400000,
-       0x20500000,
-       0x205a0000,
-       0x20a00000,
-       0x202fa000,
-       0x202f9000,
-       0x202ea000,
-       0x202da000,
-       0x202e2000,
-       0x202f2000,
-};
-
-u32 MCD_funcDescTab10[] = {
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0xa0045670,
-       0xa0000000,
-       0xa0000000,
-       0x20000000,
-       0x21800000,
-       0x21e00000,
-       0x20400000,
-       0x20500000,
-       0x205a0000,
-       0x20a00000,
-       0x202fa000,
-       0x202f9000,
-       0x202ea000,
-       0x202da000,
-       0x202e2000,
-       0x202f2000,
-};
-
-u32 MCD_funcDescTab11[] = {
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0xa0045670,
-       0xa0000000,
-       0xa0000000,
-       0x20000000,
-       0x21800000,
-       0x21e00000,
-       0x20400000,
-       0x20500000,
-       0x205a0000,
-       0x20a00000,
-       0x202fa000,
-       0x202f9000,
-       0x202ea000,
-       0x202da000,
-       0x202e2000,
-       0x202f2000,
-};
-
-u32 MCD_funcDescTab12[] = {
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0xa0045670,
-       0xa0000000,
-       0xa0000000,
-       0x20000000,
-       0x21800000,
-       0x21e00000,
-       0x20400000,
-       0x20500000,
-       0x205a0000,
-       0x20a00000,
-       0x202fa000,
-       0x202f9000,
-       0x202ea000,
-       0x202da000,
-       0x202e2000,
-       0x202f2000,
-};
-
-u32 MCD_funcDescTab13[] = {
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0xa0045670,
-       0xa0000000,
-       0xa0000000,
-       0x20000000,
-       0x21800000,
-       0x21e00000,
-       0x20400000,
-       0x20500000,
-       0x205a0000,
-       0x20a00000,
-       0x202fa000,
-       0x202f9000,
-       0x202ea000,
-       0x202da000,
-       0x202e2000,
-       0x202f2000,
-};
-
-u32 MCD_funcDescTab14[] = {
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0xa0045670,
-       0xa0000000,
-       0xa0000000,
-       0x20000000,
-       0x21800000,
-       0x21e00000,
-       0x20400000,
-       0x20500000,
-       0x205a0000,
-       0x20a00000,
-       0x202fa000,
-       0x202f9000,
-       0x202ea000,
-       0x202da000,
-       0x202e2000,
-       0x202f2000,
-};
-
-u32 MCD_funcDescTab15[] = {
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0xa0045670,
-       0xa0000000,
-       0xa0000000,
-       0x20000000,
-       0x21800000,
-       0x21e00000,
-       0x20400000,
-       0x20500000,
-       0x205a0000,
-       0x20a00000,
-       0x202fa000,
-       0x202f9000,
-       0x202ea000,
-       0x202da000,
-       0x202e2000,
-       0x202f2000,
-};
-#endif                         /*MCD_INCLUDE_EU */
-
-u32 MCD_contextSave0[128];     /* Task 0 context save space */
-u32 MCD_contextSave1[128];     /* Task 1 context save space */
-u32 MCD_contextSave2[128];     /* Task 2 context save space */
-u32 MCD_contextSave3[128];     /* Task 3 context save space */
-u32 MCD_contextSave4[128];     /* Task 4 context save space */
-u32 MCD_contextSave5[128];     /* Task 5 context save space */
-u32 MCD_contextSave6[128];     /* Task 6 context save space */
-u32 MCD_contextSave7[128];     /* Task 7 context save space */
-u32 MCD_contextSave8[128];     /* Task 8 context save space */
-u32 MCD_contextSave9[128];     /* Task 9 context save space */
-u32 MCD_contextSave10[128];    /* Task 10 context save space */
-u32 MCD_contextSave11[128];    /* Task 11 context save space */
-u32 MCD_contextSave12[128];    /* Task 12 context save space */
-u32 MCD_contextSave13[128];    /* Task 13 context save space */
-u32 MCD_contextSave14[128];    /* Task 14 context save space */
-u32 MCD_contextSave15[128];    /* Task 15 context save space */
-
-u32 MCD_ChainNoEu_TDT[];
-u32 MCD_SingleNoEu_TDT[];
-#ifdef MCD_INCLUDE_EU
-u32 MCD_ChainEu_TDT[];
-u32 MCD_SingleEu_TDT[];
-#endif
-u32 MCD_ENetRcv_TDT[];
-u32 MCD_ENetXmit_TDT[];
-
-u32 MCD_modelTaskTableSrc[] = {
-       (u32) MCD_ChainNoEu_TDT,
-       (u32) & ((u8 *) MCD_ChainNoEu_TDT)[0x0000016c],
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       (u32) MCD_SingleNoEu_TDT,
-       (u32) & ((u8 *) MCD_SingleNoEu_TDT)[0x000000d4],
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-#ifdef MCD_INCLUDE_EU
-       (u32) MCD_ChainEu_TDT,
-       (u32) & ((u8 *) MCD_ChainEu_TDT)[0x000001b4],
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       (u32) MCD_SingleEu_TDT,
-       (u32) & ((u8 *) MCD_SingleEu_TDT)[0x00000124],
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-#endif
-       (u32) MCD_ENetRcv_TDT,
-       (u32) & ((u8 *) MCD_ENetRcv_TDT)[0x0000009c],
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       (u32) MCD_ENetXmit_TDT,
-       (u32) & ((u8 *) MCD_ENetXmit_TDT)[0x000000d0],
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-};
-
-u32 MCD_ChainNoEu_TDT[] = {
-       0x80004000,
-       0x8118801b,
-       0xb8c60018,
-       0x10002b10,
-       0x7000000d,
-       0x018cf89f,
-       0x6000000a,
-       0x080cf89f,
-       0x000001f8,
-       0x98180364,
-       0x8118801b,
-       0xf8c6001a,
-       0xb8c6601b,
-       0x10002710,
-       0x00000f18,
-       0xb8c6001d,
-       0x10001310,
-       0x60000007,
-       0x014cf88b,
-       0x98c6001c,
-       0x00000710,
-       0x98c70018,
-       0x10001f10,
-       0x0000c818,
-       0x000001f8,
-       0xc1476018,
-       0xc003231d,
-       0x811a601b,
-       0xc1862102,
-       0x849be009,
-       0x03fed7b8,
-       0xda9b001b,
-       0x9b9be01b,
-       0x1000cb20,
-       0x70000006,
-       0x088cf88f,
-       0x1000cb28,
-       0x70000006,
-       0x088cf88f,
-       0x1000cb30,
-       0x70000006,
-       0x088cf88f,
-       0x1000cb38,
-       0x0000c728,
-       0x000001f8,
-       0xc1476018,
-       0xc003241d,
-       0x811a601b,
-       0xda9b001b,
-       0x9b9be01b,
-       0x0000d3a0,
-       0xc1862102,
-       0x849be009,
-       0x0bfed7b8,
-       0xda9b001b,
-       0x9b9be01b,
-       0x1000cb20,
-       0x70000006,
-       0x088cf88f,
-       0x1000cb28,
-       0x70000006,
-       0x088cf88f,
-       0x1000cb30,
-       0x70000006,
-       0x088cf88f,
-       0x1000cb38,
-       0x0000c728,
-       0x000001f8,
-       0x8118801b,
-       0xd8c60018,
-       0x98c6601c,
-       0x6000000b,
-       0x0c8cfc9f,
-       0x000001f8,
-       0xa146001e,
-       0x10000b08,
-       0x10002050,
-       0xb8c60018,
-       0x10002b10,
-       0x7000000a,
-       0x080cf89f,
-       0x6000000d,
-       0x018cf89f,
-       0x000001f8,
-       0x8618801b,
-       0x7000000e,
-       0x084cf21f,
-       0xd8990336,
-       0x8019801b,
-       0x040001f8,
-       0x000001f8,
-       0x000001f8,
-};
-
-u32 MCD_SingleNoEu_TDT[] = {
-       0x8198001b,
-       0x7000000d,
-       0x080cf81f,
-       0x8198801b,
-       0x6000000e,
-       0x084cf85f,
-       0x000001f8,
-       0x8298001b,
-       0x7000000d,
-       0x010cf81f,
-       0x6000000e,
-       0x018cf81f,
-       0xc202601b,
-       0xc002221c,
-       0x809a601b,
-       0xc10420c2,
-       0x839be009,
-       0x03fed7b8,
-       0xda9b001b,
-       0x9b9be01b,
-       0x70000006,
-       0x088cf889,
-       0x1000cb28,
-       0x70000006,
-       0x088cf889,
-       0x1000cb30,
-       0x70000006,
-       0x088cf889,
-       0x0000cb38,
-       0x000001f8,
-       0xc202601b,
-       0xc002229c,
-       0x809a601b,
-       0xda9b001b,
-       0x9b9be01b,
-       0x0000d3a0,
-       0xc10420c2,
-       0x839be009,
-       0x0bfed7b8,
-       0xda9b001b,
-       0x9b9be01b,
-       0x70000006,
-       0x088cf889,
-       0x1000cb28,
-       0x70000006,
-       0x088cf889,
-       0x1000cb30,
-       0x70000006,
-       0x088cf889,
-       0x0000cb38,
-       0x000001f8,
-       0xc318022d,
-       0x8018801b,
-       0x040001f8,
-};
-
-#ifdef MCD_INCLUDE_EU
-u32 MCD_ChainEu_TDT[] = {
-       0x80004000,
-       0x8198801b,
-       0xb8c68018,
-       0x10002f10,
-       0x7000000d,
-       0x01ccf89f,
-       0x6000000a,
-       0x080cf89f,
-       0x000001f8,
-       0x981803a4,
-       0x8198801b,
-       0xf8c6801a,
-       0xb8c6e01b,
-       0x10002b10,
-       0x00001318,
-       0xb8c6801d,
-       0x10001710,
-       0x60000007,
-       0x018cf88c,
-       0x98c6801c,
-       0x00000b10,
-       0x98c78018,
-       0x10002310,
-       0x0000c820,
-       0x000001f8,
-       0x8698801b,
-       0x7000000f,
-       0x084cf2df,
-       0xd899042d,
-       0x8019801b,
-       0x60000003,
-       0x2cd7c7df,
-       0xd8990364,
-       0x8019801b,
-       0x60000003,
-       0x2c17c7df,
-       0x000001f8,
-       0xc1c7e018,
-       0xc003a35e,
-       0x819a601b,
-       0xc206a142,
-       0x851be009,
-       0x63fe0000,
-       0x0d4cfddf,
-       0xda9b001b,
-       0x9b9be01b,
-       0x70000002,
-       0x004cf81f,
-       0x1000cb20,
-       0x70000006,
-       0x088cf891,
-       0x1000cb28,
-       0x70000006,
-       0x088cf891,
-       0x1000cb30,
-       0x70000006,
-       0x088cf891,
-       0x1000cb38,
-       0x0000c728,
-       0x000001f8,
-       0xc1c7e018,
-       0xc003a49e,
-       0x819a601b,
-       0xda9b001b,
-       0x9b9be01b,
-       0x0000d3a0,
-       0xc206a142,
-       0x851be009,
-       0x6bfe0000,
-       0x0d4cfddf,
-       0xda9b001b,
-       0x9b9be01b,
-       0x70000002,
-       0x004cf81f,
-       0x1000cb20,
-       0x70000006,
-       0x088cf891,
-       0x1000cb28,
-       0x70000006,
-       0x088cf891,
-       0x1000cb30,
-       0x70000006,
-       0x088cf891,
-       0x1000cb38,
-       0x0000c728,
-       0x000001f8,
-       0x8198801b,
-       0xd8c68018,
-       0x98c6e01c,
-       0x6000000b,
-       0x0c8cfc9f,
-       0x0000cc08,
-       0xa1c6801e,
-       0x10000f08,
-       0x10002458,
-       0xb8c68018,
-       0x10002f10,
-       0x7000000a,
-       0x080cf89f,
-       0x6000000d,
-       0x01ccf89f,
-       0x000001f8,
-       0x8698801b,
-       0x7000000e,
-       0x084cf25f,
-       0xd899037f,
-       0x8019801b,
-       0x040001f8,
-       0x000001f8,
-       0x000001f8,
-};
-
-u32 MCD_SingleEu_TDT[] = {
-       0x8218001b,
-       0x7000000d,
-       0x080cf81f,
-       0x8218801b,
-       0x6000000e,
-       0x084cf85f,
-       0x000001f8,
-       0x8318001b,
-       0x7000000d,
-       0x014cf81f,
-       0x6000000e,
-       0x01ccf81f,
-       0x8498001b,
-       0x7000000f,
-       0x080cf19f,
-       0xd81882a4,
-       0x8019001b,
-       0x60000003,
-       0x2c97c7df,
-       0xd818826d,
-       0x8019001b,
-       0x60000003,
-       0x2c17c7df,
-       0x000001f8,
-       0xc282e01b,
-       0xc002a25e,
-       0x811a601b,
-       0xc184a102,
-       0x841be009,
-       0x63fe0000,
-       0x0d4cfddf,
-       0xda9b001b,
-       0x9b9be01b,
-       0x70000002,
-       0x004cf99f,
-       0x70000006,
-       0x088cf88b,
-       0x1000cb28,
-       0x70000006,
-       0x088cf88b,
-       0x1000cb30,
-       0x70000006,
-       0x088cf88b,
-       0x0000cb38,
-       0x000001f8,
-       0xc282e01b,
-       0xc002a31e,
-       0x811a601b,
-       0xda9b001b,
-       0x9b9be01b,
-       0x0000d3a0,
-       0xc184a102,
-       0x841be009,
-       0x6bfe0000,
-       0x0d4cfddf,
-       0xda9b001b,
-       0x9b9be01b,
-       0x70000002,
-       0x004cf99f,
-       0x70000006,
-       0x088cf88b,
-       0x1000cb28,
-       0x70000006,
-       0x088cf88b,
-       0x1000cb30,
-       0x70000006,
-       0x088cf88b,
-       0x0000cb38,
-       0x000001f8,
-       0x8144801c,
-       0x0000c008,
-       0xc398027f,
-       0x8018801b,
-       0x040001f8,
-};
-#endif
-u32 MCD_ENetRcv_TDT[] = {
-       0x80004000,
-       0x81988000,
-       0x10000788,
-       0x6000000a,
-       0x080cf05f,
-       0x98180209,
-       0x81c40004,
-       0x7000000e,
-       0x010cf05f,
-       0x7000000c,
-       0x01ccf05f,
-       0x70000004,
-       0x014cf049,
-       0x70000004,
-       0x004cf04a,
-       0x00000b88,
-       0xc4030150,
-       0x8119e012,
-       0x03e0cf90,
-       0x81188000,
-       0x000ac788,
-       0xc4030000,
-       0x8199e000,
-       0x70000004,
-       0x084cfc8b,
-       0x60000005,
-       0x0cccf841,
-       0x81c60000,
-       0xc399021b,
-       0x80198000,
-       0x00008400,
-       0x00000f08,
-       0x81988000,
-       0x10000788,
-       0x6000000a,
-       0x080cf05f,
-       0xc2188209,
-       0x80190000,
-       0x040001f8,
-       0x000001f8,
-};
-
-u32 MCD_ENetXmit_TDT[] = {
-       0x80004000,
-       0x81988000,
-       0x10000788,
-       0x6000000a,
-       0x080cf05f,
-       0x98180309,
-       0x80004003,
-       0x81c60004,
-       0x7000000e,
-       0x014cf05f,
-       0x7000000c,
-       0x028cf05f,
-       0x7000000d,
-       0x018cf05f,
-       0x70000004,
-       0x01ccf04d,
-       0x10000b90,
-       0x60000004,
-       0x020cf0a1,
-       0xc3188312,
-       0x83c70000,
-       0x00001f10,
-       0xc583a3c3,
-       0x81042325,
-       0x03e0c798,
-       0xd8990000,
-       0x9999e000,
-       0x000acf98,
-       0xd8992306,
-       0x9999e03f,
-       0x03eac798,
-       0xd8990000,
-       0x9999e000,
-       0x000acf98,
-       0xd8990000,
-       0x99832302,
-       0x0beac798,
-       0x81988000,
-       0x6000000b,
-       0x0c4cfc5f,
-       0x81c80000,
-       0xc5190312,
-       0x80198000,
-       0x00008400,
-       0x00000f08,
-       0x81988000,
-       0x10000788,
-       0x6000000a,
-       0x080cf05f,
-       0xc2988309,
-       0x80190000,
-       0x040001f8,
-       0x000001f8,
-};
-
-#ifdef MCD_INCLUDE_EU
-MCD_bufDesc MCD_singleBufDescs[NCHANNELS];
-#endif
diff --git a/drivers/dma/MCD_tasksInit.c b/drivers/dma/MCD_tasksInit.c
deleted file mode 100644 (file)
index 079cd0a..0000000
+++ /dev/null
@@ -1,225 +0,0 @@
-// SPDX-License-Identifier: GPL-2.0+
-/*
- * Copyright (C) 2004-2007 Freescale Semiconductor, Inc.
- */
-
-#include <common.h>
-
-/* Functions for initializing variable tables of different types of tasks. */
-
-/*
- * Do not edit!
- */
-
-#include <MCD_dma.h>
-
-extern dmaRegs *MCD_dmaBar;
-
-/* Task 0 */
-
-void MCD_startDmaChainNoEu(int *currBD, short srcIncr, short destIncr,
-                          int xferSize, short xferSizeIncr, int *cSave,
-                          volatile TaskTableEntry * taskTable, int channel)
-{
-       volatile TaskTableEntry *taskChan = taskTable + channel;
-
-       MCD_SET_VAR(taskChan, 2, (u32) currBD); /* var[2] */
-       MCD_SET_VAR(taskChan, 25, (u32) (0xe000 << 16) | (0xffff & srcIncr));   /* inc[1] */
-       MCD_SET_VAR(taskChan, 24, (u32) (0xe000 << 16) | (0xffff & destIncr));  /* inc[0] */
-       MCD_SET_VAR(taskChan, 11, (u32) xferSize);      /* var[11] */
-       MCD_SET_VAR(taskChan, 26, (u32) (0x2000 << 16) | (0xffff & xferSizeIncr));      /* inc[2] */
-       MCD_SET_VAR(taskChan, 0, (u32) cSave);  /* var[0] */
-       MCD_SET_VAR(taskChan, 1, (u32) 0x00000000);     /* var[1] */
-       MCD_SET_VAR(taskChan, 3, (u32) 0x00000000);     /* var[3] */
-       MCD_SET_VAR(taskChan, 4, (u32) 0x00000000);     /* var[4] */
-       MCD_SET_VAR(taskChan, 5, (u32) 0x00000000);     /* var[5] */
-       MCD_SET_VAR(taskChan, 6, (u32) 0x00000000);     /* var[6] */
-       MCD_SET_VAR(taskChan, 7, (u32) 0x00000000);     /* var[7] */
-       MCD_SET_VAR(taskChan, 8, (u32) 0x00000000);     /* var[8] */
-       MCD_SET_VAR(taskChan, 9, (u32) 0x00000000);     /* var[9] */
-       MCD_SET_VAR(taskChan, 10, (u32) 0x00000000);    /* var[10] */
-       MCD_SET_VAR(taskChan, 12, (u32) 0x00000000);    /* var[12] */
-       MCD_SET_VAR(taskChan, 13, (u32) 0x80000000);    /* var[13] */
-       MCD_SET_VAR(taskChan, 14, (u32) 0x00000010);    /* var[14] */
-       MCD_SET_VAR(taskChan, 15, (u32) 0x00000004);    /* var[15] */
-       MCD_SET_VAR(taskChan, 16, (u32) 0x08000000);    /* var[16] */
-       MCD_SET_VAR(taskChan, 27, (u32) 0x00000000);    /* inc[3] */
-       MCD_SET_VAR(taskChan, 28, (u32) 0x80000000);    /* inc[4] */
-       MCD_SET_VAR(taskChan, 29, (u32) 0x80000001);    /* inc[5] */
-       MCD_SET_VAR(taskChan, 30, (u32) 0x40000000);    /* inc[6] */
-
-       /* Set the task's Enable bit in its Task Control Register */
-       MCD_dmaBar->taskControl[channel] |= (u16) 0x8000;
-}
-
-/* Task 1 */
-
-void MCD_startDmaSingleNoEu(char *srcAddr, short srcIncr, char *destAddr,
-                           short destIncr, int dmaSize, short xferSizeIncr,
-                           int flags, int *currBD, int *cSave,
-                           volatile TaskTableEntry * taskTable, int channel)
-{
-       volatile TaskTableEntry *taskChan = taskTable + channel;
-
-       MCD_SET_VAR(taskChan, 7, (u32) srcAddr);        /* var[7] */
-       MCD_SET_VAR(taskChan, 25, (u32) (0xe000 << 16) | (0xffff & srcIncr));   /* inc[1] */
-       MCD_SET_VAR(taskChan, 2, (u32) destAddr);       /* var[2] */
-       MCD_SET_VAR(taskChan, 24, (u32) (0xe000 << 16) | (0xffff & destIncr));  /* inc[0] */
-       MCD_SET_VAR(taskChan, 3, (u32) dmaSize);        /* var[3] */
-       MCD_SET_VAR(taskChan, 26, (u32) (0x2000 << 16) | (0xffff & xferSizeIncr));      /* inc[2] */
-       MCD_SET_VAR(taskChan, 5, (u32) flags);  /* var[5] */
-       MCD_SET_VAR(taskChan, 1, (u32) currBD); /* var[1] */
-       MCD_SET_VAR(taskChan, 0, (u32) cSave);  /* var[0] */
-       MCD_SET_VAR(taskChan, 4, (u32) 0x00000000);     /* var[4] */
-       MCD_SET_VAR(taskChan, 6, (u32) 0x00000000);     /* var[6] */
-       MCD_SET_VAR(taskChan, 8, (u32) 0x00000000);     /* var[8] */
-       MCD_SET_VAR(taskChan, 9, (u32) 0x00000004);     /* var[9] */
-       MCD_SET_VAR(taskChan, 10, (u32) 0x08000000);    /* var[10] */
-       MCD_SET_VAR(taskChan, 27, (u32) 0x00000000);    /* inc[3] */
-       MCD_SET_VAR(taskChan, 28, (u32) 0x80000001);    /* inc[4] */
-       MCD_SET_VAR(taskChan, 29, (u32) 0x40000000);    /* inc[5] */
-
-       /* Set the task's Enable bit in its Task Control Register */
-       MCD_dmaBar->taskControl[channel] |= (u16) 0x8000;
-}
-
-/* Task 2 */
-
-void MCD_startDmaChainEu(int *currBD, short srcIncr, short destIncr,
-                        int xferSize, short xferSizeIncr, int *cSave,
-                        volatile TaskTableEntry * taskTable, int channel)
-{
-       volatile TaskTableEntry *taskChan = taskTable + channel;
-
-       MCD_SET_VAR(taskChan, 3, (u32) currBD); /* var[3] */
-       MCD_SET_VAR(taskChan, 25, (u32) (0xe000 << 16) | (0xffff & srcIncr));   /* inc[1] */
-       MCD_SET_VAR(taskChan, 24, (u32) (0xe000 << 16) | (0xffff & destIncr));  /* inc[0] */
-       MCD_SET_VAR(taskChan, 12, (u32) xferSize);      /* var[12] */
-       MCD_SET_VAR(taskChan, 26, (u32) (0x2000 << 16) | (0xffff & xferSizeIncr));      /* inc[2] */
-       MCD_SET_VAR(taskChan, 0, (u32) cSave);  /* var[0] */
-       MCD_SET_VAR(taskChan, 1, (u32) 0x00000000);     /* var[1] */
-       MCD_SET_VAR(taskChan, 2, (u32) 0x00000000);     /* var[2] */
-       MCD_SET_VAR(taskChan, 4, (u32) 0x00000000);     /* var[4] */
-       MCD_SET_VAR(taskChan, 5, (u32) 0x00000000);     /* var[5] */
-       MCD_SET_VAR(taskChan, 6, (u32) 0x00000000);     /* var[6] */
-       MCD_SET_VAR(taskChan, 7, (u32) 0x00000000);     /* var[7] */
-       MCD_SET_VAR(taskChan, 8, (u32) 0x00000000);     /* var[8] */
-       MCD_SET_VAR(taskChan, 9, (u32) 0x00000000);     /* var[9] */
-       MCD_SET_VAR(taskChan, 10, (u32) 0x00000000);    /* var[10] */
-       MCD_SET_VAR(taskChan, 11, (u32) 0x00000000);    /* var[11] */
-       MCD_SET_VAR(taskChan, 13, (u32) 0x00000000);    /* var[13] */
-       MCD_SET_VAR(taskChan, 14, (u32) 0x80000000);    /* var[14] */
-       MCD_SET_VAR(taskChan, 15, (u32) 0x00000010);    /* var[15] */
-       MCD_SET_VAR(taskChan, 16, (u32) 0x00000001);    /* var[16] */
-       MCD_SET_VAR(taskChan, 17, (u32) 0x00000004);    /* var[17] */
-       MCD_SET_VAR(taskChan, 18, (u32) 0x08000000);    /* var[18] */
-       MCD_SET_VAR(taskChan, 27, (u32) 0x00000000);    /* inc[3] */
-       MCD_SET_VAR(taskChan, 28, (u32) 0x80000000);    /* inc[4] */
-       MCD_SET_VAR(taskChan, 29, (u32) 0xc0000000);    /* inc[5] */
-       MCD_SET_VAR(taskChan, 30, (u32) 0x80000001);    /* inc[6] */
-       MCD_SET_VAR(taskChan, 31, (u32) 0x40000000);    /* inc[7] */
-
-       /* Set the task's Enable bit in its Task Control Register */
-       MCD_dmaBar->taskControl[channel] |= (u16) 0x8000;
-}
-
-/* Task 3 */
-
-void MCD_startDmaSingleEu(char *srcAddr, short srcIncr, char *destAddr,
-                         short destIncr, int dmaSize, short xferSizeIncr,
-                         int flags, int *currBD, int *cSave,
-                         volatile TaskTableEntry * taskTable, int channel)
-{
-       volatile TaskTableEntry *taskChan = taskTable + channel;
-
-       MCD_SET_VAR(taskChan, 8, (u32) srcAddr);        /* var[8] */
-       MCD_SET_VAR(taskChan, 25, (u32) (0xe000 << 16) | (0xffff & srcIncr));   /* inc[1] */
-       MCD_SET_VAR(taskChan, 3, (u32) destAddr);       /* var[3] */
-       MCD_SET_VAR(taskChan, 24, (u32) (0xe000 << 16) | (0xffff & destIncr));  /* inc[0] */
-       MCD_SET_VAR(taskChan, 4, (u32) dmaSize);        /* var[4] */
-       MCD_SET_VAR(taskChan, 26, (u32) (0x2000 << 16) | (0xffff & xferSizeIncr));      /* inc[2] */
-       MCD_SET_VAR(taskChan, 6, (u32) flags);  /* var[6] */
-       MCD_SET_VAR(taskChan, 2, (u32) currBD); /* var[2] */
-       MCD_SET_VAR(taskChan, 0, (u32) cSave);  /* var[0] */
-       MCD_SET_VAR(taskChan, 1, (u32) 0x00000000);     /* var[1] */
-       MCD_SET_VAR(taskChan, 5, (u32) 0x00000000);     /* var[5] */
-       MCD_SET_VAR(taskChan, 7, (u32) 0x00000000);     /* var[7] */
-       MCD_SET_VAR(taskChan, 9, (u32) 0x00000000);     /* var[9] */
-       MCD_SET_VAR(taskChan, 10, (u32) 0x00000001);    /* var[10] */
-       MCD_SET_VAR(taskChan, 11, (u32) 0x00000004);    /* var[11] */
-       MCD_SET_VAR(taskChan, 12, (u32) 0x08000000);    /* var[12] */
-       MCD_SET_VAR(taskChan, 27, (u32) 0x00000000);    /* inc[3] */
-       MCD_SET_VAR(taskChan, 28, (u32) 0xc0000000);    /* inc[4] */
-       MCD_SET_VAR(taskChan, 29, (u32) 0x80000000);    /* inc[5] */
-       MCD_SET_VAR(taskChan, 30, (u32) 0x80000001);    /* inc[6] */
-       MCD_SET_VAR(taskChan, 31, (u32) 0x40000000);    /* inc[7] */
-
-       /* Set the task's Enable bit in its Task Control Register */
-       MCD_dmaBar->taskControl[channel] |= (u16) 0x8000;
-}
-
-/* Task 4 */
-
-void MCD_startDmaENetRcv(char *bDBase, char *currBD, char *rcvFifoPtr,
-                        volatile TaskTableEntry * taskTable, int channel)
-{
-       volatile TaskTableEntry *taskChan = taskTable + channel;
-
-       MCD_SET_VAR(taskChan, 0, (u32) bDBase); /* var[0] */
-       MCD_SET_VAR(taskChan, 3, (u32) currBD); /* var[3] */
-       MCD_SET_VAR(taskChan, 6, (u32) rcvFifoPtr);     /* var[6] */
-       MCD_SET_VAR(taskChan, 1, (u32) 0x00000000);     /* var[1] */
-       MCD_SET_VAR(taskChan, 2, (u32) 0x00000000);     /* var[2] */
-       MCD_SET_VAR(taskChan, 4, (u32) 0x00000000);     /* var[4] */
-       MCD_SET_VAR(taskChan, 5, (u32) 0x00000000);     /* var[5] */
-       MCD_SET_VAR(taskChan, 7, (u32) 0x00000000);     /* var[7] */
-       MCD_SET_VAR(taskChan, 8, (u32) 0x00000000);     /* var[8] */
-       MCD_SET_VAR(taskChan, 9, (u32) 0x0000ffff);     /* var[9] */
-       MCD_SET_VAR(taskChan, 10, (u32) 0x30000000);    /* var[10] */
-       MCD_SET_VAR(taskChan, 11, (u32) 0x0fffffff);    /* var[11] */
-       MCD_SET_VAR(taskChan, 12, (u32) 0x00000008);    /* var[12] */
-       MCD_SET_VAR(taskChan, 24, (u32) 0x00000000);    /* inc[0] */
-       MCD_SET_VAR(taskChan, 25, (u32) 0x60000000);    /* inc[1] */
-       MCD_SET_VAR(taskChan, 26, (u32) 0x20000004);    /* inc[2] */
-       MCD_SET_VAR(taskChan, 27, (u32) 0x40000000);    /* inc[3] */
-
-       /* Set the task's Enable bit in its Task Control Register */
-       MCD_dmaBar->taskControl[channel] |= (u16) 0x8000;
-}
-
-/* Task 5 */
-
-void MCD_startDmaENetXmit(char *bDBase, char *currBD, char *xmitFifoPtr,
-                         volatile TaskTableEntry * taskTable, int channel)
-{
-       volatile TaskTableEntry *taskChan = taskTable + channel;
-
-       MCD_SET_VAR(taskChan, 0, (u32) bDBase); /* var[0] */
-       MCD_SET_VAR(taskChan, 3, (u32) currBD); /* var[3] */
-       MCD_SET_VAR(taskChan, 11, (u32) xmitFifoPtr);   /* var[11] */
-       MCD_SET_VAR(taskChan, 1, (u32) 0x00000000);     /* var[1] */
-       MCD_SET_VAR(taskChan, 2, (u32) 0x00000000);     /* var[2] */
-       MCD_SET_VAR(taskChan, 4, (u32) 0x00000000);     /* var[4] */
-       MCD_SET_VAR(taskChan, 5, (u32) 0x00000000);     /* var[5] */
-       MCD_SET_VAR(taskChan, 6, (u32) 0x00000000);     /* var[6] */
-       MCD_SET_VAR(taskChan, 7, (u32) 0x00000000);     /* var[7] */
-       MCD_SET_VAR(taskChan, 8, (u32) 0x00000000);     /* var[8] */
-       MCD_SET_VAR(taskChan, 9, (u32) 0x00000000);     /* var[9] */
-       MCD_SET_VAR(taskChan, 10, (u32) 0x00000000);    /* var[10] */
-       MCD_SET_VAR(taskChan, 12, (u32) 0x00000000);    /* var[12] */
-       MCD_SET_VAR(taskChan, 13, (u32) 0x0000ffff);    /* var[13] */
-       MCD_SET_VAR(taskChan, 14, (u32) 0xffffffff);    /* var[14] */
-       MCD_SET_VAR(taskChan, 15, (u32) 0x00000004);    /* var[15] */
-       MCD_SET_VAR(taskChan, 16, (u32) 0x00000008);    /* var[16] */
-       MCD_SET_VAR(taskChan, 24, (u32) 0x00000000);    /* inc[0] */
-       MCD_SET_VAR(taskChan, 25, (u32) 0x60000000);    /* inc[1] */
-       MCD_SET_VAR(taskChan, 26, (u32) 0x40000000);    /* inc[2] */
-       MCD_SET_VAR(taskChan, 27, (u32) 0xc000fffc);    /* inc[3] */
-       MCD_SET_VAR(taskChan, 28, (u32) 0xe0000004);    /* inc[4] */
-       MCD_SET_VAR(taskChan, 29, (u32) 0x80000000);    /* inc[5] */
-       MCD_SET_VAR(taskChan, 30, (u32) 0x4000ffff);    /* inc[6] */
-       MCD_SET_VAR(taskChan, 31, (u32) 0xe0000001);    /* inc[7] */
-
-       /* Set the task's Enable bit in its Task Control Register */
-       MCD_dmaBar->taskControl[channel] |= (u16) 0x8000;
-}
index a75572fe5dec31073363f09dbae4ee4bf4b3fdf5..48811eaaeb361612c0a8aa2af96c9a04124e3fc7 100644 (file)
@@ -5,7 +5,6 @@
 
 obj-$(CONFIG_DMA) += dma-uclass.o
 
-obj-$(CONFIG_FSLDMAFEC) += MCD_tasksInit.o MCD_dmaApi.o MCD_tasks.o
 obj-$(CONFIG_APBH_DMA) += apbh_dma.o
 obj-$(CONFIG_BCM6348_IUDMA) += bcm6348-iudma.o
 obj-$(CONFIG_FSL_DMA) += fsl_dma.o
index 837c6f1180da6bb3a64ce0988572194b1f821456..11fc0fe1c800a847ccaa8fc7c3830ffe079f5580 100644 (file)
@@ -1,4 +1,5 @@
 menu "Fastboot support"
+       depends on CMDLINE
 
 config FASTBOOT
        bool
index 29304fd7775921b6fe7e665fe816a92cae05b477..23ad2c29d0aadcc715981044448127ea0c48e7fd 100644 (file)
@@ -471,14 +471,6 @@ config SYS_UNIFY_CACHE
        depends on MCFFEC
        bool "Invalidate icache during ethernet operations"
 
-config FSLDMAFEC
-        bool "ColdFire DMA Ethernet Support"
-       select PHYLIB
-       select SYS_DISCOVER_PHY
-       help
-         This driver supports the network interface units in the
-         ColdFire family.
-
 config KS8851_MLL
        bool "Microchip KS8851-MLL controller driver"
        help
@@ -903,6 +895,23 @@ config MEDIATEK_ETH
          This Driver support MediaTek Ethernet GMAC
          Say Y to enable support for the MediaTek Ethernet GMAC.
 
+config HIFEMAC_ETH
+       bool "HiSilicon Fast Ethernet Controller"
+       select DM_CLK
+       select DM_RESET
+       select PHYLIB
+       help
+         This driver supports HIFEMAC Ethernet controller found on
+         HiSilicon SoCs.
+
+config HIFEMAC_MDIO
+       bool "HiSilicon Fast Ethernet Controller MDIO interface"
+       depends on DM_MDIO
+       select DM_CLK
+       help
+         This driver supports the internal MDIO interface of HIFEMAC
+         Ethernet controller.
+
 config HIGMACV300_ETH
        bool "HiSilicon Gigabit Ethernet Controller"
        select DM_RESET
index 1d444f5b4a69ebebf0ed62619bd2c71d1a138494..f9aed1646c961543f34f4a66e5085f13ba417ac9 100644 (file)
@@ -37,7 +37,6 @@ obj-$(CONFIG_ETH_SANDBOX_RAW) += sandbox-raw.o
 obj-$(CONFIG_FEC_MXC) += fec_mxc.o
 obj-$(CONFIG_FMAN_ENET) += fm/
 obj-$(CONFIG_FMAN_ENET) += fsl_mdio.o
-obj-$(CONFIG_FSLDMAFEC) += fsl_mcdmafec.o mcfmii.o
 obj-$(CONFIG_FSL_ENETC) += fsl_enetc.o fsl_enetc_mdio.o
 obj-$(CONFIG_FSL_LS_MDIO) += fsl_ls_mdio.o
 obj-$(CONFIG_FSL_MC_ENET) += fsl-mc/
@@ -47,6 +46,8 @@ obj-$(CONFIG_FSL_PFE) += pfe_eth/
 obj-$(CONFIG_FTGMAC100) += ftgmac100.o
 obj-$(CONFIG_FTMAC100) += ftmac100.o
 obj-$(CONFIG_GMAC_ROCKCHIP) += gmac_rockchip.o
+obj-$(CONFIG_HIFEMAC_ETH) += hifemac.o
+obj-$(CONFIG_HIFEMAC_MDIO) += hifemac_mdio.o
 obj-$(CONFIG_HIGMACV300_ETH) += higmacv300.o
 obj-$(CONFIG_KS8851_MLL) += ks8851_mll.o
 obj-$(CONFIG_KSZ9477) += ksz9477.o
index 20b86e74cecf31d769fb5aeb9cfb975973c3a95a..a174344b3ef512414b7639c13f7fb99f20253bbf 100644 (file)
@@ -19,6 +19,7 @@
 #include <net.h>
 #include <pci.h>
 #include <reset.h>
+#include <phys2bus.h>
 #include <asm/cache.h>
 #include <dm/device_compat.h>
 #include <dm/device-internal.h>
@@ -232,8 +233,10 @@ static void tx_descs_init(struct dw_eth_dev *priv)
 
        for (idx = 0; idx < CFG_TX_DESCR_NUM; idx++) {
                desc_p = &desc_table_p[idx];
-               desc_p->dmamac_addr = (ulong)&txbuffs[idx * CFG_ETH_BUFSIZE];
-               desc_p->dmamac_next = (ulong)&desc_table_p[idx + 1];
+               desc_p->dmamac_addr = dev_phys_to_bus(priv->dev,
+                               (ulong)&txbuffs[idx * CFG_ETH_BUFSIZE]);
+               desc_p->dmamac_next = dev_phys_to_bus(priv->dev,
+                               (ulong)&desc_table_p[idx + 1]);
 
 #if defined(CONFIG_DW_ALTDESCRIPTOR)
                desc_p->txrx_status &= ~(DESC_TXSTS_TXINT | DESC_TXSTS_TXLAST |
@@ -251,14 +254,15 @@ static void tx_descs_init(struct dw_eth_dev *priv)
        }
 
        /* Correcting the last pointer of the chain */
-       desc_p->dmamac_next = (ulong)&desc_table_p[0];
+       desc_p->dmamac_next = dev_phys_to_bus(priv->dev, (ulong)&desc_table_p[0]);
 
        /* Flush all Tx buffer descriptors at once */
        flush_dcache_range((ulong)priv->tx_mac_descrtable,
                           (ulong)priv->tx_mac_descrtable +
                           sizeof(priv->tx_mac_descrtable));
 
-       writel((ulong)&desc_table_p[0], &dma_p->txdesclistaddr);
+       writel(dev_phys_to_bus(priv->dev, (ulong)&desc_table_p[0]),
+                       &dma_p->txdesclistaddr);
        priv->tx_currdescnum = 0;
 }
 
@@ -280,8 +284,10 @@ static void rx_descs_init(struct dw_eth_dev *priv)
 
        for (idx = 0; idx < CFG_RX_DESCR_NUM; idx++) {
                desc_p = &desc_table_p[idx];
-               desc_p->dmamac_addr = (ulong)&rxbuffs[idx * CFG_ETH_BUFSIZE];
-               desc_p->dmamac_next = (ulong)&desc_table_p[idx + 1];
+               desc_p->dmamac_addr = dev_phys_to_bus(priv->dev,
+                               (ulong)&rxbuffs[idx * CFG_ETH_BUFSIZE]);
+               desc_p->dmamac_next = dev_phys_to_bus(priv->dev,
+                               (ulong)&desc_table_p[idx + 1]);
 
                desc_p->dmamac_cntl =
                        (MAC_MAX_FRAME_SZ & DESC_RXCTRL_SIZE1MASK) |
@@ -291,14 +297,15 @@ static void rx_descs_init(struct dw_eth_dev *priv)
        }
 
        /* Correcting the last pointer of the chain */
-       desc_p->dmamac_next = (ulong)&desc_table_p[0];
+       desc_p->dmamac_next = dev_phys_to_bus(priv->dev, (ulong)&desc_table_p[0]);
 
        /* Flush all Rx buffer descriptors at once */
        flush_dcache_range((ulong)priv->rx_mac_descrtable,
                           (ulong)priv->rx_mac_descrtable +
                           sizeof(priv->rx_mac_descrtable));
 
-       writel((ulong)&desc_table_p[0], &dma_p->rxdesclistaddr);
+       writel(dev_phys_to_bus(priv->dev, (ulong)&desc_table_p[0]),
+                       &dma_p->rxdesclistaddr);
        priv->rx_currdescnum = 0;
 }
 
@@ -448,7 +455,7 @@ static int _dw_eth_send(struct dw_eth_dev *priv, void *packet, int length)
        ulong desc_start = (ulong)desc_p;
        ulong desc_end = desc_start +
                roundup(sizeof(*desc_p), ARCH_DMA_MINALIGN);
-       ulong data_start = desc_p->dmamac_addr;
+       ulong data_start = dev_bus_to_phys(priv->dev, desc_p->dmamac_addr);
        ulong data_end = data_start + roundup(length, ARCH_DMA_MINALIGN);
        /*
         * Strictly we only need to invalidate the "txrx_status" field
@@ -515,7 +522,7 @@ static int _dw_eth_recv(struct dw_eth_dev *priv, uchar **packetp)
        ulong desc_start = (ulong)desc_p;
        ulong desc_end = desc_start +
                roundup(sizeof(*desc_p), ARCH_DMA_MINALIGN);
-       ulong data_start = desc_p->dmamac_addr;
+       ulong data_start = dev_bus_to_phys(priv->dev, desc_p->dmamac_addr);
        ulong data_end;
 
        /* Invalidate entire buffer descriptor */
@@ -532,7 +539,8 @@ static int _dw_eth_recv(struct dw_eth_dev *priv, uchar **packetp)
                /* Invalidate received data */
                data_end = data_start + roundup(length, ARCH_DMA_MINALIGN);
                invalidate_dcache_range(data_start, data_end);
-               *packetp = (uchar *)(ulong)desc_p->dmamac_addr;
+               *packetp = (uchar *)(ulong)dev_bus_to_phys(priv->dev,
+                               desc_p->dmamac_addr);
        }
 
        return length;
@@ -757,6 +765,7 @@ int designware_eth_probe(struct udevice *dev)
                goto mdio_err;
        }
        priv->bus = miiphy_get_dev_by_name(dev->name);
+       priv->dev = dev;
 
        ret = dw_phy_init(priv, dev);
        debug("%s, ret=%d\n", __func__, ret);
index 9da4e902cb0d598849618fa18df9afb208158af0..918a38615ad6bd67b5f4484cc8b94583908a5026 100644 (file)
@@ -241,6 +241,7 @@ struct dw_eth_dev {
        int clock_count;        /* number of clock in clock list */
 #endif
 
+       struct udevice *dev;
        struct phy_device *phydev;
        struct mii_dev *bus;
 };
index 18466cfe257e393f08135dafbb344604c7b9427c..a4e3698c600317ebb1c90ffbca49d917f1b8e6aa 100644 (file)
@@ -746,6 +746,7 @@ static int eqos_start(struct udevice *dev)
        u32 val, tx_fifo_sz, rx_fifo_sz, tqs, rqs, pbl;
        ulong last_rx_desc;
        ulong desc_pad;
+       ulong addr64;
 
        debug("%s(dev=%p):\n", __func__, dev);
 
@@ -1039,25 +1040,25 @@ static int eqos_start(struct udevice *dev)
 
        for (i = 0; i < EQOS_DESCRIPTORS_RX; i++) {
                struct eqos_desc *rx_desc = eqos_get_desc(eqos, i, true);
-               rx_desc->des0 = (u32)(ulong)(eqos->rx_dma_buf +
-                                            (i * EQOS_MAX_PACKET_SIZE));
+
+               addr64 = (ulong)(eqos->rx_dma_buf + (i * EQOS_MAX_PACKET_SIZE));
+               rx_desc->des0 = lower_32_bits(addr64);
+               rx_desc->des1 = upper_32_bits(addr64);
                rx_desc->des3 = EQOS_DESC3_OWN | EQOS_DESC3_BUF1V;
                mb();
                eqos->config->ops->eqos_flush_desc(rx_desc);
-               eqos->config->ops->eqos_inval_buffer(eqos->rx_dma_buf +
-                                               (i * EQOS_MAX_PACKET_SIZE),
-                                               EQOS_MAX_PACKET_SIZE);
+               eqos->config->ops->eqos_inval_buffer((void *)addr64, EQOS_MAX_PACKET_SIZE);
        }
 
-       writel(0, &eqos->dma_regs->ch0_txdesc_list_haddress);
-       writel((ulong)eqos_get_desc(eqos, 0, false),
-               &eqos->dma_regs->ch0_txdesc_list_address);
+       addr64 = (ulong)eqos_get_desc(eqos, 0, false);
+       writel(upper_32_bits(addr64), &eqos->dma_regs->ch0_txdesc_list_haddress);
+       writel(lower_32_bits(addr64), &eqos->dma_regs->ch0_txdesc_list_address);
        writel(EQOS_DESCRIPTORS_TX - 1,
               &eqos->dma_regs->ch0_txdesc_ring_length);
 
-       writel(0, &eqos->dma_regs->ch0_rxdesc_list_haddress);
-       writel((ulong)eqos_get_desc(eqos, 0, true),
-               &eqos->dma_regs->ch0_rxdesc_list_address);
+       addr64 = (ulong)eqos_get_desc(eqos, 0, true);
+       writel(upper_32_bits(addr64), &eqos->dma_regs->ch0_rxdesc_list_haddress);
+       writel(lower_32_bits(addr64), &eqos->dma_regs->ch0_rxdesc_list_address);
        writel(EQOS_DESCRIPTORS_RX - 1,
               &eqos->dma_regs->ch0_rxdesc_ring_length);
 
@@ -1162,8 +1163,8 @@ static int eqos_send(struct udevice *dev, void *packet, int length)
        eqos->tx_desc_idx++;
        eqos->tx_desc_idx %= EQOS_DESCRIPTORS_TX;
 
-       tx_desc->des0 = (ulong)eqos->tx_dma_buf;
-       tx_desc->des1 = 0;
+       tx_desc->des0 = lower_32_bits((ulong)eqos->tx_dma_buf);
+       tx_desc->des1 = upper_32_bits((ulong)eqos->tx_dma_buf);
        tx_desc->des2 = length;
        /*
         * Make sure that if HW sees the _OWN write below, it will see all the
@@ -1234,14 +1235,17 @@ static int eqos_free_pkt(struct udevice *dev, uchar *packet, int length)
                for (idx = eqos->rx_desc_idx - idx_mask;
                     idx <= eqos->rx_desc_idx;
                     idx++) {
+                       ulong addr64;
+
                        rx_desc = eqos_get_desc(eqos, idx, true);
                        rx_desc->des0 = 0;
+                       rx_desc->des1 = 0;
                        mb();
                        eqos->config->ops->eqos_flush_desc(rx_desc);
                        eqos->config->ops->eqos_inval_buffer(packet, length);
-                       rx_desc->des0 = (u32)(ulong)(eqos->rx_dma_buf +
-                                            (idx * EQOS_MAX_PACKET_SIZE));
-                       rx_desc->des1 = 0;
+                       addr64 = (ulong)(eqos->rx_dma_buf + (idx * EQOS_MAX_PACKET_SIZE));
+                       rx_desc->des0 = lower_32_bits(addr64);
+                       rx_desc->des1 = upper_32_bits(addr64);
                        rx_desc->des2 = 0;
                        /*
                         * Make sure that if HW sees the _OWN write below,
index 41e6ba760e2992f741d7dd5b7390967c121892e7..84a2a7cf90494a1b00bd54fb7de81994c5590d3c 100644 (file)
@@ -5718,15 +5718,9 @@ static const struct eth_ops e1000_eth_ops = {
        .write_hwaddr = e1000_write_hwaddr,
 };
 
-static const struct udevice_id e1000_eth_ids[] = {
-       { .compatible = "intel,e1000" },
-       { }
-};
-
 U_BOOT_DRIVER(eth_e1000) = {
        .name   = "eth_e1000",
        .id     = UCLASS_ETH,
-       .of_match = e1000_eth_ids,
        .bind   = e1000_eth_bind,
        .probe  = e1000_eth_probe,
        .ops    = &e1000_eth_ops,
index 7dfa82190949a29a89b40adbff433e4a3cd0bcab..a8caa0f0927dbc60cc6f4bc367ece39d1678efb1 100644 (file)
@@ -3,7 +3,6 @@
  * Copyright 2009-2011 Freescale Semiconductor, Inc.
  *     Dave Liu <daveliu@freescale.com>
  */
-#include <common.h>
 #include <env.h>
 #include <fs_loader.h>
 #include <image.h>
diff --git a/drivers/net/fsl_mcdmafec.c b/drivers/net/fsl_mcdmafec.c
deleted file mode 100644 (file)
index cc61a10..0000000
+++ /dev/null
@@ -1,592 +0,0 @@
-// SPDX-License-Identifier: GPL-2.0+
-/*
- * (C) Copyright 2000-2004
- * Wolfgang Denk, DENX Software Engineering, wd@denx.de.
- *
- * (C) Copyright 2007 Freescale Semiconductor, Inc.
- * TsiChung Liew (Tsi-Chung.Liew@freescale.com)
- *
- * Conversion to DM
- * (C) 2019 Angelo Dureghello <angelo.dureghello@timesys.com>
- */
-
-#include <common.h>
-#include <env.h>
-#include <hang.h>
-#include <malloc.h>
-#include <command.h>
-#include <config.h>
-#include <net.h>
-#include <miiphy.h>
-#include <asm/global_data.h>
-#include <linux/delay.h>
-#include <linux/mii.h>
-#include <asm/immap.h>
-#include <asm/fsl_mcdmafec.h>
-
-#include "MCD_dma.h"
-
-#undef ET_DEBUG
-#undef MII_DEBUG
-
-/* Ethernet Transmit and Receive Buffers */
-#define DBUF_LENGTH            1520
-#define PKT_MAXBUF_SIZE                1518
-#define FIFO_ERRSTAT           (FIFO_STAT_RXW | FIFO_STAT_UF | FIFO_STAT_OF)
-
-/* RxBD bits definitions */
-#define BD_ENET_RX_ERR (BD_ENET_RX_LG | BD_ENET_RX_NO | BD_ENET_RX_CR | \
-                        BD_ENET_RX_OV | BD_ENET_RX_TR)
-
-DECLARE_GLOBAL_DATA_PTR;
-
-static void init_eth_info(struct fec_info_dma *info)
-{
-       /* setup Receive and Transmit buffer descriptor */
-#ifdef CFG_SYS_FEC_BUF_USE_SRAM
-       static u32 tmp;
-
-       if (info->index == 0)
-               tmp = CFG_SYS_INIT_RAM_ADDR + 0x1000;
-       else
-               info->rxbd = (cbd_t *)DBUF_LENGTH;
-
-       info->rxbd = (cbd_t *)((u32)info->rxbd + tmp);
-       tmp = (u32)info->rxbd;
-       info->txbd =
-           (cbd_t *)((u32)info->txbd + tmp +
-           (PKTBUFSRX * sizeof(cbd_t)));
-       tmp = (u32)info->txbd;
-       info->txbuf =
-           (char *)((u32)info->txbuf + tmp +
-           (CFG_SYS_TX_ETH_BUFFER * sizeof(cbd_t)));
-       tmp = (u32)info->txbuf;
-#else
-       info->rxbd =
-           (cbd_t *)memalign(CONFIG_SYS_CACHELINE_SIZE,
-                              (PKTBUFSRX * sizeof(cbd_t)));
-       info->txbd =
-           (cbd_t *)memalign(CONFIG_SYS_CACHELINE_SIZE,
-                              (CFG_SYS_TX_ETH_BUFFER * sizeof(cbd_t)));
-       info->txbuf =
-           (char *)memalign(CONFIG_SYS_CACHELINE_SIZE, DBUF_LENGTH);
-#endif
-
-#ifdef ET_DEBUG
-       printf("rxbd %x txbd %x\n", (int)info->rxbd, (int)info->txbd);
-#endif
-       info->phy_name = (char *)memalign(CONFIG_SYS_CACHELINE_SIZE, 32);
-}
-
-static void fec_halt(struct udevice *dev)
-{
-       struct fec_info_dma *info = dev_get_priv(dev);
-       volatile fecdma_t *fecp = (fecdma_t *)info->iobase;
-       int counter = 0xffff;
-
-       /* issue graceful stop command to the FEC transmitter if necessary */
-       fecp->tcr |= FEC_TCR_GTS;
-
-       /* wait for graceful stop to register */
-       while ((counter--) && (!(fecp->eir & FEC_EIR_GRA)))
-               ;
-
-       /* Disable DMA tasks */
-       MCD_killDma(info->tx_task);
-       MCD_killDma(info->rx_task);
-
-       /* Disable the Ethernet Controller */
-       fecp->ecr &= ~FEC_ECR_ETHER_EN;
-
-       /* Clear FIFO status registers */
-       fecp->rfsr &= FIFO_ERRSTAT;
-       fecp->tfsr &= FIFO_ERRSTAT;
-
-       fecp->frst = 0x01000000;
-
-       /* Issue a reset command to the FEC chip */
-       fecp->ecr |= FEC_ECR_RESET;
-
-       /* wait at least 20 clock cycles */
-       mdelay(10);
-
-#ifdef ET_DEBUG
-       printf("Ethernet task stopped\n");
-#endif
-}
-
-#ifdef ET_DEBUG
-static void dbg_fec_regs(struct eth_device *dev)
-{
-       struct fec_info_dma *info = dev->priv;
-       volatile fecdma_t *fecp = (fecdma_t *)info->iobase;
-
-       printf("=====\n");
-       printf("ievent       %x - %x\n", (int)&fecp->eir, fecp->eir);
-       printf("imask        %x - %x\n", (int)&fecp->eimr, fecp->eimr);
-       printf("ecntrl       %x - %x\n", (int)&fecp->ecr, fecp->ecr);
-       printf("mii_mframe   %x - %x\n", (int)&fecp->mmfr, fecp->mmfr);
-       printf("mii_speed    %x - %x\n", (int)&fecp->mscr, fecp->mscr);
-       printf("mii_ctrlstat %x - %x\n", (int)&fecp->mibc, fecp->mibc);
-       printf("r_cntrl      %x - %x\n", (int)&fecp->rcr, fecp->rcr);
-       printf("r hash       %x - %x\n", (int)&fecp->rhr, fecp->rhr);
-       printf("x_cntrl      %x - %x\n", (int)&fecp->tcr, fecp->tcr);
-       printf("padr_l       %x - %x\n", (int)&fecp->palr, fecp->palr);
-       printf("padr_u       %x - %x\n", (int)&fecp->paur, fecp->paur);
-       printf("op_pause     %x - %x\n", (int)&fecp->opd, fecp->opd);
-       printf("iadr_u       %x - %x\n", (int)&fecp->iaur, fecp->iaur);
-       printf("iadr_l       %x - %x\n", (int)&fecp->ialr, fecp->ialr);
-       printf("gadr_u       %x - %x\n", (int)&fecp->gaur, fecp->gaur);
-       printf("gadr_l       %x - %x\n", (int)&fecp->galr, fecp->galr);
-       printf("x_wmrk       %x - %x\n", (int)&fecp->tfwr, fecp->tfwr);
-       printf("r_fdata      %x - %x\n", (int)&fecp->rfdr, fecp->rfdr);
-       printf("r_fstat      %x - %x\n", (int)&fecp->rfsr, fecp->rfsr);
-       printf("r_fctrl      %x - %x\n", (int)&fecp->rfcr, fecp->rfcr);
-       printf("r_flrfp      %x - %x\n", (int)&fecp->rlrfp, fecp->rlrfp);
-       printf("r_flwfp      %x - %x\n", (int)&fecp->rlwfp, fecp->rlwfp);
-       printf("r_frfar      %x - %x\n", (int)&fecp->rfar, fecp->rfar);
-       printf("r_frfrp      %x - %x\n", (int)&fecp->rfrp, fecp->rfrp);
-       printf("r_frfwp      %x - %x\n", (int)&fecp->rfwp, fecp->rfwp);
-       printf("t_fdata      %x - %x\n", (int)&fecp->tfdr, fecp->tfdr);
-       printf("t_fstat      %x - %x\n", (int)&fecp->tfsr, fecp->tfsr);
-       printf("t_fctrl      %x - %x\n", (int)&fecp->tfcr, fecp->tfcr);
-       printf("t_flrfp      %x - %x\n", (int)&fecp->tlrfp, fecp->tlrfp);
-       printf("t_flwfp      %x - %x\n", (int)&fecp->tlwfp, fecp->tlwfp);
-       printf("t_ftfar      %x - %x\n", (int)&fecp->tfar, fecp->tfar);
-       printf("t_ftfrp      %x - %x\n", (int)&fecp->tfrp, fecp->tfrp);
-       printf("t_ftfwp      %x - %x\n", (int)&fecp->tfwp, fecp->tfwp);
-       printf("frst         %x - %x\n", (int)&fecp->frst, fecp->frst);
-       printf("ctcwr        %x - %x\n", (int)&fecp->ctcwr, fecp->ctcwr);
-}
-#endif
-
-static void set_fec_duplex_speed(volatile fecdma_t *fecp, int dup_spd)
-{
-       struct bd_info *bd = gd->bd;
-
-       if ((dup_spd >> 16) == FULL) {
-               /* Set maximum frame length */
-               fecp->rcr = FEC_RCR_MAX_FL(PKT_MAXBUF_SIZE) | FEC_RCR_MII_MODE |
-                   FEC_RCR_PROM | 0x100;
-               fecp->tcr = FEC_TCR_FDEN;
-       } else {
-               /* Half duplex mode */
-               fecp->rcr = FEC_RCR_MAX_FL(PKT_MAXBUF_SIZE) |
-                   FEC_RCR_MII_MODE | FEC_RCR_DRT;
-               fecp->tcr &= ~FEC_TCR_FDEN;
-       }
-
-       if ((dup_spd & 0xFFFF) == _100BASET) {
-#ifdef MII_DEBUG
-               printf("100Mbps\n");
-#endif
-               bd->bi_ethspeed = 100;
-       } else {
-#ifdef MII_DEBUG
-               printf("10Mbps\n");
-#endif
-               bd->bi_ethspeed = 10;
-       }
-}
-
-static void fec_set_hwaddr(volatile fecdma_t *fecp, u8 *mac)
-{
-       u8 curr_byte;           /* byte for which to compute the CRC */
-       int byte;               /* loop - counter */
-       int bit;                /* loop - counter */
-       u32 crc = 0xffffffff;   /* initial value */
-
-       for (byte = 0; byte < 6; byte++) {
-               curr_byte = mac[byte];
-               for (bit = 0; bit < 8; bit++) {
-                       if ((curr_byte & 0x01) ^ (crc & 0x01)) {
-                               crc >>= 1;
-                               crc = crc ^ 0xedb88320;
-                       } else {
-                               crc >>= 1;
-                       }
-                       curr_byte >>= 1;
-               }
-       }
-
-       crc = crc >> 26;
-
-       /* Set individual hash table register */
-       if (crc >= 32) {
-               fecp->ialr = (1 << (crc - 32));
-               fecp->iaur = 0;
-       } else {
-               fecp->ialr = 0;
-               fecp->iaur = (1 << crc);
-       }
-
-       /* Set physical address */
-       fecp->palr = (mac[0] << 24) + (mac[1] << 16) + (mac[2] << 8) + mac[3];
-       fecp->paur = (mac[4] << 24) + (mac[5] << 16) + 0x8808;
-
-       /* Clear multicast address hash table */
-       fecp->gaur = 0;
-       fecp->galr = 0;
-}
-
-static int fec_init(struct udevice *dev)
-{
-       struct fec_info_dma *info = dev_get_priv(dev);
-       volatile fecdma_t *fecp = (fecdma_t *)info->iobase;
-       int rval, i;
-       uchar enetaddr[6];
-
-#ifdef ET_DEBUG
-       printf("fec_init: iobase 0x%08x ...\n", info->iobase);
-#endif
-
-       fecpin_setclear(info, 1);
-       fec_halt(dev);
-
-       mii_init();
-       set_fec_duplex_speed(fecp, info->dup_spd);
-
-       /* We use strictly polling mode only */
-       fecp->eimr = 0;
-
-       /* Clear any pending interrupt */
-       fecp->eir = 0xffffffff;
-
-       /* Set station address   */
-       if (info->index == 0)
-               rval = eth_env_get_enetaddr("ethaddr", enetaddr);
-       else
-               rval = eth_env_get_enetaddr("eth1addr", enetaddr);
-
-       if (!rval) {
-               puts("Please set a valid MAC address\n");
-               return -EINVAL;
-       }
-
-       fec_set_hwaddr(fecp, enetaddr);
-
-       /* Set Opcode/Pause Duration Register */
-       fecp->opd = 0x00010020;
-
-       /* Setup Buffers and Buffer Descriptors */
-       info->rx_idx = 0;
-       info->tx_idx = 0;
-
-       /* Setup Receiver Buffer Descriptors (13.14.24.18)
-        * Settings:     Empty, Wrap */
-       for (i = 0; i < PKTBUFSRX; i++) {
-               info->rxbd[i].cbd_sc = BD_ENET_RX_EMPTY;
-               info->rxbd[i].cbd_datlen = PKTSIZE_ALIGN;
-               info->rxbd[i].cbd_bufaddr = (uint) net_rx_packets[i];
-       }
-       info->rxbd[PKTBUFSRX - 1].cbd_sc |= BD_ENET_RX_WRAP;
-
-       /* Setup Ethernet Transmitter Buffer Descriptors (13.14.24.19)
-        * Settings:    Last, Tx CRC */
-       for (i = 0; i < CFG_SYS_TX_ETH_BUFFER; i++) {
-               info->txbd[i].cbd_sc = 0;
-               info->txbd[i].cbd_datlen = 0;
-               info->txbd[i].cbd_bufaddr = (uint) (&info->txbuf[0]);
-       }
-       info->txbd[CFG_SYS_TX_ETH_BUFFER - 1].cbd_sc |= BD_ENET_TX_WRAP;
-
-       info->used_tbd_idx = 0;
-       info->clean_tbd_num = CFG_SYS_TX_ETH_BUFFER;
-
-       /* Set Rx FIFO alarm and granularity value */
-       fecp->rfcr = 0x0c000000;
-       fecp->rfar = 0x0000030c;
-
-       /* Set Tx FIFO granularity value */
-       fecp->tfcr = FIFO_CTRL_FRAME | FIFO_CTRL_GR(6) | 0x00040000;
-       fecp->tfar = 0x00000080;
-
-       fecp->tfwr = 0x2;
-       fecp->ctcwr = 0x03000000;
-
-       /* Enable DMA receive task */
-       MCD_startDma(info->rx_task,
-                    (s8 *)info->rxbd,
-                    0,
-                    (s8 *)&fecp->rfdr,
-                    4,
-                    0,
-                    4,
-                    info->rx_init,
-                    info->rx_pri,
-                    (MCD_FECRX_DMA | MCD_TT_FLAGS_DEF),
-                    (MCD_NO_CSUM | MCD_NO_BYTE_SWAP)
-           );
-
-       /* Enable DMA tx task with no ready buffer descriptors */
-       MCD_startDma(info->tx_task,
-                    (s8 *)info->txbd,
-                    0,
-                    (s8 *)&fecp->tfdr,
-                    4,
-                    0,
-                    4,
-                    info->tx_init,
-                    info->tx_pri,
-                    (MCD_FECTX_DMA | MCD_TT_FLAGS_DEF),
-                    (MCD_NO_CSUM | MCD_NO_BYTE_SWAP)
-           );
-
-       /* Now enable the transmit and receive processing */
-       fecp->ecr |= FEC_ECR_ETHER_EN;
-
-       return 0;
-}
-
-static int mcdmafec_init(struct udevice *dev)
-{
-       return fec_init(dev);
-}
-
-static int mcdmafec_send(struct udevice *dev, void *packet, int length)
-{
-       struct fec_info_dma *info = dev_get_priv(dev);
-       cbd_t *p_tbd, *p_used_tbd;
-       u16 phy_status;
-
-       miiphy_read(dev->name, info->phy_addr, MII_BMSR, &phy_status);
-
-       /* process all the consumed TBDs */
-       while (info->clean_tbd_num < CFG_SYS_TX_ETH_BUFFER) {
-               p_used_tbd = &info->txbd[info->used_tbd_idx];
-               if (p_used_tbd->cbd_sc & BD_ENET_TX_READY) {
-#ifdef ET_DEBUG
-                       printf("Cannot clean TBD %d, in use\n",
-                              info->clean_tbd_num);
-#endif
-                       return 0;
-               }
-
-               /* clean this buffer descriptor */
-               if (info->used_tbd_idx == (CFG_SYS_TX_ETH_BUFFER - 1))
-                       p_used_tbd->cbd_sc = BD_ENET_TX_WRAP;
-               else
-                       p_used_tbd->cbd_sc = 0;
-
-               /* update some indeces for a correct handling of TBD ring */
-               info->clean_tbd_num++;
-               info->used_tbd_idx = (info->used_tbd_idx + 1)
-                       % CFG_SYS_TX_ETH_BUFFER;
-       }
-
-       /* Check for valid length of data. */
-       if (length > 1500 || length <= 0)
-               return -1;
-
-       /* Check the number of vacant TxBDs. */
-       if (info->clean_tbd_num < 1) {
-               printf("No available TxBDs ...\n");
-               return -1;
-       }
-
-       /* Get the first TxBD to send the mac header */
-       p_tbd = &info->txbd[info->tx_idx];
-       p_tbd->cbd_datlen = length;
-       p_tbd->cbd_bufaddr = (u32)packet;
-       p_tbd->cbd_sc |= BD_ENET_TX_LAST | BD_ENET_TX_TC | BD_ENET_TX_READY;
-       info->tx_idx = (info->tx_idx + 1) % CFG_SYS_TX_ETH_BUFFER;
-
-       /* Enable DMA transmit task */
-       MCD_continDma(info->tx_task);
-
-       info->clean_tbd_num -= 1;
-
-       /* wait until frame is sent . */
-       while (p_tbd->cbd_sc & BD_ENET_TX_READY)
-               udelay(10);
-
-       return (int)(info->txbd[info->tx_idx].cbd_sc & BD_ENET_TX_STATS);
-}
-
-static int mcdmafec_recv(struct udevice *dev, int flags, uchar **packetp)
-{
-       struct fec_info_dma *info = dev_get_priv(dev);
-       volatile fecdma_t *fecp = (fecdma_t *)info->iobase;
-
-       cbd_t *prbd = &info->rxbd[info->rx_idx];
-       u32 ievent;
-       int frame_length, len = 0;
-
-       /* Check if any critical events have happened */
-       ievent = fecp->eir;
-       if (ievent != 0) {
-               fecp->eir = ievent;
-
-               if (ievent & (FEC_EIR_BABT | FEC_EIR_TXERR | FEC_EIR_RXERR)) {
-                       printf("fec_recv: error\n");
-                       fec_halt(dev);
-                       fec_init(dev);
-                       return 0;
-               }
-
-               if (ievent & FEC_EIR_HBERR) {
-                       /* Heartbeat error */
-                       fecp->tcr |= FEC_TCR_GTS;
-               }
-
-               if (ievent & FEC_EIR_GRA) {
-                       /* Graceful stop complete */
-                       if (fecp->tcr & FEC_TCR_GTS) {
-                               printf("fec_recv: tcr_gts\n");
-                               fec_halt(dev);
-                               fecp->tcr &= ~FEC_TCR_GTS;
-                               fec_init(dev);
-                       }
-               }
-       }
-
-       if (!(prbd->cbd_sc & BD_ENET_RX_EMPTY)) {
-               if ((prbd->cbd_sc & BD_ENET_RX_LAST) &&
-                   !(prbd->cbd_sc & BD_ENET_RX_ERR) &&
-                   ((prbd->cbd_datlen - 4) > 14)) {
-                       /* Get buffer address and size */
-                       frame_length = prbd->cbd_datlen - 4;
-
-                       /* Fill the buffer and pass it to upper layers */
-                       net_process_received_packet((uchar *)prbd->cbd_bufaddr,
-                                                   frame_length);
-                       len = frame_length;
-               }
-
-               /* Reset buffer descriptor as empty */
-               if (info->rx_idx == (PKTBUFSRX - 1))
-                       prbd->cbd_sc = (BD_ENET_RX_WRAP | BD_ENET_RX_EMPTY);
-               else
-                       prbd->cbd_sc = BD_ENET_RX_EMPTY;
-
-               prbd->cbd_datlen = PKTSIZE_ALIGN;
-
-               /* Now, we have an empty RxBD, restart the DMA receive task */
-               MCD_continDma(info->rx_task);
-
-               /* Increment BD count */
-               info->rx_idx = (info->rx_idx + 1) % PKTBUFSRX;
-       }
-
-       return len;
-}
-
-static void mcdmafec_halt(struct udevice *dev)
-{
-       fec_halt(dev);
-}
-
-static const struct eth_ops mcdmafec_ops = {
-       .start  = mcdmafec_init,
-       .send   = mcdmafec_send,
-       .recv   = mcdmafec_recv,
-       .stop   = mcdmafec_halt,
-};
-
-/*
- * Boot sequence, called just after mcffec_of_to_plat,
- * as DM way, it replaces old mcffec_initialize.
- */
-static int mcdmafec_probe(struct udevice *dev)
-{
-       struct fec_info_dma *info = dev_get_priv(dev);
-       struct eth_pdata *pdata = dev_get_plat(dev);
-       int node = dev_of_offset(dev);
-       int retval;
-       const u32 *val;
-
-       info->index = dev_seq(dev);
-       info->iobase = pdata->iobase;
-       info->miibase = pdata->iobase;
-       info->phy_addr = -1;
-
-       val = fdt_getprop(gd->fdt_blob, node, "rx-task", NULL);
-       if (val)
-               info->rx_task = fdt32_to_cpu(*val);
-
-       val = fdt_getprop(gd->fdt_blob, node, "tx-task", NULL);
-       if (val)
-               info->tx_task = fdt32_to_cpu(*val);
-
-       val = fdt_getprop(gd->fdt_blob, node, "rx-prioprity", NULL);
-       if (val)
-               info->rx_pri = fdt32_to_cpu(*val);
-
-       val = fdt_getprop(gd->fdt_blob, node, "tx-prioprity", NULL);
-       if (val)
-               info->tx_pri = fdt32_to_cpu(*val);
-
-       val = fdt_getprop(gd->fdt_blob, node, "rx-init", NULL);
-       if (val)
-               info->rx_init = fdt32_to_cpu(*val);
-
-       val = fdt_getprop(gd->fdt_blob, node, "tx-init", NULL);
-       if (val)
-               info->tx_init = fdt32_to_cpu(*val);
-
-#ifdef CFG_SYS_FEC_BUF_USE_SRAM
-       u32 tmp = CFG_SYS_INIT_RAM_ADDR + 0x1000;
-#endif
-       init_eth_info(info);
-
-#if defined(CONFIG_MII) || defined(CONFIG_CMD_MII)
-       info->bus = mdio_alloc();
-       if (!info->bus)
-               return -ENOMEM;
-       strlcpy(info->bus->name, dev->name, MDIO_NAME_LEN);
-       info->bus->read = mcffec_miiphy_read;
-       info->bus->write = mcffec_miiphy_write;
-
-       retval = mdio_register(info->bus);
-       if (retval < 0)
-               return retval;
-#endif
-
-       return 0;
-}
-
-static int mcdmafec_remove(struct udevice *dev)
-{
-       struct fec_info_dma *priv = dev_get_priv(dev);
-
-       mdio_unregister(priv->bus);
-       mdio_free(priv->bus);
-
-       return 0;
-}
-
-/*
- * Boot sequence, called 1st
- */
-static int mcdmafec_of_to_plat(struct udevice *dev)
-{
-       struct eth_pdata *pdata = dev_get_plat(dev);
-       const u32 *val;
-
-       pdata->iobase = dev_read_addr(dev);
-       /* Default to 10Mbit/s */
-       pdata->max_speed = 10;
-
-       val = fdt_getprop(gd->fdt_blob, dev_of_offset(dev), "max-speed", NULL);
-       if (val)
-               pdata->max_speed = fdt32_to_cpu(*val);
-
-       return 0;
-}
-
-static const struct udevice_id mcdmafec_ids[] = {
-       { .compatible = "fsl,mcf-dma-fec" },
-       { }
-};
-
-U_BOOT_DRIVER(mcffec) = {
-       .name   = "mcdmafec",
-       .id     = UCLASS_ETH,
-       .of_match = mcdmafec_ids,
-       .of_to_plat = mcdmafec_of_to_plat,
-       .probe  = mcdmafec_probe,
-       .remove = mcdmafec_remove,
-       .ops    = &mcdmafec_ops,
-       .priv_auto      = sizeof(struct fec_info_dma),
-       .plat_auto      = sizeof(struct eth_pdata),
-};
index 587d3658fa9fb7b03d859449b8849739e01e3c0a..9b536fd5ab890dbbbbda76fbe6fde7fc7c57bb83 100644 (file)
@@ -13,6 +13,7 @@
 
 #include <common.h>
 #include <clk.h>
+#include <reset.h>
 #include <cpu_func.h>
 #include <dm.h>
 #include <log.h>
@@ -91,6 +92,7 @@ struct ftgmac100_data {
        u32 max_speed;
 
        struct clk_bulk clks;
+       struct reset_ctl *reset_ctl;
 
        /* End of RX/TX ring buffer bits. Depend on model */
        u32 rxdes0_edorr_mask;
@@ -569,6 +571,8 @@ static int ftgmac100_of_to_plat(struct udevice *dev)
                priv->txdes0_edotr_mask = BIT(15);
        }
 
+       priv->reset_ctl = devm_reset_control_get_optional(dev, NULL);
+
        return clk_get_bulk(dev, &priv->clks);
 }
 
@@ -594,6 +598,12 @@ static int ftgmac100_probe(struct udevice *dev)
        if (ret)
                goto out;
 
+       if (priv->reset_ctl) {
+               ret = reset_deassert(priv->reset_ctl);
+               if (ret)
+                       goto out;
+       }
+
        /*
         * If DM MDIO is enabled, the MDIO bus will be initialized later in
         * dm_eth_phy_connect
@@ -629,6 +639,8 @@ static int ftgmac100_remove(struct udevice *dev)
        free(priv->phydev);
        mdio_unregister(priv->bus);
        mdio_free(priv->bus);
+       if (priv->reset_ctl)
+               reset_assert(priv->reset_ctl);
        clk_release_bulk(&priv->clks);
 
        return 0;
diff --git a/drivers/net/hifemac.c b/drivers/net/hifemac.c
new file mode 100644 (file)
index 0000000..b61a29e
--- /dev/null
@@ -0,0 +1,481 @@
+// SPDX-License-Identifier: GPL-2.0-or-later
+/*
+ * Hisilicon Fast Ethernet MAC Driver
+ * Adapted from linux
+ *
+ * Copyright (c) 2016 HiSilicon Technologies Co., Ltd.
+ * Copyright (c) 2023 Yang Xiwen <forbidden405@outlook.com>
+ */
+
+#include <dm.h>
+#include <clk.h>
+#include <miiphy.h>
+#include <net.h>
+#include <reset.h>
+#include <wait_bit.h>
+#include <asm/io.h>
+#include <dm/device_compat.h>
+#include <linux/delay.h>
+#include <linux/kernel.h>
+
+/* MAC control register list */
+#define MAC_PORTSEL                    0x0200
+#define MAC_PORTSEL_STAT_CPU           BIT(0)
+#define MAC_PORTSEL_RMII               BIT(1)
+#define MAC_PORTSET                    0x0208
+#define MAC_PORTSET_DUPLEX_FULL                BIT(0)
+#define MAC_PORTSET_LINKED             BIT(1)
+#define MAC_PORTSET_SPEED_100M         BIT(2)
+#define MAC_SET                                0x0210
+#define MAX_FRAME_SIZE                 1600
+#define MAX_FRAME_SIZE_MASK            GENMASK(10, 0)
+#define BIT_PAUSE_EN                   BIT(18)
+#define RX_COALESCE_SET                        0x0340
+#define RX_COALESCED_FRAME_OFFSET      24
+#define RX_COALESCED_FRAMES            8
+#define RX_COALESCED_TIMER             0x74
+#define QLEN_SET                       0x0344
+#define RX_DEPTH_OFFSET                        8
+#define MAX_HW_FIFO_DEPTH              64
+#define HW_TX_FIFO_DEPTH               1
+#define MAX_HW_RX_FIFO_DEPTH           (MAX_HW_FIFO_DEPTH - HW_TX_FIFO_DEPTH)
+#define HW_RX_FIFO_DEPTH               min(PKTBUFSRX, MAX_HW_RX_FIFO_DEPTH)
+#define IQFRM_DES                      0x0354
+#define RX_FRAME_LEN_MASK              GENMASK(11, 0)
+#define RX_FRAME_IN_INDEX_MASK         GENMASK(17, 12)
+#define IQ_ADDR                                0x0358
+#define EQ_ADDR                                0x0360
+#define EQFRM_LEN                      0x0364
+#define ADDRQ_STAT                     0x036C
+#define TX_CNT_INUSE_MASK              GENMASK(5, 0)
+#define BIT_TX_READY                   BIT(24)
+#define BIT_RX_READY                   BIT(25)
+/* global control register list */
+#define GLB_HOSTMAC_L32                        0x0000
+#define GLB_HOSTMAC_H16                        0x0004
+#define GLB_SOFT_RESET                 0x0008
+#define SOFT_RESET_ALL                 BIT(0)
+#define GLB_FWCTRL                     0x0010
+#define FWCTRL_VLAN_ENABLE             BIT(0)
+#define FWCTRL_FW2CPU_ENA              BIT(5)
+#define FWCTRL_FWALL2CPU               BIT(7)
+#define GLB_MACTCTRL                   0x0014
+#define MACTCTRL_UNI2CPU               BIT(1)
+#define MACTCTRL_MULTI2CPU             BIT(3)
+#define MACTCTRL_BROAD2CPU             BIT(5)
+#define MACTCTRL_MACT_ENA              BIT(7)
+#define GLB_IRQ_STAT                   0x0030
+#define GLB_IRQ_ENA                    0x0034
+#define IRQ_ENA_PORT0_MASK             GENMASK(7, 0)
+#define IRQ_ENA_PORT0                  BIT(18)
+#define IRQ_ENA_ALL                    BIT(19)
+#define GLB_IRQ_RAW                    0x0038
+#define IRQ_INT_RX_RDY                 BIT(0)
+#define IRQ_INT_TX_PER_PACKET          BIT(1)
+#define IRQ_INT_TX_FIFO_EMPTY          BIT(6)
+#define IRQ_INT_MULTI_RXRDY            BIT(7)
+#define DEF_INT_MASK                   (IRQ_INT_MULTI_RXRDY | \
+                                       IRQ_INT_TX_PER_PACKET | \
+                                       IRQ_INT_TX_FIFO_EMPTY)
+#define GLB_MAC_L32_BASE               0x0100
+#define GLB_MAC_H16_BASE               0x0104
+#define MACFLT_HI16_MASK               GENMASK(15, 0)
+#define BIT_MACFLT_ENA                 BIT(17)
+#define BIT_MACFLT_FW2CPU              BIT(21)
+#define GLB_MAC_H16(reg)               (GLB_MAC_H16_BASE + ((reg) * 0x8))
+#define GLB_MAC_L32(reg)               (GLB_MAC_L32_BASE + ((reg) * 0x8))
+#define MAX_MAC_FILTER_NUM             8
+#define MAX_UNICAST_ADDRESSES          2
+#define MAX_MULTICAST_ADDRESSES                (MAX_MAC_FILTER_NUM - \
+                                       MAX_UNICAST_ADDRESSES)
+/* software tx and rx queue number, should be power of 2 */
+#define TXQ_NUM                                64
+#define RXQ_NUM                                128
+
+#define PHY_RESET_DELAYS_PROPERTY      "hisilicon,phy-reset-delays-us"
+#define MAC_RESET_DELAY_PROPERTY       "hisilicon,mac-reset-delay-us"
+#define MAC_RESET_ASSERT_PERIOD                200000
+
+enum phy_reset_delays {
+       PRE_DELAY,
+       PULSE,
+       POST_DELAY,
+       DELAYS_NUM,
+};
+
+enum clk_type {
+       CLK_MAC,
+       CLK_BUS,
+       CLK_PHY,
+       CLK_NUM,
+};
+
+struct hisi_femac_priv {
+       void __iomem *port_base;
+       void __iomem *glb_base;
+       struct clk *clks[CLK_NUM];
+       struct reset_ctl *mac_rst;
+       struct reset_ctl *phy_rst;
+       u32 phy_reset_delays[DELAYS_NUM];
+       u32 mac_reset_delay;
+
+       struct phy_device *phy;
+
+       u32 link_status;
+};
+
+static void hisi_femac_irq_enable(struct hisi_femac_priv *priv, int irqs)
+{
+       u32 val;
+
+       val = readl(priv->glb_base + GLB_IRQ_ENA);
+       writel(val | irqs, priv->glb_base + GLB_IRQ_ENA);
+}
+
+static void hisi_femac_irq_disable(struct hisi_femac_priv *priv, int irqs)
+{
+       u32 val;
+
+       val = readl(priv->glb_base + GLB_IRQ_ENA);
+       writel(val & (~irqs), priv->glb_base + GLB_IRQ_ENA);
+}
+
+static void hisi_femac_port_init(struct hisi_femac_priv *priv)
+{
+       u32 val;
+
+       /* MAC gets link status info and phy mode by software config */
+       val = MAC_PORTSEL_STAT_CPU;
+       if (priv->phy->interface == PHY_INTERFACE_MODE_RMII)
+               val |= MAC_PORTSEL_RMII;
+       writel(val, priv->port_base + MAC_PORTSEL);
+
+       /*clear all interrupt status */
+       writel(IRQ_ENA_PORT0_MASK, priv->glb_base + GLB_IRQ_RAW);
+       hisi_femac_irq_disable(priv, IRQ_ENA_PORT0_MASK | IRQ_ENA_PORT0);
+
+       val = readl(priv->glb_base + GLB_FWCTRL);
+       val &= ~(FWCTRL_VLAN_ENABLE | FWCTRL_FWALL2CPU);
+       val |= FWCTRL_FW2CPU_ENA;
+       writel(val, priv->glb_base + GLB_FWCTRL);
+
+       val = readl(priv->glb_base + GLB_MACTCTRL);
+       val |= (MACTCTRL_BROAD2CPU | MACTCTRL_MACT_ENA);
+       writel(val, priv->glb_base + GLB_MACTCTRL);
+
+       val = readl(priv->port_base + MAC_SET);
+       val &= ~MAX_FRAME_SIZE_MASK;
+       val |= MAX_FRAME_SIZE;
+       writel(val, priv->port_base + MAC_SET);
+
+       val = RX_COALESCED_TIMER |
+               (RX_COALESCED_FRAMES << RX_COALESCED_FRAME_OFFSET);
+       writel(val, priv->port_base + RX_COALESCE_SET);
+
+       val = (HW_RX_FIFO_DEPTH << RX_DEPTH_OFFSET) | HW_TX_FIFO_DEPTH;
+       writel(val, priv->port_base + QLEN_SET);
+}
+
+static void hisi_femac_rx_refill(struct hisi_femac_priv *priv)
+{
+       int i;
+       ulong addr;
+
+       for (i = 0; i < HW_RX_FIFO_DEPTH; i++) {
+               addr = (ulong)net_rx_packets[i];
+               writel(addr, priv->port_base + IQ_ADDR);
+       }
+}
+
+static void hisi_femac_adjust_link(struct udevice *dev)
+{
+       struct hisi_femac_priv *priv = dev_get_priv(dev);
+       struct phy_device *phy = priv->phy;
+       u32 status = 0;
+
+       if (phy->link)
+               status |= MAC_PORTSET_LINKED;
+       if (phy->duplex == DUPLEX_FULL)
+               status |= MAC_PORTSET_DUPLEX_FULL;
+       if (phy->speed == SPEED_100)
+               status |= MAC_PORTSET_SPEED_100M;
+
+       writel(status, priv->port_base + MAC_PORTSET);
+}
+
+static int hisi_femac_port_reset(struct hisi_femac_priv *priv)
+{
+       u32 val;
+
+       val = readl(priv->glb_base + GLB_SOFT_RESET);
+       val |= SOFT_RESET_ALL;
+       writel(val, priv->glb_base + GLB_SOFT_RESET);
+
+       udelay(800);
+
+       val &= ~SOFT_RESET_ALL;
+       writel(val, priv->glb_base + GLB_SOFT_RESET);
+
+       return 0;
+}
+
+static int hisi_femac_set_hw_mac_addr(struct udevice *dev)
+{
+       struct hisi_femac_priv *priv = dev_get_priv(dev);
+       struct eth_pdata *plat = dev_get_plat(dev);
+       unsigned char *mac = plat->enetaddr;
+       u32 reg;
+
+       reg = mac[1] | (mac[0] << 8);
+       writel(reg, priv->glb_base + GLB_HOSTMAC_H16);
+
+       reg = mac[5] | (mac[4] << 8) | (mac[3] << 16) | (mac[2] << 24);
+       writel(reg, priv->glb_base + GLB_HOSTMAC_L32);
+
+       return 0;
+}
+
+static int hisi_femac_start(struct udevice *dev)
+{
+       int ret;
+       struct hisi_femac_priv *priv = dev_get_priv(dev);
+
+       hisi_femac_port_reset(priv);
+       hisi_femac_set_hw_mac_addr(dev);
+       hisi_femac_rx_refill(priv);
+
+       ret = phy_startup(priv->phy);
+       if (ret)
+               return log_msg_ret("Failed to startup phy", ret);
+
+       if (!priv->phy->link) {
+               debug("%s: link down\n", __func__);
+               return -ENODEV;
+       }
+
+       hisi_femac_adjust_link(dev);
+
+       writel(IRQ_ENA_PORT0_MASK, priv->glb_base + GLB_IRQ_RAW);
+       hisi_femac_irq_enable(priv, IRQ_ENA_ALL | IRQ_ENA_PORT0 | DEF_INT_MASK);
+
+       return 0;
+}
+
+static int hisi_femac_send(struct udevice *dev, void *packet, int length)
+{
+       struct hisi_femac_priv *priv = dev_get_priv(dev);
+       ulong addr = (ulong)packet;
+       int ret;
+
+       // clear previous irq
+       writel(IRQ_INT_TX_PER_PACKET, priv->glb_base + GLB_IRQ_RAW);
+
+       // flush cache
+       flush_cache(addr, length + ETH_FCS_LEN);
+
+       // write packet address
+       writel(addr, priv->port_base + EQ_ADDR);
+
+       // write packet length (and send it)
+       writel(length + ETH_FCS_LEN, priv->port_base + EQFRM_LEN);
+
+       // wait until FIFO is empty
+       ret = wait_for_bit_le32(priv->glb_base + GLB_IRQ_RAW, IRQ_INT_TX_PER_PACKET, true, 50, false);
+       if (ret == -ETIMEDOUT)
+               return log_msg_ret("FIFO timeout", ret);
+
+       return 0;
+}
+
+static int hisi_femac_recv(struct udevice *dev, int flags, uchar **packetp)
+{
+       struct hisi_femac_priv *priv = dev_get_priv(dev);
+       int val, index, length;
+
+       val = readl(priv->glb_base + GLB_IRQ_RAW);
+       if (!(val & IRQ_INT_RX_RDY))
+               return -EAGAIN;
+
+       val = readl(priv->port_base + IQFRM_DES);
+       index = (val & RX_FRAME_IN_INDEX_MASK) >> 12;
+       length = val & RX_FRAME_LEN_MASK;
+
+       // invalidate cache
+       invalidate_dcache_range((ulong)net_rx_packets[index], (ulong)net_rx_packets[index] + length);
+       *packetp = net_rx_packets[index];
+
+       // Tell hardware we will process the packet
+       writel(IRQ_INT_RX_RDY, priv->glb_base + GLB_IRQ_RAW);
+
+       return length;
+}
+
+static int hisi_femac_free_pkt(struct udevice *dev, uchar *packet, int length)
+{
+       struct hisi_femac_priv *priv = dev_get_priv(dev);
+       ulong addr = (ulong)packet;
+
+       // Tell hardware the packet can be reused
+       writel(addr, priv->port_base + IQ_ADDR);
+
+       return 0;
+}
+
+static void hisi_femac_stop(struct udevice *dev)
+{
+       struct hisi_femac_priv *priv = dev_get_priv(dev);
+
+       // assert internal reset
+       writel(SOFT_RESET_ALL, priv->glb_base + GLB_SOFT_RESET);
+}
+
+int hisi_femac_of_to_plat(struct udevice *dev)
+{
+       int ret, i;
+       struct hisi_femac_priv *priv = dev_get_priv(dev);
+       static const char * const clk_strs[] = {
+               [CLK_MAC] = "mac",
+               [CLK_BUS] = "bus",
+               [CLK_PHY] = "phy",
+       };
+
+       priv->port_base = dev_remap_addr_name(dev, "port");
+       if (IS_ERR(priv->port_base))
+               return log_msg_ret("Failed to remap port address space", PTR_ERR(priv->port_base));
+
+       priv->glb_base = dev_remap_addr_name(dev, "glb");
+       if (IS_ERR(priv->glb_base))
+               return log_msg_ret("Failed to remap global address space", PTR_ERR(priv->glb_base));
+
+       for (i = 0; i < ARRAY_SIZE(clk_strs); i++) {
+               priv->clks[i] = devm_clk_get(dev, clk_strs[i]);
+               if (IS_ERR(priv->clks[i])) {
+                       dev_err(dev, "Error getting clock %s\n", clk_strs[i]);
+                       return log_msg_ret("Failed to get clocks", PTR_ERR(priv->clks[i]));
+               }
+       }
+
+       priv->mac_rst = devm_reset_control_get(dev, "mac");
+       if (IS_ERR(priv->mac_rst))
+               return log_msg_ret("Failed to get MAC reset", PTR_ERR(priv->mac_rst));
+
+       priv->phy_rst = devm_reset_control_get(dev, "phy");
+       if (IS_ERR(priv->phy_rst))
+               return log_msg_ret("Failed to get PHY reset", PTR_ERR(priv->phy_rst));
+
+       ret = dev_read_u32_array(dev,
+                                PHY_RESET_DELAYS_PROPERTY,
+                                priv->phy_reset_delays,
+                                DELAYS_NUM);
+       if (ret < 0)
+               return log_msg_ret("Failed to get PHY reset delays", ret);
+
+       priv->mac_reset_delay = dev_read_u32_default(dev,
+                                                    MAC_RESET_DELAY_PROPERTY,
+                                                    MAC_RESET_ASSERT_PERIOD);
+
+       return 0;
+}
+
+static int hisi_femac_phy_reset(struct hisi_femac_priv *priv)
+{
+       struct reset_ctl *rst = priv->phy_rst;
+       u32 *delays = priv->phy_reset_delays;
+       int ret;
+
+       // Disable MAC clk before phy reset
+       ret = clk_disable(priv->clks[CLK_MAC]);
+       if (ret < 0)
+               return log_msg_ret("Failed to disable MAC clock", ret);
+       ret = clk_disable(priv->clks[CLK_BUS]);
+       if (ret < 0)
+               return log_msg_ret("Failed to disable bus clock", ret);
+
+       udelay(delays[PRE_DELAY]);
+
+       ret = reset_assert(rst);
+       if (ret < 0)
+               return log_msg_ret("Failed to assert reset", ret);
+
+       udelay(delays[PULSE]);
+
+       ret = reset_deassert(rst);
+       if (ret < 0)
+               return log_msg_ret("Failed to deassert reset", ret);
+
+       udelay(delays[POST_DELAY]);
+
+       ret = clk_enable(priv->clks[CLK_MAC]);
+       if (ret < 0)
+               return log_msg_ret("Failed to enable MAC clock", ret);
+       ret = clk_enable(priv->clks[CLK_BUS]);
+       if (ret < 0)
+               return log_msg_ret("Failed to enable MAC bus clock", ret);
+
+       return 0;
+}
+
+int hisi_femac_probe(struct udevice *dev)
+{
+       struct hisi_femac_priv *priv = dev_get_priv(dev);
+       int ret, i;
+
+       // Enable clocks
+       for (i = 0; i < CLK_NUM; i++) {
+               ret = clk_prepare_enable(priv->clks[i]);
+               if (ret < 0)
+                       return log_msg_ret("Failed to enable clks", ret);
+       }
+
+       // Reset MAC
+       ret = reset_assert(priv->mac_rst);
+       if (ret < 0)
+               return log_msg_ret("Failed to assert MAC reset", ret);
+
+       udelay(priv->mac_reset_delay);
+
+       ret = reset_deassert(priv->mac_rst);
+       if (ret < 0)
+               return log_msg_ret("Failed to deassert MAC reset", ret);
+
+       // Reset PHY
+       ret = hisi_femac_phy_reset(priv);
+       if (ret < 0)
+               return log_msg_ret("Failed to reset phy", ret);
+
+       // Connect to PHY
+       priv->phy = dm_eth_phy_connect(dev);
+       if (!priv->phy)
+               return log_msg_ret("Failed to connect to phy", -EINVAL);
+
+       hisi_femac_port_init(priv);
+       return 0;
+}
+
+static const struct eth_ops hisi_femac_ops = {
+       .start          = hisi_femac_start,
+       .send           = hisi_femac_send,
+       .recv           = hisi_femac_recv,
+       .free_pkt       = hisi_femac_free_pkt,
+       .stop           = hisi_femac_stop,
+       .write_hwaddr   = hisi_femac_set_hw_mac_addr,
+};
+
+static const struct udevice_id hisi_femac_ids[] = {
+       {.compatible = "hisilicon,hisi-femac-v1",},
+       {.compatible = "hisilicon,hisi-femac-v2",},
+       {.compatible = "hisilicon,hi3516cv300-femac",},
+       {.compatible = "hisilicon,hi3798mv200-femac",},
+       {},
+};
+
+U_BOOT_DRIVER(hisi_femac_driver) = {
+       .name = "eth_hisi_femac",
+       .id = UCLASS_ETH,
+       .of_match = of_match_ptr(hisi_femac_ids),
+       .of_to_plat = hisi_femac_of_to_plat,
+       .ops = &hisi_femac_ops,
+       .probe = hisi_femac_probe,
+       .plat_auto = sizeof(struct eth_pdata),
+       .priv_auto = sizeof(struct hisi_femac_priv),
+};
diff --git a/drivers/net/hifemac_mdio.c b/drivers/net/hifemac_mdio.c
new file mode 100644 (file)
index 0000000..343c5f3
--- /dev/null
@@ -0,0 +1,116 @@
+// SPDX-License-Identifier: GPL-2.0+
+/*
+ * Hisilicon Fast Ethernet MDIO Bus Driver
+ *
+ * Copyright (c) 2016 HiSilicon Technologies Co., Ltd.
+ */
+
+#include <dm.h>
+#include <clk.h>
+#include <miiphy.h>
+#include <linux/io.h>
+#include <linux/iopoll.h>
+
+#define MDIO_RWCTRL            0x00
+#define MDIO_RO_DATA           0x04
+#define MDIO_WRITE             BIT(13)
+#define MDIO_RW_FINISH         BIT(15)
+#define BIT_PHY_ADDR_OFFSET    8
+#define BIT_WR_DATA_OFFSET     16
+
+struct hisi_femac_mdio_data {
+       struct clk *clk;
+       void __iomem *membase;
+};
+
+static int hisi_femac_mdio_wait_ready(struct hisi_femac_mdio_data *data)
+{
+       u32 val;
+
+       return readl_poll_timeout(data->membase + MDIO_RWCTRL,
+                                 val, val & MDIO_RW_FINISH, 10000);
+}
+
+static int hisi_femac_mdio_read(struct udevice *dev, int addr, int devad, int reg)
+{
+       struct hisi_femac_mdio_data *data = dev_get_priv(dev);
+       int ret;
+
+       ret = hisi_femac_mdio_wait_ready(data);
+       if (ret)
+               return ret;
+
+       writel((addr << BIT_PHY_ADDR_OFFSET) | reg,
+              data->membase + MDIO_RWCTRL);
+
+       ret = hisi_femac_mdio_wait_ready(data);
+       if (ret)
+               return ret;
+
+       return readl(data->membase + MDIO_RO_DATA) & 0xFFFF;
+}
+
+static int hisi_femac_mdio_write(struct udevice *dev, int addr, int devad, int reg, u16 val)
+{
+       struct hisi_femac_mdio_data *data = dev_get_priv(dev);
+       int ret;
+
+       ret = hisi_femac_mdio_wait_ready(data);
+       if (ret)
+               return ret;
+
+       writel(MDIO_WRITE | (val << BIT_WR_DATA_OFFSET) |
+              (addr << BIT_PHY_ADDR_OFFSET) | reg,
+              data->membase + MDIO_RWCTRL);
+
+       return hisi_femac_mdio_wait_ready(data);
+}
+
+static int hisi_femac_mdio_of_to_plat(struct udevice *dev)
+{
+       struct hisi_femac_mdio_data *data = dev_get_priv(dev);
+       int ret;
+
+       data->membase = dev_remap_addr(dev);
+       if (IS_ERR(data->membase)) {
+               ret = PTR_ERR(data->membase);
+               return log_msg_ret("Failed to remap base addr", ret);
+       }
+
+       // clk is optional
+       data->clk = devm_clk_get_optional(dev, NULL);
+
+       return 0;
+}
+
+static int hisi_femac_mdio_probe(struct udevice *dev)
+{
+       struct hisi_femac_mdio_data *data = dev_get_priv(dev);
+       int ret;
+
+       ret = clk_prepare_enable(data->clk);
+       if (ret)
+               return log_msg_ret("Failed to enable clk", ret);
+
+       return 0;
+}
+
+static const struct mdio_ops hisi_femac_mdio_ops = {
+       .read = hisi_femac_mdio_read,
+       .write = hisi_femac_mdio_write,
+};
+
+static const struct udevice_id hisi_femac_mdio_dt_ids[] = {
+       { .compatible = "hisilicon,hisi-femac-mdio" },
+       { }
+};
+
+U_BOOT_DRIVER(hisi_femac_mdio_driver) = {
+       .name = "hisi-femac-mdio",
+       .id = UCLASS_MDIO,
+       .of_match = hisi_femac_mdio_dt_ids,
+       .of_to_plat = hisi_femac_mdio_of_to_plat,
+       .probe = hisi_femac_mdio_probe,
+       .ops = &hisi_femac_mdio_ops,
+       .priv_auto = sizeof(struct hisi_femac_mdio_data),
+};
index 64e860e324dcd956734890e7104c8fe303760325..c073f81e72d0dffc1f3a94bd451cb64acce68256 100644 (file)
@@ -29,6 +29,7 @@
 #include <dm/device-internal.h>
 #include <dm/lists.h>
 #include <dm/of_extra.h>
+#include <linux/bitfield.h>
 #include <linux/delay.h>
 #include <miiphy.h>
 #include <net/dsa.h>
  */
 #define SMI_BUSY                       BIT(15)
 #define SMI_CMD_CLAUSE_22              BIT(12)
-#define SMI_CMD_CLAUSE_22_OP_READ      (2 << 10)
-#define SMI_CMD_CLAUSE_22_OP_WRITE     (1 << 10)
-#define SMI_CMD_ADDR_SHIFT             5
-#define SMI_CMD_ADDR_MASK              0x1f
-#define SMI_CMD_REG_SHIFT              0
-#define SMI_CMD_REG_MASK               0x1f
+#define SMI_CMD_OP_MASK                        GENMASK(11, 10)
+#define SMI_CMD_CLAUSE_22_OP_WRITE     0x1
+#define SMI_CMD_CLAUSE_22_OP_READ      0x2
+#define SMI_CMD_CLAUSE_45_OP_WRITE_ADDR        0x0
+#define SMI_CMD_CLAUSE_45_OP_WRITE     0x1
+#define SMI_CMD_CLAUSE_45_OP_READ      0x3
+
+#define SMI_CMD_ADDR_MASK              GENMASK(9, 5)
+#define SMI_CMD_REG_MASK               GENMASK(4, 0)
 #define SMI_CMD_READ(addr, reg) \
-       (SMI_BUSY | SMI_CMD_CLAUSE_22 | SMI_CMD_CLAUSE_22_OP_READ) | \
-       (((addr) & SMI_CMD_ADDR_MASK) << SMI_CMD_ADDR_SHIFT) | \
-       (((reg) & SMI_CMD_REG_MASK) << SMI_CMD_REG_SHIFT)
+       (SMI_BUSY | SMI_CMD_CLAUSE_22 | FIELD_PREP(SMI_CMD_OP_MASK, SMI_CMD_CLAUSE_22_OP_READ)) | \
+       (FIELD_PREP(SMI_CMD_ADDR_MASK, addr)) | \
+       (FIELD_PREP(SMI_CMD_REG_MASK, reg))
 #define SMI_CMD_WRITE(addr, reg) \
-       (SMI_BUSY | SMI_CMD_CLAUSE_22 | SMI_CMD_CLAUSE_22_OP_WRITE) | \
-       (((addr) & SMI_CMD_ADDR_MASK) << SMI_CMD_ADDR_SHIFT) | \
-       (((reg) & SMI_CMD_REG_MASK) << SMI_CMD_REG_SHIFT)
+       (SMI_BUSY | SMI_CMD_CLAUSE_22 | FIELD_PREP(SMI_CMD_OP_MASK, SMI_CMD_CLAUSE_22_OP_WRITE)) | \
+       (FIELD_PREP(SMI_CMD_ADDR_MASK, addr)) | \
+       (FIELD_PREP(SMI_CMD_REG_MASK, reg))
+#define SMI_CMD_SET_C45_ADDR(phyad, devad) \
+       (SMI_BUSY | FIELD_PREP(SMI_CMD_OP_MASK, SMI_CMD_CLAUSE_45_OP_WRITE_ADDR)) | \
+       (FIELD_PREP(SMI_CMD_ADDR_MASK, phyad)) | \
+       (FIELD_PREP(SMI_CMD_REG_MASK, devad))
+#define SMI_CMD_READ_C45(phyad, devad) \
+       (SMI_BUSY | FIELD_PREP(SMI_CMD_OP_MASK, SMI_CMD_CLAUSE_45_OP_READ)) | \
+       (FIELD_PREP(SMI_CMD_ADDR_MASK, phyad)) | \
+       (FIELD_PREP(SMI_CMD_REG_MASK, devad))
+#define SMI_CMD_WRITE_C45(phyad, devad) \
+       (SMI_BUSY | FIELD_PREP(SMI_CMD_OP_MASK, SMI_CMD_CLAUSE_45_OP_WRITE)) | \
+       (FIELD_PREP(SMI_CMD_ADDR_MASK, phyad)) | \
+       (FIELD_PREP(SMI_CMD_REG_MASK, devad))
 
 /* ID register values for different switch models */
 #define PORT_SWITCH_ID_6020            0x0200
@@ -272,12 +288,37 @@ static int mv88e6xxx_phy_wait(struct udevice *dev)
 static int mv88e6xxx_phy_read_indirect(struct udevice *dev, int phyad, int devad, int reg)
 {
        struct mv88e6xxx_priv *priv = dev_get_priv(dev);
+       u16 smi_cmd;
        int res;
 
+       if (devad >= 0) {
+               /*
+                * For C45 we need to write the register address into the
+                * PHY Data register first and then call the Write Address
+                * Register OP in the PHY command register.
+                */
+               res = mv88e6xxx_reg_write(dev, priv->global2,
+                                         GLOBAL2_REG_PHY_DATA,
+                                         reg);
+
+               res = mv88e6xxx_reg_write(dev, priv->global2,
+                                         GLOBAL2_REG_PHY_CMD,
+                                         SMI_CMD_SET_C45_ADDR(phyad, devad));
+
+               /* Wait for busy bit to clear */
+               res = mv88e6xxx_phy_wait(dev);
+               if (res < 0)
+                       return res;
+
+               /* Set the actual C45 or C22 OP-s */
+               smi_cmd = SMI_CMD_READ_C45(phyad, devad);
+       } else
+               smi_cmd = SMI_CMD_READ(phyad, reg);
+
        /* Issue command to read */
        res = mv88e6xxx_reg_write(dev, priv->global2,
                                  GLOBAL2_REG_PHY_CMD,
-                                 SMI_CMD_READ(phyad, reg));
+                                 smi_cmd);
 
        /* Wait for data to be read */
        res = mv88e6xxx_phy_wait(dev);
@@ -293,8 +334,33 @@ static int mv88e6xxx_phy_write_indirect(struct udevice *dev, int phyad,
                                        int devad, int reg, u16 data)
 {
        struct mv88e6xxx_priv *priv = dev_get_priv(dev);
+       u16 smi_cmd;
        int res;
 
+       if (devad >= 0) {
+               /*
+                * For C45 we need to write the register address into the
+                * PHY Data register first and then call the Write Address
+                * Register OP in the PHY command register.
+                */
+               res = mv88e6xxx_reg_write(dev, priv->global2,
+                                         GLOBAL2_REG_PHY_DATA,
+                                         reg);
+
+               res = mv88e6xxx_reg_write(dev, priv->global2,
+                                         GLOBAL2_REG_PHY_CMD,
+                                         SMI_CMD_SET_C45_ADDR(phyad, devad));
+
+               /* Wait for busy bit to clear */
+               res = mv88e6xxx_phy_wait(dev);
+               if (res < 0)
+                       return res;
+
+               /* Set the actual C45 or C22 OP-s */
+               smi_cmd = SMI_CMD_WRITE_C45(phyad, devad);
+       } else
+               smi_cmd = SMI_CMD_WRITE(phyad, reg);
+
        /* Set the data to write */
        res = mv88e6xxx_reg_write(dev, priv->global2,
                                  GLOBAL2_REG_PHY_DATA, data);
@@ -303,7 +369,7 @@ static int mv88e6xxx_phy_write_indirect(struct udevice *dev, int phyad,
        /* Issue the write command */
        res = mv88e6xxx_reg_write(dev, priv->global2,
                                  GLOBAL2_REG_PHY_CMD,
-                                 SMI_CMD_WRITE(phyad, reg));
+                                 smi_cmd);
        if (res < 0)
                return res;
 
index 8d32d73b07f2aa52bcc9cb6de624a9bcf79bd143..f9d4782580e9318049f1f69840431e320a650e26 100644 (file)
 
 /* RGMIIDCTL bits */
 #define DP83869_RGMII_TX_CLK_DELAY_SHIFT       4
-#define DP83869_CLK_DELAY_DEF                          7
+#define DP83869_CLK_DELAY_STEP                 250
+#define DP83869_CLK_DELAY_MIN                  250
+#define DP83869_CLK_DELAY_MAX                  4000
+#define DP83869_CLK_DELAY_DEFAULT              2000
 
 /* CFG2 bits */
 #define MII_DP83869_CFG2_SPEEDOPT_10EN         0x0040
@@ -157,10 +160,6 @@ static int dp83869_config_port_mirroring(struct phy_device *phydev)
        return 0;
 }
 
-static const int dp83869_internal_delay[] = {250, 500, 750, 1000, 1250, 1500,
-                                            1750, 2000, 2250, 2500, 2750, 3000,
-                                            3250, 3500, 3750, 4000};
-
 static int dp83869_set_strapped_mode(struct phy_device *phydev)
 {
        struct dp83869_private *dp83869 = phydev->priv;
@@ -183,7 +182,6 @@ static int dp83869_set_strapped_mode(struct phy_device *phydev)
 static int dp83869_of_init(struct phy_device *phydev)
 {
        struct dp83869_private * const dp83869 = phydev->priv;
-       const int delay_entries = ARRAY_SIZE(dp83869_internal_delay);
        int ret;
        ofnode node;
 
@@ -238,32 +236,45 @@ static int dp83869_of_init(struct phy_device *phydev)
        dp83869->tx_fifo_depth = ofnode_read_s32_default(node, "tx-fifo-depth",
                                                         DP83869_PHYCR_FIFO_DEPTH_4_B_NIB);
 
+       /* Internal clock delay values can be configured in steps of
+        * 250ps (0.25ns). The register field for clock delay is 4-bits wide,
+        * the values range from 0b0000 for 0.25ns to 0b1111 for 4ns.
+        */
+
        /* RX delay *must* be specified if internal delay of RX is used. */
        if (phydev->interface == PHY_INTERFACE_MODE_RGMII_ID ||
            phydev->interface == PHY_INTERFACE_MODE_RGMII_RXID) {
-               dp83869->rx_int_delay = ofnode_read_u32_default(node, "rx-internal-delay-ps",
-                                                               DP83869_CLK_DELAY_DEF);
-               if (dp83869->rx_int_delay > delay_entries) {
-                       dp83869->rx_int_delay = DP83869_CLK_DELAY_DEF;
-                       pr_debug("rx-internal-delay-ps not set/invalid, default to %ups\n",
-                                dp83869_internal_delay[dp83869->rx_int_delay]);
+               dp83869->rx_int_delay = ofnode_read_u32_default(node,
+                       "rx-internal-delay-ps", DP83869_CLK_DELAY_DEFAULT);
+               if (dp83869->rx_int_delay > DP83869_CLK_DELAY_MAX ||
+                   dp83869->rx_int_delay < DP83869_CLK_DELAY_MIN ||
+                   dp83869->rx_int_delay % DP83869_CLK_DELAY_STEP) {
+                       dp83869->rx_int_delay = DP83869_CLK_DELAY_DEFAULT;
+                       pr_warn("rx-internal-delay-ps not set/invalid, default"
+                               " to %ups\n", DP83869_CLK_DELAY_DEFAULT);
                }
 
-               dp83869->rx_int_delay = dp83869_internal_delay[dp83869->rx_int_delay];
+               dp83869->rx_int_delay =
+                       (dp83869->rx_int_delay - DP83869_CLK_DELAY_STEP)
+                       / DP83869_CLK_DELAY_STEP;
        }
 
-       /* TX delay *must* be specified if internal delay of RX is used. */
+       /* TX delay *must* be specified if internal delay of TX is used. */
        if (phydev->interface == PHY_INTERFACE_MODE_RGMII_ID ||
            phydev->interface == PHY_INTERFACE_MODE_RGMII_TXID) {
-               dp83869->tx_int_delay = ofnode_read_u32_default(node, "tx-internal-delay-ps",
-                                                               DP83869_CLK_DELAY_DEF);
-               if (dp83869->tx_int_delay > delay_entries) {
-                       dp83869->tx_int_delay = DP83869_CLK_DELAY_DEF;
-                       pr_debug("tx-internal-delay-ps not set/invalid, default to %ups\n",
-                                dp83869_internal_delay[dp83869->tx_int_delay]);
+               dp83869->tx_int_delay = ofnode_read_u32_default(node,
+                       "tx-internal-delay-ps", DP83869_CLK_DELAY_DEFAULT);
+               if (dp83869->tx_int_delay > DP83869_CLK_DELAY_MAX ||
+                   dp83869->tx_int_delay < DP83869_CLK_DELAY_MIN ||
+                   dp83869->tx_int_delay % DP83869_CLK_DELAY_STEP) {
+                       dp83869->tx_int_delay = DP83869_CLK_DELAY_DEFAULT;
+                       pr_warn("tx-internal-delay-ps not set/invalid, default"
+                               " to %ups\n", DP83869_CLK_DELAY_DEFAULT);
                }
 
-               dp83869->tx_int_delay = dp83869_internal_delay[dp83869->tx_int_delay];
+               dp83869->tx_int_delay =
+                       (dp83869->tx_int_delay - DP83869_CLK_DELAY_STEP)
+                       / DP83869_CLK_DELAY_STEP;
        }
 
        return 0;
index 306f1ea1db68636259a7e178bfc839ee6f165f0d..00848a1a37d7b252b363bb20baa451a2bd0c5a77 100644 (file)
@@ -6,7 +6,6 @@
  * based on source code of Shlomi Gridish
  */
 
-#include <common.h>
 #include <malloc.h>
 #include <linux/errno.h>
 #include <asm/io.h>
index 8bb7588714a43189d8681a15ca469ca6d9c3e420..7120b8edba002d467a30e12640bdca519f7229bd 100644 (file)
@@ -505,6 +505,8 @@ static const struct udevice_id stm32_pinctrl_ids[] = {
        { .compatible = "st,stm32mp157-pinctrl" },
        { .compatible = "st,stm32mp157-z-pinctrl" },
        { .compatible = "st,stm32mp135-pinctrl" },
+       { .compatible = "st,stm32mp257-pinctrl" },
+       { .compatible = "st,stm32mp257-z-pinctrl" },
        { }
 };
 
index 6195c7c4442c6322934c81a15b9fa7f67d587c2c..fa9e406556031db0394c12cea1ddd700219d9d55 100644 (file)
@@ -6,7 +6,6 @@
  * Wolfgang Denk, DENX Software Engineering, wd@denx.de.
  */
 
-#include <common.h>
 #include <asm/global_data.h>
 #include <linux/libfdt.h>
 #include <fdt_support.h>
index 2825dc6f9aa6c4e630e85e0842207d2ef6fc4a9f..9631337b8d9df2b68e08b9babd697829e89c7106 100644 (file)
@@ -6,7 +6,6 @@
  * based on source code of Shlomi Gridish
  */
 
-#include <common.h>
 #include <malloc.h>
 #include <command.h>
 #include <asm/global_data.h>
@@ -24,6 +23,9 @@
 #include <asm/armv8/mmu.h>
 #include <asm/arch/cpu.h>
 #endif
+#ifdef CONFIG_PPC
+#include <asm/ppc.h>
+#endif
 
 #define MPC85xx_DEVDISR_QE_DISABLE     0x1
 
index a8014129d3357b61068ac04e18ad6bb9d08fd920..7e21c4ae2bb8bbe76de07a9a4b5897d13845755a 100644 (file)
@@ -1,46 +1,9 @@
 config SCSI
-       bool "Support SCSI controllers"
+       bool "Support SCSI controllers with driver model"
        help
          This enables support for SCSI (Small Computer System Interface),
          a parallel interface widely used with storage peripherals such as
          hard drives and optical drives. The SCSI standards define physical
          interfaces as well as protocols for controlling devices and
-         tranferring data.
-
-config DM_SCSI
-       bool "Support SCSI controllers with driver model"
-       help
-         This option enables the SCSI (Small Computer System Interface) uclass
-         which supports SCSI and SATA HDDs. For every device configuration
-         (IDs/LUNs) a block device is created with RAW read/write and
-         filesystem support.
-
-if SCSI && !DM_SCSI
-
-config SCSI_AHCI_PLAT
-       bool "Platform-specific init of AHCI"
-       help
-         This enables a way for boards to set up an AHCI device manually, by
-         called ahci_init() and providing an ahci_reset() mechanism.
-
-         This is deprecated. An AHCI driver should be provided instead.
-
-config SYS_SCSI_MAX_SCSI_ID
-       int "Maximum supported SCSI ID"
-       default 1
-       help
-         Sets the maximum number of SCSI IDs to scan when looking for devices.
-         IDs from 0 to (this value - 1) are scanned.
-
-         This is deprecated and is not needed when BLK is enabled.
-
-config SYS_SCSI_MAX_LUN
-       int "Maximum support SCSI LUN"
-       default 1
-       help
-         Sets the maximum number of SCSI Logical Unit Numbers (LUNs) to scan on
-         devices. LUNs from 0 to (this value - 1) are scanned.
-
-         This is deprecated and is not needed when CONFIG_DM_SCSI is enabled.
-
-endif
+         tranferring data. For every device configuration (IDs/LUNs) a block
+         device is created with RAW read/write and filesystem support.
index d8d6de59090d089dbc911fe122db9e4d5e07c29f..628be4c89fba8e61c6d235dca64949fa6f353086 100644 (file)
@@ -4,25 +4,16 @@
 # Wolfgang Denk, DENX Software Engineering, wd@denx.de.
 
 ifndef CONFIG_SPL_BUILD
-obj-$(CONFIG_DM_SCSI) += scsi-uclass.o
-obj-$(CONFIG_SCSI) += scsi.o
-
+obj-$(CONFIG_SCSI) += scsi.o scsi-uclass.o
 ifdef CONFIG_SCSI
-ifdef CONFIG_DM_SCSI
 obj-$(CONFIG_$(SPL_TPL_)BOOTSTD) += scsi_bootdev.o
+obj-$(CONFIG_SANDBOX) += sandbox_scsi.o
+obj-$(CONFIG_SANDBOX) += scsi_emul.o
 endif
 endif
 
-endif
-
 ifdef CONFIG_SPL_BUILD
 ifdef CONFIG_SPL_SATA
-obj-$(CONFIG_DM_SCSI) += scsi-uclass.o
-obj-$(CONFIG_SCSI) += scsi.o
+obj-$(CONFIG_SCSI) += scsi.o scsi-uclass.o
 endif
 endif
-
-ifdef CONFIG_SCSI
-obj-$(CONFIG_SANDBOX) += sandbox_scsi.o
-obj-$(CONFIG_SANDBOX) += scsi_emul.o
-endif
index 779a34bd2f1ce8f022fea8f78fab078bf15bd4c8..363047d0f72cdbd64fcab3a0292d50b2f6531caf 100644 (file)
 #include <dm/device-internal.h>
 #include <dm/uclass-internal.h>
 
-#if !defined(CONFIG_DM_SCSI)
-# ifdef CFG_SCSI_DEV_LIST
-#  define SCSI_DEV_LIST CFG_SCSI_DEV_LIST
-# else
-#  ifdef CONFIG_SATA_ULI5288
-
-#   define SCSI_VEND_ID 0x10b9
-#   define SCSI_DEV_ID  0x5288
-
-#  elif !defined(CONFIG_SCSI_AHCI_PLAT)
-#   error no scsi device defined
-#  endif
-# define SCSI_DEV_LIST {SCSI_VEND_ID, SCSI_DEV_ID}
-# endif
-#endif
-
-#if defined(CONFIG_PCI) && !defined(CONFIG_SCSI_AHCI_PLAT) && \
-       !defined(CONFIG_DM_SCSI)
-const struct pci_device_id scsi_device_list[] = { SCSI_DEV_LIST };
-#endif
 static struct scsi_cmd tempccb;        /* temporary scsi command buffer */
 
 DEFINE_CACHE_ALIGN_BUFFER(u8, tempbuff, 512);  /* temporary data buffer */
 
-#if !defined(CONFIG_DM_SCSI)
-static int scsi_max_devs; /* number of highest available scsi device */
-
-static int scsi_curr_dev; /* current device */
-
-static struct blk_desc scsi_dev_desc[SCSI_MAX_DEVICE];
-#endif
-
 /* almost the maximum amount of the scsi_ext command.. */
 #define SCSI_MAX_BLK 0xFFFF
 #define SCSI_LBA48_READ        0xFFFFFFF
@@ -107,7 +79,6 @@ static void scsi_setup_inquiry(struct scsi_cmd *pccb)
        pccb->msgout[0] = SCSI_IDENTIFY; /* NOT USED */
 }
 
-#ifdef CONFIG_BLK
 static void scsi_setup_read_ext(struct scsi_cmd *pccb, lbaint_t start,
                                unsigned short blocks)
 {
@@ -286,59 +257,6 @@ static int scsi_buffer_aligned(struct udevice *dev, struct bounce_buffer *state)
        return 1;
 }
 #endif /* CONFIG_BOUNCE_BUFFER */
-#endif
-
-#if defined(CONFIG_PCI) && !defined(CONFIG_SCSI_AHCI_PLAT) && \
-       !defined(CONFIG_DM_SCSI)
-void scsi_init(void)
-{
-       int busdevfunc = -1;
-       int i;
-       /*
-        * Find a device from the list, this driver will support a single
-        * controller.
-        */
-       for (i = 0; i < ARRAY_SIZE(scsi_device_list); i++) {
-               /* get PCI Device ID */
-               struct udevice *dev;
-               int ret;
-
-               ret = dm_pci_find_device(scsi_device_list[i].vendor,
-                                        scsi_device_list[i].device, 0, &dev);
-               if (!ret) {
-                       busdevfunc = dm_pci_get_bdf(dev);
-                       break;
-               }
-               if (busdevfunc != -1)
-                       break;
-       }
-
-       if (busdevfunc == -1) {
-               printf("Error: SCSI Controller(s) ");
-               for (i = 0; i < ARRAY_SIZE(scsi_device_list); i++) {
-                       printf("%04X:%04X ",
-                              scsi_device_list[i].vendor,
-                              scsi_device_list[i].device);
-               }
-               printf("not found\n");
-               return;
-       }
-#ifdef DEBUG
-       else {
-               printf("SCSI Controller (%04X,%04X) found (%d:%d:%d)\n",
-                      scsi_device_list[i].vendor,
-                      scsi_device_list[i].device,
-                      (busdevfunc >> 16) & 0xFF,
-                      (busdevfunc >> 11) & 0x1F,
-                      (busdevfunc >> 8) & 0x7);
-       }
-#endif
-       bootstage_start(BOOTSTAGE_ID_ACCUM_SCSI, "ahci");
-       scsi_low_level_init(busdevfunc);
-       scsi_scan(true);
-       bootstage_accum(BOOTSTAGE_ID_ACCUM_SCSI);
-}
-#endif
 
 /* copy src to dest, skipping leading and trailing blanks
  * and null terminate the string
@@ -464,25 +382,6 @@ static void scsi_init_dev_desc_priv(struct blk_desc *dev_desc)
 #endif /* CONFIG_BOUNCE_BUFFER */
 }
 
-#if !defined(CONFIG_DM_SCSI)
-/**
- * scsi_init_dev_desc - initialize all SCSI specific blk_desc properties
- *
- * @dev_desc: Block device description pointer
- * @devnum: Device number
- */
-static void scsi_init_dev_desc(struct blk_desc *dev_desc, int devnum)
-{
-       dev_desc->lba = 0;
-       dev_desc->blksz = 0;
-       dev_desc->uclass_id = UCLASS_SCSI;
-       dev_desc->devnum = devnum;
-       dev_desc->part_type = PART_TYPE_UNKNOWN;
-
-       scsi_init_dev_desc_priv(dev_desc);
-}
-#endif
-
 /**
  * scsi_detect_dev - Detect scsi device
  *
@@ -570,7 +469,6 @@ removable:
  * (re)-scan the scsi bus and reports scsi device info
  * to the user if mode = 1
  */
-#if defined(CONFIG_DM_SCSI)
 static int do_scsi_scan_one(struct udevice *dev, int id, int lun, bool verbose)
 {
        int ret;
@@ -691,48 +589,7 @@ int scsi_scan(bool verbose)
 
        return 0;
 }
-#else
-int scsi_scan(bool verbose)
-{
-       unsigned char i, lun;
-       int ret;
-
-       if (verbose)
-               printf("scanning bus for devices...\n");
-       for (i = 0; i < SCSI_MAX_DEVICE; i++)
-               scsi_init_dev_desc(&scsi_dev_desc[i], i);
-
-       scsi_max_devs = 0;
-       for (i = 0; i < CONFIG_SYS_SCSI_MAX_SCSI_ID; i++) {
-               for (lun = 0; lun < CONFIG_SYS_SCSI_MAX_LUN; lun++) {
-                       struct blk_desc *bdesc = &scsi_dev_desc[scsi_max_devs];
-
-                       ret = scsi_detect_dev(NULL, i, lun, bdesc);
-                       if (ret)
-                               continue;
-                       part_init(bdesc);
-
-                       if (verbose) {
-                               printf("  Device %d: ", bdesc->devnum);
-                               dev_print(bdesc);
-                       }
-                       scsi_max_devs++;
-               } /* next LUN */
-       }
-       if (scsi_max_devs > 0)
-               scsi_curr_dev = 0;
-       else
-               scsi_curr_dev = -1;
-
-       printf("Found %d device(s).\n", scsi_max_devs);
-#ifndef CONFIG_SPL_BUILD
-       env_set_ulong("scsidevs", scsi_max_devs);
-#endif
-       return 0;
-}
-#endif
 
-#ifdef CONFIG_BLK
 static const struct blk_ops scsi_blk_ops = {
        .read   = scsi_read,
        .write  = scsi_write,
@@ -746,11 +603,3 @@ U_BOOT_DRIVER(scsi_blk) = {
        .id             = UCLASS_BLK,
        .ops            = &scsi_blk_ops,
 };
-#else
-U_BOOT_LEGACY_BLK(scsi) = {
-       .uclass_idname  = "scsi",
-       .uclass_id      = UCLASS_SCSI,
-       .max_devs       = SCSI_MAX_DEVICE,
-       .desc           = scsi_dev_desc,
-};
-#endif
index 23d476fba28356b11febe2e2a840efc9235f6e41..fb039546a41b73a3ba656e1ca12eaff3b628734d 100644 (file)
@@ -30,7 +30,7 @@
  */
 #define ONE_BYTE_B115200_US            87
 
-static void _stm32_serial_setbrg(fdt_addr_t base,
+static void _stm32_serial_setbrg(void __iomem *base,
                                 struct stm32_uart_info *uart_info,
                                 u32 clock_rate,
                                 int baudrate)
@@ -75,7 +75,7 @@ static int stm32_serial_setconfig(struct udevice *dev, uint serial_config)
        struct stm32x7_serial_plat *plat = dev_get_plat(dev);
        bool stm32f4 = plat->uart_info->stm32f4;
        u8 uart_enable_bit = plat->uart_info->uart_enable_bit;
-       u32 cr1 = plat->base + CR1_OFFSET(stm32f4);
+       void __iomem *cr1 = plat->base + CR1_OFFSET(stm32f4);
        u32 config = 0;
        uint parity = SERIAL_GET_PARITY(serial_config);
        uint bits = SERIAL_GET_BITS(serial_config);
@@ -122,7 +122,7 @@ static int stm32_serial_getc(struct udevice *dev)
 {
        struct stm32x7_serial_plat *plat = dev_get_plat(dev);
        bool stm32f4 = plat->uart_info->stm32f4;
-       fdt_addr_t base = plat->base;
+       void __iomem *base = plat->base;
        u32 isr = readl(base + ISR_OFFSET(stm32f4));
 
        if ((isr & USART_ISR_RXNE) == 0)
@@ -141,7 +141,7 @@ static int stm32_serial_getc(struct udevice *dev)
        return readl(base + RDR_OFFSET(stm32f4));
 }
 
-static int _stm32_serial_putc(fdt_addr_t base,
+static int _stm32_serial_putc(void __iomem *base,
                              struct stm32_uart_info *uart_info,
                              const char c)
 {
@@ -166,7 +166,7 @@ static int stm32_serial_pending(struct udevice *dev, bool input)
 {
        struct stm32x7_serial_plat *plat = dev_get_plat(dev);
        bool stm32f4 = plat->uart_info->stm32f4;
-       fdt_addr_t base = plat->base;
+       void __iomem *base = plat->base;
 
        if (input)
                return readl(base + ISR_OFFSET(stm32f4)) &
@@ -176,7 +176,7 @@ static int stm32_serial_pending(struct udevice *dev, bool input)
                        USART_ISR_TXE ? 0 : 1;
 }
 
-static void _stm32_serial_init(fdt_addr_t base,
+static void _stm32_serial_init(void __iomem *base,
                               struct stm32_uart_info *uart_info)
 {
        bool stm32f4 = uart_info->stm32f4;
@@ -250,11 +250,14 @@ static const struct udevice_id stm32_serial_id[] = {
 static int stm32_serial_of_to_plat(struct udevice *dev)
 {
        struct stm32x7_serial_plat *plat = dev_get_plat(dev);
+       fdt_addr_t addr;
 
-       plat->base = dev_read_addr(dev);
-       if (plat->base == FDT_ADDR_T_NONE)
+       addr = dev_read_addr(dev);
+       if (addr == FDT_ADDR_T_NONE)
                return -EINVAL;
 
+       plat->base = (void __iomem *)addr;
+
        return 0;
 }
 
@@ -297,7 +300,7 @@ static inline struct stm32_uart_info *_debug_uart_info(void)
 
 static inline void _debug_uart_init(void)
 {
-       fdt_addr_t base = CONFIG_VAL(DEBUG_UART_BASE);
+       void __iomem *base = (void __iomem *)CONFIG_VAL(DEBUG_UART_BASE);
        struct stm32_uart_info *uart_info = _debug_uart_info();
 
        _stm32_serial_init(base, uart_info);
@@ -308,7 +311,7 @@ static inline void _debug_uart_init(void)
 
 static inline void _debug_uart_putc(int c)
 {
-       fdt_addr_t base = CONFIG_VAL(DEBUG_UART_BASE);
+       void __iomem *base = (void __iomem *)CONFIG_VAL(DEBUG_UART_BASE);
        struct stm32_uart_info *uart_info = _debug_uart_info();
 
        while (_stm32_serial_putc(base, uart_info, c) == -EAGAIN)
index b7e7a90b9316906481b5cb8dc890167a85129770..d2c92ba48ea958b465ad1bf663fb770004fa6317 100644 (file)
@@ -49,7 +49,7 @@ struct stm32_uart_info stm32h7_info = {
 
 /* Information about a serial port */
 struct stm32x7_serial_plat {
-       fdt_addr_t base;  /* address of registers in physical memory */
+       void __iomem *base;  /* address of registers in physical memory */
        struct stm32_uart_info *uart_info;
        unsigned long int clock_rate;
 };
index 25adaf4560735fef158398f14062fb6c0b1a73ba..15b3b0e2672f6e714474df8ac3b7fc43faf3948c 100644 (file)
@@ -193,6 +193,7 @@ U_BOOT_DRIVER(meson_sm) = {
        .id = UCLASS_SM,
        .of_match = meson_sm_ids,
        .probe = meson_sm_probe,
+       .bind = dm_scan_fdt_dev,
        .priv_auto = sizeof(struct meson_sm_priv),
        .ops = &sm_ops,
 };
index 77ddb19a9f32986af5c69242f2c8fb23817832ec..f9cadcc026dcdb6e78ad12b1a8c6491f1409d281 100644 (file)
@@ -3,6 +3,7 @@
  * Copyright (C) 2018 Texas Instruments Incorporated - http://www.ti.com/
  */
 
+#include <errno.h>
 #include <log.h>
 #include <malloc.h>
 #include <spi.h>
index 0e0cc58e3d64f356d43a53eef3d61728fb203535..ee021c7d549da624f510a84ad701d28b5881dbc4 100644 (file)
@@ -2,7 +2,7 @@ menu "UFS Host Controller Support"
 
 config UFS
        bool "Support UFS controllers"
-       depends on DM_SCSI
+       depends on SCSI
        select CHARSET
        help
          This selects support for Universal Flash Subsystem (UFS).
index ab927641bb7ab948d6ddd701483201dfcc473cb1..6f319ba0d544efa45b18e5871e4a1ddd08b448ff 100644 (file)
@@ -180,7 +180,6 @@ config CONSOLE_ROTATION
 
 config CONSOLE_TRUETYPE
        bool "Support a console that uses TrueType fonts"
-       select CMD_SELECT_FONT
        help
          TrueTrype fonts can provide outline-drawing capability rather than
          needing to provide a bitmap for each font and size that is needed.
index 852f6735b6025bc869a84c93b665db6611c85951..1de68867d52e65ba679af5e8f0aee2827c603672 100644 (file)
@@ -56,7 +56,7 @@ config VIRTIO_SANDBOX
 
 config VIRTIO_NET
        bool "virtio net driver"
-       depends on VIRTIO
+       depends on VIRTIO && NETDEVICES
        help
          This is the virtual net driver for virtio. It can be used with
          QEMU based targets.
index eb1a91379539b500676058628a9b21967cfd3ccf..656748c1f5b72cf9ddfec5ea3611b85fab207c41 100644 (file)
@@ -37,11 +37,116 @@ struct hsearch_data env_htab = {
 };
 
 /*
- * This env_set() function is defined in cmd/nvedit.c, since it calls
- * _do_env_set(), whis is a static function in that file.
- *
- * int env_set(const char *varname, const char *varvalue);
+ * This variable is incremented each time we set an environment variable so we
+ * can be check via env_get_id() to see if the environment has changed or not.
+ * This makes it possible to reread an environment variable only if the
+ * environment was changed, typically used by networking code.
  */
+static int env_id = 1;
+
+int env_get_id(void)
+{
+       return env_id;
+}
+
+void env_inc_id(void)
+{
+       env_id++;
+}
+
+int env_do_env_set(int flag, int argc, char *const argv[], int env_flag)
+{
+       int   i, len;
+       char  *name, *value, *s;
+       struct env_entry e, *ep;
+
+       debug("Initial value for argc=%d\n", argc);
+
+#if !IS_ENABLED(CONFIG_SPL_BUILD) && IS_ENABLED(CONFIG_CMD_NVEDIT_EFI)
+       if (argc > 1 && argv[1][0] == '-' && argv[1][1] == 'e')
+               return do_env_set_efi(NULL, flag, --argc, ++argv);
+#endif
+
+       while (argc > 1 && **(argv + 1) == '-') {
+               char *arg = *++argv;
+
+               --argc;
+               while (*++arg) {
+                       switch (*arg) {
+                       case 'f':               /* force */
+                               env_flag |= H_FORCE;
+                               break;
+                       default:
+                               return CMD_RET_USAGE;
+                       }
+               }
+       }
+       debug("Final value for argc=%d\n", argc);
+       name = argv[1];
+
+       if (strchr(name, '=')) {
+               printf("## Error: illegal character '='"
+                      "in variable name \"%s\"\n", name);
+               return 1;
+       }
+
+       env_inc_id();
+
+       /* Delete only ? */
+       if (argc < 3 || argv[2] == NULL) {
+               int rc = hdelete_r(name, &env_htab, env_flag);
+
+               /* If the variable didn't exist, don't report an error */
+               return rc && rc != -ENOENT ? 1 : 0;
+       }
+
+       /*
+        * Insert / replace new value
+        */
+       for (i = 2, len = 0; i < argc; ++i)
+               len += strlen(argv[i]) + 1;
+
+       value = malloc(len);
+       if (value == NULL) {
+               printf("## Can't malloc %d bytes\n", len);
+               return 1;
+       }
+       for (i = 2, s = value; i < argc; ++i) {
+               char *v = argv[i];
+
+               while ((*s++ = *v++) != '\0')
+                       ;
+               *(s - 1) = ' ';
+       }
+       if (s != value)
+               *--s = '\0';
+
+       e.key   = name;
+       e.data  = value;
+       hsearch_r(e, ENV_ENTER, &ep, &env_htab, env_flag);
+       free(value);
+       if (!ep) {
+               printf("## Error inserting \"%s\" variable, errno=%d\n",
+                       name, errno);
+               return 1;
+       }
+
+       return 0;
+}
+
+int env_set(const char *varname, const char *varvalue)
+{
+       const char * const argv[4] = { "setenv", varname, varvalue, NULL };
+
+       /* before import into hashtable */
+       if (!(gd->flags & GD_FLG_ENV_READY))
+               return 1;
+
+       if (varvalue == NULL || varvalue[0] == '\0')
+               return env_do_env_set(0, 2, (char * const *)argv, H_PROGRAMMATIC);
+       else
+               return env_do_env_set(0, 3, (char * const *)argv, H_PROGRAMMATIC);
+}
 
 /**
  * Set an environment variable to an integer value
diff --git a/include/MCD_dma.h b/include/MCD_dma.h
deleted file mode 100644 (file)
index 2f16c89..0000000
+++ /dev/null
@@ -1,369 +0,0 @@
-/* SPDX-License-Identifier: GPL-2.0+ */
-/*
- * Copyright (C) 2004-2007 Freescale Semiconductor, Inc.
- */
-
-#ifndef _MCD_API_H
-#define _MCD_API_H
-
-/* Turn Execution Unit tasks ON (#define) or OFF (#undef) */
-#undef MCD_INCLUDE_EU
-
-/* Number of DMA channels */
-#define NCHANNELS      16
-
-/* Total number of variants */
-#ifdef MCD_INCLUDE_EU
-#define NUMOFVARIANTS  6
-#else
-#define NUMOFVARIANTS  4
-#endif
-
-/* Define sizes of the various tables */
-#define TASK_TABLE_SIZE                (NCHANNELS*32)
-#define VAR_TAB_SIZE           (128)
-#define CONTEXT_SAVE_SIZE      (128)
-#define FUNCDESC_TAB_SIZE      (256)
-
-#ifdef MCD_INCLUDE_EU
-#define FUNCDESC_TAB_NUM       16
-#else
-#define FUNCDESC_TAB_NUM       1
-#endif
-
-#ifndef DEFINESONLY
-
-/* Portability typedefs */
-#if 1
-#include "common.h"
-#else
-#ifndef s32
-typedef int s32;
-#endif
-#ifndef u32
-typedef unsigned int u32;
-#endif
-#ifndef s16
-typedef short s16;
-#endif
-#ifndef u16
-typedef unsigned short u16;
-#endif
-#ifndef s8
-typedef char s8;
-#endif
-#ifndef u8
-typedef unsigned char u8;
-#endif
-#endif
-
-/*
- * These structures represent the internal registers of the
- * multi-channel DMA
- */
-struct dmaRegs_s {
-       u32 taskbar;            /* task table base address */
-       u32 currPtr;
-       u32 endPtr;
-       u32 varTablePtr;
-       u16 dma_rsvd0;
-       u16 ptdControl;         /* ptd control */
-       u32 intPending;         /* interrupt pending */
-       u32 intMask;            /* interrupt mask */
-       u16 taskControl[16];    /* task control */
-       u8 priority[32];        /* priority */
-       u32 initiatorMux;       /* initiator mux control */
-       u32 taskSize0;          /* task size control 0. */
-       u32 taskSize1;          /* task size control 1. */
-       u32 dma_rsvd1;          /* reserved */
-       u32 dma_rsvd2;          /* reserved */
-       u32 debugComp1;         /* debug comparator 1 */
-       u32 debugComp2;         /* debug comparator 2 */
-       u32 debugControl;       /* debug control */
-       u32 debugStatus;        /* debug status */
-       u32 ptdDebug;           /* priority task decode debug */
-       u32 dma_rsvd3[31];      /* reserved */
-};
-typedef volatile struct dmaRegs_s dmaRegs;
-
-#endif
-
-/* PTD contrl reg bits */
-#define PTD_CTL_TSK_PRI                0x8000
-#define PTD_CTL_COMM_PREFETCH  0x0001
-
-/* Task Control reg bits and field masks */
-#define TASK_CTL_EN            0x8000
-#define TASK_CTL_VALID         0x4000
-#define TASK_CTL_ALWAYS                0x2000
-#define TASK_CTL_INIT_MASK     0x1f00
-#define TASK_CTL_ASTRT         0x0080
-#define TASK_CTL_HIPRITSKEN    0x0040
-#define TASK_CTL_HLDINITNUM    0x0020
-#define TASK_CTL_ASTSKNUM_MASK 0x000f
-
-/* Priority reg bits and field masks */
-#define PRIORITY_HLD           0x80
-#define PRIORITY_PRI_MASK      0x07
-
-/* Debug Control reg bits and field masks */
-#define DBG_CTL_BLOCK_TASKS_MASK       0xffff0000
-#define DBG_CTL_AUTO_ARM               0x00008000
-#define DBG_CTL_BREAK                  0x00004000
-#define DBG_CTL_COMP1_TYP_MASK         0x00003800
-#define DBG_CTL_COMP2_TYP_MASK         0x00000070
-#define DBG_CTL_EXT_BREAK              0x00000004
-#define DBG_CTL_INT_BREAK              0x00000002
-
-/*
- * PTD Debug reg selector addresses
- * This reg must be written with a value to show the contents of
- * one of the desired internal register.
- */
-#define PTD_DBG_REQ            0x00    /* shows the state of 31 initiators */
-#define PTD_DBG_TSK_VLD_INIT   0x01    /* shows which 16 tasks are valid and
-                                          have initiators asserted */
-
-/* General return values */
-#define MCD_OK                 0
-#define MCD_ERROR              -1
-#define MCD_TABLE_UNALIGNED    -2
-#define MCD_CHANNEL_INVALID    -3
-
-/* MCD_initDma input flags */
-#define MCD_RELOC_TASKS                0x00000001
-#define MCD_NO_RELOC_TASKS     0x00000000
-#define MCD_COMM_PREFETCH_EN   0x00000002      /* MCF547x/548x ONLY */
-
-/*
- * MCD_dmaStatus Status Values for each channel:
- * MCD_NO_DMA  - No DMA has been requested since reset
- * MCD_IDLE    - DMA active, but the initiator is currently inactive
- * MCD_RUNNING - DMA active, and the initiator is currently active
- * MCD_PAUSED  - DMA active but it is currently paused
- * MCD_HALTED  - the most recent DMA has been killed with MCD_killTask()
- * MCD_DONE    - the most recent DMA has completed
- */
-#define MCD_NO_DMA             1
-#define MCD_IDLE               2
-#define MCD_RUNNING            3
-#define MCD_PAUSED             4
-#define MCD_HALTED             5
-#define MCD_DONE               6
-
-/* MCD_startDma parameter defines */
-
-/* Constants for the funcDesc parameter */
-/*
- * MCD_NO_BYTE_SWAP    - to disable byte swapping
- * MCD_BYTE_REVERSE    - to reverse the bytes of each u32 of the DMAed data
- * MCD_U16_REVERSE     - to reverse the 16-bit halves of each 32-bit data
- *                       value being DMAed
- * MCD_U16_BYTE_REVERSE        - to reverse the byte halves of each 16-bit half of
- *                       each 32-bit data value DMAed
- * MCD_NO_BIT_REV      - do not reverse the bits of each byte DMAed
- * MCD_BIT_REV         - reverse the bits of each byte DMAed
- * MCD_CRC16           - to perform CRC-16 on DMAed data
- * MCD_CRCCCITT                - to perform CRC-CCITT on DMAed data
- * MCD_CRC32           - to perform CRC-32 on DMAed data
- * MCD_CSUMINET                - to perform internet checksums on DMAed data
- * MCD_NO_CSUM         - to perform no checksumming
- */
-#define MCD_NO_BYTE_SWAP       0x00045670
-#define MCD_BYTE_REVERSE       0x00076540
-#define MCD_U16_REVERSE                0x00067450
-#define MCD_U16_BYTE_REVERSE   0x00054760
-#define MCD_NO_BIT_REV         0x00000000
-#define MCD_BIT_REV            0x00088880
-/* CRCing: */
-#define MCD_CRC16              0xc0100000
-#define MCD_CRCCCITT           0xc0200000
-#define MCD_CRC32              0xc0300000
-#define MCD_CSUMINET           0xc0400000
-#define MCD_NO_CSUM            0xa0000000
-
-#define MCD_FUNC_NOEU1         (MCD_NO_BYTE_SWAP | MCD_NO_BIT_REV | \
-                                MCD_NO_CSUM)
-#define MCD_FUNC_NOEU2         (MCD_NO_BYTE_SWAP | MCD_NO_CSUM)
-
-/* Constants for the flags parameter */
-#define MCD_TT_FLAGS_RL                0x00000001      /* Read line */
-#define MCD_TT_FLAGS_CW                0x00000002      /* Combine Writes */
-#define MCD_TT_FLAGS_SP                0x00000004      /* MCF547x/548x ONLY  */
-#define MCD_TT_FLAGS_MASK      0x000000ff
-#define MCD_TT_FLAGS_DEF       (MCD_TT_FLAGS_RL | MCD_TT_FLAGS_CW)
-
-#define MCD_SINGLE_DMA         0x00000100      /* Unchained DMA */
-#define MCD_CHAIN_DMA          /* TBD */
-#define MCD_EU_DMA             /* TBD */
-#define MCD_FECTX_DMA          0x00001000      /* FEC TX ring DMA */
-#define MCD_FECRX_DMA          0x00002000      /* FEC RX ring DMA */
-
-/* these flags are valid for MCD_startDma and the chained buffer descriptors */
-/*
- * MCD_BUF_READY       - indicates that this buf is now under the DMA's ctrl
- * MCD_WRAP            - to tell the FEC Dmas to wrap to the first BD
- * MCD_INTERRUPT       - to generate an interrupt after completion of the DMA
- * MCD_END_FRAME       - tell the DMA to end the frame when transferring
- *                       last byte of data in buffer
- * MCD_CRC_RESTART     - to empty out the accumulated checksum prior to
- *                       performing the DMA
- */
-#define MCD_BUF_READY          0x80000000
-#define MCD_WRAP               0x20000000
-#define MCD_INTERRUPT          0x10000000
-#define MCD_END_FRAME          0x08000000
-#define MCD_CRC_RESTART                0x40000000
-
-/* Defines for the FEC buffer descriptor control/status word*/
-#define MCD_FEC_BUF_READY      0x8000
-#define MCD_FEC_WRAP           0x2000
-#define MCD_FEC_INTERRUPT      0x1000
-#define MCD_FEC_END_FRAME      0x0800
-
-/* Defines for general intuitiveness */
-
-#define MCD_TRUE               1
-#define MCD_FALSE              0
-
-/* Three different cases for destination and source. */
-#define MINUS1                 -1
-#define ZERO                   0
-#define PLUS1                  1
-
-#ifndef DEFINESONLY
-
-/* Task Table Entry struct*/
-typedef struct {
-       u32 TDTstart;           /* task descriptor table start */
-       u32 TDTend;             /* task descriptor table end */
-       u32 varTab;             /* variable table start */
-       u32 FDTandFlags;        /* function descriptor table start & flags */
-       volatile u32 descAddrAndStatus;
-       volatile u32 modifiedVarTab;
-       u32 contextSaveSpace;   /* context save space start */
-       u32 literalBases;
-} TaskTableEntry;
-
-/* Chained buffer descriptor:
- * flags       - flags describing the DMA
- * csumResult  - checksum performed since last checksum reset
- * srcAddr     - the address to move data from
- * destAddr    - the address to move data to
- * lastDestAddr        - the last address written to
- * dmaSize     - the no of bytes to xfer independent of the xfer sz
- * next                - next buffer descriptor in chain
- * info                - private info about this descriptor;  DMA does not affect it
- */
-typedef volatile struct MCD_bufDesc_struct MCD_bufDesc;
-struct MCD_bufDesc_struct {
-       u32 flags;
-       u32 csumResult;
-       s8 *srcAddr;
-       s8 *destAddr;
-       s8 *lastDestAddr;
-       u32 dmaSize;
-       MCD_bufDesc *next;
-       u32 info;
-};
-
-/* Progress Query struct:
- * lastSrcAddr - the most-recent or last, post-increment source address
- * lastDestAddr        - the most-recent or last, post-increment destination address
- * dmaSize     - the amount of data transferred for the current buffer
- * currBufDesc - pointer to the current buffer descriptor being DMAed
- */
-
-typedef volatile struct MCD_XferProg_struct {
-       s8 *lastSrcAddr;
-       s8 *lastDestAddr;
-       u32 dmaSize;
-       MCD_bufDesc *currBufDesc;
-} MCD_XferProg;
-
-/* FEC buffer descriptor */
-typedef volatile struct MCD_bufDescFec_struct {
-       u16 statCtrl;
-       u16 length;
-       u32 dataPointer;
-} MCD_bufDescFec;
-
-/*************************************************************************/
-/* API function Prototypes  - see MCD_dmaApi.c for further notes */
-
-/* MCD_startDma starts a particular kind of DMA:
- * srcAddr     - the channel on which to run the DMA
- * srcIncr     - the address to move data from, or buffer-descriptor address
- * destAddr    - the amount to increment the source address per transfer
- * destIncr    - the address to move data to
- * dmaSize     - the amount to increment the destination address per transfer
- * xferSize    - the number bytes in of each data movement (1, 2, or 4)
- * initiator   - what device initiates the DMA
- * priority    - priority of the DMA
- * flags       - flags describing the DMA
- * funcDesc    - description of byte swapping, bit swapping, and CRC actions
- */
-int MCD_startDma(int channel, s8 * srcAddr, s16 srcIncr, s8 * destAddr,
-                s16 destIncr, u32 dmaSize, u32 xferSize, u32 initiator,
-                int priority, u32 flags, u32 funcDesc);
-
-/*
- * MCD_initDma() initializes the DMA API by setting up a pointer to the DMA
- * registers, relocating and creating the appropriate task structures, and
- * setting up some global settings
- */
-int MCD_initDma(dmaRegs * sDmaBarAddr, void *taskTableDest, u32 flags);
-
-/* MCD_dmaStatus() returns the status of the DMA on the requested channel. */
-int MCD_dmaStatus(int channel);
-
-/* MCD_XferProgrQuery() returns progress of DMA on requested channel */
-int MCD_XferProgrQuery(int channel, MCD_XferProg * progRep);
-
-/*
- * MCD_killDma() halts the DMA on the requested channel, without any
- * intention of resuming the DMA.
- */
-int MCD_killDma(int channel);
-
-/*
- * MCD_continDma() continues a DMA which as stopped due to encountering an
- * unready buffer descriptor.
- */
-int MCD_continDma(int channel);
-
-/*
- * MCD_pauseDma() pauses the DMA on the given channel ( if any DMA is
- * running on that channel).
- */
-int MCD_pauseDma(int channel);
-
-/*
- * MCD_resumeDma() resumes the DMA on a given channel (if any DMA is
- * running on that channel).
- */
-int MCD_resumeDma(int channel);
-
-/* MCD_csumQuery provides the checksum/CRC after performing a non-chained DMA */
-int MCD_csumQuery(int channel, u32 * csum);
-
-/*
- * MCD_getCodeSize provides the packed size required by the microcoded task
- * and structures.
- */
-int MCD_getCodeSize(void);
-
-/*
- * MCD_getVersion provides a pointer to a version string and returns a
- * version number.
- */
-int MCD_getVersion(char **longVersion);
-
-/* macro for setting a location in the variable table */
-#define MCD_SET_VAR(taskTab,idx,value) ((u32 *)(taskTab)->varTab)[idx] = value
-/* Note that MCD_SET_VAR() is invoked many times in firing up a DMA function,
-   so I'm avoiding surrounding it with "do {} while(0)" */
-
-#endif                         /* DEFINESONLY */
-
-#endif                         /* _MCD_API_H */
diff --git a/include/MCD_progCheck.h b/include/MCD_progCheck.h
deleted file mode 100644 (file)
index 1ec8fbf..0000000
+++ /dev/null
@@ -1,10 +0,0 @@
-/* SPDX-License-Identifier: GPL-2.0+ */
-/*
- * Copyright (C) 2004-2007 Freescale Semiconductor, Inc.
- */
-
- /* This file is autogenerated. Do not change */
-#define CURRBD         4
-#define DCOUNT         6
-#define DESTPTR                5
-#define SRCPTR         7
diff --git a/include/MCD_tasksInit.h b/include/MCD_tasksInit.h
deleted file mode 100644 (file)
index 9f582be..0000000
+++ /dev/null
@@ -1,43 +0,0 @@
-/* SPDX-License-Identifier: GPL-2.0+ */
-/*
- * Copyright (C) 2004-2007 Freescale Semiconductor, Inc.
- */
-
-#ifndef MCD_TSK_INIT_H
-#define MCD_TSK_INIT_H 1
-
-/*
- * Do not edit!
- */
-
-/* Task 0 */
-void MCD_startDmaChainNoEu(int *currBD, short srcIncr, short destIncr,
-                          int xferSize, short xferSizeIncr, int *cSave,
-                          volatile TaskTableEntry * taskTable, int channel);
-
-/* Task 1 */
-void MCD_startDmaSingleNoEu(char *srcAddr, short srcIncr, char *destAddr,
-                           short destIncr, int dmaSize, short xferSizeIncr,
-                           int flags, int *currBD, int *cSave,
-                           volatile TaskTableEntry * taskTable, int channel);
-
-/* Task 2 */
-void MCD_startDmaChainEu(int *currBD, short srcIncr, short destIncr,
-                        int xferSize, short xferSizeIncr, int *cSave,
-                        volatile TaskTableEntry * taskTable, int channel);
-
-/* Task 3 */
-void MCD_startDmaSingleEu(char *srcAddr, short srcIncr, char *destAddr,
-                         short destIncr, int dmaSize, short xferSizeIncr,
-                         int flags, int *currBD, int *cSave,
-                         volatile TaskTableEntry * taskTable, int channel);
-
-/* Task 4 */
-void MCD_startDmaENetRcv(char *bDBase, char *currBD, char *rcvFifoPtr,
-                        volatile TaskTableEntry * taskTable, int channel);
-
-/* Task 5 */
-void MCD_startDmaENetXmit(char *bDBase, char *currBD, char *xmitFifoPtr,
-                         volatile TaskTableEntry * taskTable, int channel);
-
-#endif                         /* MCD_TSK_INIT_H */
index d7f951c3883b1ee6e4ebe710eb6f9b41e6fbcdfd..d4f0f3ce0e7173e90a5d39ad76b72bce3c1da395 100644 (file)
@@ -223,9 +223,6 @@ int sata_dm_port_status(struct udevice *dev, int port);
  */
 int sata_scan(struct udevice *dev);
 
-int ahci_init(void __iomem *base);
-int ahci_reset(void __iomem *base);
-
 /**
  * ahci_init_one_dm() - set up a single AHCI port
  *
index bfa5d4642764777dbfd37a51899b4df6ec5efecd..bc06e17c9fb71f7b883038e8231f1576c3dc41bb 100644 (file)
@@ -6,7 +6,6 @@
 #ifndef _BOOTCOUNT_H__
 #define _BOOTCOUNT_H__
 
-#include <common.h>
 #include <asm/global_data.h>
 #include <asm/io.h>
 #include <asm/byteorder.h>
diff --git a/include/configs/inteno_xg6846.h b/include/configs/inteno_xg6846.h
new file mode 100644 (file)
index 0000000..4f2a2f8
--- /dev/null
@@ -0,0 +1,8 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
+/*
+ * Copyright (C) 2023 Linus Walleij <linusw@kernel.org>
+ */
+
+#include <configs/bmips_common.h>
+#include <configs/bmips_bcm6328.h>
+
index bf20d3154302972379310a9466c64588b820da93..16239f25202e8e41860331ce5698d81aed37228f 100644 (file)
@@ -11,6 +11,7 @@
 
 #define BOOT_TARGET_DEVICES(func) \
        func(ROMUSB, romusb, na)  \
+       func(USB_DFU, usbdfu, na)  \
        func(MMC, mmc, 0) \
        BOOT_TARGET_DEVICES_USB(func) \
        func(PXE, pxe, na) \
index 83ab94ec444c4916da9122c0f7835182229ae593..971a393817a3a7f0c4ff35be58f5f8f76a6d35be 100644 (file)
  * MMC
  */
 
-/* SATA */
-#ifndef PCI_DEVICE_ID_FREESCALE_AHCI
-#define PCI_DEVICE_ID_FREESCALE_AHCI   0x0440
-#endif
-#define CFG_SCSI_DEV_LIST              {PCI_VENDOR_ID_FREESCALE, \
-       PCI_DEVICE_ID_FREESCALE_AHCI}
-
 /* SPI */
 
 #define FSL_PCIE_COMPAT                "fsl,ls1021a-pcie"
index ee4f885c5341e7293ab192281c3421ce8531bb1e..0f591e3c4ab5c71a49babc2e23a7de65cf55364a 100644 (file)
                                        CSOR_NOR_TRHZ_80)
 #endif
 
-/* SATA */
-#define SCSI_VEND_ID 0x1b4b
-#define SCSI_DEV_ID  0x9170
-#define CFG_SCSI_DEV_LIST {SCSI_VEND_ID, SCSI_DEV_ID}
-
 /* Initial environment variables */
 #ifndef SPL_NO_ENV
 #undef CFG_EXTRA_ENV_SETTINGS
index 60362b6a4d07d07b54a8c5adfe3e5628234a656e..ef8fdc1912bd295199a23c61d7738287227aab88 100644 (file)
 #endif
 #endif
 
-/* SATA */
-#ifndef SPL_NO_SATA
-#define SCSI_VEND_ID 0x1b4b
-#define SCSI_DEV_ID  0x9170
-#define CFG_SCSI_DEV_LIST {SCSI_VEND_ID, SCSI_DEV_ID}
-#endif
-
 #include <asm/fsl_secure_boot.h>
 
 #endif /* __LS1043ARDB_H__ */
diff --git a/include/configs/stm32mp25_common.h b/include/configs/stm32mp25_common.h
new file mode 100644 (file)
index 0000000..ec980ee
--- /dev/null
@@ -0,0 +1,24 @@
+/* SPDX-License-Identifier: GPL-2.0-or-later OR BSD-3-Clause */
+/*
+ * Copyright (C) 2023, STMicroelectronics - All Rights Reserved
+ *
+ * Configuration settings for the STM32MP25x CPU
+ */
+
+#ifndef __CONFIG_STM32MP25_COMMMON_H
+#define __CONFIG_STM32MP25_COMMMON_H
+#include <linux/sizes.h>
+#include <asm/arch/stm32.h>
+
+/*
+ * Configuration of the external SRAM memory used by U-Boot
+ */
+#define CFG_SYS_SDRAM_BASE     STM32_DDR_BASE
+
+/*
+ * For booting Linux, use the first 256 MB of memory, since this is
+ * the maximum mapped by the Linux kernel during initialization.
+ */
+#define CFG_SYS_BOOTMAPSZ      SZ_256M
+
+#endif /* __CONFIG_STM32MP25_COMMMON_H */
index 07922224ef1991805e393d897db0a205c7842916..68b5ca46ce54dc35d4f69441d224f2912321f859 100644 (file)
@@ -10,7 +10,6 @@
 #ifndef __DFU_ENTITY_H_
 #define __DFU_ENTITY_H_
 
-#include <common.h>
 #include <linux/list.h>
 #include <mmc.h>
 #include <spi_flash.h>
index 85dacbc7590229c5518ebbb16ac9d77692089735..66e596077370a88ef341c179145b71598ad2fe37 100644 (file)
@@ -9,6 +9,8 @@
 #ifndef __DISPLAY_OPTIONS_H
 #define __DISPLAY_OPTIONS_H
 
+#include <linux/types.h>
+
 /**
  * print_size() - Print a size with a suffix
  *
@@ -19,7 +21,6 @@
  * @size:      Size to print
  * @suffix     String to print after the size
  */
-#include <display_options.h>
 void print_size(uint64_t size, const char *suffix);
 
 /**
index e6fb8ada3f4d395184a33b900a43c2566cc6cc76..28ad0235086a6b036c40245b3a796b46910a307f 100644 (file)
@@ -37,6 +37,9 @@
 #define STM32MP_PKG_AB 0x2
 #define STM32MP_PKG_AC 0x4
 #define STM32MP_PKG_AD 0x8
+#define STM32MP_PKG_AI 0x100
+#define STM32MP_PKG_AK 0x400
+#define STM32MP_PKG_AL 0x800
 
 #endif /* _DT_BINDINGS_STM32_PINFUNC_H */
 
index e24410505f404637b230f5340174f0c254ca14a9..247be060e1c028b102b84fb2341d826a7b56fe09 100644 (file)
@@ -8,7 +8,6 @@
 #ifndef _EFI_LOADER_H
 #define _EFI_LOADER_H 1
 
-#include <common.h>
 #include <blk.h>
 #include <event.h>
 #include <log.h>
index 7c69c3f3761080a585dfa7be4011b530cf149601..5bcebb368287c50b5be1e4e52547703d010e39c4 100644 (file)
@@ -8,7 +8,6 @@
 #ifndef _EFI_SELFTEST_H
 #define _EFI_SELFTEST_H
 
-#include <common.h>
 #include <efi.h>
 #include <efi_api.h>
 #include <efi_loader.h>
index 430c4fa94a426362e8060f3730ef2fb6f0135d71..9778e3e4f2ce33e3530e3a941357a8df92c739bf 100644 (file)
@@ -72,6 +72,14 @@ enum env_redund_flags {
  */
 int env_get_id(void);
 
+/**
+ * env_inc_id() - Increase the sequence number for the environment
+ *
+ * Increment the value that is used by env_get_id() to inform callers
+ * if the environment has changed since they last checked.
+ */
+void env_inc_id(void);
+
 /**
  * env_init() - Set up the pre-relocation environment
  *
index 6a69494646893aaeb227ebfb43839cd0ab76b20c..ae7816d38e588e802453b173aabe9d54720e8d32 100644 (file)
@@ -193,6 +193,18 @@ struct env_driver {
 
 extern struct hsearch_data env_htab;
 
+/**
+ * env_do_env_set() - Perform the actual setting of an environment variable
+ *
+ * Due to the number of places we may need to set an environmental variable
+ * from we have an exposed internal function that performs the real work and
+ * then call this from both the command line function as well as other
+ * locations.
+ *
+ * Return: 0 on success or 1 on failure
+ */
+int env_do_env_set(int flag, int argc, char *const argv[], int env_flag);
+
 /**
  * env_ext4_get_intf() - Provide the interface for env in EXT4
  *
index 8b133e703b40af0f74be3709369000a3f10302fd..f30110817c78811a4333f9623cf9ba1e66fef365 100644 (file)
@@ -7,7 +7,6 @@
 #ifndef __FM_ETH_H__
 #define __FM_ETH_H__
 
-#include <common.h>
 #include <phy.h>
 #include <asm/types.h>
 
index e341a0ed01bfafefc82920b507929de629f8ae79..ef540e7c23de31d51452fcf2b96dc19770b1c52a 100644 (file)
@@ -5,7 +5,6 @@
 #ifndef _FS_H
 #define _FS_H
 
-#include <common.h>
 #include <rtc.h>
 
 struct cmd_tbl;
index 258738dfc8c263333f890dccde5a5b2b65615503..71907bc73c5ff6101eba4a239ceb4ad18cf7017d 100644 (file)
@@ -7,9 +7,10 @@
 #ifndef __FSL_MC_H__
 #define __FSL_MC_H__
 
-#include <common.h>
 #include <linux/bitops.h>
 
+struct bd_info;
+
 #define MC_CCSR_BASE_ADDR \
        ((struct mc_ccsr_registers __iomem *)0x8340000)
 
index 88f4268658a1027697d4b24de2281636e54460a8..44547645df8793dbce5e1db3d13059e204600480 100644 (file)
@@ -6,7 +6,6 @@
 #ifndef _FSL_ERRATA_H
 #define _FSL_ERRATA_H
 
-#include <common.h>
 #if defined(CONFIG_PPC)
 #include <asm/processor.h>
 #elif defined(CONFIG_ARCH_LS1021A)
index de1e70a6d0ba1be32cea498f402703a7b1746a89..f9a0a7017d4a390657c42d58f6d80c60252fca07 100644 (file)
@@ -9,7 +9,6 @@
 
 #ifdef CONFIG_FSL_IFC
 #include <config.h>
-#include <common.h>
 #include <part.h>
 #ifdef CONFIG_ARM
 #include <asm/arch/soc.h>
index 48accb8d8918c72e90581af0ce91f15d38ee8660..309ca7ea6afc80ad89e9553cdfef53884cf4ba44 100644 (file)
@@ -9,7 +9,6 @@
 #ifndef __QE_H__
 #define __QE_H__
 
-#include "common.h"
 #ifdef CONFIG_U_QE
 #include <linux/immap_qe.h>
 #endif
index 9dad1d1ec473cefb03af83536a95c41cc7870edc..8c5e59c5b1cab3b9ada4093638b96b5e3ed7bcd7 100644 (file)
@@ -9,7 +9,6 @@
 #ifndef __FSL_SEC_H
 #define __FSL_SEC_H
 
-#include <common.h>
 #include <asm/io.h>
 
 #ifdef CONFIG_SYS_FSL_SEC_LE
index 3092a0ea62a04a2c56bf55a54ad52886c86f274b..248d5b6d42118b447107e62092f7c33a7f4755c1 100644 (file)
@@ -8,7 +8,6 @@
 #ifndef __FSL_SEC_MON_H
 #define __FSL_SEC_MON_H
 
-#include <common.h>
 #include <asm/io.h>
 
 #ifdef CONFIG_SYS_FSL_SEC_MON_LE
index e7674c1bff2a2d40786ea16556ebbb8682db8e48..0dec69a7235d64a7ced0d6d5110e5260694bc550 100644 (file)
@@ -6,7 +6,6 @@
 #ifndef _FSL_SFP_SNVS_
 #define _FSL_SFP_SNVS_
 
-#include <common.h>
 #include <config.h>
 #include <asm/io.h>
 
index 7ff2e8332b0b9088287fa8f83efcb82b52ca01fe..d5610426cc84ea1cbac0b4e473c345aa6d3f1d35 100644 (file)
@@ -6,7 +6,6 @@
 #ifndef __IOTRACE_H
 #define __IOTRACE_H
 
-//#include <common.h>
 #include <linux/types.h>
 
 /* Support up to the machine word length for now */
index fd16a89cb20313788b75609a61dcdd9f4608ecae..175c47f6f23313a09c6de44edb9aa008ca16160b 100644 (file)
@@ -16,9 +16,6 @@ struct k210_pll_config {
 #ifdef CONFIG_UNIT_TEST
 TEST_STATIC int k210_pll_calc_config(u32 rate, u32 rate_in,
                                     struct k210_pll_config *best);
-#ifndef nop
-#define nop()
-#endif
 
 #endif
 #endif /* K210_PLL_H */
index e7420b9d7956e764b1de5ef355767ff43674b613..17f5d12cdd9f9418e3e717339064da536e4857c8 100644 (file)
@@ -8,7 +8,6 @@
 #ifndef _KEY_MATRIX_H
 #define _KEY_MATRIX_H
 
-#include <common.h>
 
 /* Information about a matrix keyboard */
 struct key_matrix {
index b03b29960df58b849dd4744dfebb4e9e5450513d..a55e9315a73010070c83694c6cb49caac1cc8c83 100644 (file)
@@ -10,7 +10,6 @@
 #ifndef __LIBATA_H__
 #define __LIBATA_H__
 
-#include <common.h>
 
 enum {
        /* various global constants */
index 49e29ac314a50a6e742a18660d14eeab47cd8ecc..70689bc53d768f4f3c0a28a2f26fdd63f7afe854 100644 (file)
@@ -9,6 +9,8 @@
 #ifndef __LINUX_MII_H__
 #define __LINUX_MII_H__
 
+#include <linux/types.h>
+
 /* Generic MII registers. */
 #define MII_BMCR               0x00    /* Basic mode control register */
 #define MII_BMSR               0x01    /* Basic mode status register  */
index e8d6feb9705e22d84a72b38b6c85e40a235680ea..6d68514e07af71674eec3de476dcc7cb04a2e678 100644 (file)
@@ -17,7 +17,6 @@
 #include <linux/spi/spi.h>
 #include <linux/spi/spi-mem.h>
 #else
-#include <common.h>
 #include <spi.h>
 #include <spi-mem.h>
 #include <linux/mtd/nand.h>
index 935e5c0cbb1cff38ef0c2c0527dd7648ef358017..bb1eb93bd20e2c268f1fa57fb4040864a5468906 100644 (file)
@@ -21,7 +21,6 @@
  * the composite model the host can use both functions at the same time.
  */
 
-#include <common.h>
 #include <linux/usb/ch9.h>
 #include <linux/usb/gadget.h>
 #include <linux/bitmap.h>
index c66a1845b58545ec18e9e562f56b08ad0866bb15..5abffd8fb6ba15519a6823312c1a9e9640d4b747 100644 (file)
@@ -14,7 +14,6 @@
 #ifndef _miiphy_h_
 #define _miiphy_h_
 
-#include <common.h>
 #include <linux/mii.h>
 #include <linux/list.h>
 #include <net.h>
index 5926c8090a48ad1e76623397d27ba261398b6834..aa8803413cd529eb65dac73afadcbd9ea248a8ba 100644 (file)
@@ -6,8 +6,6 @@
 #ifndef __MPC83XX_H__
 #define __MPC83XX_H__
 
-#include <config.h>
-#include <asm/fsl_lbc.h>
 #if defined(CONFIG_E300)
 #include <asm/e300.h>
 #endif
index 2e810c8183edf9b1b9c591b9f536c75d21003cc2..152a0774fc0f2d0ac27330efb9eaa8c28ffaf174 100644 (file)
@@ -7,7 +7,6 @@
 #ifndef __MV886352_H
 #define __MV886352_H
 
-#include <common.h>
 
 /* PHY registers */
 #define PHY(itf)       (itf)
index e254df7d7f4374856f8d096171fe7bd88ba3a654..e63a946002df94edfde0a16f00f909594625ee8d 100644 (file)
@@ -16,6 +16,7 @@
 #include <asm/cache.h>
 #include <asm/byteorder.h>     /* for nton* / ntoh* stuff */
 #include <env.h>
+#include <hexdump.h>
 #include <log.h>
 #include <time.h>
 #include <linux/if_ether.h>
@@ -29,6 +30,7 @@ struct udevice;
 #define DEBUG_DEV_PKT 0                /* Packets or info directed to the device */
 #define DEBUG_NET_PKT 0                /* Packets on info on the network at large */
 #define DEBUG_INT_STATE 0      /* Internal network state changes */
+#define DEBUG_NET_PKT_TRACE 0  /* Trace all packet data */
 
 /*
  *     The number of receive packet buffers, and the required packet buffer
@@ -640,6 +642,8 @@ uchar * net_get_async_tx_pkt_buf(void);
 /* Transmit a packet */
 static inline void net_send_packet(uchar *pkt, int len)
 {
+       if (DEBUG_NET_PKT_TRACE)
+               print_hex_dump_bytes("tx: ", DUMP_PREFIX_OFFSET, pkt, len);
        /* Currently no way to return errors from eth_send() */
        (void) eth_send(pkt, len);
 }
index 2800c842b72ebc13abf2e57c31e98792482e94f4..7aec457562d0a9ec7680c8defadfe139c9b535dd 100644 (file)
@@ -5,7 +5,6 @@
  * Copyright (C) 2019, IBM Corporation.
  */
 
-#include <common.h>
 #include <phy.h>
 
 bool ncsi_active(void);
index e259a4d04ba4efb08450a9ebb54ac48d51cc87a6..c13b67a84d9e62f9c06cf684370ba4d8c046cc5b 100644 (file)
@@ -6,7 +6,6 @@
 #ifndef PALMAS_H
 #define PALMAS_H
 
-#include <common.h>
 #include <i2c.h>
 
 /* I2C chip addresses, TW6035/37 */
index 6e88d5507224599003554284118ad348edab4505..da851e37fa2cd4738dd01bf24720c1249e3daa7a 100644 (file)
@@ -11,7 +11,6 @@
 #define _POST_H
 
 #ifndef        __ASSEMBLY__
-#include <common.h>
 #include <asm/io.h>
 
 #if defined(CONFIG_POST)
index 6111cf65d9d146a143b0596fd5afef2d4ad59add..8414e77e42bae3715ad53a2f89848dfc3c4a3377 100644 (file)
@@ -2,22 +2,6 @@
 #define __SATA_H__
 #include <part.h>
 
-#if !defined(CONFIG_DM_SCSI) && !defined(CONFIG_AHCI)
-int init_sata(int dev);
-int reset_sata(int dev);
-int scan_sata(int dev);
-ulong sata_read(int dev, ulong blknr, lbaint_t blkcnt, void *buffer);
-ulong sata_write(int dev, ulong blknr, lbaint_t blkcnt, const void *buffer);
-
-int sata_initialize(void);
-int __sata_initialize(void);
-int sata_stop(void);
-int __sata_stop(void);
-int sata_port_status(int dev, int port);
-
-extern struct blk_desc sata_dev_desc[];
-#endif
-
 int sata_probe(int devnum);
 int sata_remove(int devnum);
 
index ee9d622680d60a2541cc8152c5f006eebc86ae17..cf756aa62e161b3a80b90fbaedd8377e8499f692 100644 (file)
 #include <bouncebuf.h>
 #include <linux/dma-direction.h>
 
-/* Fix this to the maximum */
-#define SCSI_MAX_DEVICE \
-       (CONFIG_SYS_SCSI_MAX_SCSI_ID * CONFIG_SYS_SCSI_MAX_LUN)
-
 struct udevice;
 
 /**
@@ -355,11 +351,6 @@ int scsi_scan(bool verbose);
  */
 int scsi_scan_dev(struct udevice *dev, bool verbose);
 
-#ifndef CONFIG_DM_SCSI
-void scsi_low_level_init(int busdevfunc);
-void scsi_init(void);
-#endif
-
 #define SCSI_IDENTIFY                                  0xC0  /* not used */
 
 /* Hardware errors  */
index 1bc18e65525e0538acbaade20c64d4870cafc7cf..7e38cc2a2ad0bbe6953be8ee3aca17bae30b32c6 100644 (file)
@@ -9,7 +9,6 @@
 #ifndef _SPI_H_
 #define _SPI_H_
 
-#include <common.h>
 #include <linux/bitops.h>
 
 /* SPI mode flags */
index f331c79c9d546f14c7115f81f8d67f483cf61b57..1208b75ee784a194dd4a0b243585c87a2ee2184b 100644 (file)
@@ -7,7 +7,6 @@
 #ifndef __include_tegra_kbc_h__
 #define __include_tegra_kbc_h__
 
-#include <common.h>
 
 #define KEY_IS_MODIFIER(key) ((key) >= KEY_FIRST_MODIFIER)
 
index 0a6d85a7c1c945faf9cad1c97a11ed14d40388de..ee80bb1f6b9bcdfd4771e9f76e39c78084d1f280 100644 (file)
@@ -11,7 +11,6 @@
 #ifndef TWL4030_H
 #define TWL4030_H
 
-#include <common.h>
 #include <i2c.h>
 
 /* I2C chip addresses */
index 05d476f80485164bc9e645f60efcea9a44962045..e3a1058091ae21a48c1ed715e70853c07d13b45c 100644 (file)
@@ -7,7 +7,6 @@
 #ifndef TWL6030_H
 #define TWL6030_H
 
-#include <common.h>
 #include <i2c.h>
 
 /* I2C chip addresses */
index 6da348eb6285f36b63b3391b6b62fa683a582e43..d7a8851094bc463d04ebb6f8afa4c6a6ccc7f2d1 100644 (file)
@@ -14,7 +14,6 @@
 #ifndef __UBOOT_UBI_H
 #define __UBOOT_UBI_H
 
-#include <common.h>
 #include <compiler.h>
 #include <linux/compat.h>
 #include <malloc.h>
index 80c5af0cbcd21416ec9ee286c1a696f0008092f9..e59f5587eea55222288119fdc5f6a1c2cd5756b4 100644 (file)
@@ -17,7 +17,6 @@
 #ifndef __USBDCORE_H__
 #define __USBDCORE_H__
 
-#include <common.h>
 #include "usbdescriptors.h"
 
 
index 19649517a39bb8cf57b23e9602574e69a6846e8d..9ae846ea5f75d1891f211242457e09a8ade67125 100644 (file)
@@ -74,6 +74,13 @@ config HAVE_PRIVATE_LIBGCC
 config LIB_UUID
        bool
 
+config RANDOM_UUID
+       bool "GPT Random UUID generation"
+       select LIB_UUID
+       help
+         Enable the generation of partitions with random UUIDs if none
+         are provided.
+
 config SPL_LIB_UUID
        depends on SPL
        bool
@@ -93,7 +100,7 @@ config SEMIHOSTING
 
 config SEMIHOSTING_FALLBACK
        bool "Recover gracefully when semihosting fails"
-       depends on SEMIHOSTING && (ARM64 || RISCV)
+       depends on SEMIHOSTING
        default y
        help
          Normally, if U-Boot makes a semihosting call and no debugger is
@@ -116,7 +123,7 @@ config SPL_SEMIHOSTING
 
 config SPL_SEMIHOSTING_FALLBACK
        bool "Recover gracefully when semihosting fails in SPL"
-       depends on SPL_SEMIHOSTING && (ARM64 || RISCV)
+       depends on SPL_SEMIHOSTING
        select ARMV8_SPL_EXCEPTION_VECTORS if ARM64
        default y
        help
index 4ccd26f94a93d181ca1a13b62e1a8afdde3ad80c..547dfd76ef522577181b8d48a5a371aa8640dcd9 100644 (file)
@@ -32,14 +32,14 @@ config EFI_LOADER
 
 if EFI_LOADER
 
-config CMD_BOOTEFI_BOOTMGR
+config BOOTEFI_BOOTMGR
        bool "UEFI Boot Manager"
        default y
        select BOOTMETH_GLOBAL if BOOTSTD
        help
          Select this option if you want to select the UEFI binary to be booted
-         via UEFI variables Boot####, BootOrder, and BootNext. This enables the
-         'bootefi bootmgr' command.
+         via UEFI variables Boot####, BootOrder, and BootNext. You should also
+         normally enable CMD_BOOTEFI_BOOTMGR so that the command is available.
 
 choice
        prompt "Store for non-volatile UEFI variables"
index 8d31fc61c60171803444fee9fd8c616d55f925f2..0a2cb6e3c4766df2c4e660ecfab99e9c25964dc7 100644 (file)
@@ -42,7 +42,7 @@ targets += initrddump.o
 endif
 
 obj-$(CONFIG_CMD_BOOTEFI_HELLO) += helloworld_efi.o
-obj-$(CONFIG_CMD_BOOTEFI_BOOTMGR) += efi_bootmgr.o
+obj-$(CONFIG_BOOTEFI_BOOTMGR) += efi_bootmgr.o
 obj-y += efi_boottime.o
 obj-y += efi_helper.o
 obj-$(CONFIG_EFI_HAVE_CAPSULE_SUPPORT) += efi_capsule.o
index 7b0f45e18a9737880b5d2e63ef2d20ded22798e6..680029096349d1c8b4c6ae5ab0a605337df33e06 100644 (file)
@@ -26,6 +26,7 @@
 #ifdef CONFIG_BOOTP_RANDOM_DELAY
 #include "net_rand.h"
 #endif
+#include <malloc.h>
 
 #define BOOTP_VENDOR_MAGIC     0x63825363      /* RFC1048 Magic Cookie */
 
@@ -601,6 +602,10 @@ static int dhcp_extended(u8 *e, int message_type, struct in_addr server_ip,
        *e++  = 42;
        *cnt += 1;
 #endif
+       if (IS_ENABLED(CONFIG_BOOTP_PXE_DHCP_OPTION)) {
+               *e++ = 209;     /* PXELINUX Config File */
+               *cnt += 1;
+       }
        /* no options, so back up to avoid sending an empty request list */
        if (*cnt == 0)
                e -= 2;
@@ -909,6 +914,22 @@ static void dhcp_process_options(uchar *popt, uchar *end)
                                net_boot_file_name[size] = 0;
                        }
                        break;
+               case 209:       /* PXELINUX Config File */
+                       if (IS_ENABLED(CONFIG_BOOTP_PXE_DHCP_OPTION)) {
+                               /* In case it has already been allocated when get DHCP Offer packet,
+                                * free first to avoid memory leak.
+                                */
+                               if (pxelinux_configfile)
+                                       free(pxelinux_configfile);
+
+                               pxelinux_configfile = (char *)malloc((oplen + 1) * sizeof(char));
+
+                               if (pxelinux_configfile)
+                                       strlcpy(pxelinux_configfile, popt + 2, oplen + 1);
+                               else
+                                       printf("Error: Failed to allocate pxelinux_configfile\n");
+                       }
+                       break;
                default:
 #if defined(CONFIG_BOOTP_VENDOREX)
                        if (dhcp_vendorex_proc(popt))
index 73a1067877cf464699484affcedf6df6d413749c..4aea779f6f24cd4ab1fe8dcefa6ddb5d3692bb35 100644 (file)
@@ -304,7 +304,7 @@ static void dhcp6_parse_ia_options(struct dhcp6_option_hdr *ia_ptr, uchar *ia_op
 static void dhcp6_parse_options(uchar *rx_pkt, unsigned int len)
 {
        uchar *option_ptr;
-       int sol_max_rt_sec, option_len;
+       int sol_max_rt_sec, option_len, param_len_1;
        char *s, *e;
        struct dhcp6_option_hdr *option_hdr;
 
@@ -390,14 +390,23 @@ static void dhcp6_parse_options(uchar *rx_pkt, unsigned int len)
                case DHCP6_OPTION_OPT_BOOTFILE_PARAM:
                        if (IS_ENABLED(CONFIG_DHCP6_PXE_DHCP_OPTION)) {
                                debug("DHCP6_OPTION_OPT_BOOTFILE_PARAM FOUND\n");
+                               /* if CONFIG_DHCP6_PXE_DHCP_OPTION is set the PXE config file path
+                                * is contained in the first OPT_BOOTFILE_PARAM argument
+                                */
+                               param_len_1 = ntohs(*((u16 *)option_ptr));
+                               option_ptr += sizeof(u16);
+                               if (param_len_1 + sizeof(u16) > option_len) {
+                                       debug("Invalid BOOTFILE_PARAM param_len_1. Skipping\n");
+                                       break;
+                               }
 
                                if (pxelinux_configfile)
                                        free(pxelinux_configfile);
 
-                               pxelinux_configfile = (char *)malloc((option_len + 1) *
+                               pxelinux_configfile = (char *)malloc((param_len_1 + 1) *
                                                      sizeof(char));
                                if (pxelinux_configfile)
-                                       strlcpy(pxelinux_configfile, option_ptr, option_len + 1);
+                                       strlcpy(pxelinux_configfile, option_ptr, param_len_1 + 1);
                                else
                                        printf("Error: Failed to allocate pxelinux_configfile\n");
 
index 4311f3fe6e8935625d1d3002e1f2e0ac3d16e17d..3d0ec91dfa495b8d2ce1bfd3a96851b59be66fa6 100644 (file)
@@ -562,10 +562,14 @@ static int eth_post_probe(struct udevice *dev)
        /* Check if the device has a valid MAC address in device tree */
        if (!eth_dev_get_mac_address(dev, pdata->enetaddr) ||
            !is_valid_ethaddr(pdata->enetaddr)) {
-               source = "ROM";
                /* Check if the device has a MAC address in ROM */
-               if (eth_get_ops(dev)->read_rom_hwaddr)
-                       eth_get_ops(dev)->read_rom_hwaddr(dev);
+               if (eth_get_ops(dev)->read_rom_hwaddr) {
+                       int ret;
+
+                       ret = eth_get_ops(dev)->read_rom_hwaddr(dev);
+                       if (!ret)
+                               source = "ROM";
+               }
        }
 
        eth_env_get_enetaddr_by_index("eth", dev_seq(dev), env_enetaddr);
@@ -594,7 +598,7 @@ static int eth_post_probe(struct udevice *dev)
                eth_env_set_enetaddr_by_index("eth", dev_seq(dev),
                                              pdata->enetaddr);
 #else
-               printf("\nError: %s address not set.\n",
+               printf("\nError: %s No valid MAC address found.\n",
                       dev->name);
                return -EINVAL;
 #endif
index 8357f084101975c4930ff78b5a4d2e8e90234481..0fb2d2507734ebd8f4061f280d412fc3d36475e9 100644 (file)
--- a/net/net.c
+++ b/net/net.c
@@ -1201,6 +1201,9 @@ void net_process_received_packet(uchar *in_packet, int len)
        ushort cti = 0, vlanid = VLAN_NONE, myvlanid, mynvlanid;
 
        debug_cond(DEBUG_NET_PKT, "packet received\n");
+       if (DEBUG_NET_PKT_TRACE)
+               print_hex_dump_bytes("rx: ", DUMP_PREFIX_OFFSET, in_packet,
+                                    len);
 
 #if defined(CONFIG_CMD_PCAP)
        pcap_post(in_packet, len, false);
index ca648d23376f9cf50fd2b605f92b450847b77a1e..c3db727c58e38dbbb7498a23ac128dc81b81331e 100644 (file)
@@ -2,6 +2,7 @@ menu "Testing"
 
 config UNIT_TEST
        bool "Unit tests"
+       depends on CMDLINE
        help
          Select this to compile in unit tests for various parts of
          U-Boot. Test suites will be subcommands of the "ut" command.
diff --git a/test/py/tests/test_sandbox_opts.py b/test/py/tests/test_sandbox_opts.py
new file mode 100644 (file)
index 0000000..422b43c
--- /dev/null
@@ -0,0 +1,30 @@
+# SPDX-License-Identifier: GPL-2.0
+# Copyright 2022 Google LLC
+# Written by Simon Glass <sjg@chromium.org>
+
+import pytest
+
+import u_boot_utils as util
+
+# This is needed for Azure, since the default '..' directory is not writeable
+TMPDIR = '/tmp/test_cmdline'
+
+@pytest.mark.slow
+@pytest.mark.boardspec('sandbox')
+def test_sandbox_cmdline(u_boot_console):
+    """Test building sandbox without CONFIG_CMDLINE"""
+    cons = u_boot_console
+
+    out = util.run_and_log(
+        cons, ['./tools/buildman/buildman', '-m', '--board', 'sandbox',
+               '-a', '~CMDLINE', '-o', TMPDIR])
+
+@pytest.mark.slow
+@pytest.mark.boardspec('sandbox')
+def test_sandbox_lto(u_boot_console):
+    """Test building sandbox without CONFIG_LTO"""
+    cons = u_boot_console
+
+    out = util.run_and_log(
+        cons, ['./tools/buildman/buildman', '-m', '--board', 'sandbox',
+               '-a', '~LTO', '-o', TMPDIR])
index 3e42c987d1cd14fdcdb00dc16734f0878afbcac0..f35175b4598d904d1f0d2d612bcb11539b696209 100644 (file)
@@ -480,7 +480,7 @@ class Builder:
         Args:
             commit: Commit object that is being built
             brd: Board object that is being built
-            stage: Stage that we are at (mrproper, config, build)
+            stage: Stage that we are at (mrproper, config, oldconfig, build)
             cwd: Directory where make should be run
             args: Arguments to pass to make
             kwargs: Arguments to pass to command.run_pipe()
index 6a61f64da1d4337bd56b1d2d2d99290c1df68e34..a8599c0bb2a8bde66433aa64878be7af1dfb81c8 100644 (file)
@@ -426,6 +426,12 @@ class BuilderThread(threading.Thread):
 
         # Now do the build, if everything looks OK
         if result.return_code == 0:
+            if adjust_cfg:
+                oldc_args = list(args) + ['oldconfig']
+                oldc_result = self.make(commit, brd, 'oldconfig', cwd,
+                                        *oldc_args, env=env)
+                if oldc_result.return_code:
+                    return oldc_result
             result = self._build(commit, brd, cwd, args, env, cmd_list,
                                  config_only)
             if adjust_cfg:
index 55dd494fe8ee36d02c45702420e57fd73ac377eb..6b88ed815d65162e2f1a28cae780c5dcdd26b37c 100644 (file)
@@ -439,6 +439,8 @@ class TestFunctional(unittest.TestCase):
             tools.write_file(fname, b'CONFIG_SOMETHING=1')
             return command.CommandResult(return_code=0,
                     combined='Test configuration complete')
+        elif stage == 'oldconfig':
+            return command.CommandResult(return_code=0)
         elif stage == 'build':
             stderr = ''
             fname = os.path.join(cwd or '', out_dir, 'u-boot')
@@ -461,7 +463,7 @@ Some images are invalid'''
             return command.CommandResult(return_code=0)
 
         # Not handled, so abort
-        print('make', stage)
+        print('_HandleMake failure: make', stage)
         sys.exit(1)
 
     # Example function to print output lines