Re: [PATCH v2 21/38] pci: mpc85xx: Support 64-bit bus and cpu address
Hello Bin, On 18.02.21 16:57, Bin Meng wrote: > At present the driver only supports 32-bit bus and cpu address. > The controller's outbound registers/fields for extended address > are not programmed. Let's program them to support 64-bit bus and > cpu address. > > Signed-off-by: Bin Meng > --- > > (no changes since v1) > > drivers/pci/pci_mpc85xx.c | 16 > 1 file changed, 8 insertions(+), 8 deletions(-) Reviewed-by: Heiko Schocher bye, Heiko -- DENX Software Engineering GmbH, Managing Director: Wolfgang Denk HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany Phone: +49-8142-66989-52 Fax: +49-8142-66989-80 Email: h...@denx.de
Re: [PATCH v2 20/38] pci: mpc85xx: Support controller register physical address beyond 32-bit
Hello Bin, On 18.02.21 16:57, Bin Meng wrote: > devfdt_get_addr_index() returns fdt_addr_t which might be a 64-bit > physical address. Use map_physmem() to return the virtual address > that can be used by a 32-bit machine. > > Signed-off-by: Bin Meng > --- > > (no changes since v1) > > drivers/pci/pci_mpc85xx.c | 5 ++--- > 1 file changed, 2 insertions(+), 3 deletions(-) Reviewed-by: Heiko Schocher bye, Heiko -- DENX Software Engineering GmbH, Managing Director: Wolfgang Denk HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany Phone: +49-8142-66989-52 Fax: +49-8142-66989-80 Email: h...@denx.de
Re: [PATCH v2 19/38] pci: mpc85xx: Wrap LAW programming with CONFIG_FSL_LAW
Hello Bin, On 18.02.21 16:57, Bin Meng wrote: > For the QEMU ppce500 machine, LAW registers are not implemented > hence CONFIG_FSL_LAW is not turned on and all LAW APIs are not > available. We should wrap all LAW registers programming in the > mpc85xx PCI driver with CONFIG_FSL_LAW. > > Signed-off-by: Bin Meng > --- > > (no changes since v1) > > drivers/pci/pci_mpc85xx.c | 4 > 1 file changed, 4 insertions(+) Reviewed-by: Heiko Schocher bye, Heiko -- DENX Software Engineering GmbH, Managing Director: Wolfgang Denk HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany Phone: +49-8142-66989-52 Fax: +49-8142-66989-80 Email: h...@denx.de
[U-Boot] Please pull from u-boot-i2c
Hello Tom, please pull from u-boot-i2c.git master The following changes since commit ea966d24ef3a9f7f32712a518a07374f9ae43905: Merge https://gitlab.denx.de/u-boot/custodians/u-boot-sunxi (2021-02-19 21:06:16 -0500) are available in the Git repository at: https://gitlab.denx.de/u-boot/custodians/u-boot-i2c.git tags/for-v2021.04 for you to fetch changes up to 2147a16983d17bcb0438607aa7760494afc27014: dm: i2c: use CONFIG_IS_ENABLED macro for DM_I2C/DM_I2C_GPIO (2021-02-21 06:08:00 +0100) i2c changes for v2021.04 new feature: - Allow disabling driver model for I2C in SPL fixes: - i2c-gpio: Fix GPIO output - at91: fix crash when using 'i2c probe' Eugen Hristev (1): i2c: at91: fix crash when using 'i2c probe' Harm Berntsen (1): i2c: i2c-gpio: Fix GPIO output Igor Opaniuk (3): dm: i2c: allow disabling driver model in SPL board: freescale: drop CONFIG_DM_I2C undefs dm: i2c: use CONFIG_IS_ENABLED macro for DM_I2C/DM_I2C_GPIO arch/arm/include/asm/arch-fsl-layerscape/config.h | 2 +- arch/arm/include/asm/arch-lpc32xx/i2c.h | 2 +- arch/arm/include/asm/mach-imx/mxc_i2c.h | 2 +- arch/arm/include/asm/omap_i2c.h | 2 +- arch/arm/mach-imx/i2c-mxv7.c| 2 +- arch/arm/mach-keystone/ddr3_spd.c | 2 +- arch/arm/mach-kirkwood/include/mach/config.h| 2 +- arch/arm/mach-omap2/am33xx/board.c | 2 +- arch/arm/mach-omap2/am33xx/clk_synthesizer.c| 6 +++--- arch/arm/mach-omap2/boot-common.c | 2 +- arch/arm/mach-omap2/clocks-common.c | 2 +- arch/arm/mach-sunxi/board.c | 2 +- arch/powerpc/include/asm/fsl_i2c.h | 2 +- board/freescale/common/dcu_sii9022a.c | 2 +- board/freescale/common/diu_ch7301.c | 2 +- board/freescale/common/emc2305.c| 4 ++-- board/freescale/common/qixis.c | 4 ++-- board/freescale/common/sys_eeprom.c | 20 ++-- board/freescale/common/vid.c| 24 board/freescale/common/vsc3316_3308.c | 10 +- board/freescale/ls1012aqds/ls1012aqds.c | 2 +- board/freescale/ls1012ardb/eth.c| 2 +- board/freescale/ls1012ardb/ls1012ardb.c | 12 ++-- board/freescale/ls1021aqds/dcu.c| 6 +++--- board/freescale/ls1021aqds/ls1021aqds.c | 2 +- board/freescale/ls1021atwr/ls1021atwr.c | 2 +- board/freescale/ls1028a/ls1028a.c | 2 +- board/freescale/ls1043aqds/ls1043aqds.c | 4 ++-- board/freescale/ls1046afrwy/ls1046afrwy.c | 2 +- board/freescale/ls1046aqds/ls1046aqds.c | 2 +- board/freescale/ls1088a/eth_ls1088aqds.c| 16 board/freescale/ls1088a/ls1088a.c | 60 ++-- board/freescale/ls2080aqds/eth.c| 14 +++--- board/freescale/ls2080aqds/ls2080aqds.c | 4 ++-- board/freescale/ls2080ardb/ls2080ardb.c | 2 +- board/freescale/lx2160a/lx2160a.c | 2 +- board/freescale/p1010rdb/p1010rdb.c | 8 board/freescale/p1_p2_rdb_pc/p1_p2_rdb_pc.c | 2 +- board/freescale/t102xrdb/t102xrdb.c | 2 +- board/freescale/t208xqds/t208xqds.c | 2 +- board/friendlyarm/nanopi2/onewire.c | 6 +++--- board/keymile/common/ivm.c | 2 +- board/samsung/common/misc.c | 2 +- board/samsung/trats/trats.c | 10 +- board/samsung/trats2/trats2.c | 10 +- board/sunxi/board.c | 2 +- board/ti/am335x/board.c | 8 board/ti/am335x/mux.c | 2 +- board/ti/am43xx/board.c | 12 ++-- board/ti/common/board_detect.c | 4 ++-- board/ti/ks2_evm/board_k2g.c| 2 +- board/wandboard/wandboard.c | 4 ++-- cmd/eeprom.c| 6 +++--- cmd/i2c.c | 98 +- configs/imx8mp_evk_defconfig| 1 + configs/ls1021atwr_sdcard_ifc_SECURE_BOOT_defconfig | 1 + configs/ls1046ardb_sdcard_SECURE_BOOT_defconfig | 1 + configs/phycore-imx8mp_defconfig| 1 + doc/driver-model/i2c-howto.rst
Re: [PATCH v3 2/3] board: freescale: drop CONFIG_DM_I2C undefs
Hello Igor,
On 09.02.21 12:52, Igor Opaniuk wrote:
> From: Igor Opaniuk
>
> Drop CONFIG_DM_I2C undefs from board header files, and make them
> disabled on these boards in defconfigs instead.
>
> Disabling on Kconfig symbol was done automatically with this script:
>
> cd configs
> files=(*ls1046a*)
> files2=(*T104*RDB*)
> files3=(ls1021atwr_*)
> files4=("imx8mp_evk_defconfig phycore-imx8mp_defconfig")
> combine=("${files[@]}" "${files2[@]}" "${files3[@]}" "${files4[@]}")
> cd ..
>
> for item in ${combine[*]}
> do
>echo "Adjusting $item"
>echo "# CONFIG_SPL_DM_I2C is not set" >> configs/$item
>make $item && make savedefconfig && cp defconfig configs/$item
> done
>
> Signed-off-by: Igor Opaniuk
> ---
>
> Changes in v3:
> - Drop CONFIG_DM_I2C undefs from board header files (instead of
> replacing them with another undef for CONFIG_SPL_DM_I2C), and make them
> disabled on these boards in defconfigs.
>
> configs/imx8mp_evk_defconfig| 1 +
> configs/ls1021atwr_sdcard_ifc_SECURE_BOOT_defconfig | 1 +
> configs/ls1046ardb_sdcard_SECURE_BOOT_defconfig | 1 +
> configs/phycore-imx8mp_defconfig| 1 +
> include/configs/T104xRDB.h | 1 -
> include/configs/imx8mp_evk.h| 1 -
> include/configs/ls1021atwr.h| 1 -
> include/configs/ls1046a_common.h| 1 -
> include/configs/phycore_imx8mp.h| 1 -
> 9 files changed, 4 insertions(+), 5 deletions(-)
Applied to u-boot-i2c.git master
Thanks!
bye,
Heiko
--
DENX Software Engineering GmbH, Managing Director: Wolfgang Denk
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: +49-8142-66989-52 Fax: +49-8142-66989-80 Email: h...@denx.de
Re: [PATCH v3 1/3] dm: i2c: allow disabling driver model in SPL
Hello Igor, On 09.02.21 12:52, Igor Opaniuk wrote: > From: Igor Opaniuk > > At present if U-Boot proper uses driver model for I2C, then SPL has to > also. While this is desirable, it places a significant barrier to moving > to driver model in some cases. For example, with a space-constrained SPL > it may be necessary to enable CONFIG_SPL_OF_PLATDATA which involves > adjusting some drivers. > > This patch introduces a separate Kconfig symbols for enabling DM_I2C and > DM_I2C_GPIO support in SPL. > > This will also help to get away from dirty workarounds to > achieve non-DM I2C support for SPL, which is currently used in some > board header files like: > > ifdef CONFIG_SPL_BUILD > undef CONFIG_DM_I2C > endif > > Reviewed-by: Simon Glass > Reviewed-by: Heiko Schocher > Signed-off-by: Igor Opaniuk > > --- > > (no changes since v2) > > Changes in v2: > - R-b tags applied (Simon and Heiko) > > drivers/i2c/Kconfig | 21 + > drivers/i2c/Makefile | 4 ++-- > drivers/misc/Makefile | 2 +- > 3 files changed, 24 insertions(+), 3 deletions(-) Applied to u-boot-i2c.git master Thanks! bye, Heiko -- DENX Software Engineering GmbH, Managing Director: Wolfgang Denk HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany Phone: +49-8142-66989-52 Fax: +49-8142-66989-80 Email: h...@denx.de
Re: i2c: i2c-gpio: Fix GPIO output
Hello Harm
On 29.11.20 10:47, Harm Berntsen wrote:
> The dm_gpio_set_dir_flags function cannot be used to update the
> configuration of a GPIO pin because it does a bitwise OR with the
> existing flags. Looks like commit 788ea834124b ("gpio: add function
> _dm_gpio_set_dir_flags") has introduced this behaviour and the i2c-gpio
> driver has been broken since.
>
> Signed-off-by: Harm Berntsen
> CC: Heiko Schocher
> CC: Patrick Delaunay
> ---
>
> drivers/i2c/i2c-gpio.c | 17 ++---
> 1 file changed, 10 insertions(+), 7 deletions(-)
Applied to u-boot-i2c.git master
Thanks!
bye,
Heiko
--
DENX Software Engineering GmbH, Managing Director: Wolfgang Denk
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: +49-8142-66989-52 Fax: +49-8142-66989-80 Email: h...@denx.de
Re: [PATCH] i2c: at91: fix crash when using 'i2c probe'
Hello Eugen,
On 04.12.20 17:06, Eugen Hristev wrote:
> When issuing 'i2c probe', the driver was crashing, because at probe
> there is a request with zero length buffer to write to i2c bus.
> The xfer_msg function assumes the buffer is always there, and never
> checks for the buffer length.
>
> => i2c dev 0
> Setting bus to 0
> => i2c probe
> Valid chip addresses:
> data abort
> pc : [<7ffa97dc>] lr : [<7ffa96f8>]
> reloc pc : [<66f277dc>]lr : [<66f276f8>]
> sp : 7fb7c110 ip : 7ff87a28 fp : 7ff99938
> r10: 0002 r9 : 7fb7dec0 r8 :
> r7 : e181c600 r6 : 7fb88c20 r5 : r4 : 7fb7c128
> r3 : r2 : 0001 r1 : r0 : 0009
> Flags: nZCv IRQs off FIQs off Mode SVC_32
> Code: eb0092f4 e1a5 e8bd81f0 e594300c (e5d33000)
> Resetting CPU ...
>
> Fixes: 8800e0fa20 ("i2c: atmel: add i2c driver")
> Signed-off-by: Eugen Hristev
> ---
> drivers/i2c/at91_i2c.c | 4
> 1 file changed, 4 insertions(+)
Applied to u-boot-i2c.git master
Thanks!
bye,
Heiko
--
DENX Software Engineering GmbH, Managing Director: Wolfgang Denk
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: +49-8142-66989-52 Fax: +49-8142-66989-80 Email: h...@denx.de
Re: [PATCH 44/57] ppc: Remove T2081QDS board and ARCH_T2081 support
On Sun, 21 Feb 2021, 2:16 PM Tom Rini, wrote: > This board has not been converted to CONFIG_DM_MMC by the deadline. > Remove it. It is also the only ARCH_T2081 board so remove that support > as well. > > Cc: Shengzhou Liu > Cc: Ruchika Gupta > Signed-off-by: Tom Rini > Does this impact the T2080? I don't see anything obvious in this series (but gmail doesn't do threading well so I could have missed it). I've got a T2080RDB I'd be keen to keep in a working state. --- > arch/powerpc/cpu/mpc85xx/Kconfig | 36 +--- > arch/powerpc/cpu/mpc85xx/Makefile | 2 - > arch/powerpc/cpu/mpc85xx/speed.c | 4 +- > arch/powerpc/cpu/mpc85xx/t2080_serdes.c | 4 - > arch/powerpc/include/asm/config_mpc85xx.h | 5 +- > arch/powerpc/include/asm/immap_85xx.h | 4 +- > board/freescale/t208xqds/Kconfig | 2 +- > board/freescale/t208xqds/Makefile | 1 - > board/freescale/t208xqds/eth_t208xqds.c | 106 -- > board/freescale/t208xqds/t208xqds.c | 70 -- > configs/T2081QDS_NAND_defconfig | 78 > configs/T2081QDS_SDCARD_defconfig | 75 --- > configs/T2081QDS_SPIFLASH_defconfig | 77 > configs/T2081QDS_SRIO_PCIE_BOOT_defconfig | 54 --- > configs/T2081QDS_defconfig| 62 - > drivers/net/Kconfig | 1 - > drivers/net/fm/Makefile | 1 - > include/configs/T208xQDS.h| 7 -- > 18 files changed, 7 insertions(+), 582 deletions(-) > delete mode 100644 configs/T2081QDS_NAND_defconfig > delete mode 100644 configs/T2081QDS_SDCARD_defconfig > delete mode 100644 configs/T2081QDS_SPIFLASH_defconfig > delete mode 100644 configs/T2081QDS_SRIO_PCIE_BOOT_defconfig > delete mode 100644 configs/T2081QDS_defconfig > > diff --git a/arch/powerpc/cpu/mpc85xx/Kconfig > b/arch/powerpc/cpu/mpc85xx/Kconfig > index 565b311f39ac..3a787919f306 100644 > --- a/arch/powerpc/cpu/mpc85xx/Kconfig > +++ b/arch/powerpc/cpu/mpc85xx/Kconfig > @@ -193,14 +193,6 @@ config TARGET_T2080RDB > imply CMD_SATA > imply PANIC_HANG > > -config TARGET_T2081QDS > - bool "Support T2081QDS" > - select ARCH_T2081 > - select SUPPORT_SPL > - select PHYS_64BIT > - select FSL_DDR_FIRST_SLOT_QUAD_CAPABLE > - select FSL_DDR_INTERACTIVE > - > config TARGET_T4160RDB > bool "Support T4160RDB" > select ARCH_T4160 > @@ -924,29 +916,6 @@ config ARCH_T2080 > imply CMD_REGINFO > imply FSL_SATA > > -config ARCH_T2081 > - bool > - select E500MC > - select E6500 > - select FSL_LAW > - select SYS_FSL_DDR_VER_47 > - select SYS_FSL_ERRATUM_A006379 > - select SYS_FSL_ERRATUM_A006593 > - select SYS_FSL_ERRATUM_A007186 > - select SYS_FSL_ERRATUM_A007212 > - select SYS_FSL_ERRATUM_A009942 > - select SYS_FSL_ERRATUM_ESDHC111 > - select FSL_PCIE_RESET > - select SYS_FSL_HAS_DDR3 > - select SYS_FSL_HAS_SEC > - select SYS_FSL_QORIQ_CHASSIS2 > - select SYS_FSL_SEC_BE > - select SYS_FSL_SEC_COMPAT_4 > - select SYS_PPC64 > - select FSL_IFC > - imply CMD_NAND > - imply CMD_REGINFO > - > config ARCH_T4160 > bool > select E500MC > @@ -1048,8 +1017,7 @@ config MAX_CPUS > ARCH_P5040 || \ > ARCH_T1040 || \ > ARCH_T1042 || \ > -ARCH_T2080 || \ > -ARCH_T2081 > +ARCH_T2080 > default 2 if ARCH_B4420 || \ > ARCH_BSC9132 || \ > ARCH_MPC8572 || \ > @@ -1107,7 +1075,6 @@ config SYS_CCSRBAR_DEFAULT > ARCH_T1040 || \ > ARCH_T1042 || \ > ARCH_T2080 || \ > - ARCH_T2081 || \ > ARCH_T4160 || \ > ARCH_T4240 > default 0xe000 if ARCH_QEMU_E500 > @@ -1294,7 +1261,6 @@ config SYS_FSL_NUM_LAWS > ARCH_P5020 || \ > ARCH_P5040 || \ > ARCH_T2080 || \ > - ARCH_T2081 || \ > ARCH_T4160 || \ > ARCH_T4240 > default 16 if ARCH_T1023 || \ > diff --git a/arch/powerpc/cpu/mpc85xx/Makefile > b/arch/powerpc/cpu/mpc85xx/Makefile > index 019fce631425..5bfa9904adda 100644 > --- a/arch/powerpc/cpu/mpc85xx/Makefile > +++ b/arch/powerpc/cpu/mpc85xx/Makefile > @@ -51,7 +51,6 @@ obj-$(CONFIG_ARCH_T1042) += t1040_ids.o > obj-$(CONFIG_ARCH_T1023) += t1024_ids.o > obj-$(CONFIG_ARCH_T1024) += t1024_ids.o > obj-$(CONFIG_ARCH_T2080) += t2080_ids.o > -obj-$(CONFIG_ARCH_T2081) += t2080_ids.o
[PATCH 55/57] ppc: Remove T1023RDB board
This board has not been converted to CONFIG_DM_MMC by the deadline. Remove it. As this is the last ARCH_T1023 platform, remove that support as well. Cc: Priyanka Jain Signed-off-by: Tom Rini --- arch/powerpc/cpu/mpc85xx/Kconfig| 38 +- arch/powerpc/cpu/mpc85xx/Makefile | 2 - arch/powerpc/cpu/mpc85xx/speed.c| 4 +- arch/powerpc/include/asm/config_mpc85xx.h | 2 +- arch/powerpc/include/asm/fsl_secure_boot.h | 1 - arch/powerpc/include/asm/immap_85xx.h | 4 +- board/freescale/t102xrdb/Kconfig| 14 - board/freescale/t102xrdb/MAINTAINERS| 15 - board/freescale/t102xrdb/Makefile | 17 - board/freescale/t102xrdb/README | 340 -- board/freescale/t102xrdb/cpld.c | 102 --- board/freescale/t102xrdb/cpld.h | 48 -- board/freescale/t102xrdb/ddr.c | 258 --- board/freescale/t102xrdb/eth_t102xrdb.c | 149 board/freescale/t102xrdb/law.c | 31 - board/freescale/t102xrdb/pci.c | 25 - board/freescale/t102xrdb/spl.c | 142 board/freescale/t102xrdb/t1023_nand_rcw.cfg | 8 - board/freescale/t102xrdb/t1023_sd_rcw.cfg | 8 - board/freescale/t102xrdb/t1023_spi_rcw.cfg | 8 - board/freescale/t102xrdb/t1024_nand_rcw.cfg | 8 - board/freescale/t102xrdb/t1024_pbi.cfg | 26 - board/freescale/t102xrdb/t1024_sd_rcw.cfg | 8 - board/freescale/t102xrdb/t1024_spi_rcw.cfg | 8 - board/freescale/t102xrdb/t102xrdb.c | 397 --- board/freescale/t102xrdb/t102xrdb.h | 15 - board/freescale/t102xrdb/tlb.c | 116 configs/T1023RDB_NAND_defconfig | 80 --- configs/T1023RDB_SDCARD_defconfig | 77 --- configs/T1023RDB_SECURE_BOOT_defconfig | 67 -- configs/T1023RDB_SPIFLASH_defconfig | 79 --- configs/T1023RDB_defconfig | 64 -- configs/T1024RDB_NAND_defconfig | 93 --- configs/T1024RDB_SDCARD_defconfig | 90 --- configs/T1024RDB_SECURE_BOOT_defconfig | 71 -- configs/T1024RDB_SPIFLASH_defconfig | 92 --- configs/T1024RDB_defconfig | 78 --- drivers/net/Kconfig | 1 - drivers/net/fm/Makefile | 1 - include/configs/T102xRDB.h | 709 40 files changed, 6 insertions(+), 3290 deletions(-) delete mode 100644 board/freescale/t102xrdb/Kconfig delete mode 100644 board/freescale/t102xrdb/MAINTAINERS delete mode 100644 board/freescale/t102xrdb/Makefile delete mode 100644 board/freescale/t102xrdb/README delete mode 100644 board/freescale/t102xrdb/cpld.c delete mode 100644 board/freescale/t102xrdb/cpld.h delete mode 100644 board/freescale/t102xrdb/ddr.c delete mode 100644 board/freescale/t102xrdb/eth_t102xrdb.c delete mode 100644 board/freescale/t102xrdb/law.c delete mode 100644 board/freescale/t102xrdb/pci.c delete mode 100644 board/freescale/t102xrdb/spl.c delete mode 100644 board/freescale/t102xrdb/t1023_nand_rcw.cfg delete mode 100644 board/freescale/t102xrdb/t1023_sd_rcw.cfg delete mode 100644 board/freescale/t102xrdb/t1023_spi_rcw.cfg delete mode 100644 board/freescale/t102xrdb/t1024_nand_rcw.cfg delete mode 100644 board/freescale/t102xrdb/t1024_pbi.cfg delete mode 100644 board/freescale/t102xrdb/t1024_sd_rcw.cfg delete mode 100644 board/freescale/t102xrdb/t1024_spi_rcw.cfg delete mode 100644 board/freescale/t102xrdb/t102xrdb.c delete mode 100644 board/freescale/t102xrdb/t102xrdb.h delete mode 100644 board/freescale/t102xrdb/tlb.c delete mode 100644 configs/T1023RDB_NAND_defconfig delete mode 100644 configs/T1023RDB_SDCARD_defconfig delete mode 100644 configs/T1023RDB_SECURE_BOOT_defconfig delete mode 100644 configs/T1023RDB_SPIFLASH_defconfig delete mode 100644 configs/T1023RDB_defconfig delete mode 100644 configs/T1024RDB_NAND_defconfig delete mode 100644 configs/T1024RDB_SDCARD_defconfig delete mode 100644 configs/T1024RDB_SECURE_BOOT_defconfig delete mode 100644 configs/T1024RDB_SPIFLASH_defconfig delete mode 100644 configs/T1024RDB_defconfig delete mode 100644 include/configs/T102xRDB.h diff --git a/arch/powerpc/cpu/mpc85xx/Kconfig b/arch/powerpc/cpu/mpc85xx/Kconfig index 55cce515ccf0..42c4d1f0399e 100644 --- a/arch/powerpc/cpu/mpc85xx/Kconfig +++ b/arch/powerpc/cpu/mpc85xx/Kconfig @@ -124,16 +124,6 @@ config TARGET_QEMU_PPCE500 select ARCH_QEMU_E500 select PHYS_64BIT -config TARGET_T1023RDB - bool "Support T1023RDB" - select ARCH_T1023 - select BOARD_LATE_INIT if CHAIN_OF_TRUST - select SUPPORT_SPL - select PHYS_64BIT - select FSL_DDR_INTERACTIVE - imply CMD_EEPROM - imply PANIC_HANG - config TARGET_T1024RDB bool "Support T1024RDB" select ARCH_T1024 @@ -722,27 +712,6 @@ config ARCH_P5040 config ARCH_QEMU_E500 bool -config ARCH_T1023 - bool - select
[PATCH 42/57] ppc: Remove T1040RDB boards
These boards have not been converted to CONFIG_DM_MMC by the deadline. Remove them. Cc: Priyanka Jain Cc: Ruchika Gupta Cc: Sumit Garg Signed-off-by: Tom Rini --- arch/powerpc/cpu/mpc85xx/Kconfig | 19 - arch/powerpc/include/asm/fsl_secure_boot.h| 2 - board/freescale/t104xrdb/Kconfig | 16 - board/freescale/t104xrdb/MAINTAINERS | 38 - board/freescale/t104xrdb/Makefile | 16 - board/freescale/t104xrdb/README | 386 - board/freescale/t104xrdb/cpld.c | 115 --- board/freescale/t104xrdb/cpld.h | 46 - board/freescale/t104xrdb/ddr.c| 146 board/freescale/t104xrdb/ddr.h| 56 -- board/freescale/t104xrdb/diu.c| 84 -- board/freescale/t104xrdb/eth.c| 157 board/freescale/t104xrdb/law.c| 31 - board/freescale/t104xrdb/pci.c| 25 - board/freescale/t104xrdb/spl.c| 141 --- board/freescale/t104xrdb/t1040_nand_rcw.cfg | 7 - board/freescale/t104xrdb/t1040_sd_rcw.cfg | 7 - board/freescale/t104xrdb/t1040_spi_rcw.cfg| 7 - board/freescale/t104xrdb/t1040d4_nand_rcw.cfg | 7 - board/freescale/t104xrdb/t1040d4_sd_rcw.cfg | 7 - board/freescale/t104xrdb/t1040d4_spi_rcw.cfg | 7 - board/freescale/t104xrdb/t1042_nand_rcw.cfg | 7 - .../freescale/t104xrdb/t1042_pi_nand_rcw.cfg | 7 - board/freescale/t104xrdb/t1042_pi_sd_rcw.cfg | 7 - board/freescale/t104xrdb/t1042_pi_spi_rcw.cfg | 7 - board/freescale/t104xrdb/t1042_sd_rcw.cfg | 7 - board/freescale/t104xrdb/t1042_spi_rcw.cfg| 7 - board/freescale/t104xrdb/t1042d4_nand_rcw.cfg | 7 - board/freescale/t104xrdb/t1042d4_sd_rcw.cfg | 7 - board/freescale/t104xrdb/t1042d4_spi_rcw.cfg | 7 - board/freescale/t104xrdb/t104x_pbi.cfg| 36 - board/freescale/t104xrdb/t104x_pbi_sb.cfg | 38 - board/freescale/t104xrdb/t104xrdb.c | 164 board/freescale/t104xrdb/t104xrdb.h | 12 - board/freescale/t104xrdb/tlb.c| 131 --- configs/T1040D4RDB_NAND_defconfig | 78 -- configs/T1040D4RDB_SDCARD_defconfig | 75 -- configs/T1040D4RDB_SECURE_BOOT_defconfig | 64 -- configs/T1040D4RDB_SPIFLASH_defconfig | 77 -- configs/T1040D4RDB_defconfig | 62 -- configs/T1040RDB_NAND_defconfig | 79 -- configs/T1040RDB_SDCARD_defconfig | 76 -- configs/T1040RDB_SECURE_BOOT_defconfig| 65 -- configs/T1040RDB_SPIFLASH_defconfig | 78 -- configs/T1040RDB_defconfig| 63 -- configs/T1042D4RDB_NAND_defconfig | 86 -- configs/T1042D4RDB_SDCARD_defconfig | 83 -- configs/T1042D4RDB_SECURE_BOOT_defconfig | 63 -- configs/T1042D4RDB_SPIFLASH_defconfig | 85 -- configs/T1042D4RDB_defconfig | 71 -- .../T1042RDB_PI_NAND_SECURE_BOOT_defconfig| 84 -- configs/T1042RDB_PI_NAND_defconfig| 79 -- configs/T1042RDB_PI_SDCARD_defconfig | 76 -- configs/T1042RDB_PI_SPIFLASH_defconfig| 78 -- configs/T1042RDB_PI_defconfig | 63 -- configs/T1042RDB_SECURE_BOOT_defconfig| 64 -- configs/T1042RDB_defconfig| 62 -- include/configs/T104xRDB.h| 806 -- 58 files changed, 4181 deletions(-) delete mode 100644 board/freescale/t104xrdb/Kconfig delete mode 100644 board/freescale/t104xrdb/MAINTAINERS delete mode 100644 board/freescale/t104xrdb/Makefile delete mode 100644 board/freescale/t104xrdb/README delete mode 100644 board/freescale/t104xrdb/cpld.c delete mode 100644 board/freescale/t104xrdb/cpld.h delete mode 100644 board/freescale/t104xrdb/ddr.c delete mode 100644 board/freescale/t104xrdb/ddr.h delete mode 100644 board/freescale/t104xrdb/diu.c delete mode 100644 board/freescale/t104xrdb/eth.c delete mode 100644 board/freescale/t104xrdb/law.c delete mode 100644 board/freescale/t104xrdb/pci.c delete mode 100644 board/freescale/t104xrdb/spl.c delete mode 100644 board/freescale/t104xrdb/t1040_nand_rcw.cfg delete mode 100644 board/freescale/t104xrdb/t1040_sd_rcw.cfg delete mode 100644 board/freescale/t104xrdb/t1040_spi_rcw.cfg delete mode 100644 board/freescale/t104xrdb/t1040d4_nand_rcw.cfg delete mode 100644 board/freescale/t104xrdb/t1040d4_sd_rcw.cfg delete mode 100644 board/freescale/t104xrdb/t1040d4_spi_rcw.cfg delete mode 100644 board/freescale/t104xrdb/t1042_nand_rcw.cfg delete mode 100644 board/freescale/t104xrdb/t1042_pi_nand_rcw.cfg delete mode 100644 board/freescale/t104xrdb/t1042_pi_sd_rcw.cfg delete mode 100644 board/freescale/t104xrdb/t1042_pi_spi_rcw.cfg delete mode 100644 board/freescale/t104xrdb/t1042_sd_rcw.cfg delete mode 100644 board/freescale/t104xrdb/t1042_spi_rcw.cfg delete mode 100644 board/freescale/t104xrdb/t1042d4_nand_rcw.cfg delete mode 100644 board/
[PATCH] usb: kbd: Also accept keyboards with Interrupt OUT endpoint
The OUT endpoint can just be ignored as it is not used, just as the
corresponding Set_Report request for IN-only interfaces. E.g. the
Linux gadget hid keyboard also provides an interrupt endpoint.
Also cleanup confusing debug messages like "found set protocol", which
is printed when a keyboard device is found, while the Set_Protocol request
is issued quite some time later.
Signed-off-by: Stefan Brüns
---
common/usb_kbd.c | 23 ++-
1 file changed, 14 insertions(+), 9 deletions(-)
diff --git a/common/usb_kbd.c b/common/usb_kbd.c
index 60c6027e04..afad260d3d 100644
--- a/common/usb_kbd.c
+++ b/common/usb_kbd.c
@@ -443,6 +443,7 @@ static int usb_kbd_probe_dev(struct usb_device *dev,
unsigned int ifnum)
struct usb_interface *iface;
struct usb_endpoint_descriptor *ep;
struct usb_kbd_pdata *data;
+ int epNum;
if (dev->descriptor.bNumConfigurations != 1)
return 0;
@@ -458,19 +459,21 @@ static int usb_kbd_probe_dev(struct usb_device *dev,
unsigned int ifnum)
if (iface->desc.bInterfaceProtocol != USB_PROT_HID_KEYBOARD)
return 0;
- if (iface->desc.bNumEndpoints != 1)
- return 0;
+ for (epNum = 0; epNum < iface->desc.bNumEndpoints; epNum++) {
+ ep = &iface->ep_desc[epNum];
- ep = &iface->ep_desc[0];
+ /* Check if endpoint is interrupt IN endpoint */
+ if ((ep->bmAttributes & 3) != 3)
+ continue;
- /* Check if endpoint 1 is interrupt endpoint */
- if (!(ep->bEndpointAddress & 0x80))
- return 0;
+ if (ep->bEndpointAddress & 0x80)
+ break;
+ }
- if ((ep->bmAttributes & 3) != 3)
+ if (epNum == iface->desc.bNumEndpoints)
return 0;
- debug("USB KBD: found set protocol...\n");
+ debug("USB KBD: found interrupt EP: 0x%x\n", ep->bEndpointAddress);
data = malloc(sizeof(struct usb_kbd_pdata));
if (!data) {
@@ -498,13 +501,15 @@ static int usb_kbd_probe_dev(struct usb_device *dev,
unsigned int ifnum)
data->last_report = -1;
/* We found a USB Keyboard, install it. */
+ debug("USB KBD: set boot protocol\n");
usb_set_protocol(dev, iface->desc.bInterfaceNumber, 0);
- debug("USB KBD: found set idle...\n");
#if !defined(CONFIG_SYS_USB_EVENT_POLL_VIA_CONTROL_EP) && \
!defined(CONFIG_SYS_USB_EVENT_POLL_VIA_INT_QUEUE)
+ debug("USB KBD: set idle interval...\n");
usb_set_idle(dev, iface->desc.bInterfaceNumber, REPEAT_RATE / 4, 0);
#else
+ debug("USB KBD: set idle interval=0...\n");
usb_set_idle(dev, iface->desc.bInterfaceNumber, 0, 0);
#endif
--
2.30.1
[PATCH 56/57] ppc: Remove T4160RDB board
This board has not been converted to CONFIG_DM_MMC by the deadline. Remove it. As this is the last ARCH_T1023 platform, remove that support as well. Cc: Priyanka Jain Signed-off-by: Tom Rini --- arch/powerpc/cpu/mpc85xx/Kconfig | 39 +- arch/powerpc/cpu/mpc85xx/Makefile | 2 - arch/powerpc/cpu/mpc85xx/fdt.c| 5 +- .../powerpc/cpu/mpc85xx/fsl_corenet2_serdes.c | 2 +- arch/powerpc/cpu/mpc85xx/speed.c | 3 +- arch/powerpc/cpu/mpc85xx/t4240_serdes.c | 202 -- arch/powerpc/include/asm/config_mpc85xx.h | 5 +- arch/powerpc/include/asm/fsl_secure_boot.h| 1 - arch/powerpc/include/asm/immap_85xx.h | 4 +- board/freescale/t4rdb/Kconfig | 14 - board/freescale/t4rdb/MAINTAINERS | 8 - board/freescale/t4rdb/Makefile| 19 - board/freescale/t4rdb/cpld.c | 129 board/freescale/t4rdb/cpld.h | 48 -- board/freescale/t4rdb/ddr.c | 128 board/freescale/t4rdb/ddr.h | 77 -- board/freescale/t4rdb/eth.c | 152 board/freescale/t4rdb/law.c | 30 - board/freescale/t4rdb/pci.c | 25 - board/freescale/t4rdb/spl.c | 98 --- board/freescale/t4rdb/t4240rdb.c | 153 board/freescale/t4rdb/t4_pbi.cfg | 27 - board/freescale/t4rdb/t4_sd_rcw.cfg | 7 - board/freescale/t4rdb/t4rdb.h | 17 - board/freescale/t4rdb/tlb.c | 123 configs/T4160RDB_defconfig| 57 -- configs/T4240RDB_SDCARD_defconfig | 78 -- configs/T4240RDB_defconfig| 66 -- drivers/ddr/fsl/Kconfig | 3 +- drivers/net/Kconfig | 1 - drivers/net/fm/Makefile | 1 - include/configs/T4240RDB.h| 667 -- 32 files changed, 9 insertions(+), 2182 deletions(-) delete mode 100644 board/freescale/t4rdb/Kconfig delete mode 100644 board/freescale/t4rdb/MAINTAINERS delete mode 100644 board/freescale/t4rdb/Makefile delete mode 100644 board/freescale/t4rdb/cpld.c delete mode 100644 board/freescale/t4rdb/cpld.h delete mode 100644 board/freescale/t4rdb/ddr.c delete mode 100644 board/freescale/t4rdb/ddr.h delete mode 100644 board/freescale/t4rdb/eth.c delete mode 100644 board/freescale/t4rdb/law.c delete mode 100644 board/freescale/t4rdb/pci.c delete mode 100644 board/freescale/t4rdb/spl.c delete mode 100644 board/freescale/t4rdb/t4240rdb.c delete mode 100644 board/freescale/t4rdb/t4_pbi.cfg delete mode 100644 board/freescale/t4rdb/t4_sd_rcw.cfg delete mode 100644 board/freescale/t4rdb/t4rdb.h delete mode 100644 board/freescale/t4rdb/tlb.c delete mode 100644 configs/T4160RDB_defconfig delete mode 100644 configs/T4240RDB_SDCARD_defconfig delete mode 100644 configs/T4240RDB_defconfig delete mode 100644 include/configs/T4240RDB.h diff --git a/arch/powerpc/cpu/mpc85xx/Kconfig b/arch/powerpc/cpu/mpc85xx/Kconfig index 42c4d1f0399e..143ddaec2e6a 100644 --- a/arch/powerpc/cpu/mpc85xx/Kconfig +++ b/arch/powerpc/cpu/mpc85xx/Kconfig @@ -179,13 +179,6 @@ config TARGET_T2080RDB imply CMD_SATA imply PANIC_HANG -config TARGET_T4160RDB - bool "Support T4160RDB" - select ARCH_T4160 - select SUPPORT_SPL - select PHYS_64BIT - imply PANIC_HANG - config TARGET_T4240RDB bool "Support T4240RDB" select ARCH_T4240 @@ -810,31 +803,6 @@ config ARCH_T2080 imply CMD_REGINFO imply FSL_SATA -config ARCH_T4160 - bool - select E500MC - select E6500 - select FSL_LAW - select SYS_FSL_DDR_VER_47 - select SYS_FSL_ERRATUM_A004468 - select SYS_FSL_ERRATUM_A005871 - select SYS_FSL_ERRATUM_A006379 - select SYS_FSL_ERRATUM_A006593 - select SYS_FSL_ERRATUM_A007186 - select SYS_FSL_ERRATUM_A007798 - select SYS_FSL_ERRATUM_A009942 - select SYS_FSL_HAS_DDR3 - select SYS_FSL_HAS_SEC - select SYS_FSL_QORIQ_CHASSIS2 - select SYS_FSL_SEC_BE - select SYS_FSL_SEC_COMPAT_4 - select SYS_PPC64 - select FSL_IFC - imply CMD_SATA - imply CMD_NAND - imply CMD_REGINFO - imply FSL_SATA - config ARCH_T4240 bool select E500MC @@ -903,8 +871,7 @@ config NXP_ESBC config MAX_CPUS int "Maximum number of CPUs permitted for MPC85xx" default 12 if ARCH_T4240 - default 8 if ARCH_P4080 || \ -ARCH_T4160 + default 8 if ARCH_P4080 default 4 if ARCH_B4860 || \ ARCH_P2041 || \ ARCH_P3041 || \ @@ -962,7 +929,6 @@ config SYS_CCSRBAR_DEFAULT ARCH_T1040 || \ ARCH_T1042 || \
[PATCH 48/57] ppc: Remove controlcenterd boards
These boards have not been converted to CONFIG_DM_MMC by the deadline. Remove them. Cc: Mario Six Cc: Dirk Eibach Signed-off-by: Tom Rini --- arch/powerpc/cpu/mpc85xx/Kconfig |5 - board/gdsys/p1022/Kconfig | 22 - board/gdsys/p1022/MAINTAINERS |9 - board/gdsys/p1022/Makefile| 10 - board/gdsys/p1022/controlcenterd-id.c | 1244 - board/gdsys/p1022/controlcenterd-id.h | 15 - board/gdsys/p1022/controlcenterd.c| 431 -- board/gdsys/p1022/ddr.c | 68 - board/gdsys/p1022/diu.c | 85 -- board/gdsys/p1022/law.c | 16 - board/gdsys/p1022/sdhc_boot.c | 63 - board/gdsys/p1022/tlb.c | 73 - ...trolcenterd_36BIT_SDCARD_DEVELOP_defconfig | 69 - configs/controlcenterd_36BIT_SDCARD_defconfig | 69 - ...ntrolcenterd_TRAILBLAZER_DEVELOP_defconfig | 36 - configs/controlcenterd_TRAILBLAZER_defconfig | 36 - include/configs/controlcenterd.h | 352 - 17 files changed, 2603 deletions(-) delete mode 100644 board/gdsys/p1022/Kconfig delete mode 100644 board/gdsys/p1022/MAINTAINERS delete mode 100644 board/gdsys/p1022/Makefile delete mode 100644 board/gdsys/p1022/controlcenterd-id.c delete mode 100644 board/gdsys/p1022/controlcenterd-id.h delete mode 100644 board/gdsys/p1022/controlcenterd.c delete mode 100644 board/gdsys/p1022/ddr.c delete mode 100644 board/gdsys/p1022/diu.c delete mode 100644 board/gdsys/p1022/law.c delete mode 100644 board/gdsys/p1022/sdhc_boot.c delete mode 100644 board/gdsys/p1022/tlb.c delete mode 100644 configs/controlcenterd_36BIT_SDCARD_DEVELOP_defconfig delete mode 100644 configs/controlcenterd_36BIT_SDCARD_defconfig delete mode 100644 configs/controlcenterd_TRAILBLAZER_DEVELOP_defconfig delete mode 100644 configs/controlcenterd_TRAILBLAZER_defconfig delete mode 100644 include/configs/controlcenterd.h diff --git a/arch/powerpc/cpu/mpc85xx/Kconfig b/arch/powerpc/cpu/mpc85xx/Kconfig index 3a787919f306..77dae8f6ffab 100644 --- a/arch/powerpc/cpu/mpc85xx/Kconfig +++ b/arch/powerpc/cpu/mpc85xx/Kconfig @@ -209,10 +209,6 @@ config TARGET_T4240RDB imply CMD_SATA imply PANIC_HANG -config TARGET_CONTROLCENTERD - bool "Support controlcenterd" - select ARCH_P1022 - config TARGET_KMP204X bool "Support kmp204x" select VENDOR_KM @@ -1390,7 +1386,6 @@ source "board/freescale/t102xrdb/Kconfig" source "board/freescale/t208xqds/Kconfig" source "board/freescale/t208xrdb/Kconfig" source "board/freescale/t4rdb/Kconfig" -source "board/gdsys/p1022/Kconfig" source "board/keymile/Kconfig" source "board/sbc8548/Kconfig" source "board/socrates/Kconfig" diff --git a/board/gdsys/p1022/Kconfig b/board/gdsys/p1022/Kconfig deleted file mode 100644 index f5154271d157.. --- a/board/gdsys/p1022/Kconfig +++ /dev/null @@ -1,22 +0,0 @@ -config GDSYS_LEGACY_DRIVERS - bool - help - Enable the gdsys legacy drivers under board/gdsys/common. If this - option is not set, all relevant DM drivers must be configured for the - device in question. - -if TARGET_CONTROLCENTERD - -config SYS_BOARD - default "p1022" - -config SYS_VENDOR - default "gdsys" - -config SYS_CONFIG_NAME - default "controlcenterd" - -config GDSYS_LEGACY_DRIVERS - default y - -endif diff --git a/board/gdsys/p1022/MAINTAINERS b/board/gdsys/p1022/MAINTAINERS deleted file mode 100644 index 99f1200c0984.. --- a/board/gdsys/p1022/MAINTAINERS +++ /dev/null @@ -1,9 +0,0 @@ -P1022 BOARD -M: Dirk Eibach -S: Maintained -F: board/gdsys/p1022/ -F: include/configs/controlcenterd.h -F: configs/controlcenterd_36BIT_SDCARD_defconfig -F: configs/controlcenterd_36BIT_SDCARD_DEVELOP_defconfig -F: configs/controlcenterd_TRAILBLAZER_defconfig -F: configs/controlcenterd_TRAILBLAZER_DEVELOP_defconfig diff --git a/board/gdsys/p1022/Makefile b/board/gdsys/p1022/Makefile deleted file mode 100644 index 83a008d198f6.. --- a/board/gdsys/p1022/Makefile +++ /dev/null @@ -1,10 +0,0 @@ -# SPDX-License-Identifier: GPL-2.0+ -# -# Copyright 2010 Freescale Semiconductor, Inc. - -obj-y += law.o -obj-y += ddr.o -obj-y += tlb.o -obj-y += sdhc_boot.o -obj-$(CONFIG_CONTROLCENTERD) += controlcenterd.o controlcenterd-id.o -obj-$(CONFIG_FSL_DIU_FB) += diu.o diff --git a/board/gdsys/p1022/controlcenterd-id.c b/board/gdsys/p1022/controlcenterd-id.c deleted file mode 100644 index 1b5aa9042f57.. --- a/board/gdsys/p1022/controlcenterd-id.c +++ /dev/null @@ -1,1244 +0,0 @@ -// SPDX-License-Identifier: GPL-2.0+ -/* - * (C) Copyright 2013 - * Reinhard Pfau, Guntermann & Drunck GmbH, reinhard.p...@gdsys.cc - */ - -/* TODO: some more #ifdef's to avoid unneeded code for stage 1 / stage 2 */ - -#ifdef CCDM_ID_DEBUG -#define DEBUG -#endif - -#include
[PATCH 50/57] ppc: Remove MPC837XERDB board
This board has not been converted to CONFIG_DM_MMC by the deadline. Remove it. Cc: Sinan Akman Signed-off-by: Tom Rini --- arch/powerpc/cpu/mpc83xx/Kconfig | 6 - board/freescale/mpc837xerdb/Kconfig | 12 - board/freescale/mpc837xerdb/MAINTAINERS | 7 - board/freescale/mpc837xerdb/Makefile | 7 - board/freescale/mpc837xerdb/README| 97 - board/freescale/mpc837xerdb/mpc837xerdb.c | 226 board/freescale/mpc837xerdb/pci.c | 109 -- configs/MPC837XERDB_SLAVE_defconfig | 142 configs/MPC837XERDB_defconfig | 186 -- include/configs/MPC837XERDB.h | 412 -- 10 files changed, 1204 deletions(-) delete mode 100644 board/freescale/mpc837xerdb/Kconfig delete mode 100644 board/freescale/mpc837xerdb/MAINTAINERS delete mode 100644 board/freescale/mpc837xerdb/Makefile delete mode 100644 board/freescale/mpc837xerdb/README delete mode 100644 board/freescale/mpc837xerdb/mpc837xerdb.c delete mode 100644 board/freescale/mpc837xerdb/pci.c delete mode 100644 configs/MPC837XERDB_SLAVE_defconfig delete mode 100644 configs/MPC837XERDB_defconfig delete mode 100644 include/configs/MPC837XERDB.h diff --git a/arch/powerpc/cpu/mpc83xx/Kconfig b/arch/powerpc/cpu/mpc83xx/Kconfig index d2c620e22954..b13a555413ec 100644 --- a/arch/powerpc/cpu/mpc83xx/Kconfig +++ b/arch/powerpc/cpu/mpc83xx/Kconfig @@ -82,11 +82,6 @@ config TARGET_MPC837XEMDS imply CMD_SATA imply FSL_SATA -config TARGET_MPC837XERDB - bool "Support MPC837XERDB" - select ARCH_MPC837X - select BOARD_EARLY_INIT_F - config TARGET_IDS8313 bool "Support ids8313" select ARCH_MPC8313 @@ -322,7 +317,6 @@ source "board/freescale/mpc832xemds/Kconfig" source "board/freescale/mpc8349emds/Kconfig" source "board/freescale/mpc8349itx/Kconfig" source "board/freescale/mpc837xemds/Kconfig" -source "board/freescale/mpc837xerdb/Kconfig" source "board/ids/ids8313/Kconfig" source "board/keymile/Kconfig" source "board/mpc8308_p1m/Kconfig" diff --git a/board/freescale/mpc837xerdb/Kconfig b/board/freescale/mpc837xerdb/Kconfig deleted file mode 100644 index 03415f9fc941.. --- a/board/freescale/mpc837xerdb/Kconfig +++ /dev/null @@ -1,12 +0,0 @@ -if TARGET_MPC837XERDB - -config SYS_BOARD - default "mpc837xerdb" - -config SYS_VENDOR - default "freescale" - -config SYS_CONFIG_NAME - default "MPC837XERDB" - -endif diff --git a/board/freescale/mpc837xerdb/MAINTAINERS b/board/freescale/mpc837xerdb/MAINTAINERS deleted file mode 100644 index 9f44a37a0d94.. --- a/board/freescale/mpc837xerdb/MAINTAINERS +++ /dev/null @@ -1,7 +0,0 @@ -MPC837XERDB BOARD -M: Sinan Akman -S: Maintained -F: board/freescale/mpc837xerdb/ -F: include/configs/MPC837XERDB.h -F: configs/MPC837XERDB_defconfig -F: configs/MPC837XERDB_SLAVE_defconfig diff --git a/board/freescale/mpc837xerdb/Makefile b/board/freescale/mpc837xerdb/Makefile deleted file mode 100644 index c683b017b559.. --- a/board/freescale/mpc837xerdb/Makefile +++ /dev/null @@ -1,7 +0,0 @@ -# SPDX-License-Identifier: GPL-2.0+ -# -# (C) Copyright 2006 -# Wolfgang Denk, DENX Software Engineering, w...@denx.de. - -obj-y += mpc837xerdb.o -obj-$(CONFIG_PCI) += pci.o diff --git a/board/freescale/mpc837xerdb/README b/board/freescale/mpc837xerdb/README deleted file mode 100644 index 12df2f2e756d.. --- a/board/freescale/mpc837xerdb/README +++ /dev/null @@ -1,97 +0,0 @@ -Freescale MPC837xE-RDB Board -- - -1. Board Description - - The MPC837xE-RDB are reference boards featuring the Freescale MPC8377E, - MPC8378E, and the MPC8379E processors in a Mini-ITX form factor. - - The MPC837xE-RDB's have the following common features: - - A) 256-MBytes on-board DDR2 unbuffered SDRAM - B) 8-Mbytes NOR Flash - C) 32-MBytes NAND Flash - D) 1 Secure Digital High Speed Card (SDHC) Interface - E) 1 Gigabit Ethernet - F) 5-port Ethernet switch (Vitesse 7385) - G) 1 32-bit, 3.3 V, PCI slot - H) 1 32-bit, 3.3 V, Mini-PCI slot - I) 4-port USB 2.0 Hub - J) 1-port OTG USB - K) 2 serial ports (top main console) - L) on board Oscillator: 66M - - The MPC837xE-RDB's have the following differences: - - MPC8377E-RDBMPC8378E-RDBMPC8379E-RDB - SATA controllers2 0 4 - PCI-Express (mini) 2 2 0 - SGMII Ports 0 2 0 - - -2. Memory Map - -2.1. The memory map should look pretty much like this: - - Address Range Device Size Port Size - (Bytes) (Bits) - === =
[PATCH 57/57] DM: DM_MMC migration is now mandatory for non-SPL
As it has been now two years past the migration deadline, it is required to have migrated. Remove the check from the Makefile and rework some of the Kconfig logic slightly to get the functional dependencies of DM_MMC / BLK right in both the SPL and non-SPL case. Signed-off-by: Tom Rini --- Makefile | 10 -- drivers/block/Kconfig | 2 +- drivers/mmc/Kconfig | 4 +++- 3 files changed, 4 insertions(+), 12 deletions(-) diff --git a/Makefile b/Makefile index 4da46dea39b0..bfc353be2d1b 100644 --- a/Makefile +++ b/Makefile @@ -1044,16 +1044,6 @@ ifneq ($(CONFIG_DM),y) @echo >&2 "See doc/driver-model/migration.rst for more info." @echo >&2 "" endif -ifeq ($(CONFIG_MMC),y) -ifneq ($(CONFIG_DM_MMC)$(CONFIG_BLK),yy) - @echo >&2 "= WARNING ==" - @echo >&2 "This board does not use CONFIG_DM_MMC. Please update" - @echo >&2 "the board to use CONFIG_DM_MMC before the v2019.04 release." - @echo >&2 "Failure to update by the deadline may result in board removal." - @echo >&2 "See doc/driver-model/migration.rst for more info." - @echo >&2 "" -endif -endif ifeq ($(CONFIG_USB),y) ifneq ($(CONFIG_DM_USB)$(CONFIG_OF_CONTROL)$(CONFIG_BLK),yyy) @echo >&2 "= WARNING ==" diff --git a/drivers/block/Kconfig b/drivers/block/Kconfig index 1e6dad86927f..ebc638cb0fad 100644 --- a/drivers/block/Kconfig +++ b/drivers/block/Kconfig @@ -18,7 +18,7 @@ config HAVE_BLOCK_DEVICE config SPL_BLK bool "Support block devices in SPL" depends on SPL_DM && BLK - default y + default y if SPL_DM_MMC help Enable support for block devices, such as SCSI, MMC and USB flash sticks. These provide a block-level interface which permits diff --git a/drivers/mmc/Kconfig b/drivers/mmc/Kconfig index 59aea01f..ae6cabd093c7 100644 --- a/drivers/mmc/Kconfig +++ b/drivers/mmc/Kconfig @@ -4,6 +4,7 @@ config MMC bool "MMC/SD/SDIO card support" default ARM || PPC || SANDBOX select HAVE_BLOCK_DEVICE + select DM_MMC if DM help This selects MultiMediaCard, Secure Digital and Secure Digital I/O support. @@ -33,6 +34,7 @@ config MMC_BROKEN_CD config DM_MMC bool "Enable MMC controllers using Driver Model" depends on DM + select BLK help This enables the MultiMediaCard (MMC) uclass which supports MMC and Secure Digital I/O (SDIO) cards. Both removable (SD, micro-SD, etc.) @@ -42,7 +44,7 @@ config DM_MMC config SPL_DM_MMC bool "Enable MMC controllers using Driver Model in SPL" - depends on SPL_DM && DM_MMC + depends on SPL_DM && DM_MMC && SPL_OF_LIBFDT default y help This enables the MultiMediaCard (MMC) uclass which supports MMC and -- 2.17.1
[PATCH 54/57] ppc: Remove MPC837XEMDS board
This board has not been converted to CONFIG_DM_MMC by the deadline. Remove it. As this is the last ARCH_MPC837X platform, remove that support as well. Cc: Priyanka Jain Signed-off-by: Tom Rini --- arch/powerpc/cpu/mpc83xx/Kconfig | 21 - arch/powerpc/cpu/mpc83xx/hrcw/Kconfig | 52 ++- arch/powerpc/cpu/mpc83xx/initreg/Kconfig.spcr | 2 +- arch/powerpc/cpu/mpc83xx/speed.c | 34 +- arch/powerpc/include/asm/arch-mpc83xx/gpio.h | 3 +- arch/powerpc/include/asm/global_data.h| 7 +- arch/powerpc/include/asm/immap_83xx.h | 44 --- arch/powerpc/include/asm/mpc8xxx_spi.h| 3 +- board/freescale/mpc837xemds/Kconfig | 12 - board/freescale/mpc837xemds/MAINTAINERS | 8 - board/freescale/mpc837xemds/Makefile | 7 - board/freescale/mpc837xemds/README| 104 - board/freescale/mpc837xemds/mpc837xemds.c | 354 - board/freescale/mpc837xemds/pci.c | 149 --- board/freescale/mpc837xemds/pci.h | 6 - configs/MPC837XEMDS_HOST_defconfig| 190 - configs/MPC837XEMDS_SLAVE_defconfig | 143 --- configs/MPC837XEMDS_defconfig | 166 drivers/ram/mpc83xx_sdram.c | 12 +- include/configs/MPC837XEMDS.h | 370 -- include/mpc83xx.h | 114 +- 21 files changed, 51 insertions(+), 1750 deletions(-) delete mode 100644 board/freescale/mpc837xemds/Kconfig delete mode 100644 board/freescale/mpc837xemds/MAINTAINERS delete mode 100644 board/freescale/mpc837xemds/Makefile delete mode 100644 board/freescale/mpc837xemds/README delete mode 100644 board/freescale/mpc837xemds/mpc837xemds.c delete mode 100644 board/freescale/mpc837xemds/pci.c delete mode 100644 board/freescale/mpc837xemds/pci.h delete mode 100644 configs/MPC837XEMDS_HOST_defconfig delete mode 100644 configs/MPC837XEMDS_SLAVE_defconfig delete mode 100644 configs/MPC837XEMDS_defconfig delete mode 100644 include/configs/MPC837XEMDS.h diff --git a/arch/powerpc/cpu/mpc83xx/Kconfig b/arch/powerpc/cpu/mpc83xx/Kconfig index b13a555413ec..4b5ad5bb0173 100644 --- a/arch/powerpc/cpu/mpc83xx/Kconfig +++ b/arch/powerpc/cpu/mpc83xx/Kconfig @@ -75,13 +75,6 @@ config TARGET_MPC8349ITX select ARCH_MPC8349 imply CMD_IRQ -config TARGET_MPC837XEMDS - bool "Support MPC837XEMDS" - select ARCH_MPC837X - select BOARD_EARLY_INIT_F - imply CMD_SATA - imply FSL_SATA - config TARGET_IDS8313 bool "Support ids8313" select ARCH_MPC8313 @@ -251,19 +244,6 @@ config ARCH_MPC8360 select MPC83XX_LDP_PIN select MPC83XX_SECOND_I2C_SUPPORT -config ARCH_MPC837X - bool - select MPC83XX_PCI_SUPPORT - select MPC83XX_TSEC1_SUPPORT - select MPC83XX_TSEC2_SUPPORT - select MPC83XX_PCIE1_SUPPORT - select MPC83XX_PCIE2_SUPPORT - select MPC83XX_SDHC_SUPPORT - select MPC83XX_SATA_SUPPORT - select MPC83XX_LDP_PIN - select MPC83XX_SECOND_I2C_SUPPORT - select FSL_ELBC - config SYS_IMMR hex "Value for IMMR" default 0xE000 @@ -316,7 +296,6 @@ source "board/freescale/mpc8323erdb/Kconfig" source "board/freescale/mpc832xemds/Kconfig" source "board/freescale/mpc8349emds/Kconfig" source "board/freescale/mpc8349itx/Kconfig" -source "board/freescale/mpc837xemds/Kconfig" source "board/ids/ids8313/Kconfig" source "board/keymile/Kconfig" source "board/mpc8308_p1m/Kconfig" diff --git a/arch/powerpc/cpu/mpc83xx/hrcw/Kconfig b/arch/powerpc/cpu/mpc83xx/hrcw/Kconfig index c657a47b1143..b88c8938b94f 100644 --- a/arch/powerpc/cpu/mpc83xx/hrcw/Kconfig +++ b/arch/powerpc/cpu/mpc83xx/hrcw/Kconfig @@ -7,7 +7,7 @@ config LBMC_CLOCK_MODE_1_1 bool "1 : 1" config LBMC_CLOCK_MODE_1_2 - depends on ARCH_MPC8349 || ARCH_MPC8360 || ARCH_MPC837X + depends on ARCH_MPC8349 || ARCH_MPC8360 bool "1 : 2" endchoice @@ -19,7 +19,7 @@ config DDR_MC_CLOCK_MODE_1_2 bool "1 : 2" config DDR_MC_CLOCK_MODE_1_1 - depends on ARCH_MPC8315 || ARCH_MPC8349 || ARCH_MPC8360 || ARCH_MPC837X + depends on ARCH_MPC8315 || ARCH_MPC8349 || ARCH_MPC8360 bool "1 : 1" endchoice @@ -30,7 +30,6 @@ choice prompt "System PLL VCO division" config SYSTEM_PLL_VCO_DIV_1 - depends on !ARCH_MPC837X bool "1" config SYSTEM_PLL_VCO_DIV_2 @@ -67,39 +66,39 @@ config SYSTEM_PLL_FACTOR_6_1 bool "6 : 1" config SYSTEM_PLL_FACTOR_7_1 - depends on ARCH_MPC8349 || ARCH_MPV8360 || ARCH_MPC837X + depends on ARCH_MPC8349 || ARCH_MPV8360 bool "7 : 1" config SYSTEM_PLL_FACTOR_8_1 - depends on ARCH_MPC8349 || ARCH_MPV8360 || ARCH_MPC837X + depends on ARCH_MPC8349 || ARCH_MPV8360 bool "8 : 1" config SYSTEM_PLL_FACTOR_9_1 - depends on ARCH_MPC8349 || ARCH_MPV8360 || ARCH_MPC837X + d
[PATCH 52/57] ppc: Remove MPC8569MDS board
This board has not been converted to CONFIG_DM_MMC by the deadline. Remove it. As this is the last ARCH_MPC8569 board, remove that support as well. Cc: Priyanka Jain Signed-off-by: Tom Rini --- arch/powerpc/cpu/mpc85xx/Kconfig | 22 +- arch/powerpc/cpu/mpc85xx/Makefile | 1 - arch/powerpc/cpu/mpc85xx/mpc8569_serdes.c | 67 --- arch/powerpc/cpu/mpc85xx/speed.c | 2 +- arch/powerpc/cpu/mpc85xx/start.S | 33 -- arch/powerpc/include/asm/config_mpc85xx.h | 10 - arch/powerpc/include/asm/immap_85xx.h | 9 +- board/freescale/common/pq-mds-pib.c | 15 +- board/freescale/mpc8569mds/Kconfig| 12 - board/freescale/mpc8569mds/MAINTAINERS| 7 - board/freescale/mpc8569mds/Makefile | 11 - board/freescale/mpc8569mds/README | 77 --- board/freescale/mpc8569mds/bcsr.c | 50 -- board/freescale/mpc8569mds/bcsr.h | 71 --- board/freescale/mpc8569mds/ddr.c | 63 --- board/freescale/mpc8569mds/law.c | 40 -- board/freescale/mpc8569mds/mpc8569mds.c | 590 -- board/freescale/mpc8569mds/tlb.c | 94 configs/MPC8569MDS_ATM_defconfig | 40 -- configs/MPC8569MDS_defconfig | 39 -- include/configs/MPC8569MDS.h | 489 -- 21 files changed, 4 insertions(+), 1738 deletions(-) delete mode 100644 arch/powerpc/cpu/mpc85xx/mpc8569_serdes.c delete mode 100644 board/freescale/mpc8569mds/Kconfig delete mode 100644 board/freescale/mpc8569mds/MAINTAINERS delete mode 100644 board/freescale/mpc8569mds/Makefile delete mode 100644 board/freescale/mpc8569mds/README delete mode 100644 board/freescale/mpc8569mds/bcsr.c delete mode 100644 board/freescale/mpc8569mds/bcsr.h delete mode 100644 board/freescale/mpc8569mds/ddr.c delete mode 100644 board/freescale/mpc8569mds/law.c delete mode 100644 board/freescale/mpc8569mds/mpc8569mds.c delete mode 100644 board/freescale/mpc8569mds/tlb.c delete mode 100644 configs/MPC8569MDS_ATM_defconfig delete mode 100644 configs/MPC8569MDS_defconfig delete mode 100644 include/configs/MPC8569MDS.h diff --git a/arch/powerpc/cpu/mpc85xx/Kconfig b/arch/powerpc/cpu/mpc85xx/Kconfig index 841c6677e35f..e249ff5926a0 100644 --- a/arch/powerpc/cpu/mpc85xx/Kconfig +++ b/arch/powerpc/cpu/mpc85xx/Kconfig @@ -64,10 +64,6 @@ config TARGET_MPC8568MDS bool "Support MPC8568MDS" select ARCH_MPC8568 -config TARGET_MPC8569MDS - bool "Support MPC8569MDS" - select ARCH_MPC8569 - config TARGET_P1010RDB_PA bool "Support P1010RDB_PA" select ARCH_P1010 @@ -443,19 +439,6 @@ config ARCH_MPC8568 select SYS_FSL_SEC_BE select SYS_FSL_SEC_COMPAT_2 -config ARCH_MPC8569 - bool - select FSL_LAW - select SYS_FSL_ERRATUM_A004508 - select SYS_FSL_ERRATUM_A005125 - select FSL_PCIE_RESET - select SYS_FSL_HAS_DDR3 - select SYS_FSL_HAS_SEC - select SYS_FSL_SEC_BE - select SYS_FSL_SEC_COMPAT_2 - select FSL_ELBC - imply CMD_NAND - config ARCH_MPC8572 bool select FSL_LAW @@ -1030,7 +1013,6 @@ config SYS_CCSRBAR_DEFAULT ARCH_MPC8555|| \ ARCH_MPC8560|| \ ARCH_MPC8568|| \ - ARCH_MPC8569|| \ ARCH_MPC8572|| \ ARCH_P1010 || \ ARCH_P1011 || \ @@ -1259,8 +1241,7 @@ config SYS_FSL_NUM_LAWS ARCH_P2020 default 10 if ARCH_MPC8544|| \ ARCH_MPC8548|| \ - ARCH_MPC8568|| \ - ARCH_MPC8569 + ARCH_MPC8568 default 8 ifARCH_MPC8540|| \ ARCH_MPC8541|| \ ARCH_MPC8555|| \ @@ -1356,7 +1337,6 @@ source "board/freescale/mpc8541cds/Kconfig" source "board/freescale/mpc8548cds/Kconfig" source "board/freescale/mpc8555cds/Kconfig" source "board/freescale/mpc8568mds/Kconfig" -source "board/freescale/mpc8569mds/Kconfig" source "board/freescale/p1010rdb/Kconfig" source "board/freescale/p1_p2_rdb_pc/Kconfig" source "board/freescale/p2041rdb/Kconfig" diff --git a/arch/powerpc/cpu/mpc85xx/Makefile b/arch/powerpc/cpu/mpc85xx/Makefile index d8b917f14e32..ed13d5cb56a7 100644 --- a/arch/powerpc/cpu/mpc85xx/Makefile +++ b/arch/powerpc/cpu/mpc85xx/Makefile @@ -64,7 +64,6 @@ obj-$(CONFIG_ARCH_MPC8536) += mpc8536_serdes.o obj-$(CONFIG_ARCH_MPC8544) += mpc8544_serdes.o obj-$(CONFIG_ARCH_MPC8548) += mpc8548_serdes.o obj-$(CONFIG_ARCH_MPC8568) += mpc8568_serdes.o -obj-$(CONFIG_ARCH_MPC8569) += mpc8569_serdes.o obj-$(CONFIG_ARCH_MPC8572) += mpc8572_serdes.o obj-$(CONFIG_ARCH_P1010) += p1010_serdes.o obj-$(CONFIG_ARCH_P1011) += p1021_serdes.o diff --git a/arch/powerpc/
[PATCH 53/57] ppc: Remove Cyrus_P5020 and P5040 boards
These boards have not been converted to CONFIG_DM_MMC by the deadline. Remove them. As the P5020 is the last ARCH_P5020 platform, remove that support as well. Cc: Andy Fleming Cc: Priyanka Jain Signed-off-by: Tom Rini --- arch/powerpc/cpu/mpc85xx/Kconfig | 44 +- arch/powerpc/cpu/mpc85xx/Makefile | 2 - arch/powerpc/cpu/mpc85xx/p5020_ids.c | 124 -- arch/powerpc/cpu/mpc85xx/p5020_serdes.c| 134 -- arch/powerpc/include/asm/config_mpc85xx.h | 18 - arch/powerpc/include/asm/fsl_secure_boot.h | 1 - arch/powerpc/include/asm/immap_85xx.h | 2 +- board/varisys/cyrus/Kconfig| 14 - board/varisys/cyrus/MAINTAINERS| 7 - board/varisys/cyrus/Makefile | 8 - board/varisys/cyrus/README | 19 - board/varisys/cyrus/cyrus.c| 117 -- board/varisys/cyrus/cyrus.h| 9 - board/varisys/cyrus/ddr.c | 192 - board/varisys/cyrus/eth.c | 100 - board/varisys/cyrus/law.c | 26 -- board/varisys/cyrus/pbi.cfg| 35 -- board/varisys/cyrus/pci.c | 23 -- board/varisys/cyrus/rcw_p5020_v2.cfg | 11 - board/varisys/cyrus/rcw_p5040.cfg | 11 - board/varisys/cyrus/tlb.c | 105 - configs/Cyrus_P5020_defconfig | 48 --- configs/Cyrus_P5040_defconfig | 48 --- drivers/ddr/fsl/Kconfig| 1 - drivers/net/Kconfig| 1 - drivers/net/fm/Makefile| 1 - include/configs/cyrus.h| 458 - 27 files changed, 2 insertions(+), 1557 deletions(-) delete mode 100644 arch/powerpc/cpu/mpc85xx/p5020_ids.c delete mode 100644 arch/powerpc/cpu/mpc85xx/p5020_serdes.c delete mode 100644 board/varisys/cyrus/Kconfig delete mode 100644 board/varisys/cyrus/MAINTAINERS delete mode 100644 board/varisys/cyrus/Makefile delete mode 100644 board/varisys/cyrus/README delete mode 100644 board/varisys/cyrus/cyrus.c delete mode 100644 board/varisys/cyrus/cyrus.h delete mode 100644 board/varisys/cyrus/ddr.c delete mode 100644 board/varisys/cyrus/eth.c delete mode 100644 board/varisys/cyrus/law.c delete mode 100644 board/varisys/cyrus/pbi.cfg delete mode 100644 board/varisys/cyrus/pci.c delete mode 100644 board/varisys/cyrus/rcw_p5020_v2.cfg delete mode 100644 board/varisys/cyrus/rcw_p5040.cfg delete mode 100644 board/varisys/cyrus/tlb.c delete mode 100644 configs/Cyrus_P5020_defconfig delete mode 100644 configs/Cyrus_P5040_defconfig delete mode 100644 include/configs/cyrus.h diff --git a/arch/powerpc/cpu/mpc85xx/Kconfig b/arch/powerpc/cpu/mpc85xx/Kconfig index e249ff5926a0..55cce515ccf0 100644 --- a/arch/powerpc/cpu/mpc85xx/Kconfig +++ b/arch/powerpc/cpu/mpc85xx/Kconfig @@ -233,18 +233,6 @@ config TARGET_UCP1020 imply CMD_SATA imply PANIC_HANG -config TARGET_CYRUS_P5020 - bool "Support Varisys Cyrus P5020" - select ARCH_P5020 - select PHYS_64BIT - imply PANIC_HANG - -config TARGET_CYRUS_P5040 -bool "Support Varisys Cyrus P5040" - select ARCH_P5040 - select PHYS_64BIT - imply PANIC_HANG - endchoice config ARCH_B4420 @@ -706,31 +694,6 @@ config ARCH_P4080 imply CMD_REGINFO imply SATA_SIL -config ARCH_P5020 - bool - select E500MC - select FSL_LAW - select SYS_FSL_DDR_VER_44 - select SYS_FSL_ERRATUM_A004510 - select SYS_FSL_ERRATUM_A005275 - select SYS_FSL_ERRATUM_A006261 - select SYS_FSL_ERRATUM_DDR_A003 - select SYS_FSL_ERRATUM_DDR_A003474 - select SYS_FSL_ERRATUM_ESDHC111 - select SYS_FSL_ERRATUM_I2C_A004447 - select SYS_FSL_ERRATUM_SRIO_A004034 - select SYS_FSL_ERRATUM_USB14 - select SYS_FSL_HAS_DDR3 - select SYS_FSL_HAS_SEC - select SYS_FSL_QORIQ_CHASSIS1 - select SYS_FSL_SEC_BE - select SYS_FSL_SEC_COMPAT_4 - select SYS_PPC64 - select FSL_ELBC - imply CMD_SATA - imply CMD_REGINFO - imply FSL_SATA - config ARCH_P5040 bool select E500MC @@ -989,7 +952,6 @@ config MAX_CPUS ARCH_P1024 || \ ARCH_P1025 || \ ARCH_P2020 || \ -ARCH_P5020 || \ ARCH_T1023 || \ ARCH_T1024 default 1 @@ -1027,7 +989,6 @@ config SYS_CCSRBAR_DEFAULT ARCH_P2041 || \ ARCH_P3041 || \ ARCH_P4080 || \ - ARCH_P5020 || \ ARCH_P5040 || \ ARCH_T1023 || \ ARCH_T1024 || \ @@ -1147,7 +1108,7 @@ config SYS_FSL_A004447_SVR_REV default 0x00 if ARCH_MPC8548
[PATCH 51/57] ppc: configs: Remove a few non-updated build configurations
In the cases of T2080RDB_SECURE_BOOT, T2080RDB_SRIO_PCIE_BOOT, P2041RDB_SECURE_BOOT, P2041RDB_SRIO_PCIE_BOOT, P3041DS_SRIO_PCIE_BOOT and P4080DS_SRIO_PCIE_BOOT while some forms of the board have been migrated more fully to current build standards, these have not. Remove them. Cc: Priyanka Jain Signed-off-by: Tom Rini --- configs/P2041RDB_SECURE_BOOT_defconfig| 62 - configs/P2041RDB_SRIO_PCIE_BOOT_defconfig | 53 -- configs/P3041DS_SRIO_PCIE_BOOT_defconfig | 53 -- configs/P4080DS_SRIO_PCIE_BOOT_defconfig | 51 -- configs/T2080RDB_SECURE_BOOT_defconfig| 66 --- configs/T2080RDB_SRIO_PCIE_BOOT_defconfig | 56 --- 6 files changed, 341 deletions(-) delete mode 100644 configs/P2041RDB_SECURE_BOOT_defconfig delete mode 100644 configs/P2041RDB_SRIO_PCIE_BOOT_defconfig delete mode 100644 configs/P3041DS_SRIO_PCIE_BOOT_defconfig delete mode 100644 configs/P4080DS_SRIO_PCIE_BOOT_defconfig delete mode 100644 configs/T2080RDB_SECURE_BOOT_defconfig delete mode 100644 configs/T2080RDB_SRIO_PCIE_BOOT_defconfig diff --git a/configs/P2041RDB_SECURE_BOOT_defconfig b/configs/P2041RDB_SECURE_BOOT_defconfig deleted file mode 100644 index c42e583f6cc9.. --- a/configs/P2041RDB_SECURE_BOOT_defconfig +++ /dev/null @@ -1,62 +0,0 @@ -CONFIG_PPC=y -CONFIG_SYS_TEXT_BASE=0xEFF4 -CONFIG_ENV_SIZE=0x2000 -CONFIG_NXP_ESBC=y -CONFIG_DEFAULT_DEVICE_TREE="p2041rdb" -CONFIG_MPC85xx=y -CONFIG_TARGET_P2041RDB=y -CONFIG_MPC85XX_HAVE_RESET_VECTOR=y -CONFIG_FIT=y -CONFIG_FIT_VERBOSE=y -CONFIG_OF_BOARD_SETUP=y -CONFIG_OF_STDOUT_VIA_ALIAS=y -CONFIG_BOOTDELAY=10 -CONFIG_BOARD_EARLY_INIT_F=y -CONFIG_BOARD_EARLY_INIT_R=y -CONFIG_HUSH_PARSER=y -CONFIG_CMD_IMLS=y -CONFIG_CMD_GREPENV=y -CONFIG_CMD_DM=y -CONFIG_CMD_I2C=y -CONFIG_CMD_MMC=y -CONFIG_CMD_SF=y -CONFIG_CMD_USB=y -CONFIG_CMD_DHCP=y -CONFIG_CMD_MII=y -CONFIG_CMD_PING=y -CONFIG_MP=y -CONFIG_CMD_EXT2=y -CONFIG_CMD_FAT=y -CONFIG_OF_CONTROL=y -CONFIG_ENV_OVERWRITE=y -CONFIG_DM=y -CONFIG_FSL_ESDHC=y -CONFIG_MTD=y -CONFIG_MTD_NOR_FLASH=y -CONFIG_FLASH_CFI_DRIVER=y -CONFIG_SYS_FLASH_USE_BUFFER_WRITE=y -CONFIG_SYS_FLASH_CFI=y -CONFIG_SPI_FLASH=y -CONFIG_SF_DEFAULT_MODE=0 -CONFIG_SF_DEFAULT_SPEED=1000 -CONFIG_SPI_FLASH_SPANSION=y -CONFIG_PHYLIB=y -CONFIG_PHYLIB_10G=y -CONFIG_PHY_TERANETICS=y -CONFIG_PHY_VITESSE=y -CONFIG_DM_ETH=y -CONFIG_DM_MDIO=y -CONFIG_PHY_GIGE=y -CONFIG_FMAN_ENET=y -CONFIG_MII=y -CONFIG_SYS_QE_FMAN_FW_IN_NOR=y -CONFIG_SYS_NS16550=y -CONFIG_SPI=y -CONFIG_FSL_ESPI=y -CONFIG_USB=y -CONFIG_USB_STORAGE=y -CONFIG_ADDR_MAP=y -CONFIG_SYS_NUM_ADDR_MAP=64 -CONFIG_RSA=y -CONFIG_SPL_RSA=y -CONFIG_RSA_SOFTWARE_EXP=y diff --git a/configs/P2041RDB_SRIO_PCIE_BOOT_defconfig b/configs/P2041RDB_SRIO_PCIE_BOOT_defconfig deleted file mode 100644 index 822a91be2761.. --- a/configs/P2041RDB_SRIO_PCIE_BOOT_defconfig +++ /dev/null @@ -1,53 +0,0 @@ -CONFIG_PPC=y -CONFIG_SYS_TEXT_BASE=0xFFF4 -CONFIG_ENV_SIZE=0x2000 -CONFIG_MPC85xx=y -CONFIG_TARGET_P2041RDB=y -CONFIG_FIT=y -CONFIG_FIT_VERBOSE=y -CONFIG_OF_BOARD_SETUP=y -CONFIG_OF_STDOUT_VIA_ALIAS=y -CONFIG_SYS_EXTRA_OPTIONS="SRIO_PCIE_BOOT_SLAVE" -CONFIG_BOOTDELAY=10 -CONFIG_BOARD_EARLY_INIT_F=y -CONFIG_BOARD_EARLY_INIT_R=y -CONFIG_HUSH_PARSER=y -CONFIG_CMD_GREPENV=y -# CONFIG_CMD_FLASH is not set -CONFIG_CMD_I2C=y -CONFIG_CMD_MMC=y -CONFIG_CMD_SF=y -CONFIG_CMD_USB=y -CONFIG_CMD_DHCP=y -CONFIG_CMD_MII=y -CONFIG_CMD_PING=y -CONFIG_MP=y -CONFIG_CMD_EXT2=y -CONFIG_CMD_FAT=y -CONFIG_ENV_OVERWRITE=y -CONFIG_ENV_IS_IN_REMOTE=y -CONFIG_ENV_ADDR=0xFFE2 -CONFIG_FSL_CAAM=y -CONFIG_FSL_ESDHC=y -CONFIG_MTD=y -CONFIG_SPI_FLASH=y -CONFIG_SF_DEFAULT_MODE=0 -CONFIG_SF_DEFAULT_SPEED=1000 -CONFIG_SPI_FLASH_SPANSION=y -CONFIG_PHYLIB=y -CONFIG_PHYLIB_10G=y -CONFIG_PHY_TERANETICS=y -CONFIG_PHY_VITESSE=y -CONFIG_PHY_GIGE=y -CONFIG_E1000=y -CONFIG_FMAN_ENET=y -CONFIG_MII=y -CONFIG_SYS_QE_FMAN_FW_IN_REMOTE=y -CONFIG_SYS_NS16550=y -CONFIG_SPI=y -CONFIG_FSL_ESPI=y -CONFIG_USB=y -CONFIG_USB_STORAGE=y -CONFIG_ADDR_MAP=y -CONFIG_SYS_NUM_ADDR_MAP=64 -CONFIG_OF_LIBFDT=y diff --git a/configs/P3041DS_SRIO_PCIE_BOOT_defconfig b/configs/P3041DS_SRIO_PCIE_BOOT_defconfig deleted file mode 100644 index 76ac6abce57c.. --- a/configs/P3041DS_SRIO_PCIE_BOOT_defconfig +++ /dev/null @@ -1,53 +0,0 @@ -CONFIG_PPC=y -CONFIG_SYS_TEXT_BASE=0xFFF4 -CONFIG_ENV_SIZE=0x2000 -CONFIG_MPC85xx=y -CONFIG_TARGET_P3041DS=y -CONFIG_FIT=y -CONFIG_FIT_VERBOSE=y -CONFIG_OF_BOARD_SETUP=y -CONFIG_OF_STDOUT_VIA_ALIAS=y -CONFIG_SYS_EXTRA_OPTIONS="SRIO_PCIE_BOOT_SLAVE" -CONFIG_BOOTDELAY=10 -CONFIG_BOARD_EARLY_INIT_F=y -CONFIG_BOARD_EARLY_INIT_R=y -CONFIG_HUSH_PARSER=y -CONFIG_CMD_GREPENV=y -# CONFIG_CMD_FLASH is not set -CONFIG_CMD_I2C=y -CONFIG_CMD_MMC=y -CONFIG_CMD_SF=y -CONFIG_CMD_USB=y -CONFIG_CMD_DHCP=y -CONFIG_CMD_MII=y -CONFIG_CMD_PING=y -CONFIG_MP=y -CONFIG_CMD_EXT2=y -CONFIG_CMD_FAT=y -CONFIG_ENV_OVERWRITE=y -CONFIG_ENV_IS_IN_REMOTE=y -
[PATCH 47/57] ppc: Remove gdsys hrcon boards
These boards have not been converted to CONFIG_DM_MMC, along with other
DM conversions, by the deadline. Remove them.
Cc: Dirk Eibach
Signed-off-by: Tom Rini
---
arch/powerpc/cpu/mpc83xx/Kconfig | 4 -
board/gdsys/common/Makefile | 1 -
board/gdsys/common/fanctrl.c | 35 ---
board/gdsys/common/fanctrl.h | 12 -
board/gdsys/common/mclink.c | 141 -
board/gdsys/common/mclink.h | 14 -
board/gdsys/common/phy.c | 278 -
board/gdsys/common/phy.h | 13 -
board/gdsys/mpc8308/Kconfig | 26 +-
board/gdsys/mpc8308/MAINTAINERS | 4 +-
board/gdsys/mpc8308/Makefile | 1 -
board/gdsys/mpc8308/hrcon.c | 504 ---
configs/hrcon_defconfig | 147 -
configs/hrcon_dh_defconfig | 145 -
include/configs/hrcon.h | 421 --
include/gdsys_fpga.h | 46 ---
16 files changed, 3 insertions(+), 1789 deletions(-)
delete mode 100644 board/gdsys/common/fanctrl.c
delete mode 100644 board/gdsys/common/fanctrl.h
delete mode 100644 board/gdsys/common/mclink.c
delete mode 100644 board/gdsys/common/mclink.h
delete mode 100644 board/gdsys/common/phy.c
delete mode 100644 board/gdsys/common/phy.h
delete mode 100644 board/gdsys/mpc8308/hrcon.c
delete mode 100644 configs/hrcon_defconfig
delete mode 100644 configs/hrcon_dh_defconfig
delete mode 100644 include/configs/hrcon.h
diff --git a/arch/powerpc/cpu/mpc83xx/Kconfig b/arch/powerpc/cpu/mpc83xx/Kconfig
index 3ca56695af89..d2c620e22954 100644
--- a/arch/powerpc/cpu/mpc83xx/Kconfig
+++ b/arch/powerpc/cpu/mpc83xx/Kconfig
@@ -137,10 +137,6 @@ config TARGET_TQM834X
bool "Support TQM834x"
select ARCH_MPC8349
-config TARGET_HRCON
- bool "Support hrcon"
- select ARCH_MPC8308
- select SYS_FSL_ERRATUM_ESDHC111
config TARGET_GAZERBEAM
bool "Support gazerbeam"
diff --git a/board/gdsys/common/Makefile b/board/gdsys/common/Makefile
index fa4c65c63478..dd6d5e69de56 100644
--- a/board/gdsys/common/Makefile
+++ b/board/gdsys/common/Makefile
@@ -6,7 +6,6 @@
obj-$(CONFIG_SYS_FPGA_COMMON) += fpga.o
obj-$(CONFIG_CMD_IOLOOP) += cmd_ioloop.o
obj-$(CONFIG_CONTROLCENTERD) += dp501.o
-obj-$(CONFIG_TARGET_HRCON) += osd.o mclink.o dp501.o phy.o ioep-fpga.o
fanctrl.o
obj-$(CONFIG_TARGET_GAZERBEAM) += osd.o ihs_mdio.o ioep-fpga.o
ifdef CONFIG_OSD
diff --git a/board/gdsys/common/fanctrl.c b/board/gdsys/common/fanctrl.c
deleted file mode 100644
index 27c875cbec07..
--- a/board/gdsys/common/fanctrl.c
+++ /dev/null
@@ -1,35 +0,0 @@
-// SPDX-License-Identifier: GPL-2.0+
-/*
- * (C) Copyright 2015
- * Dirk Eibach, Guntermann & Drunck GmbH, dirk.eib...@gdsys.cc
- */
-
-#ifdef CONFIG_GDSYS_LEGACY_DRIVERS
-
-#include
-#include
-
-enum {
- FAN_CONFIG = 0x03,
- FAN_TACHLIM_LSB = 0x48,
- FAN_TACHLIM_MSB = 0x49,
- FAN_PWM_FREQ = 0x4D,
-};
-
-void init_fan_controller(u8 addr)
-{
- int val;
-
- /* set PWM Frequency to 2.5% resolution */
- i2c_reg_write(addr, FAN_PWM_FREQ, 20);
-
- /* set Tachometer Limit */
- i2c_reg_write(addr, FAN_TACHLIM_LSB, 0x10);
- i2c_reg_write(addr, FAN_TACHLIM_MSB, 0x0a);
-
- /* enable Tach input */
- val = i2c_reg_read(addr, FAN_CONFIG) | 0x04;
- i2c_reg_write(addr, FAN_CONFIG, val);
-}
-
-#endif /* CONFIG_GDSYS_LEGACY_DRIVERS */
diff --git a/board/gdsys/common/fanctrl.h b/board/gdsys/common/fanctrl.h
deleted file mode 100644
index ab7e58def5a0..
--- a/board/gdsys/common/fanctrl.h
+++ /dev/null
@@ -1,12 +0,0 @@
-/* SPDX-License-Identifier: GPL-2.0+ */
-/*
- * (C) Copyright 2015
- * Dirk Eibach, Guntermann & Drunck GmbH, dirk.eib...@gdsys.cc
- */
-
-#ifndef _FANCTRL_H_
-#define _FANCTRL_H_
-
-void init_fan_controller(u8 addr);
-
-#endif
diff --git a/board/gdsys/common/mclink.c b/board/gdsys/common/mclink.c
deleted file mode 100644
index 6147fbfc87fb..
--- a/board/gdsys/common/mclink.c
+++ /dev/null
@@ -1,141 +0,0 @@
-// SPDX-License-Identifier: GPL-2.0+
-/*
- * (C) Copyright 2012
- * Dirk Eibach, Guntermann & Drunck GmbH, dirk.eib...@gdsys.cc
- */
-
-#ifdef CONFIG_GDSYS_LEGACY_DRIVERS
-
-#include
-#include
-#include
-
-#include
-#include
-
-enum {
- MCINT_SLAVE_LINK_CHANGED_EV = 1 << 7,
- MCINT_TX_ERROR_EV = 1 << 9,
- MCINT_TX_BUFFER_FREE = 1 << 10,
- MCINT_TX_PACKET_TRANSMITTED_EV = 1 << 11,
- MCINT_RX_ERROR_EV = 1 << 13,
- MCINT_RX_CONTENT_AVAILABLE = 1 << 14,
- MCINT_RX_PACKET_RECEIVED_EV = 1 << 15,
-};
-
-int mclink_probe(void)
-{
- unsigned int k;
- int slaves = 0;
-
- for (k = 0; k < CONFIG_SYS_MCLINK_MAX; ++k) {
- int timeout = 0;
- unsigned int ctr = 0;
- u16 mc_status;
-
- FPGA_GET_REG(k, mc_status, &mc_status);
-
- if (!(mc_status & (1 << 15)))
- break;
-
- FPGA_
[PATCH 49/57] ppc: Remove ARCH_P1022 support
With the last of the ARCH_P1022 platforms removed, finish removing the
rest of the platform support.
Cc: Priyanka Jain
Signed-off-by: Tom Rini
---
arch/powerpc/cpu/mpc85xx/Kconfig | 21
arch/powerpc/cpu/mpc85xx/Makefile | 1 -
arch/powerpc/cpu/mpc85xx/p1022_serdes.c | 129 --
arch/powerpc/cpu/mpc85xx/speed.c | 3 +-
arch/powerpc/include/asm/config_mpc85xx.h | 4 -
arch/powerpc/include/asm/immap_85xx.h | 15 +--
6 files changed, 2 insertions(+), 171 deletions(-)
delete mode 100644 arch/powerpc/cpu/mpc85xx/p1022_serdes.c
diff --git a/arch/powerpc/cpu/mpc85xx/Kconfig b/arch/powerpc/cpu/mpc85xx/Kconfig
index 77dae8f6ffab..841c6677e35f 100644
--- a/arch/powerpc/cpu/mpc85xx/Kconfig
+++ b/arch/powerpc/cpu/mpc85xx/Kconfig
@@ -560,23 +560,6 @@ config ARCH_P1021
imply CMD_REGINFO
imply SATA_SIL
-config ARCH_P1022
- bool
- select FSL_LAW
- select SYS_FSL_ERRATUM_A004477
- select SYS_FSL_ERRATUM_A004508
- select SYS_FSL_ERRATUM_A005125
- select SYS_FSL_ERRATUM_ELBC_A001
- select SYS_FSL_ERRATUM_ESDHC111
- select SYS_FSL_ERRATUM_SATA_A001
- select FSL_PCIE_RESET
- select SYS_FSL_HAS_DDR3
- select SYS_FSL_HAS_SEC
- select SYS_FSL_SEC_BE
- select SYS_FSL_SEC_COMPAT_2
- select SYS_PPC_E500_USE_DEBUG_TLB
- select FSL_ELBC
-
config ARCH_P1023
bool
select FSL_LAW
@@ -1019,7 +1002,6 @@ config MAX_CPUS
ARCH_MPC8572 || \
ARCH_P1020 || \
ARCH_P1021 || \
-ARCH_P1022 || \
ARCH_P1023 || \
ARCH_P1024 || \
ARCH_P1025 || \
@@ -1054,7 +1036,6 @@ config SYS_CCSRBAR_DEFAULT
ARCH_P1011 || \
ARCH_P1020 || \
ARCH_P1021 || \
- ARCH_P1022 || \
ARCH_P1024 || \
ARCH_P1025 || \
ARCH_P2020
@@ -1272,7 +1253,6 @@ config SYS_FSL_NUM_LAWS
ARCH_P1011 || \
ARCH_P1020 || \
ARCH_P1021 || \
- ARCH_P1022 || \
ARCH_P1023 || \
ARCH_P1024 || \
ARCH_P1025 || \
@@ -1323,7 +1303,6 @@ config SYS_PPC_E500_DEBUG_TLB
ARCH_P1011 || \
ARCH_P1020 || \
ARCH_P1021 || \
- ARCH_P1022 || \
ARCH_P1024 || \
ARCH_P1025 || \
ARCH_P2020
diff --git a/arch/powerpc/cpu/mpc85xx/Makefile
b/arch/powerpc/cpu/mpc85xx/Makefile
index 5bfa9904adda..d8b917f14e32 100644
--- a/arch/powerpc/cpu/mpc85xx/Makefile
+++ b/arch/powerpc/cpu/mpc85xx/Makefile
@@ -70,7 +70,6 @@ obj-$(CONFIG_ARCH_P1010) += p1010_serdes.o
obj-$(CONFIG_ARCH_P1011) += p1021_serdes.o
obj-$(CONFIG_ARCH_P1020) += p1021_serdes.o
obj-$(CONFIG_ARCH_P1021) += p1021_serdes.o
-obj-$(CONFIG_ARCH_P1022) += p1022_serdes.o
obj-$(CONFIG_ARCH_P1023) += p1023_serdes.o
obj-$(CONFIG_ARCH_P1024) += p1021_serdes.o
obj-$(CONFIG_ARCH_P1025) += p1021_serdes.o
diff --git a/arch/powerpc/cpu/mpc85xx/p1022_serdes.c
b/arch/powerpc/cpu/mpc85xx/p1022_serdes.c
deleted file mode 100644
index 719cb4f3d4e4..
--- a/arch/powerpc/cpu/mpc85xx/p1022_serdes.c
+++ /dev/null
@@ -1,129 +0,0 @@
-// SPDX-License-Identifier: GPL-2.0+
-/*
- * Copyright 2010 Freescale Semiconductor, Inc.
- * Author: Timur Tabi
- */
-
-#include
-#include
-#include
-#include
-#include
-#include
-
-#define SRDS1_MAX_LANES4
-#define SRDS2_MAX_LANES2
-
-static u32 serdes1_prtcl_map, serdes2_prtcl_map;
-
-static const u8 serdes1_cfg_tbl[][SRDS1_MAX_LANES] = {
- [0x00] = {NONE, NONE, NONE, NONE},
- [0x01] = {NONE, NONE, NONE, NONE},
- [0x02] = {NONE, NONE, NONE, NONE},
- [0x03] = {NONE, NONE, NONE, NONE},
- [0x04] = {NONE, NONE, NONE, NONE},
- [0x06] = {PCIE1, PCIE3, SGMII_TSEC1, PCIE2},
- [0x07] = {PCIE1, PCIE3, SGMII_TSEC1, PCIE2},
- [0x09] = {PCIE1, NONE, NONE, NONE},
- [0x0a] = {PCIE1, PCIE3, SGMII_TSEC1, SGMII_TSEC2},
- [0x0b] = {PCIE1, PCIE3, SGMII_TSEC1, SGMII_TSEC2},
- [0x0d] = {PCIE1, PCIE1, SGMII_TSEC1, SGMII_TSEC2},
- [0x0e] = {PCIE1, PCIE1, SGMII_TSEC1, SGMII_TSEC2},
- [0x0f] = {PCIE1, PCIE1, SGMII_TSEC1, SGMII_TSEC2},
- [0x15] = {PCIE1, PCIE3, PCIE2, PCIE2},
- [0x16] = {PCIE1, PCIE3, PCIE2, PCIE2},
- [0x17] = {PCIE1, PCIE3, PCIE2, PCIE2},
- [0x18] = {PCIE1, PCIE1, PCIE2, PCIE2},
- [0x19] = {PCIE1, PC
[PATCH 46/57] ppc: Remove gdsys strider boards
These boards have not been converted to CONFIG_DM_MMC, along with other
DM conversions, by the deadline. Remove them.
Cc: Dirk Eibach
Signed-off-by: Tom Rini
---
arch/powerpc/cpu/mpc83xx/Kconfig | 6 -
board/gdsys/common/Makefile | 4 -
board/gdsys/common/adv7611.c | 180 --
board/gdsys/common/adv7611.h | 12 -
board/gdsys/common/ch7301.c | 67
board/gdsys/common/ch7301.h | 12 -
board/gdsys/mpc8308/Kconfig | 21 +-
board/gdsys/mpc8308/MAINTAINERS | 6 -
board/gdsys/mpc8308/Makefile | 1 -
board/gdsys/mpc8308/strider.c| 559 ---
configs/strider_con_defconfig| 146
configs/strider_con_dp_defconfig | 146
configs/strider_cpu_defconfig| 146
configs/strider_cpu_dp_defconfig | 146
include/configs/strider.h| 454 -
include/gdsys_fpga.h | 65 +---
16 files changed, 2 insertions(+), 1969 deletions(-)
delete mode 100644 board/gdsys/common/adv7611.c
delete mode 100644 board/gdsys/common/adv7611.h
delete mode 100644 board/gdsys/common/ch7301.c
delete mode 100644 board/gdsys/common/ch7301.h
delete mode 100644 board/gdsys/mpc8308/strider.c
delete mode 100644 configs/strider_con_defconfig
delete mode 100644 configs/strider_con_dp_defconfig
delete mode 100644 configs/strider_cpu_defconfig
delete mode 100644 configs/strider_cpu_dp_defconfig
delete mode 100644 include/configs/strider.h
diff --git a/arch/powerpc/cpu/mpc83xx/Kconfig b/arch/powerpc/cpu/mpc83xx/Kconfig
index 15f09672e4dd..3ca56695af89 100644
--- a/arch/powerpc/cpu/mpc83xx/Kconfig
+++ b/arch/powerpc/cpu/mpc83xx/Kconfig
@@ -142,12 +142,6 @@ config TARGET_HRCON
select ARCH_MPC8308
select SYS_FSL_ERRATUM_ESDHC111
-config TARGET_STRIDER
- bool "Support strider"
- select ARCH_MPC8308
- select SYS_FSL_ERRATUM_ESDHC111
- imply CMD_PCA953X
-
config TARGET_GAZERBEAM
bool "Support gazerbeam"
select ARCH_MPC8308
diff --git a/board/gdsys/common/Makefile b/board/gdsys/common/Makefile
index 7dfe104561a8..fa4c65c63478 100644
--- a/board/gdsys/common/Makefile
+++ b/board/gdsys/common/Makefile
@@ -7,10 +7,6 @@ obj-$(CONFIG_SYS_FPGA_COMMON) += fpga.o
obj-$(CONFIG_CMD_IOLOOP) += cmd_ioloop.o
obj-$(CONFIG_CONTROLCENTERD) += dp501.o
obj-$(CONFIG_TARGET_HRCON) += osd.o mclink.o dp501.o phy.o ioep-fpga.o
fanctrl.o
-obj-$(CONFIG_TARGET_STRIDER) += mclink.o dp501.o phy.o ioep-fpga.o adv7611.o
ch7301.o
-obj-$(CONFIG_TARGET_STRIDER) += fanctrl.o
-obj-$(CONFIG_STRIDER_CON) += osd.o
-obj-$(CONFIG_STRIDER_CON_DP) += osd.o
obj-$(CONFIG_TARGET_GAZERBEAM) += osd.o ihs_mdio.o ioep-fpga.o
ifdef CONFIG_OSD
diff --git a/board/gdsys/common/adv7611.c b/board/gdsys/common/adv7611.c
deleted file mode 100644
index 06cdc05825b4..
--- a/board/gdsys/common/adv7611.c
+++ /dev/null
@@ -1,180 +0,0 @@
-// SPDX-License-Identifier: GPL-2.0+
-/*
- * (C) Copyright 2014
- * Dirk Eibach, Guntermann & Drunck GmbH, dirk.eib...@gdsys.cc
- */
-
-#ifdef CONFIG_GDSYS_LEGACY_DRIVERS
-
-#include
-#include
-
-#define ADV7611_I2C_ADDR 0x4c
-#define ADV7611_RDINFO 0x2051
-
-/*
- * ADV7611 I2C Addresses in u-boot notation
- */
-enum {
- CP_I2C_ADDR = 0x22,
- DPLL_I2C_ADDR = 0x26,
- KSV_I2C_ADDR = 0x32,
- HDMI_I2C_ADDR = 0x34,
- EDID_I2C_ADDR = 0x36,
- INFOFRAME_I2C_ADDR = 0x3e,
- CEC_I2C_ADDR = 0x40,
- IO_I2C_ADDR = ADV7611_I2C_ADDR,
-};
-
-/*
- * Global Control Registers
- */
-enum {
- IO_RD_INFO_MSB = 0xea,
- IO_RD_INFO_LSB = 0xeb,
- IO_CEC_ADDR = 0xf4,
- IO_INFOFRAME_ADDR = 0xf5,
- IO_DPLL_ADDR = 0xf8,
- IO_KSV_ADDR = 0xf9,
- IO_EDID_ADDR = 0xfa,
- IO_HDMI_ADDR = 0xfb,
- IO_CP_ADDR = 0xfd,
-};
-
-int adv7611_i2c[] = CONFIG_SYS_ADV7611_I2C;
-
-int adv7611_probe(unsigned int screen)
-{
- int old_bus = i2c_get_bus_num();
- unsigned int rd_info;
- int res = 0;
-
- i2c_set_bus_num(adv7611_i2c[screen]);
-
- rd_info = (i2c_reg_read(IO_I2C_ADDR, IO_RD_INFO_MSB) << 8)
- | i2c_reg_read(IO_I2C_ADDR, IO_RD_INFO_LSB);
-
- if (rd_info != ADV7611_RDINFO) {
- res = -1;
- goto out;
- }
-
- /*
-* set I2C addresses to default values
-*/
- i2c_reg_write(IO_I2C_ADDR, IO_CEC_ADDR, CEC_I2C_ADDR << 1);
- i2c_reg_write(IO_I2C_ADDR, IO_INFOFRAME_ADDR, INFOFRAME_I2C_ADDR << 1);
- i2c_reg_write(IO_I2C_ADDR, IO_DPLL_ADDR, DPLL_I2C_ADDR << 1);
- i2c_reg_write(IO_I2C_ADDR, IO_KSV_ADDR, KSV_I2C_ADDR << 1);
- i2c_reg_write(IO_I2C_ADDR, IO_EDID_ADDR, EDID_I2C_ADDR << 1);
- i2c_reg_write(IO_I2C_ADDR, IO_HDMI_ADDR, HDMI_I2C_ADDR << 1);
- i2c_reg_write(IO_I2C_ADDR, IO_CP_ADDR, CP_I2C_ADDR << 1);
-
- /*
-* do magic initialization sequence from
-* "ADV7611 Register Settings Recommendations Revision 1.5"
-* with
[PATCH 45/57] ppc: Remove MPC8308RDB board
This board has not been converted to CONFIG_DM_MMC by the deadline.
Remove it.
Cc: Ilya Yanok
Signed-off-by: Tom Rini
---
arch/powerpc/cpu/mpc83xx/Kconfig| 6 -
board/freescale/mpc8308rdb/Kconfig | 12 -
board/freescale/mpc8308rdb/MAINTAINERS | 6 -
board/freescale/mpc8308rdb/Makefile | 8 -
board/freescale/mpc8308rdb/mpc8308rdb.c | 192 --
board/freescale/mpc8308rdb/sdram.c | 84 --
configs/MPC8308RDB_defconfig| 152 ---
include/configs/MPC8308RDB.h| 329
8 files changed, 789 deletions(-)
delete mode 100644 board/freescale/mpc8308rdb/Kconfig
delete mode 100644 board/freescale/mpc8308rdb/MAINTAINERS
delete mode 100644 board/freescale/mpc8308rdb/Makefile
delete mode 100644 board/freescale/mpc8308rdb/mpc8308rdb.c
delete mode 100644 board/freescale/mpc8308rdb/sdram.c
delete mode 100644 configs/MPC8308RDB_defconfig
delete mode 100644 include/configs/MPC8308RDB.h
diff --git a/arch/powerpc/cpu/mpc83xx/Kconfig b/arch/powerpc/cpu/mpc83xx/Kconfig
index 2bae08e27863..15f09672e4dd 100644
--- a/arch/powerpc/cpu/mpc83xx/Kconfig
+++ b/arch/powerpc/cpu/mpc83xx/Kconfig
@@ -28,11 +28,6 @@ config TARGET_CADDY2
bool "Support caddy2"
select ARCH_MPC8349
-config TARGET_MPC8308RDB
- bool "Support MPC8308RDB"
- select ARCH_MPC8308
- select SYS_FSL_ERRATUM_ESDHC111
-
config TARGET_MPC8313ERDB_NOR
bool "Support MPC8313ERDB_NOR"
select ARCH_MPC8313
@@ -330,7 +325,6 @@ config FSL_ELBC
bool
source "board/esd/vme8349/Kconfig"
-source "board/freescale/mpc8308rdb/Kconfig"
source "board/freescale/mpc8313erdb/Kconfig"
source "board/freescale/mpc8315erdb/Kconfig"
source "board/freescale/mpc8323erdb/Kconfig"
diff --git a/board/freescale/mpc8308rdb/Kconfig
b/board/freescale/mpc8308rdb/Kconfig
deleted file mode 100644
index 48d25e5a26ed..
--- a/board/freescale/mpc8308rdb/Kconfig
+++ /dev/null
@@ -1,12 +0,0 @@
-if TARGET_MPC8308RDB
-
-config SYS_BOARD
- default "mpc8308rdb"
-
-config SYS_VENDOR
- default "freescale"
-
-config SYS_CONFIG_NAME
- default "MPC8308RDB"
-
-endif
diff --git a/board/freescale/mpc8308rdb/MAINTAINERS
b/board/freescale/mpc8308rdb/MAINTAINERS
deleted file mode 100644
index 07ff2abd13a1..
--- a/board/freescale/mpc8308rdb/MAINTAINERS
+++ /dev/null
@@ -1,6 +0,0 @@
-MPC8308RDB BOARD
-M: Ilya Yanok
-S: Maintained
-F: board/freescale/mpc8308rdb/
-F: include/configs/MPC8308RDB.h
-F: configs/MPC8308RDB_defconfig
diff --git a/board/freescale/mpc8308rdb/Makefile
b/board/freescale/mpc8308rdb/Makefile
deleted file mode 100644
index d6eb4dcef2e8..
--- a/board/freescale/mpc8308rdb/Makefile
+++ /dev/null
@@ -1,8 +0,0 @@
-# SPDX-License-Identifier: GPL-2.0+
-#
-# (C) Copyright 2006
-# Wolfgang Denk, DENX Software Engineering, w...@denx.de.
-# (C) Copyright 2010
-# Ilya Yanok, Emcraft Systems, ya...@emcraft.com
-
-obj-y := mpc8308rdb.o sdram.o
diff --git a/board/freescale/mpc8308rdb/mpc8308rdb.c
b/board/freescale/mpc8308rdb/mpc8308rdb.c
deleted file mode 100644
index db9c5ba1935e..
--- a/board/freescale/mpc8308rdb/mpc8308rdb.c
+++ /dev/null
@@ -1,192 +0,0 @@
-// SPDX-License-Identifier: GPL-2.0+
-/*
- * Copyright (C) 2010 Freescale Semiconductor, Inc.
- * Copyright (C) 2010 Ilya Yanok, Emcraft Systems, ya...@emcraft.com
- */
-
-#include
-#include
-#include
-#include
-#include
-#include
-#include
-#include
-#include
-#include
-#include
-#include
-#include
-#include
-#include
-#include
-#include
-
-/*
- * The following are used to control the SPI chip selects for the SPI command.
- */
-#ifdef CONFIG_MPC8XXX_SPI
-
-#define SPI_CS_MASK0x0040
-
-int spi_cs_is_valid(unsigned int bus, unsigned int cs)
-{
- return bus == 0 && cs == 0;
-}
-
-void spi_cs_activate(struct spi_slave *slave)
-{
- immap_t *immr = (immap_t *)CONFIG_SYS_IMMR;
-
- /* active low */
- clrbits_be32(&immr->gpio[0].dat, SPI_CS_MASK);
-}
-
-void spi_cs_deactivate(struct spi_slave *slave)
-{
- immap_t *immr = (immap_t *)CONFIG_SYS_IMMR;
-
- /* inactive high */
- setbits_be32(&immr->gpio[0].dat, SPI_CS_MASK);
-}
-#endif /* CONFIG_MPC8XXX_SPI */
-
-#ifdef CONFIG_FSL_ESDHC
-int board_mmc_init(struct bd_info *bd)
-{
- return fsl_esdhc_mmc_init(bd);
-}
-#endif
-
-static u8 read_board_info(void)
-{
- u8 val8;
- i2c_set_bus_num(0);
-
- if (i2c_read(CONFIG_SYS_I2C_PCF8574A_ADDR, 0, 0, &val8, 1) == 0)
- return val8;
- else
- return 0;
-}
-
-int checkboard(void)
-{
- static const char * const rev_str[] = {
- "1.0",
- "",
- "",
- "",
- "",
- };
- u8 info;
- int i;
-
- info = read_board_info();
- i = (!info) ? 4 : info & 0x03;
-
- printf("Board: Freescale MPC8308RDB Rev %s\n", rev_str[i]);
[PATCH 44/57] ppc: Remove T2081QDS board and ARCH_T2081 support
This board has not been converted to CONFIG_DM_MMC by the deadline. Remove it. It is also the only ARCH_T2081 board so remove that support as well. Cc: Shengzhou Liu Cc: Ruchika Gupta Signed-off-by: Tom Rini --- arch/powerpc/cpu/mpc85xx/Kconfig | 36 +--- arch/powerpc/cpu/mpc85xx/Makefile | 2 - arch/powerpc/cpu/mpc85xx/speed.c | 4 +- arch/powerpc/cpu/mpc85xx/t2080_serdes.c | 4 - arch/powerpc/include/asm/config_mpc85xx.h | 5 +- arch/powerpc/include/asm/immap_85xx.h | 4 +- board/freescale/t208xqds/Kconfig | 2 +- board/freescale/t208xqds/Makefile | 1 - board/freescale/t208xqds/eth_t208xqds.c | 106 -- board/freescale/t208xqds/t208xqds.c | 70 -- configs/T2081QDS_NAND_defconfig | 78 configs/T2081QDS_SDCARD_defconfig | 75 --- configs/T2081QDS_SPIFLASH_defconfig | 77 configs/T2081QDS_SRIO_PCIE_BOOT_defconfig | 54 --- configs/T2081QDS_defconfig| 62 - drivers/net/Kconfig | 1 - drivers/net/fm/Makefile | 1 - include/configs/T208xQDS.h| 7 -- 18 files changed, 7 insertions(+), 582 deletions(-) delete mode 100644 configs/T2081QDS_NAND_defconfig delete mode 100644 configs/T2081QDS_SDCARD_defconfig delete mode 100644 configs/T2081QDS_SPIFLASH_defconfig delete mode 100644 configs/T2081QDS_SRIO_PCIE_BOOT_defconfig delete mode 100644 configs/T2081QDS_defconfig diff --git a/arch/powerpc/cpu/mpc85xx/Kconfig b/arch/powerpc/cpu/mpc85xx/Kconfig index 565b311f39ac..3a787919f306 100644 --- a/arch/powerpc/cpu/mpc85xx/Kconfig +++ b/arch/powerpc/cpu/mpc85xx/Kconfig @@ -193,14 +193,6 @@ config TARGET_T2080RDB imply CMD_SATA imply PANIC_HANG -config TARGET_T2081QDS - bool "Support T2081QDS" - select ARCH_T2081 - select SUPPORT_SPL - select PHYS_64BIT - select FSL_DDR_FIRST_SLOT_QUAD_CAPABLE - select FSL_DDR_INTERACTIVE - config TARGET_T4160RDB bool "Support T4160RDB" select ARCH_T4160 @@ -924,29 +916,6 @@ config ARCH_T2080 imply CMD_REGINFO imply FSL_SATA -config ARCH_T2081 - bool - select E500MC - select E6500 - select FSL_LAW - select SYS_FSL_DDR_VER_47 - select SYS_FSL_ERRATUM_A006379 - select SYS_FSL_ERRATUM_A006593 - select SYS_FSL_ERRATUM_A007186 - select SYS_FSL_ERRATUM_A007212 - select SYS_FSL_ERRATUM_A009942 - select SYS_FSL_ERRATUM_ESDHC111 - select FSL_PCIE_RESET - select SYS_FSL_HAS_DDR3 - select SYS_FSL_HAS_SEC - select SYS_FSL_QORIQ_CHASSIS2 - select SYS_FSL_SEC_BE - select SYS_FSL_SEC_COMPAT_4 - select SYS_PPC64 - select FSL_IFC - imply CMD_NAND - imply CMD_REGINFO - config ARCH_T4160 bool select E500MC @@ -1048,8 +1017,7 @@ config MAX_CPUS ARCH_P5040 || \ ARCH_T1040 || \ ARCH_T1042 || \ -ARCH_T2080 || \ -ARCH_T2081 +ARCH_T2080 default 2 if ARCH_B4420 || \ ARCH_BSC9132 || \ ARCH_MPC8572 || \ @@ -1107,7 +1075,6 @@ config SYS_CCSRBAR_DEFAULT ARCH_T1040 || \ ARCH_T1042 || \ ARCH_T2080 || \ - ARCH_T2081 || \ ARCH_T4160 || \ ARCH_T4240 default 0xe000 if ARCH_QEMU_E500 @@ -1294,7 +1261,6 @@ config SYS_FSL_NUM_LAWS ARCH_P5020 || \ ARCH_P5040 || \ ARCH_T2080 || \ - ARCH_T2081 || \ ARCH_T4160 || \ ARCH_T4240 default 16 if ARCH_T1023 || \ diff --git a/arch/powerpc/cpu/mpc85xx/Makefile b/arch/powerpc/cpu/mpc85xx/Makefile index 019fce631425..5bfa9904adda 100644 --- a/arch/powerpc/cpu/mpc85xx/Makefile +++ b/arch/powerpc/cpu/mpc85xx/Makefile @@ -51,7 +51,6 @@ obj-$(CONFIG_ARCH_T1042) += t1040_ids.o obj-$(CONFIG_ARCH_T1023) += t1024_ids.o obj-$(CONFIG_ARCH_T1024) += t1024_ids.o obj-$(CONFIG_ARCH_T2080) += t2080_ids.o -obj-$(CONFIG_ARCH_T2081) += t2080_ids.o obj-$(CONFIG_QE) += qe_io.o @@ -91,7 +90,6 @@ obj-$(CONFIG_ARCH_T1042) += t1040_serdes.o obj-$(CONFIG_ARCH_T1023) += t1024_serdes.o obj-$(CONFIG_ARCH_T1024) += t1024_serdes.o obj-$(CONFIG_ARCH_T2080) += t2080_serdes.o -obj-$(CONFIG_ARCH_T2081) += t2080_serdes.o obj-y += cpu.o obj-y += cpu_init.o diff --git a/arch/powerpc/cpu/mpc85xx/speed.c b/arch/powerpc/cpu/mpc85xx/speed.c index 09653c70125f..09cdc5e06089 100644 --- a/arch/powerpc/cpu/mpc85xx/spe
[PATCH 43/57] ppc: Remove TARGET_T1040QDS references
The TARGET_T1040QDS platforms have been removed already, drop some remaining references in the code. Signed-off-by: Tom Rini --- arch/powerpc/include/asm/fsl_secure_boot.h | 1 - drivers/qe/Kconfig | 1 - 2 files changed, 2 deletions(-) diff --git a/arch/powerpc/include/asm/fsl_secure_boot.h b/arch/powerpc/include/asm/fsl_secure_boot.h index 0e2787076d87..015fb13388d4 100644 --- a/arch/powerpc/include/asm/fsl_secure_boot.h +++ b/arch/powerpc/include/asm/fsl_secure_boot.h @@ -25,7 +25,6 @@ defined(CONFIG_TARGET_T4240QDS) || \ defined(CONFIG_TARGET_T2080QDS) || \ defined(CONFIG_TARGET_T2080RDB) || \ - defined(CONFIG_TARGET_T1040QDS) || \ defined(CONFIG_TARGET_T1042RDB) || \ defined(CONFIG_TARGET_T1042D4RDB) || \ defined(CONFIG_TARGET_T1042RDB_PI) || \ diff --git a/drivers/qe/Kconfig b/drivers/qe/Kconfig index 864b36b82252..553ed5780e5a 100644 --- a/drivers/qe/Kconfig +++ b/drivers/qe/Kconfig @@ -14,7 +14,6 @@ config U_QE default y if (ARCH_LS1021A && !SD_BOOT && !NAND_BOOT && !QSPI_BOOT) \ || (TARGET_T1024QDS) \ || (TARGET_T1024RDB) \ - || (TARGET_T1040QDS && !NOBQFMAN) \ || (TARGET_LS1043ARDB && !SPL_NO_QE && !NAND_BOOT && !QSPI_BOOT) help Choose this option to add support for U QUICC Engine. -- 2.17.1
[PATCH 38/57] arm: Remove cgtqmx6eval board
This board has not been converted to CONFIG_DM_MMC by the deadline. Remove it. Cc: Otavio Salvador Signed-off-by: Tom Rini --- arch/arm/mach-imx/mx6/Kconfig| 10 - board/congatec/cgtqmx6eval/Kconfig | 12 - board/congatec/cgtqmx6eval/MAINTAINERS |6 - board/congatec/cgtqmx6eval/Makefile |8 - board/congatec/cgtqmx6eval/README| 74 -- board/congatec/cgtqmx6eval/cgtqmx6eval.c | 1097 -- configs/cgtqmx6eval_defconfig| 99 -- include/configs/cgtqmx6eval.h| 197 8 files changed, 1503 deletions(-) delete mode 100644 board/congatec/cgtqmx6eval/Kconfig delete mode 100644 board/congatec/cgtqmx6eval/MAINTAINERS delete mode 100644 board/congatec/cgtqmx6eval/Makefile delete mode 100644 board/congatec/cgtqmx6eval/README delete mode 100644 board/congatec/cgtqmx6eval/cgtqmx6eval.c delete mode 100644 configs/cgtqmx6eval_defconfig delete mode 100644 include/configs/cgtqmx6eval.h diff --git a/arch/arm/mach-imx/mx6/Kconfig b/arch/arm/mach-imx/mx6/Kconfig index de1588735f69..594923e804c2 100644 --- a/arch/arm/mach-imx/mx6/Kconfig +++ b/arch/arm/mach-imx/mx6/Kconfig @@ -144,15 +144,6 @@ config TARGET_ARISTAINETOS2CCSLB imply CMD_SATA imply CMD_DM -config TARGET_CGTQMX6EVAL - bool "cgtqmx6eval" - depends on MX6QDL - select BOARD_LATE_INIT - select DM - select DM_THERMAL - select SUPPORT_SPL - imply CMD_DM - config TARGET_CM_FX6 bool "CM-FX6" depends on MX6QDL @@ -628,7 +619,6 @@ source "board/armadeus/opos6uldev/Kconfig" source "board/boundary/nitrogen6x/Kconfig" source "board/bticino/mamoj/Kconfig" source "board/compulab/cm_fx6/Kconfig" -source "board/congatec/cgtqmx6eval/Kconfig" source "board/dhelectronics/dh_imx6/Kconfig" source "board/engicam/imx6q/Kconfig" source "board/engicam/imx6ul/Kconfig" diff --git a/board/congatec/cgtqmx6eval/Kconfig b/board/congatec/cgtqmx6eval/Kconfig deleted file mode 100644 index 773551baa952.. --- a/board/congatec/cgtqmx6eval/Kconfig +++ /dev/null @@ -1,12 +0,0 @@ -if TARGET_CGTQMX6EVAL - -config SYS_BOARD - default "cgtqmx6eval" - -config SYS_VENDOR - default "congatec" - -config SYS_CONFIG_NAME - default "cgtqmx6eval" - -endif diff --git a/board/congatec/cgtqmx6eval/MAINTAINERS b/board/congatec/cgtqmx6eval/MAINTAINERS deleted file mode 100644 index 48c08891b344.. --- a/board/congatec/cgtqmx6eval/MAINTAINERS +++ /dev/null @@ -1,6 +0,0 @@ -CGTQMX6EVAL BOARD -M: Otavio Salvador -S: Maintained -F: board/congatec/cgtqmx6eval/ -F: include/configs/cgtqmx6eval.h -F: configs/cgtqmx6eval_defconfig diff --git a/board/congatec/cgtqmx6eval/Makefile b/board/congatec/cgtqmx6eval/Makefile deleted file mode 100644 index 2c45ca0e12ec.. --- a/board/congatec/cgtqmx6eval/Makefile +++ /dev/null @@ -1,8 +0,0 @@ -# SPDX-License-Identifier: GPL-2.0+ -# -# Copyright (C) 2007, Guennadi Liakhovetski -# -# (C) Copyright 2011 Freescale Semiconductor, Inc. -# (C) Copyright 2013 Adeneo Embedded - -obj-y := cgtqmx6eval.o diff --git a/board/congatec/cgtqmx6eval/README b/board/congatec/cgtqmx6eval/README deleted file mode 100644 index 0777c781c26f.. --- a/board/congatec/cgtqmx6eval/README +++ /dev/null @@ -1,74 +0,0 @@ -U-Boot for the Congatec QMX6 boards - -This file contains information for the port of U-Boot to the Congatec -QMX6 boards. - -1. Building U-Boot --- - -- Build U-Boot for Congatec QMX6 boards: - -$ make mrproper -$ make cgtqmx6eval_defconfig -$ make - -This will generate the following binaries: - -- SPL -- u-boot.img - -2. Flashing U-Boot in the SPI NOR -- - -Copy SPL and u-boot.img to the exported TFTP directory of the -host PC (/tftpboot , for example). - -=> sf probe - -=> setenv serverip - -=> setenv ipaddr - -=> tftp 0x1200 SPL - -=> sf erase 0x0 0x1 - -=> sf write 0x1200 0x400 0x1 - -=> tftp 0x1200 u-boot.img - -=> sf erase 0x1 0x7 - -=> sf write 0x1200 0x1 0x7 - -Reboot the board and the new U-Boot should come up. - -3. Booting from the SD card - -- Flash the SPL image into the SD card: - -sudo dd if=SPL of=/dev/mmcblk0 bs=1k seek=1; sync - -- Flash the u-boot.img image into the SD card: - -sudo dd if=u-boot.img of=/dev/mmcblk0 bs=1k seek=69; sync - -- Insert the SD card into the big slot. - -The boot medium of Congatec QMX6 boards is the SPI NOR flash, so boot -the board from SPI first. - -It is also possible to boot from the SD card slot by using the 'bmode' -command: - -=> bmode esdhc4 - -And then the U-Boot from the big slot will boot. - -Note: If the "bmode" command is not available from your pre-installed U-Boot, -these instruction will produce the same effect: - -=> mw.l 0x20d8040 0x3850 -=> mw.l 0x020d8044 0x1000 -=> reset diff --git a/board/congatec/cgtqmx6eval/cgtqmx6eval.c b/board/congate
[PATCH 39/57] arm: Remove mx6dlarm2 board
This board has not been converted to CONFIG_DM_MMC by the deadline. Remove it. Cc: Jason Liu Cc: Ye Li Signed-off-by: Tom Rini --- arch/arm/mach-imx/mx6/Kconfig | 4 - board/freescale/mx6qarm2/Kconfig| 12 - board/freescale/mx6qarm2/MAINTAINERS| 10 - board/freescale/mx6qarm2/Makefile | 7 - board/freescale/mx6qarm2/imximage.cfg | 337 -- board/freescale/mx6qarm2/imximage_mx6dl.cfg | 461 board/freescale/mx6qarm2/mx6qarm2.c | 290 configs/mx6dlarm2_defconfig | 41 -- configs/mx6dlarm2_lpddr2_defconfig | 41 -- configs/mx6qarm2_defconfig | 41 -- configs/mx6qarm2_lpddr2_defconfig | 41 -- include/configs/mx6qarm2.h | 127 -- 12 files changed, 1412 deletions(-) delete mode 100644 board/freescale/mx6qarm2/Kconfig delete mode 100644 board/freescale/mx6qarm2/MAINTAINERS delete mode 100644 board/freescale/mx6qarm2/Makefile delete mode 100644 board/freescale/mx6qarm2/imximage.cfg delete mode 100644 board/freescale/mx6qarm2/imximage_mx6dl.cfg delete mode 100644 board/freescale/mx6qarm2/mx6qarm2.c delete mode 100644 configs/mx6dlarm2_defconfig delete mode 100644 configs/mx6dlarm2_lpddr2_defconfig delete mode 100644 configs/mx6qarm2_defconfig delete mode 100644 configs/mx6qarm2_lpddr2_defconfig delete mode 100644 include/configs/mx6qarm2.h diff --git a/arch/arm/mach-imx/mx6/Kconfig b/arch/arm/mach-imx/mx6/Kconfig index 594923e804c2..b0923ef76edb 100644 --- a/arch/arm/mach-imx/mx6/Kconfig +++ b/arch/arm/mach-imx/mx6/Kconfig @@ -287,9 +287,6 @@ config TARGET_MX6MEMCAL and characterize the memory layout of a new design during the initial development and pre-production stages. -config TARGET_MX6QARM2 - bool "mx6qarm2" - config TARGET_MX6DL_MAMOJ bool "Support BTicino Mamoj" depends on MX6QDL @@ -622,7 +619,6 @@ source "board/compulab/cm_fx6/Kconfig" source "board/dhelectronics/dh_imx6/Kconfig" source "board/engicam/imx6q/Kconfig" source "board/engicam/imx6ul/Kconfig" -source "board/freescale/mx6qarm2/Kconfig" source "board/freescale/mx6memcal/Kconfig" source "board/freescale/mx6sabreauto/Kconfig" source "board/freescale/mx6sabresd/Kconfig" diff --git a/board/freescale/mx6qarm2/Kconfig b/board/freescale/mx6qarm2/Kconfig deleted file mode 100644 index 8ab8b460f92a.. --- a/board/freescale/mx6qarm2/Kconfig +++ /dev/null @@ -1,12 +0,0 @@ -if TARGET_MX6QARM2 - -config SYS_BOARD - default "mx6qarm2" - -config SYS_VENDOR - default "freescale" - -config SYS_CONFIG_NAME - default "mx6qarm2" - -endif diff --git a/board/freescale/mx6qarm2/MAINTAINERS b/board/freescale/mx6qarm2/MAINTAINERS deleted file mode 100644 index fdbc7fa7254b.. --- a/board/freescale/mx6qarm2/MAINTAINERS +++ /dev/null @@ -1,10 +0,0 @@ -MX6QARM2 BOARD -M: Jason Liu -M: Ye Li -S: Maintained -F: board/freescale/mx6qarm2/ -F: include/configs/mx6qarm2.h -F: configs/mx6qarm2_defconfig -F: configs/mx6dlarm2_defconfig -F: configs/mx6qarm2_lpddr2_defconfig -F: configs/mx6dlarm2_lpddr2_defconfig diff --git a/board/freescale/mx6qarm2/Makefile b/board/freescale/mx6qarm2/Makefile deleted file mode 100644 index ef80a8967258.. --- a/board/freescale/mx6qarm2/Makefile +++ /dev/null @@ -1,7 +0,0 @@ -# SPDX-License-Identifier: GPL-2.0+ -# -# Copyright (C) 2007, Guennadi Liakhovetski -# -# (C) Copyright 2011 Freescale Semiconductor, Inc. - -obj-y := mx6qarm2.o diff --git a/board/freescale/mx6qarm2/imximage.cfg b/board/freescale/mx6qarm2/imximage.cfg deleted file mode 100644 index 74a33c25032a.. --- a/board/freescale/mx6qarm2/imximage.cfg +++ /dev/null @@ -1,337 +0,0 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ -/* - * Copyright (C) 2011-2014 Freescale Semiconductor, Inc. - * Jason Liu - * - * Refer doc/imx/mkimage/imximage.txt for more details about how-to configure - * and create imximage boot image - * - * The syntax is taken as close as possible with the kwbimage - */ - -/* image version */ -IMAGE_VERSION 2 - -/* - * Boot Device : one of - * spi, sd (the board has no nand neither onenand) - */ -BOOT_FROM sd - -/* - * Device Configuration Data (DCD) - * - * Each entry must have the format: - * Addr-type AddressValue - * - * where: - * Addr-type register length (1,2 or 4 bytes) - * Address absolute address of the register - * value value to be stored in the register - */ -#ifdef CONFIG_MX6DQ_LPDDR2 -/* DCD */ -DATA 4 0x020C4018 0x60324 - -DATA 4 0x020E05a8 0x3038 -DATA 4 0x020E05b0 0x3038 -DATA 4 0x020E0524 0x3038 -DATA 4 0x020E051c 0x3038 - -DATA 4 0x020E0518 0x3038 -DATA 4 0x020E050c 0x3038 -DATA 4 0x020E05b8 0x3038 -DATA 4 0x020E05c0 0x3038 - -DATA 4 0x020E05ac 0x0038 -DATA 4 0x020E05b4 0x0038 -DATA 4 0x020E0528 0x0038 -DATA 4 0x020E05
[PATCH 41/57] arm: Remove tqma6s_wru4_mmc config
This board has not been converted to CONFIG_DM_MMC by the deadline. Remove it. Cc: Markus Niebel Signed-off-by: Tom Rini --- configs/tqma6s_wru4_mmc_defconfig | 82 --- 1 file changed, 82 deletions(-) delete mode 100644 configs/tqma6s_wru4_mmc_defconfig diff --git a/configs/tqma6s_wru4_mmc_defconfig b/configs/tqma6s_wru4_mmc_defconfig deleted file mode 100644 index bae00c688b72.. --- a/configs/tqma6s_wru4_mmc_defconfig +++ /dev/null @@ -1,82 +0,0 @@ -CONFIG_ARM=y -CONFIG_ARCH_MX6=y -CONFIG_NR_DRAM_BANKS=1 -CONFIG_ENV_SIZE=0x2000 -CONFIG_ENV_OFFSET=0x10 -CONFIG_MX6S=y -CONFIG_TARGET_TQMA6=y -CONFIG_SYS_I2C_MXC_I2C1=y -CONFIG_SYS_I2C_MXC_I2C2=y -CONFIG_SYS_I2C_MXC_I2C3=y -CONFIG_WRU4=y -CONFIG_SYS_BOOTCOUNT_ADDR=0x0090 -CONFIG_FIT=y -CONFIG_FIT_VERBOSE=y -CONFIG_SUPPORT_RAW_INITRD=y -CONFIG_OF_BOARD_SETUP=y -CONFIG_BOOTDELAY=3 -CONFIG_AUTOBOOT_KEYED=y -CONFIG_AUTOBOOT_PROMPT="Enter password in %d seconds to stop autoboot\n" -CONFIG_AUTOBOOT_ENCRYPTION=y -CONFIG_AUTOBOOT_STOP_STR_SHA256="36a9e7f1c95b82ffb99743e0c5c4ce95d83c9a430aac59f84ef3cbfab6145068" -CONFIG_DEFAULT_FDT_FILE="imx6s-wru4.dtb" -CONFIG_MISC_INIT_R=y -CONFIG_HUSH_PARSER=y -CONFIG_CMD_BOOTZ=y -CONFIG_CMD_EEPROM=y -CONFIG_CMD_GPIO=y -CONFIG_CMD_I2C=y -CONFIG_CMD_MMC=y -CONFIG_CMD_USB=y -CONFIG_CMD_DHCP=y -CONFIG_CMD_MII=y -CONFIG_CMD_PING=y -CONFIG_CMD_CACHE=y -CONFIG_CMD_DATE=y -CONFIG_CMD_EXT2=y -CONFIG_CMD_EXT4=y -CONFIG_CMD_EXT4_WRITE=y -CONFIG_CMD_FAT=y -CONFIG_CMD_FS_GENERIC=y -CONFIG_ENV_OVERWRITE=y -CONFIG_ENV_IS_IN_MMC=y -CONFIG_SYS_RELOC_GD_ENV_ADDR=y -# CONFIG_DM is not set -CONFIG_BOUNCE_BUFFER=y -CONFIG_BOOTCOUNT_LIMIT=y -CONFIG_SYS_I2C_MXC=y -CONFIG_LED_STATUS=y -CONFIG_LED_STATUS0=y -CONFIG_LED_STATUS_BIT=0 -CONFIG_LED_STATUS_STATE=2 -CONFIG_LED_STATUS1=y -CONFIG_LED_STATUS_BIT1=1 -CONFIG_LED_STATUS_STATE1=2 -CONFIG_LED_STATUS2=y -CONFIG_LED_STATUS_BIT2=2 -CONFIG_LED_STATUS_STATE2=2 -CONFIG_LED_STATUS3=y -CONFIG_LED_STATUS_BIT3=3 -CONFIG_LED_STATUS_STATE3=2 -CONFIG_LED_STATUS4=y -CONFIG_LED_STATUS_BIT4=4 -CONFIG_LED_STATUS_STATE4=2 -CONFIG_LED_STATUS5=y -CONFIG_LED_STATUS_BIT5=5 -CONFIG_LED_STATUS_STATE5=2 -CONFIG_LED_STATUS_CMD=y -CONFIG_PCA9551_LED=y -CONFIG_FSL_USDHC=y -CONFIG_MTD=y -CONFIG_PHYLIB=y -CONFIG_PHY_SMSC=y -CONFIG_MII=y -# CONFIG_SPECIFY_CONSOLE_INDEX is not set -CONFIG_MXC_UART=y -CONFIG_USB=y -CONFIG_USB_STORAGE=y -CONFIG_USB_HOST_ETHER=y -CONFIG_USB_ETHER_SMSC95XX=y -CONFIG_WATCHDOG_TIMEOUT_MSECS=6 -CONFIG_IMX_WATCHDOG=y -CONFIG_OF_LIBFDT=y -- 2.17.1
[PATCH 40/57] arm: Remove sksimx6 board
This board has not been converted to CONFIG_DM_MMC by the deadline.
Remove it.
Cc: Stefano Babic
Signed-off-by: Tom Rini
---
arch/arm/mach-imx/mx6/Kconfig| 6 -
board/sks-kinkel/sksimx6/Kconfig | 11 -
board/sks-kinkel/sksimx6/MAINTAINERS | 6 -
board/sks-kinkel/sksimx6/Makefile| 2 -
board/sks-kinkel/sksimx6/sksimx6.c | 431 ---
configs/sksimx6_defconfig| 53
include/configs/sksimx6.h| 85 --
7 files changed, 594 deletions(-)
delete mode 100644 board/sks-kinkel/sksimx6/Kconfig
delete mode 100644 board/sks-kinkel/sksimx6/MAINTAINERS
delete mode 100644 board/sks-kinkel/sksimx6/Makefile
delete mode 100644 board/sks-kinkel/sksimx6/sksimx6.c
delete mode 100644 configs/sksimx6_defconfig
delete mode 100644 include/configs/sksimx6.h
diff --git a/arch/arm/mach-imx/mx6/Kconfig b/arch/arm/mach-imx/mx6/Kconfig
index b0923ef76edb..b4c2be67bced 100644
--- a/arch/arm/mach-imx/mx6/Kconfig
+++ b/arch/arm/mach-imx/mx6/Kconfig
@@ -514,11 +514,6 @@ config TARGET_PCL063_ULL
select DM_THERMAL
select SUPPORT_SPL
-config TARGET_SKSIMX6
- bool "sks-imx6"
- depends on MX6QDL
- select SUPPORT_SPL
-
config TARGET_SOMLABS_VISIONSOM_6ULL
bool "visionsom-6ull"
depends on MX6ULL
@@ -636,7 +631,6 @@ source "board/softing/vining_2000/Kconfig"
source "board/liebherr/display5/Kconfig"
source "board/liebherr/mccmon6/Kconfig"
source "board/logicpd/imx6/Kconfig"
-source "board/sks-kinkel/sksimx6/Kconfig"
source "board/solidrun/mx6cuboxi/Kconfig"
source "board/somlabs/visionsom-6ull/Kconfig"
source "board/technexion/pico-imx6/Kconfig"
diff --git a/board/sks-kinkel/sksimx6/Kconfig b/board/sks-kinkel/sksimx6/Kconfig
deleted file mode 100644
index 3efdf9d8b2a0..
--- a/board/sks-kinkel/sksimx6/Kconfig
+++ /dev/null
@@ -1,11 +0,0 @@
-if TARGET_SKSIMX6
-
-config SYS_BOARD
- default "sksimx6"
-
-config SYS_VENDOR
- default "sks-kinkel"
-
-config SYS_CONFIG_NAME
- default "sksimx6"
-endif
diff --git a/board/sks-kinkel/sksimx6/MAINTAINERS
b/board/sks-kinkel/sksimx6/MAINTAINERS
deleted file mode 100644
index c1527bfa5f3f..
--- a/board/sks-kinkel/sksimx6/MAINTAINERS
+++ /dev/null
@@ -1,6 +0,0 @@
-SKS-Kinkel sksimx6
-M: Stefano Babic
-S: Maintained
-F: board/sks-kinkel/sksimx6/
-F: include/configs/sksimx6.h
-F: configs/sksimx6_defconfig
diff --git a/board/sks-kinkel/sksimx6/Makefile
b/board/sks-kinkel/sksimx6/Makefile
deleted file mode 100644
index 1828fadd4e83..
--- a/board/sks-kinkel/sksimx6/Makefile
+++ /dev/null
@@ -1,2 +0,0 @@
-#
-obj-y := sksimx6.o
diff --git a/board/sks-kinkel/sksimx6/sksimx6.c
b/board/sks-kinkel/sksimx6/sksimx6.c
deleted file mode 100644
index cec3ade96cfd..
--- a/board/sks-kinkel/sksimx6/sksimx6.c
+++ /dev/null
@@ -1,431 +0,0 @@
-// SPDX-License-Identifier: GPL-2.0+
-/*
- * Copyright (C) 2016 Stefano Babic
- */
-
-#include
-#include
-#include
-#include
-#include
-#include
-#include
-#include
-#include
-#include
-#include
-#include
-#include
-#include
-#include
-#include
-#include
-#include
-#include
-#include
-#include
-#include
-#include
-
-#include
-#include
-#include
-
-DECLARE_GLOBAL_DATA_PTR;
-
-#define UART_PAD_CTRL (PAD_CTL_PUS_100K_UP | \
- PAD_CTL_SPEED_MED | PAD_CTL_DSE_40ohm | \
- PAD_CTL_SRE_FAST | PAD_CTL_HYS)
-
-#define USDHC_PAD_CTRL (PAD_CTL_PKE | PAD_CTL_PUE | \
- PAD_CTL_PUS_22K_UP | PAD_CTL_SPEED_LOW | \
- PAD_CTL_DSE_80ohm | PAD_CTL_SRE_FAST | PAD_CTL_HYS)
-
-#define I2C_PAD_CTRL (PAD_CTL_PUS_100K_UP | \
- PAD_CTL_SPEED_MED | PAD_CTL_DSE_40ohm | PAD_CTL_HYS | \
- PAD_CTL_ODE | PAD_CTL_SRE_FAST)
-
-#define ENET_PAD_CTRL (PAD_CTL_PUS_100K_UP | PAD_CTL_SPEED_MED | \
-PAD_CTL_DSE_40ohm | PAD_CTL_HYS)
-
-static iomux_v3_cfg_t const uart1_pads[] = {
- IOMUX_PADS(PAD_CSI0_DAT10__UART1_TX_DATA | MUX_PAD_CTRL(UART_PAD_CTRL)),
- IOMUX_PADS(PAD_CSI0_DAT11__UART1_RX_DATA | MUX_PAD_CTRL(UART_PAD_CTRL)),
-};
-
-static iomux_v3_cfg_t const gpios_pads[] = {
- IOMUX_PADS(PAD_EIM_A24__GPIO5_IO04 | MUX_PAD_CTRL(NO_PAD_CTRL)),
-};
-
-static iomux_v3_cfg_t const usdhc2_pads[] = {
- IOMUX_PADS(PAD_SD2_CLK__SD2_CLK | MUX_PAD_CTRL(USDHC_PAD_CTRL)),
- IOMUX_PADS(PAD_SD2_CMD__SD2_CMD | MUX_PAD_CTRL(USDHC_PAD_CTRL)),
- IOMUX_PADS(PAD_SD2_DAT0__SD2_DATA0 | MUX_PAD_CTRL(USDHC_PAD_CTRL)),
- IOMUX_PADS(PAD_SD2_DAT1__SD2_DATA1 | MUX_PAD_CTRL(USDHC_PAD_CTRL)),
- IOMUX_PADS(PAD_SD2_DAT2__SD2_DATA2 | MUX_PAD_CTRL(USDHC_PAD_CTRL)),
- IOMUX_PADS(PAD_SD2_DAT3__SD2_DATA3 | MUX_PAD_CTRL(USDHC_PAD_CTRL)),
- IOMUX_PADS(PAD_NANDF_D0__GPIO2_IO00 | MUX_PAD_CTRL(NO_PAD_CTRL)),/* CD
*/
-};
-
-static iomux_v3_cfg_t const enet_pads[] = {
- IOMUX_PADS(PAD_ENET_MDIO__E
[PATCH 37/57] arm: Remove titanium board
This board has not been converted to CONFIG_DM_MMC by the deadline. Remove it. Cc: Stefan Roese Signed-off-by: Tom Rini --- arch/arm/mach-imx/mx6/Kconfig | 5 - board/barco/titanium/Kconfig | 12 -- board/barco/titanium/MAINTAINERS | 6 - board/barco/titanium/Makefile | 7 - board/barco/titanium/imximage.cfg | 166 board/barco/titanium/titanium.c | 320 -- configs/titanium_defconfig| 55 - include/configs/titanium.h| 151 -- 8 files changed, 722 deletions(-) delete mode 100644 board/barco/titanium/Kconfig delete mode 100644 board/barco/titanium/MAINTAINERS delete mode 100644 board/barco/titanium/Makefile delete mode 100644 board/barco/titanium/imximage.cfg delete mode 100644 board/barco/titanium/titanium.c delete mode 100644 configs/titanium_defconfig delete mode 100644 include/configs/titanium.h diff --git a/arch/arm/mach-imx/mx6/Kconfig b/arch/arm/mach-imx/mx6/Kconfig index 5b29a700eb7d..de1588735f69 100644 --- a/arch/arm/mach-imx/mx6/Kconfig +++ b/arch/arm/mach-imx/mx6/Kconfig @@ -547,10 +547,6 @@ config TARGET_TBS2910 bool "TBS2910 Matrix ARM mini PC" depends on MX6Q -config TARGET_TITANIUM - bool "titanium" - depends on MX6Q - config TARGET_KP_IMX6Q_TPC bool "K+P KP_IMX6Q_TPC i.MX6 Quad" depends on MX6QDL @@ -629,7 +625,6 @@ source "board/ge/bx50v3/Kconfig" source "board/ge/b1x5v2/Kconfig" source "board/aristainetos/Kconfig" source "board/armadeus/opos6uldev/Kconfig" -source "board/barco/titanium/Kconfig" source "board/boundary/nitrogen6x/Kconfig" source "board/bticino/mamoj/Kconfig" source "board/compulab/cm_fx6/Kconfig" diff --git a/board/barco/titanium/Kconfig b/board/barco/titanium/Kconfig deleted file mode 100644 index 21bc36e004f0.. --- a/board/barco/titanium/Kconfig +++ /dev/null @@ -1,12 +0,0 @@ -if TARGET_TITANIUM - -config SYS_BOARD - default "titanium" - -config SYS_VENDOR - default "barco" - -config SYS_CONFIG_NAME - default "titanium" - -endif diff --git a/board/barco/titanium/MAINTAINERS b/board/barco/titanium/MAINTAINERS deleted file mode 100644 index 7e9913ffa670.. --- a/board/barco/titanium/MAINTAINERS +++ /dev/null @@ -1,6 +0,0 @@ -TITANIUM BOARD -M: Stefan Roese -S: Maintained -F: board/barco/titanium/ -F: include/configs/titanium.h -F: configs/titanium_defconfig diff --git a/board/barco/titanium/Makefile b/board/barco/titanium/Makefile deleted file mode 100644 index 6bc5c134f639.. --- a/board/barco/titanium/Makefile +++ /dev/null @@ -1,7 +0,0 @@ -# SPDX-License-Identifier: GPL-2.0+ -# -# Copyright (C) 2007, Guennadi Liakhovetski -# -# (C) Copyright 2011 Freescale Semiconductor, Inc. - -obj-y := titanium.o diff --git a/board/barco/titanium/imximage.cfg b/board/barco/titanium/imximage.cfg deleted file mode 100644 index 1fc26ed2c940.. --- a/board/barco/titanium/imximage.cfg +++ /dev/null @@ -1,166 +0,0 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ -/* - * Projectiondesign AS - * Derived from ./board/freescale/mx6qsabrelite/imximage.cfg - * - * Copyright (C) 2011 Freescale Semiconductor, Inc. - * Jason Liu - * - * Refer doc/imx/mkimage/imximage.txt for more details about how-to configure - * and create imximage boot image - * - * The syntax is taken as close as possible with the kwbimage - */ - -/* image version */ - -IMAGE_VERSION 2 - -/* - * Boot Device : one of - * sd, nand - */ -BOOT_FROM nand - -/* - * Device Configuration Data (DCD) - * - * Each entry must have the format: - * Addr-type AddressValue - * - * where: - * Addr-type register length (1,2 or 4 bytes) - * Address absolute address of the register - * value value to be stored in the register - */ - -#define __ASSEMBLY__ -#include -#include "asm/arch/mx6-ddr.h" -#include "asm/arch/iomux.h" -#include "asm/arch/crm_regs.h" - -DATA 4, MX6_IOM_DRAM_SDQS0, 0x0030 -DATA 4, MX6_IOM_DRAM_SDQS1, 0x0030 -DATA 4, MX6_IOM_DRAM_SDQS2, 0x0030 -DATA 4, MX6_IOM_DRAM_SDQS3, 0x0030 -DATA 4, MX6_IOM_DRAM_SDQS4, 0x0030 -DATA 4, MX6_IOM_DRAM_SDQS5, 0x0030 -DATA 4, MX6_IOM_DRAM_SDQS6, 0x0030 -DATA 4, MX6_IOM_DRAM_SDQS7, 0x0030 - -DATA 4, MX6_IOM_DRAM_DQM0, 0x00020030 -DATA 4, MX6_IOM_DRAM_DQM1, 0x00020030 -DATA 4, MX6_IOM_DRAM_DQM2, 0x00020030 -DATA 4, MX6_IOM_DRAM_DQM3, 0x00020030 -DATA 4, MX6_IOM_DRAM_DQM4, 0x00020030 -DATA 4, MX6_IOM_DRAM_DQM5, 0x00020030 -DATA 4, MX6_IOM_DRAM_DQM6, 0x00020030 -DATA 4, MX6_IOM_DRAM_DQM7, 0x00020030 - -DATA 4, MX6_IOM_DRAM_CAS, 0x00020030 -DATA 4, MX6_IOM_DRAM_RAS, 0x00020030 -DATA 4, MX6_IOM_DRAM_SDCLK_0, 0x00020030 -DATA 4, MX6_IOM_DRAM_SDCLK_1, 0x00020030 - -DATA 4, MX6_IOM_DRAM_RESET, 0x00020030 -DATA 4, MX6_IOM_DRAM_SDCKE0, 0x3000 -DATA 4, MX6_IOM_DRAM_SDCKE1, 0x3000 - -DATA 4, MX6_IOM_DRAM_SDBA2, 0x - -DATA 4, MX6_IOM_DRAM_SDODT0, 0x3030 -DATA 4, MX6_IOM_DRAM
[PATCH 36/57] arm: Remove ts4800 board
This board has not been converted to CONFIG_DM_MMC by the deadline.
Remove it.
Cc: Lucile Quirion
Signed-off-by: Tom Rini
---
arch/arm/mach-imx/mx5/Kconfig| 5 -
board/technologic/ts4800/Kconfig | 15 --
board/technologic/ts4800/MAINTAINERS | 6 -
board/technologic/ts4800/Makefile| 5 -
board/technologic/ts4800/ts4800.c| 263 ---
board/technologic/ts4800/ts4800.h| 15 --
configs/ts4800_defconfig | 30 ---
include/configs/ts4800.h | 133 --
8 files changed, 472 deletions(-)
delete mode 100644 board/technologic/ts4800/Kconfig
delete mode 100644 board/technologic/ts4800/MAINTAINERS
delete mode 100644 board/technologic/ts4800/Makefile
delete mode 100644 board/technologic/ts4800/ts4800.c
delete mode 100644 board/technologic/ts4800/ts4800.h
delete mode 100644 configs/ts4800_defconfig
delete mode 100644 include/configs/ts4800.h
diff --git a/arch/arm/mach-imx/mx5/Kconfig b/arch/arm/mach-imx/mx5/Kconfig
index 0a2897309020..d059963ab78f 100644
--- a/arch/arm/mach-imx/mx5/Kconfig
+++ b/arch/arm/mach-imx/mx5/Kconfig
@@ -63,10 +63,6 @@ config TARGET_MX53PPD
help
Enable support for the GE Healthcare PPD.
-config TARGET_TS4800
- bool "Support TS4800"
- select MX51
-
endchoice
config SYS_SOC
@@ -78,6 +74,5 @@ source "board/freescale/mx53loco/Kconfig"
source "board/ge/mx53ppd/Kconfig"
source "board/k+p/kp_imx53/Kconfig"
source "board/menlo/m53menlo/Kconfig"
-source "board/technologic/ts4800/Kconfig"
endif
diff --git a/board/technologic/ts4800/Kconfig b/board/technologic/ts4800/Kconfig
deleted file mode 100644
index a28d5e41bd38..
--- a/board/technologic/ts4800/Kconfig
+++ /dev/null
@@ -1,15 +0,0 @@
-if TARGET_TS4800
-
-config SYS_BOARD
- default "ts4800"
-
-config SYS_VENDOR
- default "technologic"
-
-config SYS_SOC
- default "mx5"
-
-config SYS_CONFIG_NAME
- default "ts4800"
-
-endif
diff --git a/board/technologic/ts4800/MAINTAINERS
b/board/technologic/ts4800/MAINTAINERS
deleted file mode 100644
index e013ee42f8c4..
--- a/board/technologic/ts4800/MAINTAINERS
+++ /dev/null
@@ -1,6 +0,0 @@
-TS4800 BOARD
-M: Lucile Quirion
-S: Maintained
-F: board/ts/ts4800/
-F: include/configs/ts4800.h
-F: configs/ts4800_defconfig
diff --git a/board/technologic/ts4800/Makefile
b/board/technologic/ts4800/Makefile
deleted file mode 100644
index ec33cf92ca35..
--- a/board/technologic/ts4800/Makefile
+++ /dev/null
@@ -1,5 +0,0 @@
-# SPDX-License-Identifier: GPL-2.0+
-#
-# (C) Copyright 2015 Savoir-faire Linux
-
-obj-y += ts4800.o
diff --git a/board/technologic/ts4800/ts4800.c
b/board/technologic/ts4800/ts4800.c
deleted file mode 100644
index a309e58b27fd..
--- a/board/technologic/ts4800/ts4800.c
+++ /dev/null
@@ -1,263 +0,0 @@
-// SPDX-License-Identifier: GPL-2.0+
-/*
- * (C) Copyright 2015 Savoir-faire Linux Inc.
- *
- * Derived from MX51EVK code by
- * Freescale Semiconductor, Inc.
- */
-
-#include
-#include
-#include
-#include
-#include
-#include
-#include
-#include
-#include
-#include
-#include
-#include
-#include
-#include
-#include
-#include
-#include
-#include
-#include
-#include
-
-#include
-#include
-#include
-#include "ts4800.h"
-
-DECLARE_GLOBAL_DATA_PTR;
-
-#ifdef CONFIG_FSL_ESDHC_IMX
-struct fsl_esdhc_cfg esdhc_cfg[2] = {
- {MMC_SDHC1_BASE_ADDR},
- {MMC_SDHC2_BASE_ADDR},
-};
-#endif
-
-int dram_init(void)
-{
- /* dram_init must store complete ramsize in gd->ram_size */
- gd->ram_size = get_ram_size((void *)CONFIG_SYS_SDRAM_BASE,
- PHYS_SDRAM_1_SIZE);
- return 0;
-}
-
-u32 get_board_rev(void)
-{
- u32 rev = get_cpu_rev();
- if (!gpio_get_value(IMX_GPIO_NR(1, 22)))
- rev |= BOARD_REV_2_0 << BOARD_VER_OFFSET;
- return rev;
-}
-
-#define UART_PAD_CTRL (PAD_CTL_HYS | PAD_CTL_PUS_100K_DOWN | PAD_CTL_DSE_HIGH)
-
-static void setup_iomux_uart(void)
-{
- static const iomux_v3_cfg_t uart_pads[] = {
- MX51_PAD_UART1_RXD__UART1_RXD,
- MX51_PAD_UART1_TXD__UART1_TXD,
- NEW_PAD_CTRL(MX51_PAD_UART1_RTS__UART1_RTS, UART_PAD_CTRL),
- NEW_PAD_CTRL(MX51_PAD_UART1_CTS__UART1_CTS, UART_PAD_CTRL),
- };
-
- imx_iomux_v3_setup_multiple_pads(uart_pads, ARRAY_SIZE(uart_pads));
-}
-
-static void setup_iomux_fec(void)
-{
- static const iomux_v3_cfg_t fec_pads[] = {
- NEW_PAD_CTRL(MX51_PAD_EIM_EB2__FEC_MDIO,
- PAD_CTL_HYS |
- PAD_CTL_PUS_22K_UP |
- PAD_CTL_DSE_HIGH | PAD_CTL_SRE_FAST),
- MX51_PAD_EIM_EB3__FEC_RDATA1,
- NEW_PAD_CTRL(MX51_PAD_EIM_CS2__FEC_RDATA2, PAD_CTL_HYS),
- MX51_PAD_EIM_CS3__FEC_RDATA3,
- MX51_PAD_NANDF_CS2__FEC_TX_ER,
-
[PATCH 35/57] arm: Remove mx53smd board
This board has not been converted to CONFIG_DM_MMC by the deadline. Remove it. Cc: Fabio Estevam Signed-off-by: Tom Rini --- arch/arm/mach-imx/mx5/Kconfig| 5 - board/freescale/mx53smd/Kconfig | 15 --- board/freescale/mx53smd/MAINTAINERS | 6 - board/freescale/mx53smd/Makefile | 7 -- board/freescale/mx53smd/imximage.cfg | 82 -- board/freescale/mx53smd/mx53smd.c| 159 --- configs/mx53smd_defconfig| 25 - include/configs/mx53smd.h| 111 --- 8 files changed, 410 deletions(-) delete mode 100644 board/freescale/mx53smd/Kconfig delete mode 100644 board/freescale/mx53smd/MAINTAINERS delete mode 100644 board/freescale/mx53smd/Makefile delete mode 100644 board/freescale/mx53smd/imximage.cfg delete mode 100644 board/freescale/mx53smd/mx53smd.c delete mode 100644 configs/mx53smd_defconfig delete mode 100644 include/configs/mx53smd.h diff --git a/arch/arm/mach-imx/mx5/Kconfig b/arch/arm/mach-imx/mx5/Kconfig index 989b9adf9153..0a2897309020 100644 --- a/arch/arm/mach-imx/mx5/Kconfig +++ b/arch/arm/mach-imx/mx5/Kconfig @@ -63,10 +63,6 @@ config TARGET_MX53PPD help Enable support for the GE Healthcare PPD. -config TARGET_MX53SMD - bool "Support mx53smd" - select MX53 - config TARGET_TS4800 bool "Support TS4800" select MX51 @@ -79,7 +75,6 @@ config SYS_SOC source "board/beckhoff/mx53cx9020/Kconfig" source "board/freescale/mx51evk/Kconfig" source "board/freescale/mx53loco/Kconfig" -source "board/freescale/mx53smd/Kconfig" source "board/ge/mx53ppd/Kconfig" source "board/k+p/kp_imx53/Kconfig" source "board/menlo/m53menlo/Kconfig" diff --git a/board/freescale/mx53smd/Kconfig b/board/freescale/mx53smd/Kconfig deleted file mode 100644 index 1195d33d067b.. --- a/board/freescale/mx53smd/Kconfig +++ /dev/null @@ -1,15 +0,0 @@ -if TARGET_MX53SMD - -config SYS_BOARD - default "mx53smd" - -config SYS_VENDOR - default "freescale" - -config SYS_SOC - default "mx5" - -config SYS_CONFIG_NAME - default "mx53smd" - -endif diff --git a/board/freescale/mx53smd/MAINTAINERS b/board/freescale/mx53smd/MAINTAINERS deleted file mode 100644 index 17ec376f2a92.. --- a/board/freescale/mx53smd/MAINTAINERS +++ /dev/null @@ -1,6 +0,0 @@ -MX53SMD BOARD -M: Fabio Estevam -S: Maintained -F: board/freescale/mx53smd/ -F: include/configs/mx53smd.h -F: configs/mx53smd_defconfig diff --git a/board/freescale/mx53smd/Makefile b/board/freescale/mx53smd/Makefile deleted file mode 100644 index f0347578d586.. --- a/board/freescale/mx53smd/Makefile +++ /dev/null @@ -1,7 +0,0 @@ -# SPDX-License-Identifier: GPL-2.0+ -# -# Copyright (C) 2007, Guennadi Liakhovetski -# -# (C) Copyright 2011 Freescale Semiconductor, Inc. - -obj-y := mx53smd.o diff --git a/board/freescale/mx53smd/imximage.cfg b/board/freescale/mx53smd/imximage.cfg deleted file mode 100644 index fd033187b7cd.. --- a/board/freescale/mx53smd/imximage.cfg +++ /dev/null @@ -1,82 +0,0 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ -/* - * (C) Copyright 2009 - * Stefano Babic DENX Software Engineering sba...@denx.de. - * - * Refer doc/imx/mkimage/imximage.txt for more details about how-to configure - * and create imximage boot image - * - * The syntax is taken as close as possible with the kwbimage - */ - -/* image version */ -IMAGE_VERSION 2 - -/* - * Boot Device : one of - * spi, sd (the board has no nand neither onenand) - */ -BOOT_FROM sd - -/* - * Device Configuration Data (DCD) - * - * Each entry must have the format: - * Addr-type AddressValue - * - * where: - * Addr-type register length (1,2 or 4 bytes) - * Address absolute address of the register - * value value to be stored in the register - */ -DATA 4 0x53fa8554 0x0030 -DATA 4 0x53fa8558 0x00300040 -DATA 4 0x53fa8560 0x0030 -DATA 4 0x53fa8564 0x00300040 -DATA 4 0x53fa8568 0x00300040 -DATA 4 0x53fa8570 0x0030 -DATA 4 0x53fa8574 0x0030 -DATA 4 0x53fa8578 0x0030 -DATA 4 0x53fa857c 0x00300040 -DATA 4 0x53fa8580 0x00300040 -DATA 4 0x53fa8584 0x0030 -DATA 4 0x53fa8588 0x0030 -DATA 4 0x53fa8590 0x00300040 -DATA 4 0x53fa8594 0x0030 -DATA 4 0x53fa86f0 0x0030 -DATA 4 0x53fa86f4 0x -DATA 4 0x53fa86fc 0x -DATA 4 0x53fa8714 0x -DATA 4 0x53fa8718 0x0030 -DATA 4 0x53fa871c 0x0030 -DATA 4 0x53fa8720 0x0030 -DATA 4 0x53fa8724 0x0400 -DATA 4 0x53fa8728 0x0030 -DATA 4 0x53fa872c 0x0030 -DATA 4 0x63fd9088 0x35343535 -DATA 4 0x63fd9090 0x4d444c44 -DATA 4 0x63fd907c 0x01370138 -DATA 4 0x63fd9080 0x013b013c -DATA 4 0x63fd9018 0x00011740 -DATA 4 0x63fd9000 0xc319 -DATA 4 0x63fd900c 0x9f5152e3 -DATA 4 0x63fd9010 0xb68e8a63 -DATA 4 0x63fd9014 0x01ff00db -DATA 4 0x63fd902c 0x26d2 -DATA 4 0x63fd9030 0x009f0e21 -DATA 4 0x63fd9008 0x12273030 -DATA 4 0x63fd9004 0x0002002d -DATA 4 0x63
[PATCH 34/57] arm: Remove mx53evk board
This board has not been converted to CONFIG_DM_MMC by the deadline. Remove it. Cc: Jason Liu Signed-off-by: Tom Rini --- arch/arm/mach-imx/mx5/Kconfig| 6 - board/freescale/mx53evk/Kconfig | 15 -- board/freescale/mx53evk/MAINTAINERS | 6 - board/freescale/mx53evk/Makefile | 7 - board/freescale/mx53evk/imximage.cfg | 97 -- board/freescale/mx53evk/mx53evk.c| 270 --- configs/mx53evk_defconfig| 25 --- include/configs/mx53evk.h| 116 8 files changed, 542 deletions(-) delete mode 100644 board/freescale/mx53evk/Kconfig delete mode 100644 board/freescale/mx53evk/MAINTAINERS delete mode 100644 board/freescale/mx53evk/Makefile delete mode 100644 board/freescale/mx53evk/imximage.cfg delete mode 100644 board/freescale/mx53evk/mx53evk.c delete mode 100644 configs/mx53evk_defconfig delete mode 100644 include/configs/mx53evk.h diff --git a/arch/arm/mach-imx/mx5/Kconfig b/arch/arm/mach-imx/mx5/Kconfig index f7ea471fe717..989b9adf9153 100644 --- a/arch/arm/mach-imx/mx5/Kconfig +++ b/arch/arm/mach-imx/mx5/Kconfig @@ -52,11 +52,6 @@ config TARGET_MX53CX9020 select MX53 imply CMD_DM -config TARGET_MX53EVK - bool "Support mx53evk" - select BOARD_LATE_INIT - select MX53 - config TARGET_MX53LOCO bool "Support mx53loco" select BOARD_LATE_INIT @@ -83,7 +78,6 @@ config SYS_SOC source "board/beckhoff/mx53cx9020/Kconfig" source "board/freescale/mx51evk/Kconfig" -source "board/freescale/mx53evk/Kconfig" source "board/freescale/mx53loco/Kconfig" source "board/freescale/mx53smd/Kconfig" source "board/ge/mx53ppd/Kconfig" diff --git a/board/freescale/mx53evk/Kconfig b/board/freescale/mx53evk/Kconfig deleted file mode 100644 index c226c1ca0604.. --- a/board/freescale/mx53evk/Kconfig +++ /dev/null @@ -1,15 +0,0 @@ -if TARGET_MX53EVK - -config SYS_BOARD - default "mx53evk" - -config SYS_VENDOR - default "freescale" - -config SYS_SOC - default "mx5" - -config SYS_CONFIG_NAME - default "mx53evk" - -endif diff --git a/board/freescale/mx53evk/MAINTAINERS b/board/freescale/mx53evk/MAINTAINERS deleted file mode 100644 index d511046cb052.. --- a/board/freescale/mx53evk/MAINTAINERS +++ /dev/null @@ -1,6 +0,0 @@ -MX53EVK BOARD -M: Jason Liu -S: Maintained -F: board/freescale/mx53evk/ -F: include/configs/mx53evk.h -F: configs/mx53evk_defconfig diff --git a/board/freescale/mx53evk/Makefile b/board/freescale/mx53evk/Makefile deleted file mode 100644 index cfe4be321e58.. --- a/board/freescale/mx53evk/Makefile +++ /dev/null @@ -1,7 +0,0 @@ -# SPDX-License-Identifier: GPL-2.0+ -# -# Copyright (C) 2007, Guennadi Liakhovetski -# -# (C) Copyright 2010 Freescale Semiconductor, Inc. - -obj-y := mx53evk.o diff --git a/board/freescale/mx53evk/imximage.cfg b/board/freescale/mx53evk/imximage.cfg deleted file mode 100644 index ef103d6da7de.. --- a/board/freescale/mx53evk/imximage.cfg +++ /dev/null @@ -1,97 +0,0 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ -/* - * (C Copyright 2009 - * Stefano Babic DENX Software Engineering sba...@denx.de. - * - * Refer doc/imx/mkimage/imximage.txt for more details about how-to configure - * and create imximage boot image - * - * The syntax is taken as close as possible with the kwbimage - */ - -/* image version */ -IMAGE_VERSION 2 - -/* - * Boot Device : one of - * spi, sd (the board has no nand neither onenand) - */ -BOOT_FROM sd - -/* - * Device Configuration Data (DCD) - * - * Each entry must have the format: - * Addr-type AddressValue - * - * where: - * Addr-type register length (1,2 or 4 bytes) - * Address absolute address of the register - * value value to be stored in the register - */ -/* Setting IOMUXC */ -DATA 4 0x53fa8554 0x0020 -DATA 4 0x53fa8560 0x0020 -DATA 4 0x53fa8594 0x0020 -DATA 4 0x53fa8584 0x0020 -DATA 4 0x53fa8558 0x00200040 -DATA 4 0x53fa8568 0x00200040 -DATA 4 0x53fa8590 0x00200040 -DATA 4 0x53fa857c 0x00200040 -DATA 4 0x53fa8564 0x00200040 -DATA 4 0x53fa8580 0x00200040 -DATA 4 0x53fa8570 0x0020 -DATA 4 0x53fa8578 0x0020 -DATA 4 0x53fa872c 0x0020 -DATA 4 0x53fa8728 0x0020 -DATA 4 0x53fa871c 0x0020 -DATA 4 0x53fa8718 0x0020 -DATA 4 0x53fa8574 0x0028 -DATA 4 0x53fa8588 0x0028 -DATA 4 0x53fa86f0 0x0028 -DATA 4 0x53fa8720 0x0028 -DATA 4 0x53fa86fc 0x -DATA 4 0x53fa86f4 0x0200 -DATA 4 0x53fa8714 0x -DATA 4 0x53fa8724 0x0600 -DATA 4 0x63fd9088 0x34333936 -DATA 4 0x63fd9090 0x49434942 -DATA 4 0x63fd90F8 0x0800 -DATA 4 0x63fd907c 0x01350138 -DATA 4 0x63fd9080 0x01380139 -DATA 4 0x63fd9018 0x1710 -DATA 4 0x63fd9000 0xc411 -DATA 4 0x63fd900C 0x4d5122d2 -DATA 4 0x63fd9010 0x92d18a22 -DATA 4 0x63fd9014 0x00c70092 -DATA 4 0x63fd902c 0x26d2 -DATA 4 0x63fd9030 0x009f000e -DATA 4 0x63fd9008 0x12272000 -DATA 4 0x63fd9004 0x
[PATCH 33/57] arm: Remove mx53ard board
This board has not been converted to CONFIG_DM_MMC by the deadline. Remove it. Cc: Fabio Estevam Signed-off-by: Tom Rini --- arch/arm/mach-imx/mx5/Kconfig| 5 - board/freescale/mx53ard/Kconfig | 15 -- board/freescale/mx53ard/MAINTAINERS | 6 - board/freescale/mx53ard/Makefile | 7 - board/freescale/mx53ard/imximage_dd3.cfg | 82 -- board/freescale/mx53ard/mx53ard.c| 319 --- configs/mx53ard_defconfig| 31 --- include/configs/mx53ard.h| 170 8 files changed, 635 deletions(-) delete mode 100644 board/freescale/mx53ard/Kconfig delete mode 100644 board/freescale/mx53ard/MAINTAINERS delete mode 100644 board/freescale/mx53ard/Makefile delete mode 100644 board/freescale/mx53ard/imximage_dd3.cfg delete mode 100644 board/freescale/mx53ard/mx53ard.c delete mode 100644 configs/mx53ard_defconfig delete mode 100644 include/configs/mx53ard.h diff --git a/arch/arm/mach-imx/mx5/Kconfig b/arch/arm/mach-imx/mx5/Kconfig index 2ffa3fa61690..f7ea471fe717 100644 --- a/arch/arm/mach-imx/mx5/Kconfig +++ b/arch/arm/mach-imx/mx5/Kconfig @@ -44,10 +44,6 @@ config TARGET_MX51EVK select BOARD_LATE_INIT select MX51 -config TARGET_MX53ARD - bool "Support mx53ard" - select MX53 - config TARGET_MX53CX9020 bool "Support CX9020" select BOARD_LATE_INIT @@ -87,7 +83,6 @@ config SYS_SOC source "board/beckhoff/mx53cx9020/Kconfig" source "board/freescale/mx51evk/Kconfig" -source "board/freescale/mx53ard/Kconfig" source "board/freescale/mx53evk/Kconfig" source "board/freescale/mx53loco/Kconfig" source "board/freescale/mx53smd/Kconfig" diff --git a/board/freescale/mx53ard/Kconfig b/board/freescale/mx53ard/Kconfig deleted file mode 100644 index 41f46a04ac78.. --- a/board/freescale/mx53ard/Kconfig +++ /dev/null @@ -1,15 +0,0 @@ -if TARGET_MX53ARD - -config SYS_BOARD - default "mx53ard" - -config SYS_VENDOR - default "freescale" - -config SYS_SOC - default "mx5" - -config SYS_CONFIG_NAME - default "mx53ard" - -endif diff --git a/board/freescale/mx53ard/MAINTAINERS b/board/freescale/mx53ard/MAINTAINERS deleted file mode 100644 index fa81afe9a330.. --- a/board/freescale/mx53ard/MAINTAINERS +++ /dev/null @@ -1,6 +0,0 @@ -MX53ARD BOARD -M: Fabio Estevam -S: Maintained -F: board/freescale/mx53ard/ -F: include/configs/mx53ard.h -F: configs/mx53ard_defconfig diff --git a/board/freescale/mx53ard/Makefile b/board/freescale/mx53ard/Makefile deleted file mode 100644 index e963a240256f.. --- a/board/freescale/mx53ard/Makefile +++ /dev/null @@ -1,7 +0,0 @@ -# SPDX-License-Identifier: GPL-2.0+ -# -# Copyright (C) 2007, Guennadi Liakhovetski -# -# (C) Copyright 2011 Freescale Semiconductor, Inc. - -obj-y := mx53ard.o diff --git a/board/freescale/mx53ard/imximage_dd3.cfg b/board/freescale/mx53ard/imximage_dd3.cfg deleted file mode 100644 index fd033187b7cd.. --- a/board/freescale/mx53ard/imximage_dd3.cfg +++ /dev/null @@ -1,82 +0,0 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ -/* - * (C) Copyright 2009 - * Stefano Babic DENX Software Engineering sba...@denx.de. - * - * Refer doc/imx/mkimage/imximage.txt for more details about how-to configure - * and create imximage boot image - * - * The syntax is taken as close as possible with the kwbimage - */ - -/* image version */ -IMAGE_VERSION 2 - -/* - * Boot Device : one of - * spi, sd (the board has no nand neither onenand) - */ -BOOT_FROM sd - -/* - * Device Configuration Data (DCD) - * - * Each entry must have the format: - * Addr-type AddressValue - * - * where: - * Addr-type register length (1,2 or 4 bytes) - * Address absolute address of the register - * value value to be stored in the register - */ -DATA 4 0x53fa8554 0x0030 -DATA 4 0x53fa8558 0x00300040 -DATA 4 0x53fa8560 0x0030 -DATA 4 0x53fa8564 0x00300040 -DATA 4 0x53fa8568 0x00300040 -DATA 4 0x53fa8570 0x0030 -DATA 4 0x53fa8574 0x0030 -DATA 4 0x53fa8578 0x0030 -DATA 4 0x53fa857c 0x00300040 -DATA 4 0x53fa8580 0x00300040 -DATA 4 0x53fa8584 0x0030 -DATA 4 0x53fa8588 0x0030 -DATA 4 0x53fa8590 0x00300040 -DATA 4 0x53fa8594 0x0030 -DATA 4 0x53fa86f0 0x0030 -DATA 4 0x53fa86f4 0x -DATA 4 0x53fa86fc 0x -DATA 4 0x53fa8714 0x -DATA 4 0x53fa8718 0x0030 -DATA 4 0x53fa871c 0x0030 -DATA 4 0x53fa8720 0x0030 -DATA 4 0x53fa8724 0x0400 -DATA 4 0x53fa8728 0x0030 -DATA 4 0x53fa872c 0x0030 -DATA 4 0x63fd9088 0x35343535 -DATA 4 0x63fd9090 0x4d444c44 -DATA 4 0x63fd907c 0x01370138 -DATA 4 0x63fd9080 0x013b013c -DATA 4 0x63fd9018 0x00011740 -DATA 4 0x63fd9000 0xc319 -DATA 4 0x63fd900c 0x9f5152e3 -DATA 4 0x63fd9010 0xb68e8a63 -DATA 4 0x63fd9014 0x01ff00db -DATA 4 0x63fd902c 0x26d2 -DATA 4 0x63fd9030 0x009f0e21 -DATA 4 0x63fd9008 0x12273030 -DATA 4 0x63fd9004 0x0002002d -DATA 4 0x6
[PATCH 32/57] arm: Remove pfla02 board
This board has not been converted to CONFIG_DM_MMC by the deadline. Remove it. Cc: Stefano Babic Signed-off-by: Tom Rini --- arch/arm/mach-imx/mx6/Kconfig | 7 - board/phytec/pfla02/Kconfig | 18 - board/phytec/pfla02/MAINTAINERS | 6 - board/phytec/pfla02/Makefile| 7 - board/phytec/pfla02/README | 24 -- board/phytec/pfla02/pfla02.c| 714 configs/pfla02_defconfig| 75 include/configs/pfla02.h| 127 -- 8 files changed, 978 deletions(-) delete mode 100644 board/phytec/pfla02/Kconfig delete mode 100644 board/phytec/pfla02/MAINTAINERS delete mode 100644 board/phytec/pfla02/Makefile delete mode 100644 board/phytec/pfla02/README delete mode 100644 board/phytec/pfla02/pfla02.c delete mode 100644 configs/pfla02_defconfig delete mode 100644 include/configs/pfla02.h diff --git a/arch/arm/mach-imx/mx6/Kconfig b/arch/arm/mach-imx/mx6/Kconfig index dadf5ebdbe07..5b29a700eb7d 100644 --- a/arch/arm/mach-imx/mx6/Kconfig +++ b/arch/arm/mach-imx/mx6/Kconfig @@ -502,12 +502,6 @@ config TARGET_PCM058 select OF_CONTROL imply CMD_DM -config TARGET_PFLA02 - bool "Phytec PFLA02 (PhyFlex) i.MX6 Quad" - depends on MX6QDL - select BOARD_LATE_INIT - select SUPPORT_SPL - config TARGET_PCL063 bool "PHYTEC PCL063 (phyCORE-i.MX6UL)" depends on MX6UL @@ -655,7 +649,6 @@ source "board/freescale/mx6ul_14x14_evk/Kconfig" source "board/freescale/mx6ullevk/Kconfig" source "board/grinn/liteboard/Kconfig" source "board/phytec/pcm058/Kconfig" -source "board/phytec/pfla02/Kconfig" source "board/phytec/pcl063/Kconfig" source "board/kosagi/novena/Kconfig" source "board/softing/vining_2000/Kconfig" diff --git a/board/phytec/pfla02/Kconfig b/board/phytec/pfla02/Kconfig deleted file mode 100644 index f4da68b5ba95.. --- a/board/phytec/pfla02/Kconfig +++ /dev/null @@ -1,18 +0,0 @@ -if TARGET_PFLA02 - -config SYS_BOARD - default "pfla02" - -config SYS_VENDOR - default "phytec" - -config SYS_CONFIG_NAME - default "pfla02" - -config SPL_DRAM_1_BANK - bool "DRAM on just one bank" - help - activate, if the module has just one bank - of RAM - -endif diff --git a/board/phytec/pfla02/MAINTAINERS b/board/phytec/pfla02/MAINTAINERS deleted file mode 100644 index 4b069a90cdc3.. --- a/board/phytec/pfla02/MAINTAINERS +++ /dev/null @@ -1,6 +0,0 @@ -PHYTEC PHYFLEX -M: Stefano Babic -S: Maintained -F: board/phytec/pfla02/ -F: include/configs/pfla02.h -F: configs/pfla02_defconfig diff --git a/board/phytec/pfla02/Makefile b/board/phytec/pfla02/Makefile deleted file mode 100644 index c50f315d9118.. --- a/board/phytec/pfla02/Makefile +++ /dev/null @@ -1,7 +0,0 @@ -# SPDX-License-Identifier: GPL-2.0+ -# -# Copyright (C) 2007, Guennadi Liakhovetski -# -# (C) Copyright 2011 Freescale Semiconductor, Inc. - -obj-y := pfla02.o diff --git a/board/phytec/pfla02/README b/board/phytec/pfla02/README deleted file mode 100644 index 0f46ab862331.. --- a/board/phytec/pfla02/README +++ /dev/null @@ -1,24 +0,0 @@ -Board information -- - -The evaluation board "pbab01" is thought to be used -together with the SOM. - -More information on the board can be found on manufacturer's -website: - -http://www.phytec.de/produkt/system-on-modules/phyflex-imx-6/ - -Building U-Boot - -$ make pfla02_defconfig -$ make - -This generates the artifacts SPL and u-boot.img. -The SOM can boot from NAND or from SD-Card, having the SPI-NOR -as second option. -The dip switch "SW3" on the board let choose the boot device. - -SW3_1(on), SW3_2(on), SW3_3(off): Boot first from SD, then try SPI -SW3_1(off), SW3_2(on), SW3_3(off): Boot from SPI diff --git a/board/phytec/pfla02/pfla02.c b/board/phytec/pfla02/pfla02.c deleted file mode 100644 index 076ce6711ef0.. --- a/board/phytec/pfla02/pfla02.c +++ /dev/null @@ -1,714 +0,0 @@ -// SPDX-License-Identifier: GPL-2.0+ -/* - * Copyright (C) 2017 Stefano Babic - */ - -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include - -DECLARE_GLOBAL_DATA_PTR; - -#define UART_PAD_CTRL (PAD_CTL_PUS_100K_UP | \ - PAD_CTL_SPEED_MED | PAD_CTL_DSE_40ohm | \ - PAD_CTL_SRE_FAST | PAD_CTL_HYS) - -#define USDHC_PAD_CTRL (PAD_CTL_PUS_47K_UP | \ - PAD_CTL_SPEED_LOW | PAD_CTL_DSE_80ohm | \ - PAD_CTL_SRE_FAST | PAD_CTL_HYS) - -#define ENET_PAD_CTRL (PAD_CTL_PUS_100K_UP | \ - PAD_CTL_SPEED_MED | PAD_CTL_DSE_40ohm | PAD_CTL_HYS) - -#define SPI_PAD_CTRL (PAD_CTL_HYS | PAD_CTL_SPEED_MED
[PATCH 30/57] arm: Remove dms-ba16 board
This board relies on using CONFIG_LIBATA but does not enable CONFIG_AHCI. The deadline for this conversion was the v2019.07 release. The use of CONFIG_AHCI requires CONFIG_DM. The deadline for this conversion was v2020.01. Remove this board. Cc: Akshay Bhat Cc: Ken Lin Signed-off-by: Tom Rini --- arch/arm/mach-imx/mx6/Kconfig| 7 - board/advantech/dms-ba16/Kconfig | 31 -- board/advantech/dms-ba16/MAINTAINERS | 8 - board/advantech/dms-ba16/Makefile| 6 - board/advantech/dms-ba16/clocks.cfg | 25 - board/advantech/dms-ba16/ddr-setup.cfg | 39 -- board/advantech/dms-ba16/dms-ba16.c | 630 --- board/advantech/dms-ba16/dms-ba16_1g.cfg | 24 - board/advantech/dms-ba16/dms-ba16_2g.cfg | 24 - board/advantech/dms-ba16/micron-1g.cfg | 63 --- board/advantech/dms-ba16/samsung-2g.cfg | 63 --- configs/dms-ba16-1g_defconfig| 66 --- configs/dms-ba16_defconfig | 65 --- include/configs/advantech_dms-ba16.h | 222 14 files changed, 1273 deletions(-) delete mode 100644 board/advantech/dms-ba16/Kconfig delete mode 100644 board/advantech/dms-ba16/MAINTAINERS delete mode 100644 board/advantech/dms-ba16/Makefile delete mode 100644 board/advantech/dms-ba16/clocks.cfg delete mode 100644 board/advantech/dms-ba16/ddr-setup.cfg delete mode 100644 board/advantech/dms-ba16/dms-ba16.c delete mode 100644 board/advantech/dms-ba16/dms-ba16_1g.cfg delete mode 100644 board/advantech/dms-ba16/dms-ba16_2g.cfg delete mode 100644 board/advantech/dms-ba16/micron-1g.cfg delete mode 100644 board/advantech/dms-ba16/samsung-2g.cfg delete mode 100644 configs/dms-ba16-1g_defconfig delete mode 100644 configs/dms-ba16_defconfig delete mode 100644 include/configs/advantech_dms-ba16.h diff --git a/arch/arm/mach-imx/mx6/Kconfig b/arch/arm/mach-imx/mx6/Kconfig index 62b23421f17a..8401374732f9 100644 --- a/arch/arm/mach-imx/mx6/Kconfig +++ b/arch/arm/mach-imx/mx6/Kconfig @@ -111,12 +111,6 @@ choice prompt "MX6 board select" optional -config TARGET_ADVANTECH_DMS_BA16 - bool "Advantech dms-ba16" - depends on MX6Q - select BOARD_LATE_INIT - imply CMD_SATA - config TARGET_APALIS_IMX6 bool "Toradex Apalis iMX6 board" depends on MX6Q @@ -655,7 +649,6 @@ config SYS_SOC source "board/ge/bx50v3/Kconfig" source "board/ge/b1x5v2/Kconfig" -source "board/advantech/dms-ba16/Kconfig" source "board/aristainetos/Kconfig" source "board/armadeus/opos6uldev/Kconfig" source "board/barco/titanium/Kconfig" diff --git a/board/advantech/dms-ba16/Kconfig b/board/advantech/dms-ba16/Kconfig deleted file mode 100644 index 040eb866b53d.. --- a/board/advantech/dms-ba16/Kconfig +++ /dev/null @@ -1,31 +0,0 @@ -if TARGET_ADVANTECH_DMS_BA16 - -choice - prompt "DDR Size" - default SYS_DDR_2G - -config SYS_DDR_1G - bool "1GiB" - -config SYS_DDR_2G - bool "2GiB" - -endchoice - -config IMX_CONFIG - default "board/advantech/dms-ba16/dms-ba16_2g.cfg" if SYS_DDR_2G - default "board/advantech/dms-ba16/dms-ba16_1g.cfg" if SYS_DDR_1G - -config SYS_BOARD - default "dms-ba16" - -config SYS_VENDOR - default "advantech" - -config SYS_SOC - default "mx6" - -config SYS_CONFIG_NAME - default "advantech_dms-ba16" - -endif diff --git a/board/advantech/dms-ba16/MAINTAINERS b/board/advantech/dms-ba16/MAINTAINERS deleted file mode 100644 index e8ea3dd7b3cf.. --- a/board/advantech/dms-ba16/MAINTAINERS +++ /dev/null @@ -1,8 +0,0 @@ -ADVANTECH_DMS-BA16 BOARD -M: Akshay Bhat -M: Ken Lin -S: Maintained -F: board/advantech/dms-ba16/ -F: include/configs/advantech_dms-ba16.h -F: configs/dms-ba16_defconfig -F: configs/dms-ba16-1g_defconfig diff --git a/board/advantech/dms-ba16/Makefile b/board/advantech/dms-ba16/Makefile deleted file mode 100644 index b87fc29f065e.. --- a/board/advantech/dms-ba16/Makefile +++ /dev/null @@ -1,6 +0,0 @@ -# SPDX-License-Identifier: GPL-2.0+ -# -# Copyright 2016 Timesys Corporation -# Copyright 2016 Advantech Corporation - -obj-y := dms-ba16.o diff --git a/board/advantech/dms-ba16/clocks.cfg b/board/advantech/dms-ba16/clocks.cfg deleted file mode 100644 index abc769c4e5fd.. --- a/board/advantech/dms-ba16/clocks.cfg +++ /dev/null @@ -1,25 +0,0 @@ -/* set the default clock gate to save power */ -DATA 4, CCM_CCGR0, 0x00C03F3F -DATA 4, CCM_CCGR1, 0x0030FC03 -DATA 4, CCM_CCGR2, 0x0FFFC000 -DATA 4, CCM_CCGR3, 0x3FF0 -DATA 4, CCM_CCGR4, 0x00FFF300 -DATA 4, CCM_CCGR5, 0x0FC3 -DATA 4, CCM_CCGR6, 0x03FF - -/* enable AXI cache for VDOA/VPU/IPU */ -DATA 4, MX6_IOMUXC_GPR4, 0xF0CF -/* set IPU AXI-id0 Qos=0xf(bypass) AXI-id1 Qos=0x7 */ -DATA 4, MX6_IOMUXC_GPR6, 0x007F007F -DATA 4, MX6_IOMUXC_GPR7, 0x007F007F - -/* - * Setup CCM_CCOSR register as follows: - * - * cko1_en 1--> CKO1 enabled - * cko1_div 111 --> divide by 8 - * cko1_sel 10
[PATCH 31/57] arm: Remove zc5202 and zc5601 boards
These boards have not been converted to CONFIG_DM_MMC by the deadline. Remove them. Cc: Stefano Babic Signed-off-by: Tom Rini --- arch/arm/mach-imx/mx6/Kconfig | 17 - board/el/el6x/Kconfig | 25 -- board/el/el6x/MAINTAINERS | 8 - board/el/el6x/Makefile| 5 - board/el/el6x/el6x.c | 637 -- configs/zc5202_defconfig | 62 configs/zc5601_defconfig | 60 include/configs/zc5202.h | 27 -- include/configs/zc5601.h | 26 -- 9 files changed, 867 deletions(-) delete mode 100644 board/el/el6x/Kconfig delete mode 100644 board/el/el6x/MAINTAINERS delete mode 100644 board/el/el6x/Makefile delete mode 100644 board/el/el6x/el6x.c delete mode 100644 configs/zc5202_defconfig delete mode 100644 configs/zc5601_defconfig delete mode 100644 include/configs/zc5202.h delete mode 100644 include/configs/zc5601.h diff --git a/arch/arm/mach-imx/mx6/Kconfig b/arch/arm/mach-imx/mx6/Kconfig index 8401374732f9..dadf5ebdbe07 100644 --- a/arch/arm/mach-imx/mx6/Kconfig +++ b/arch/arm/mach-imx/mx6/Kconfig @@ -608,22 +608,6 @@ config TARGET_WANDBOARD select BOARD_LATE_INIT select SUPPORT_SPL -config TARGET_ZC5202 - bool "zc5202" - select BOARD_LATE_INIT - select DM - select DM_THERMAL - select SUPPORT_SPL - imply CMD_DM - -config TARGET_ZC5601 - bool "zc5601" - select BOARD_LATE_INIT - select DM - select DM_THERMAL - select SUPPORT_SPL - imply CMD_DM - config TARGET_BRPPT2 bool "brppt2" depends on MX6QDL @@ -657,7 +641,6 @@ source "board/bticino/mamoj/Kconfig" source "board/compulab/cm_fx6/Kconfig" source "board/congatec/cgtqmx6eval/Kconfig" source "board/dhelectronics/dh_imx6/Kconfig" -source "board/el/el6x/Kconfig" source "board/engicam/imx6q/Kconfig" source "board/engicam/imx6ul/Kconfig" source "board/freescale/mx6qarm2/Kconfig" diff --git a/board/el/el6x/Kconfig b/board/el/el6x/Kconfig deleted file mode 100644 index aa9bf25fb472.. --- a/board/el/el6x/Kconfig +++ /dev/null @@ -1,25 +0,0 @@ -if TARGET_ZC5202 - -config SYS_BOARD - default "el6x" - -config SYS_VENDOR - default "el" - -config SYS_CONFIG_NAME - default "zc5202" - -endif - -if TARGET_ZC5601 - -config SYS_BOARD - default "el6x" - -config SYS_VENDOR - default "el" - -config SYS_CONFIG_NAME - default "zc5601" - -endif diff --git a/board/el/el6x/MAINTAINERS b/board/el/el6x/MAINTAINERS deleted file mode 100644 index 9a40010f50e9.. --- a/board/el/el6x/MAINTAINERS +++ /dev/null @@ -1,8 +0,0 @@ -EL6X BOARD -M: Stefano Babic -S: Maintained -F: board/el/el6x/ -F: include/configs/zc5202.h -F: include/configs/zc5601.h -F: configs/zc5202_defconfig -F: configs/zc5601_defconfig diff --git a/board/el/el6x/Makefile b/board/el/el6x/Makefile deleted file mode 100644 index 065a867475aa.. --- a/board/el/el6x/Makefile +++ /dev/null @@ -1,5 +0,0 @@ -# SPDX-License-Identifier: GPL-2.0+ -# -# Copyright (C) Stefano Babic - -obj-y := el6x.o diff --git a/board/el/el6x/el6x.c b/board/el/el6x/el6x.c deleted file mode 100644 index ddac58f73d28.. --- a/board/el/el6x/el6x.c +++ /dev/null @@ -1,637 +0,0 @@ -// SPDX-License-Identifier: GPL-2.0+ -/* - * Copyright (C) Stefano Babic - * - * Based on other i.MX6 boards - */ - -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include - -DECLARE_GLOBAL_DATA_PTR; - -#define OPEN_PAD_CTRL (PAD_CTL_ODE | PAD_CTL_DSE_DISABLE | (0 << 12)) - -#define UART_PAD_CTRL (PAD_CTL_PUS_100K_UP | \ - PAD_CTL_SPEED_MED | PAD_CTL_DSE_40ohm | \ - PAD_CTL_SRE_FAST | PAD_CTL_HYS) - -#define USDHC_PAD_CTRL (PAD_CTL_PUS_47K_UP | \ - PAD_CTL_SPEED_LOW | PAD_CTL_DSE_80ohm | \ - PAD_CTL_SRE_FAST | PAD_CTL_HYS) - -#define ENET_PAD_CTRL (PAD_CTL_PUS_100K_UP | \ - PAD_CTL_SPEED_MED | PAD_CTL_DSE_40ohm | PAD_CTL_HYS) - -#define ENET_PAD_CTRL_PD (PAD_CTL_PUS_100K_DOWN | \ - PAD_CTL_SPEED_MED | PAD_CTL_DSE_40ohm | PAD_CTL_HYS) - -#define ENET_PAD_CTRL_CLK ((PAD_CTL_PUS_100K_UP & ~PAD_CTL_PKE) | \ - PAD_CTL_SPEED_MED | PAD_CTL_DSE_40ohm | PAD_CTL_SRE_FAST) - -#define SPI_PAD_CTRL (PAD_CTL_HYS | PAD_CTL_SPEED_MED | \ - PAD_CTL_DSE_40ohm | PAD_CTL_SRE_FAST) - -#define I2C_PAD_CTRL (PAD_CTL_PUS_100K_UP | \ - PAD_CTL_SPEED_MED | PAD_CTL_DSE_40ohm | PAD_CTL_HYS | \ - PAD_CTL_ODE | PAD_CTL_SRE_FAST) - -#define I2C_PMIC 1 - -#define I2C_PAD MUX_PAD_CTRL(I2C_PAD_CTRL) - -#define ETH_PHY_RESET IMX_GPIO_NR(2, 4) - -int dram_init
[PATCH 28/57] arm: Remove usbarmory board
This board has not been converted to CONFIG_DM_MMC by the deadline. Remove it. Cc: Andrej Rosano Signed-off-by: Tom Rini --- arch/arm/mach-imx/mx5/Kconfig| 5 - board/inversepath/usbarmory/Kconfig | 15 - board/inversepath/usbarmory/MAINTAINERS | 6 - board/inversepath/usbarmory/Makefile | 10 - board/inversepath/usbarmory/imximage.cfg | 81 board/inversepath/usbarmory/usbarmory.c | 452 --- configs/usbarmory_defconfig | 26 -- include/configs/usbarmory.h | 94 - 8 files changed, 689 deletions(-) delete mode 100644 board/inversepath/usbarmory/Kconfig delete mode 100644 board/inversepath/usbarmory/MAINTAINERS delete mode 100644 board/inversepath/usbarmory/Makefile delete mode 100644 board/inversepath/usbarmory/imximage.cfg delete mode 100644 board/inversepath/usbarmory/usbarmory.c delete mode 100644 configs/usbarmory_defconfig delete mode 100644 include/configs/usbarmory.h diff --git a/arch/arm/mach-imx/mx5/Kconfig b/arch/arm/mach-imx/mx5/Kconfig index bde37bb97e13..2ffa3fa61690 100644 --- a/arch/arm/mach-imx/mx5/Kconfig +++ b/arch/arm/mach-imx/mx5/Kconfig @@ -80,10 +80,6 @@ config TARGET_TS4800 bool "Support TS4800" select MX51 -config TARGET_USBARMORY - bool "Support USB armory" - select MX53 - endchoice config SYS_SOC @@ -96,7 +92,6 @@ source "board/freescale/mx53evk/Kconfig" source "board/freescale/mx53loco/Kconfig" source "board/freescale/mx53smd/Kconfig" source "board/ge/mx53ppd/Kconfig" -source "board/inversepath/usbarmory/Kconfig" source "board/k+p/kp_imx53/Kconfig" source "board/menlo/m53menlo/Kconfig" source "board/technologic/ts4800/Kconfig" diff --git a/board/inversepath/usbarmory/Kconfig b/board/inversepath/usbarmory/Kconfig deleted file mode 100644 index c2cd54437da9.. --- a/board/inversepath/usbarmory/Kconfig +++ /dev/null @@ -1,15 +0,0 @@ -if TARGET_USBARMORY - -config IMX_CONFIG - default "board/inversepath/usbarmory/imximage.cfg" - -config SYS_BOARD - default "usbarmory" - -config SYS_VENDOR - default "inversepath" - -config SYS_CONFIG_NAME - default "usbarmory" - -endif diff --git a/board/inversepath/usbarmory/MAINTAINERS b/board/inversepath/usbarmory/MAINTAINERS deleted file mode 100644 index 71a3dd40f13e.. --- a/board/inversepath/usbarmory/MAINTAINERS +++ /dev/null @@ -1,6 +0,0 @@ -USBARMORY BOARD -M: Andrej Rosano -S: Maintained -F: board/inversepath/usbarmory/ -F: include/configs/usbarmory.h -F: configs/usbarmory_defconfig diff --git a/board/inversepath/usbarmory/Makefile b/board/inversepath/usbarmory/Makefile deleted file mode 100644 index 9b8bd80ab387.. --- a/board/inversepath/usbarmory/Makefile +++ /dev/null @@ -1,10 +0,0 @@ -# -# USB armory MkI board Makefile -# http://inversepath.com/usbarmory -# -# Copyright (C) 2015, Inverse Path -# Andrej Rosano -# -# SPDX-License-Identifier:|GPL-2.0+ - -obj-y := usbarmory.o diff --git a/board/inversepath/usbarmory/imximage.cfg b/board/inversepath/usbarmory/imximage.cfg deleted file mode 100644 index d23885bed715.. --- a/board/inversepath/usbarmory/imximage.cfg +++ /dev/null @@ -1,81 +0,0 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ -/* - * USB armory MkI board imximage configuration - * http://inversepath.com/usbarmory - * - * Copyright (C) 2015, Inverse Path - * Andrej Rosano - */ - -IMAGE_VERSION 2 -BOOT_FROM sd - - -/* IOMUX */ - -DATA 4 0x53fa86f4 0x /* GRP_DDRMODE_CTL */ -DATA 4 0x53fa8714 0x /* GRP_DDRMODE */ -DATA 4 0x53fa86fc 0x /* GRP_DDRPKE */ -DATA 4 0x53fa8724 0x0400 /* GRP_DDR_TYPE*/ - -DATA 4 0x53fa872c 0x0030 /* GRP_B3DS */ -DATA 4 0x53fa8554 0x0030 /* DRAM_DQM3 */ -DATA 4 0x53fa8558 0x00300040 /* DRAM_SDQS3 */ - -DATA 4 0x53fa8728 0x0030 /* GRP_B2DS */ -DATA 4 0x53fa8560 0x0030 /* DRAM_DQM2 */ -DATA 4 0x53fa8568 0x00300040 /* DRAM_SDQS2 */ - -DATA 4 0x53fa871c 0x0030 /* GRP_B1DS */ -DATA 4 0x53fa8594 0x0030 /* DRAM_DQM1 */ -DATA 4 0x53fa8590 0x00300040 /* DRAM_SDQS1 */ - -DATA 4 0x53fa8718 0x0030 /* GRP_B0DS */ -DATA 4 0x53fa8584 0x0030 /* DRAM_DQM0 */ -DATA 4 0x53fa857c 0x00300040 /* DRAM_SDQS0 */ - -DATA 4 0x53fa8578 0x0030 /* DRAM_SDCLK0 */ -DATA 4 0x53fa8570 0x0030 /* DRAM_SDCLK1 */ - -DATA 4 0x53fa8574 0x0030 /* DRAM_CAS */ -DATA 4 0x53fa8588 0x0030 /* DRAM_RAS */ -DATA 4 0x53fa86f0 0x0030 /* GRP_ADDS */ -DATA 4 0x53fa8720 0x0030 /* GRP_CTLDS */ - -DATA 4 0x53fa8564 0x00300040 /* DRAM_SDODT1 */ -DATA 4 0x53fa8580 0x00300040 /* DRAM_SDODT0 */ - - -/* ESDCTL */ - -DATA 4 0x63fd9000 0x8418 /* ESDCTL_ESDCTL */ - -DATA 4 0x63fd9004 0x0002002d /* ESDCTL_ESDPTC */ -DATA 4 0x63fd9008 0x12273030 /* ESDCTL_ESDOTC */ -DATA 4 0x63fd900c 0x9f5152e3 /* ESDCTL_ESDCFG0 */ -DATA 4 0x63fd9010 0xb68e8a63 /* ESDCTL_ESDCFG1 */ -DATA 4 0x63fd9014 0x01ff00db /* ESDCTL_ESDCFG2 */ -DATA 4 0x6
[PATCH 29/57] arm: Remove xpress board
This board has not been converted to CONFIG_DM_MMC by the deadline. Remove it. Cc: Stefan Roese Signed-off-by: Tom Rini --- arch/arm/mach-imx/mx6/Kconfig | 10 - board/ccv/xpress/Kconfig | 12 -- board/ccv/xpress/MAINTAINERS | 7 - board/ccv/xpress/Makefile | 6 - board/ccv/xpress/imximage.cfg | 175 - board/ccv/xpress/spl.c| 118 board/ccv/xpress/xpress.c | 341 -- configs/xpress_defconfig | 46 - configs/xpress_spl_defconfig | 57 -- 9 files changed, 772 deletions(-) delete mode 100644 board/ccv/xpress/Kconfig delete mode 100644 board/ccv/xpress/MAINTAINERS delete mode 100644 board/ccv/xpress/Makefile delete mode 100644 board/ccv/xpress/imximage.cfg delete mode 100644 board/ccv/xpress/spl.c delete mode 100644 board/ccv/xpress/xpress.c delete mode 100644 configs/xpress_defconfig delete mode 100644 configs/xpress_spl_defconfig diff --git a/arch/arm/mach-imx/mx6/Kconfig b/arch/arm/mach-imx/mx6/Kconfig index 1b7090958bd2..62b23421f17a 100644 --- a/arch/arm/mach-imx/mx6/Kconfig +++ b/arch/arm/mach-imx/mx6/Kconfig @@ -614,15 +614,6 @@ config TARGET_WANDBOARD select BOARD_LATE_INIT select SUPPORT_SPL -config TARGET_XPRESS - bool "CCV xPress" - depends on MX6UL - select BOARD_LATE_INIT - select DM - select DM_THERMAL - select SUPPORT_SPL - imply CMD_DM - config TARGET_ZC5202 bool "zc5202" select BOARD_LATE_INIT @@ -670,7 +661,6 @@ source "board/armadeus/opos6uldev/Kconfig" source "board/barco/titanium/Kconfig" source "board/boundary/nitrogen6x/Kconfig" source "board/bticino/mamoj/Kconfig" -source "board/ccv/xpress/Kconfig" source "board/compulab/cm_fx6/Kconfig" source "board/congatec/cgtqmx6eval/Kconfig" source "board/dhelectronics/dh_imx6/Kconfig" diff --git a/board/ccv/xpress/Kconfig b/board/ccv/xpress/Kconfig deleted file mode 100644 index 9157013c3069.. --- a/board/ccv/xpress/Kconfig +++ /dev/null @@ -1,12 +0,0 @@ -if TARGET_XPRESS - -config SYS_BOARD - default "xpress" - -config SYS_VENDOR - default "ccv" - -config SYS_CONFIG_NAME - default "xpress" - -endif diff --git a/board/ccv/xpress/MAINTAINERS b/board/ccv/xpress/MAINTAINERS deleted file mode 100644 index e242bfb2065f.. --- a/board/ccv/xpress/MAINTAINERS +++ /dev/null @@ -1,7 +0,0 @@ -CCV XPRESS BOARD -M: Stefan Roese -S: Maintained -F: board/ccv/xpress/ -F: include/configs/xpress.h -F: configs/xpress_defconfig -F: configs/xpress_spl_defconfig diff --git a/board/ccv/xpress/Makefile b/board/ccv/xpress/Makefile deleted file mode 100644 index b750b6ae498e.. --- a/board/ccv/xpress/Makefile +++ /dev/null @@ -1,6 +0,0 @@ -# SPDX-License-Identifier: GPL-2.0+ -# -# Copyright (C) 2015-2016 Stefan Roese - -obj-y := xpress.o -obj-$(CONFIG_SPL_BUILD) += spl.o diff --git a/board/ccv/xpress/imximage.cfg b/board/ccv/xpress/imximage.cfg deleted file mode 100644 index b59dc842c1b5.. --- a/board/ccv/xpress/imximage.cfg +++ /dev/null @@ -1,175 +0,0 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ -/* - * Copyright (C) 2015-2016 Stefan Roese - * - * Refer doc/imx/mkimage/imximage.txt for more details about how-to configure - * and create imximage boot image - * - * The syntax is taken as close as possible with the kwbimage - */ - -/* image version */ - -IMAGE_VERSION 2 - -/* - * Boot Device : one of - * sd, nand - */ -BOOT_FROM sd - -/* - * Device Configuration Data (DCD) - * - * Each entry must have the format: - * Addr-type AddressValue - * - * where: - * Addr-type register length (1,2 or 4 bytes) - * Address absolute address of the register - * value value to be stored in the register - */ - -#define __ASSEMBLY__ -#include - -/* Enable all clocks */ -DATA 4 0x020c4068 0x -DATA 4 0x020c406c 0x -DATA 4 0x020c4070 0x -DATA 4 0x020c4074 0x -DATA 4 0x020c4078 0x -DATA 4 0x020c407c 0x -DATA 4 0x020c4080 0x -DATA 4 0x020c4084 0x - -/* ddr io type */ -DATA 4 0x020e04b4 0x000C /* IOMUXC_SW_PAD_CTL_GRP_DDR_TYPE */ -DATA 4 0x020e04ac 0x /* IOMUXC_SW_PAD_CTL_GRP_DDRPKE */ - -/* clock */ -DATA 4 0x020e027c 0x0030 /* IOMUXC_SW_PAD_CTL_PAD_DRAM_SDCLK0_P */ - -/* control and address */ -DATA 4 0x020E0250 0x0030 /* IOMUXC_SW_PAD_CTL_PAD_DRAM_CAS */ -DATA 4 0x020E024C 0x0030 /* IOMUXC_SW_PAD_CTL_PAD_DRAM_RAS */ -DATA 4 0x020E0490 0x0030 /* IOMUXC_SW_PAD_CTL_GRP_ADDDS */ -DATA 4 0x020E0288 0x0030 /* IOMUXC_SW_PAD_CTL_PAD_DRAM_RESET */ -DATA 4 0x020E0270 0x /* IOMUXC_SW_PAD_CTL_PAD_DRAM_SDBA2 - DSE can be - configured using Group Control Register: - IOMUXC_SW_PAD_CTL_GRP_CTLDS */ -DATA 4 0x020E0260 0x0030 /* IOMUXC_SW_PAD_CTL_PAD_DRAM_ODT0 */ -DATA 4 0x020E0264 0x0030 /* IOMUXC_SW_PAD_CTL_PA
[PATCH 24/57] arm: Remove tricorder board
This board has not been converted to CONFIG_DM_MMC by the deadline.
Remove it.
Cc: Thomas Weber
Signed-off-by: Tom Rini
---
arch/arm/mach-omap2/omap3/Kconfig | 5 -
board/corscience/tricorder/Kconfig| 12 -
board/corscience/tricorder/MAINTAINERS| 7 -
board/corscience/tricorder/Makefile | 9 -
board/corscience/tricorder/led.c | 79
board/corscience/tricorder/tricorder-eeprom.c | 225 ---
board/corscience/tricorder/tricorder-eeprom.h | 40 --
board/corscience/tricorder/tricorder.c| 208 --
board/corscience/tricorder/tricorder.h| 358 --
configs/tricorder_defconfig | 56 ---
configs/tricorder_flash_defconfig | 52 ---
include/configs/tricorder.h | 236
12 files changed, 1287 deletions(-)
delete mode 100644 board/corscience/tricorder/Kconfig
delete mode 100644 board/corscience/tricorder/MAINTAINERS
delete mode 100644 board/corscience/tricorder/Makefile
delete mode 100644 board/corscience/tricorder/led.c
delete mode 100644 board/corscience/tricorder/tricorder-eeprom.c
delete mode 100644 board/corscience/tricorder/tricorder-eeprom.h
delete mode 100644 board/corscience/tricorder/tricorder.c
delete mode 100644 board/corscience/tricorder/tricorder.h
delete mode 100644 configs/tricorder_defconfig
delete mode 100644 configs/tricorder_flash_defconfig
delete mode 100644 include/configs/tricorder.h
diff --git a/arch/arm/mach-omap2/omap3/Kconfig
b/arch/arm/mach-omap2/omap3/Kconfig
index 0a6eb4cb26d0..16e449cca026 100644
--- a/arch/arm/mach-omap2/omap3/Kconfig
+++ b/arch/arm/mach-omap2/omap3/Kconfig
@@ -97,10 +97,6 @@ config TARGET_OMAP3_PANDORA
select OMAP3_GPIO_4
select OMAP3_GPIO_6
-config TARGET_TRICORDER
- bool "Tricorder"
- select OMAP3_GPIO_2
-
config TARGET_OMAP3_LOGIC
bool "OMAP3 Logic"
select BOARD_LATE_INIT
@@ -167,7 +163,6 @@ source "board/timll/devkit8000/Kconfig"
source "board/ti/evm/Kconfig"
source "board/isee/igep00x0/Kconfig"
source "board/ti/am3517crane/Kconfig"
-source "board/corscience/tricorder/Kconfig"
source "board/logicpd/omap3som/Kconfig"
source "board/nokia/rx51/Kconfig"
source "board/technexion/tao3530/Kconfig"
diff --git a/board/corscience/tricorder/Kconfig
b/board/corscience/tricorder/Kconfig
deleted file mode 100644
index 345ac83d48a8..
--- a/board/corscience/tricorder/Kconfig
+++ /dev/null
@@ -1,12 +0,0 @@
-if TARGET_TRICORDER
-
-config SYS_BOARD
- default "tricorder"
-
-config SYS_VENDOR
- default "corscience"
-
-config SYS_CONFIG_NAME
- default "tricorder"
-
-endif
diff --git a/board/corscience/tricorder/MAINTAINERS
b/board/corscience/tricorder/MAINTAINERS
deleted file mode 100644
index 8a8171b550c2..
--- a/board/corscience/tricorder/MAINTAINERS
+++ /dev/null
@@ -1,7 +0,0 @@
-TRICORDER BOARD
-M: Thomas Weber
-S: Maintained
-F: board/corscience/tricorder/
-F: include/configs/tricorder.h
-F: configs/tricorder_defconfig
-F: configs/tricorder_flash_defconfig
diff --git a/board/corscience/tricorder/Makefile
b/board/corscience/tricorder/Makefile
deleted file mode 100644
index bee39a4f6a3b..
--- a/board/corscience/tricorder/Makefile
+++ /dev/null
@@ -1,9 +0,0 @@
-# SPDX-License-Identifier: GPL-2.0+
-#
-# (C) Copyright 2000, 2001, 2002
-# Wolfgang Denk, DENX Software Engineering, w...@denx.de.
-#
-# (C) Copyright 2012
-# Thomas Weber
-
-obj-y := tricorder.o tricorder-eeprom.o led.o
diff --git a/board/corscience/tricorder/led.c b/board/corscience/tricorder/led.c
deleted file mode 100644
index d876dd7b9f57..
--- a/board/corscience/tricorder/led.c
+++ /dev/null
@@ -1,79 +0,0 @@
-// SPDX-License-Identifier: GPL-2.0+
-/*
- * Copyright (c) 2013 Corscience GmbH & Co.KG
- * Andreas Bießmann
- */
-#include
-#include
-#include
-#include
-#include
-#include
-#include
-
-#define TRICORDER_STATUS_LED_YELLOW 42
-#define TRICORDER_STATUS_LED_GREEN 43
-
-void __led_init(led_id_t mask, int state)
-{
- __led_set(mask, state);
-}
-
-void __led_toggle(led_id_t mask)
-{
- int toggle_gpio = 0;
-#ifdef CONFIG_LED_STATUS0
- if (!toggle_gpio && CONFIG_LED_STATUS_BIT & mask)
- toggle_gpio = TRICORDER_STATUS_LED_GREEN;
-#endif
-#ifdef CONFIG_LED_STATUS1
- if (!toggle_gpio && CONFIG_LED_STATUS_BIT1 & mask)
- toggle_gpio = TRICORDER_STATUS_LED_YELLOW;
-#endif
-#ifdef CONFIG_LED_STATUS2
- if (!toggle_gpio && CONFIG_LED_STATUS_BIT2 & mask) {
- uint8_t val;
- twl4030_i2c_read_u8(TWL4030_CHIP_LED, TWL4030_LED_LEDEN,
- &val);
- val ^= (TWL4030_LED_LEDEN_LEDAON | TWL4030_LED_LEDEN_LEDAPWM);
- twl4030_i2c_write_u8(TWL4030_CHIP_LED, TWL4030_LED_LEDEN,
-val);
- }
-#endif
- if (toggle_gpio) {
-
[PATCH 26/57] arm: Remove am3517_crane board
This board has not been converted to CONFIG_DM_MMC by the deadline.
Remove it.
Cc: Nagendra T S
Signed-off-by: Tom Rini
---
arch/arm/mach-omap2/omap3/Kconfig | 4 -
board/ti/am3517crane/Kconfig | 12 -
board/ti/am3517crane/MAINTAINERS | 6 -
board/ti/am3517crane/Makefile | 9 -
board/ti/am3517crane/am3517crane.c | 72 --
board/ti/am3517crane/am3517crane.h | 343 -
configs/am3517_crane_defconfig | 43
include/configs/am3517_crane.h | 236
8 files changed, 725 deletions(-)
delete mode 100644 board/ti/am3517crane/Kconfig
delete mode 100644 board/ti/am3517crane/MAINTAINERS
delete mode 100644 board/ti/am3517crane/Makefile
delete mode 100644 board/ti/am3517crane/am3517crane.c
delete mode 100644 board/ti/am3517crane/am3517crane.h
delete mode 100644 configs/am3517_crane_defconfig
delete mode 100644 include/configs/am3517_crane.h
diff --git a/arch/arm/mach-omap2/omap3/Kconfig
b/arch/arm/mach-omap2/omap3/Kconfig
index 8bf42aa75143..81c898b66e34 100644
--- a/arch/arm/mach-omap2/omap3/Kconfig
+++ b/arch/arm/mach-omap2/omap3/Kconfig
@@ -89,9 +89,6 @@ config TARGET_OMAP3_OVERO
select OMAP3_GPIO_6
imply CMD_DM
-config TARGET_AM3517_CRANE
- bool "am3517_crane"
-
config TARGET_OMAP3_PANDORA
bool "OMAP3 Pandora"
select OMAP3_GPIO_4
@@ -162,7 +159,6 @@ source "board/ti/beagle/Kconfig"
source "board/timll/devkit8000/Kconfig"
source "board/ti/evm/Kconfig"
source "board/isee/igep00x0/Kconfig"
-source "board/ti/am3517crane/Kconfig"
source "board/logicpd/omap3som/Kconfig"
source "board/nokia/rx51/Kconfig"
source "board/lg/sniper/Kconfig"
diff --git a/board/ti/am3517crane/Kconfig b/board/ti/am3517crane/Kconfig
deleted file mode 100644
index ad025a3228be..
--- a/board/ti/am3517crane/Kconfig
+++ /dev/null
@@ -1,12 +0,0 @@
-if TARGET_AM3517_CRANE
-
-config SYS_BOARD
- default "am3517crane"
-
-config SYS_VENDOR
- default "ti"
-
-config SYS_CONFIG_NAME
- default "am3517_crane"
-
-endif
diff --git a/board/ti/am3517crane/MAINTAINERS b/board/ti/am3517crane/MAINTAINERS
deleted file mode 100644
index cbc3213ec55d..
--- a/board/ti/am3517crane/MAINTAINERS
+++ /dev/null
@@ -1,6 +0,0 @@
-AM3517CRANE BOARD
-M: Nagendra T S
-S: Maintained
-F: board/ti/am3517crane/
-F: include/configs/am3517_crane.h
-F: configs/am3517_crane_defconfig
diff --git a/board/ti/am3517crane/Makefile b/board/ti/am3517crane/Makefile
deleted file mode 100644
index eab040032321..
--- a/board/ti/am3517crane/Makefile
+++ /dev/null
@@ -1,9 +0,0 @@
-# SPDX-License-Identifier: GPL-2.0+
-#
-# Author: Srinath R
-#
-# Based on logicpd/am3517evm/Makefile
-#
-# Copyright (C) 2011 Mistral Solutions Pvt Ltd
-
-obj-y := am3517crane.o
diff --git a/board/ti/am3517crane/am3517crane.c
b/board/ti/am3517crane/am3517crane.c
deleted file mode 100644
index b1017d6c9b76..
--- a/board/ti/am3517crane/am3517crane.c
+++ /dev/null
@@ -1,72 +0,0 @@
-// SPDX-License-Identifier: GPL-2.0+
-/*
- * am3517crane.c - board file for AM3517 CraneBoard
- *
- * Author: Srinath.R
- *
- * Based on logicpd/am3517evm/am3517evm.c
- *
- * Copyright (C) 2011 Mistral Solutions Pvt Ltd
- */
-
-#include
-#include
-#include
-#include
-#include
-#include
-#include
-#include
-#include
-#include
-#include "am3517crane.h"
-
-DECLARE_GLOBAL_DATA_PTR;
-
-/*
- * Routine: board_init
- * Description: Early hardware init.
- */
-int board_init(void)
-{
- gpmc_init(); /* in SRAM or SDRAM, finish GPMC */
- /* board id for Linux */
- gd->bd->bi_arch_number = MACH_TYPE_CRANEBOARD;
- /* boot param addr */
- gd->bd->bi_boot_params = (OMAP34XX_SDRC_CS0 + 0x100);
-
- return 0;
-}
-
-/*
- * Routine: misc_init_r
- * Description: Init i2c, ethernet, etc... (done here so udelay works)
- */
-int misc_init_r(void)
-{
-#ifdef CONFIG_SYS_I2C_OMAP24XX
- i2c_init(CONFIG_SYS_OMAP24_I2C_SPEED, CONFIG_SYS_OMAP24_I2C_SLAVE);
-#endif
-
- omap_die_id_display();
-
- return 0;
-}
-
-/*
- * Routine: set_muxconf_regs
- * Description: Setting up the configuration Mux registers specific to the
- * hardware. Many pins need to be moved from protect to primary
- * mode.
- */
-void set_muxconf_regs(void)
-{
- MUX_AM3517CRANE();
-}
-
-#if defined(CONFIG_MMC)
-int board_mmc_init(struct bd_info *bis)
-{
- return omap_mmc_init(0, 0, 0, -1, -1);
-}
-#endif
diff --git a/board/ti/am3517crane/am3517crane.h
b/board/ti/am3517crane/am3517crane.h
deleted file mode 100644
index 1e6dece14bcb..
--- a/board/ti/am3517crane/am3517crane.h
+++ /dev/null
@@ -1,343 +0,0 @@
-/* SPDX-License-Identifier: GPL-2.0+ */
-/*
- * am3517crane.h - Header file for the AM3517 CraneBoard.
- *
- * Author: Srinath R
- *
- * Based on logicpd/am3517evm/am3517evm.h
- *
- * Copyright (C) 2011 Mistral Solutions Pvt Ltd
- */
-
-#ifndef _AM3517CRANE_H_
-#define _AM
[PATCH 25/57] arm: Remove omap3_ha board
This board has not been converted to CONFIG_DM_MMC by the deadline.
Remove it.
Cc: Stefan Roese
Cc: Tapani Utriainen
Signed-off-by: Tom Rini
---
arch/arm/mach-omap2/omap3/Kconfig| 1 -
board/technexion/tao3530/Kconfig | 12 -
board/technexion/tao3530/MAINTAINERS | 11 -
board/technexion/tao3530/Makefile| 3 -
board/technexion/tao3530/tao3530.c | 225
board/technexion/tao3530/tao3530.h | 370 ---
configs/omap3_ha_defconfig | 47
configs/tao3530_defconfig| 47
include/configs/tao3530.h| 222
9 files changed, 938 deletions(-)
delete mode 100644 board/technexion/tao3530/Kconfig
delete mode 100644 board/technexion/tao3530/MAINTAINERS
delete mode 100644 board/technexion/tao3530/Makefile
delete mode 100644 board/technexion/tao3530/tao3530.c
delete mode 100644 board/technexion/tao3530/tao3530.h
delete mode 100644 configs/omap3_ha_defconfig
delete mode 100644 configs/tao3530_defconfig
delete mode 100644 include/configs/tao3530.h
diff --git a/arch/arm/mach-omap2/omap3/Kconfig
b/arch/arm/mach-omap2/omap3/Kconfig
index 16e449cca026..8bf42aa75143 100644
--- a/arch/arm/mach-omap2/omap3/Kconfig
+++ b/arch/arm/mach-omap2/omap3/Kconfig
@@ -165,7 +165,6 @@ source "board/isee/igep00x0/Kconfig"
source "board/ti/am3517crane/Kconfig"
source "board/logicpd/omap3som/Kconfig"
source "board/nokia/rx51/Kconfig"
-source "board/technexion/tao3530/Kconfig"
source "board/lg/sniper/Kconfig"
endif
diff --git a/board/technexion/tao3530/Kconfig b/board/technexion/tao3530/Kconfig
deleted file mode 100644
index 27bc91f8ca35..
--- a/board/technexion/tao3530/Kconfig
+++ /dev/null
@@ -1,12 +0,0 @@
-if TARGET_TAO3530
-
-config SYS_BOARD
- default "tao3530"
-
-config SYS_VENDOR
- default "technexion"
-
-config SYS_CONFIG_NAME
- default "tao3530"
-
-endif
diff --git a/board/technexion/tao3530/MAINTAINERS
b/board/technexion/tao3530/MAINTAINERS
deleted file mode 100644
index ad02b46f7089..
--- a/board/technexion/tao3530/MAINTAINERS
+++ /dev/null
@@ -1,11 +0,0 @@
-TAO3530 BOARD
-M: Stefan Roese
-S: Maintained
-F: board/technexion/tao3530/
-F: include/configs/tao3530.h
-F: configs/omap3_ha_defconfig
-
-TAO3530 BOARD
-M: Tapani Utriainen
-S: Maintained
-F: configs/tao3530_defconfig
diff --git a/board/technexion/tao3530/Makefile
b/board/technexion/tao3530/Makefile
deleted file mode 100644
index 0297daf64e0f..
--- a/board/technexion/tao3530/Makefile
+++ /dev/null
@@ -1,3 +0,0 @@
-# SPDX-License-Identifier: GPL-2.0+
-
-obj-y := tao3530.o
diff --git a/board/technexion/tao3530/tao3530.c
b/board/technexion/tao3530/tao3530.c
deleted file mode 100644
index 0c9dca31e67e..
--- a/board/technexion/tao3530/tao3530.c
+++ /dev/null
@@ -1,225 +0,0 @@
-// SPDX-License-Identifier: GPL-2.0+
-/*
- * Maintainer :
- * Tapani Utriainen
- */
-#include
-#include
-#include
-#include
-#include
-#include
-#include
-#include
-#include
-#include
-#include
-#include
-#include
-#include
-#include
-
-#include
-#include
-
-#include "tao3530.h"
-
-DECLARE_GLOBAL_DATA_PTR;
-
-int tao3530_revision(void)
-{
- int ret = 0;
-
- /* char *label argument is unused in gpio_request() */
- ret = gpio_request(65, "");
- if (ret) {
- puts("Error: GPIO 65 not available\n");
- goto out;
- }
- MUX_VAL(CP(GPMC_WAIT3), (IEN | PTU | EN | M4));
-
- ret = gpio_request(1, "");
- if (ret) {
- puts("Error: GPIO 1 not available\n");
- goto out2;
- }
- MUX_VAL(CP(SYS_CLKREQ), (IEN | PTU | EN | M4));
-
- ret = gpio_direction_input(65);
- if (ret) {
- puts("Error: GPIO 65 not available for input\n");
- goto out3;
- }
-
- ret = gpio_direction_input(1);
- if (ret) {
- puts("Error: GPIO 1 not available for input\n");
- goto out3;
- }
-
- ret = gpio_get_value(65) << 1 | gpio_get_value(1);
-
-out3:
- MUX_VAL(CP(SYS_CLKREQ), (IEN | PTU | EN | M0));
- gpio_free(1);
-out2:
- MUX_VAL(CP(GPMC_WAIT3), (IEN | PTU | EN | M0));
- gpio_free(65);
-out:
-
- return ret;
-}
-
-#ifdef CONFIG_SPL_BUILD
-/*
- * Routine: get_board_mem_timings
- * Description: If we use SPL then there is no x-loader nor config header
- * so we have to setup the DDR timings ourself on both banks.
- */
-void get_board_mem_timings(struct board_sdrc_timings *timings)
-{
-#if defined(CONFIG_SYS_BOARD_OMAP3_HA)
- /*
-* Switch baseboard LED to red upon power-on
-*/
- MUX_OMAP3_HA();
-
- /* Request a gpio before using it */
- gpio_request(111, "");
- /* Sets the gpio as output and its value to 1, switch LED to red */
- gpio_direction_output(111, 1);
-#endif
-
- if (tao3530_revision() < 3) {
[PATCH 23/57] arm: Remove udoo and udoo_neo boards
These boards have not been converted to CONFIG_DM_MMC by the deadline. Remove them. Cc: Fabio Estevam Cc: Breno Lima Cc: Francesco Montefoschi Signed-off-by: Tom Rini --- arch/arm/mach-imx/mx6/Kconfig | 17 - board/udoo/Kconfig| 9 - board/udoo/MAINTAINERS| 6 - board/udoo/Makefile | 5 - board/udoo/README | 21 -- board/udoo/neo/Kconfig| 12 - board/udoo/neo/MAINTAINERS| 7 - board/udoo/neo/Makefile | 4 - board/udoo/neo/neo.c | 600 -- board/udoo/udoo.c | 276 board/udoo/udoo_spl.c | 257 --- configs/udoo_defconfig| 45 --- configs/udoo_neo_defconfig| 42 --- include/configs/udoo.h| 88 - include/configs/udoo_neo.h| 96 -- 15 files changed, 1485 deletions(-) delete mode 100644 board/udoo/Kconfig delete mode 100644 board/udoo/MAINTAINERS delete mode 100644 board/udoo/Makefile delete mode 100644 board/udoo/README delete mode 100644 board/udoo/neo/Kconfig delete mode 100644 board/udoo/neo/MAINTAINERS delete mode 100644 board/udoo/neo/Makefile delete mode 100644 board/udoo/neo/neo.c delete mode 100644 board/udoo/udoo.c delete mode 100644 board/udoo/udoo_spl.c delete mode 100644 configs/udoo_defconfig delete mode 100644 configs/udoo_neo_defconfig delete mode 100644 include/configs/udoo.h delete mode 100644 include/configs/udoo_neo.h diff --git a/arch/arm/mach-imx/mx6/Kconfig b/arch/arm/mach-imx/mx6/Kconfig index 83c5df416572..1b7090958bd2 100644 --- a/arch/arm/mach-imx/mx6/Kconfig +++ b/arch/arm/mach-imx/mx6/Kconfig @@ -599,21 +599,6 @@ config TARGET_TQMA6 imply CMD_SF imply CMD_DM -config TARGET_UDOO - bool "udoo" - depends on MX6QDL - select BOARD_LATE_INIT - select SUPPORT_SPL - -config TARGET_UDOO_NEO - bool "UDOO Neo" - depends on MX6SX - select BOARD_LATE_INIT - select DM - select DM_THERMAL - select SUPPORT_SPL - imply CMD_DM - config TARGET_SOFTING_VINING_2000 bool "Softing VIN|ING 2000" depends on MX6SX @@ -722,8 +707,6 @@ source "board/toradex/apalis_imx6/Kconfig" source "board/toradex/colibri_imx6/Kconfig" source "board/toradex/colibri-imx6ull/Kconfig" source "board/k+p/kp_imx6q_tpc/Kconfig" -source "board/udoo/Kconfig" -source "board/udoo/neo/Kconfig" source "board/wandboard/Kconfig" source "board/BuR/brppt2/Kconfig" diff --git a/board/udoo/Kconfig b/board/udoo/Kconfig deleted file mode 100644 index 78617a21383c.. --- a/board/udoo/Kconfig +++ /dev/null @@ -1,9 +0,0 @@ -if TARGET_UDOO - -config SYS_BOARD - default "udoo" - -config SYS_CONFIG_NAME - default "udoo" - -endif diff --git a/board/udoo/MAINTAINERS b/board/udoo/MAINTAINERS deleted file mode 100644 index b05243c429d3.. --- a/board/udoo/MAINTAINERS +++ /dev/null @@ -1,6 +0,0 @@ -UDOO BOARD -M: Fabio Estevam -S: Maintained -F: board/udoo/ -F: include/configs/udoo.h -F: configs/udoo_defconfig diff --git a/board/udoo/Makefile b/board/udoo/Makefile deleted file mode 100644 index 66f67f7c154e.. --- a/board/udoo/Makefile +++ /dev/null @@ -1,5 +0,0 @@ -# SPDX-License-Identifier: GPL-2.0+ -# -# (C) Copyright 2013 Freescale Semiconductor, Inc. - -obj-y := udoo.o udoo_spl.o diff --git a/board/udoo/README b/board/udoo/README deleted file mode 100644 index 6fbcc598f77b.. --- a/board/udoo/README +++ /dev/null @@ -1,21 +0,0 @@ -How to use U-Boot on MX6Q/DL Udoo boards - - -- Build U-Boot for MX6Q/DL Udoo boards: - -$ make mrproper -$ make udoo_defconfig -$ make - -This will generate the SPL image called SPL and the u-boot.img. - -- Flash the SPL image into the SD card: - -sudo dd if=SPL of=/dev/mmcblk0 bs=1k seek=1; sync - -- Flash the u-boot.img image into the SD card: - -sudo dd if=u-boot.img of=/dev/mmcblk0 bs=1k seek=69; sync - -- Insert the SD card in the board, power it up and U-Boot messages should -come up. diff --git a/board/udoo/neo/Kconfig b/board/udoo/neo/Kconfig deleted file mode 100644 index 8f474df24874.. --- a/board/udoo/neo/Kconfig +++ /dev/null @@ -1,12 +0,0 @@ -if TARGET_UDOO_NEO - -config SYS_VENDOR - default "udoo" - -config SYS_BOARD - default "neo" - -config SYS_CONFIG_NAME - default "udoo_neo" - -endif diff --git a/board/udoo/neo/MAINTAINERS b/board/udoo/neo/MAINTAINERS deleted file mode 100644 index 743fe33d0597.. --- a/board/udoo/neo/MAINTAINERS +++ /dev/null @@ -1,7 +0,0 @@ -UDOO NEO BOARD -M: Breno Lima -M: Francesco Montefoschi -S: Maintained -F: board/udoo/neo/ -F: include/configs/udoo_neo.h -F: configs/udoo_neo_defconfig diff --git a/board/udoo/neo/Makefile b/board/udoo/neo/Makefile deleted file mode 100644 index 831c084ce596.. --- a/board/udoo/neo/Makefile +++ /dev/null @@ -1,4 +0,0 @@ -# SPDX-License-Id
[PATCH 27/57] arm: Remove kc1 board
This board has not been converted to CONFIG_DM_MMC by the deadline.
Remove it.
Cc: Paul Kocialkowski
Signed-off-by: Tom Rini
---
arch/arm/mach-omap2/omap4/Kconfig | 4 -
board/amazon/kc1/Kconfig | 12 --
board/amazon/kc1/MAINTAINERS | 6 -
board/amazon/kc1/Makefile | 7 --
board/amazon/kc1/kc1.c| 184 --
board/amazon/kc1/kc1.h| 97
configs/kc1_defconfig | 40 ---
include/configs/kc1.h | 150
8 files changed, 500 deletions(-)
delete mode 100644 board/amazon/kc1/Kconfig
delete mode 100644 board/amazon/kc1/MAINTAINERS
delete mode 100644 board/amazon/kc1/Makefile
delete mode 100644 board/amazon/kc1/kc1.c
delete mode 100644 board/amazon/kc1/kc1.h
delete mode 100644 configs/kc1_defconfig
delete mode 100644 include/configs/kc1.h
diff --git a/arch/arm/mach-omap2/omap4/Kconfig
b/arch/arm/mach-omap2/omap4/Kconfig
index 899289b6452c..cdac11c6b62b 100644
--- a/arch/arm/mach-omap2/omap4/Kconfig
+++ b/arch/arm/mach-omap2/omap4/Kconfig
@@ -10,9 +10,6 @@ config TARGET_OMAP4_PANDA
config TARGET_OMAP4_SDP4430
bool "TI OMAP4 SDP4430"
-config TARGET_KC1
- bool "Amazon Kindle Fire (first generation)"
-
endchoice
config SYS_SOC
@@ -20,6 +17,5 @@ config SYS_SOC
source "board/ti/panda/Kconfig"
source "board/ti/sdp4430/Kconfig"
-source "board/amazon/kc1/Kconfig"
endif
diff --git a/board/amazon/kc1/Kconfig b/board/amazon/kc1/Kconfig
deleted file mode 100644
index 1b46a8f3c7a0..
--- a/board/amazon/kc1/Kconfig
+++ /dev/null
@@ -1,12 +0,0 @@
-if TARGET_KC1
-
-config SYS_BOARD
- default "kc1"
-
-config SYS_VENDOR
- default "amazon"
-
-config SYS_CONFIG_NAME
- default "kc1"
-
-endif
diff --git a/board/amazon/kc1/MAINTAINERS b/board/amazon/kc1/MAINTAINERS
deleted file mode 100644
index 7e596d906ef8..
--- a/board/amazon/kc1/MAINTAINERS
+++ /dev/null
@@ -1,6 +0,0 @@
-KC1 BOARD
-M: Paul Kocialkowski
-S: Maintained
-F: board/amazon/kc1/
-F: include/configs/kc1.h
-F: configs/kc1_defconfig
diff --git a/board/amazon/kc1/Makefile b/board/amazon/kc1/Makefile
deleted file mode 100644
index bad24dc0c259..
--- a/board/amazon/kc1/Makefile
+++ /dev/null
@@ -1,7 +0,0 @@
-# SPDX-License-Identifier: GPL-2.0+
-#
-# Amazon Kindle Fire (first generation) codename kc1 config
-#
-# Copyright (C) 2016 Paul Kocialkowski
-
-obj-y := kc1.o
diff --git a/board/amazon/kc1/kc1.c b/board/amazon/kc1/kc1.c
deleted file mode 100644
index 75fb14025c12..
--- a/board/amazon/kc1/kc1.c
+++ /dev/null
@@ -1,184 +0,0 @@
-// SPDX-License-Identifier: GPL-2.0+
-/*
- * Amazon Kindle Fire (first generation) codename kc1 config
- *
- * Copyright (C) 2016 Paul Kocialkowski
- */
-
-#include
-#include
-#include
-#include
-#include
-#include
-#include
-#include
-#include
-#include
-#include
-#include
-#include
-#include
-#include "kc1.h"
-#include
-
-DECLARE_GLOBAL_DATA_PTR;
-
-const struct omap_sysinfo sysinfo = {
- .board_string = "kc1"
-};
-
-static struct musb_hdrc_config musb_config = {
- .multipoint = 1,
- .dyn_fifo = 1,
- .num_eps = 16,
- .ram_bits = 12
-};
-
-static struct omap_musb_board_data musb_board_data = {
- .interface_type = MUSB_INTERFACE_UTMI,
-};
-
-static struct musb_hdrc_platform_data musb_platform_data = {
- .mode = MUSB_PERIPHERAL,
- .config = &musb_config,
- .power = 100,
- .platform_ops = &omap2430_ops,
- .board_data = &musb_board_data,
-};
-
-
-void set_muxconf_regs(void)
-{
- do_set_mux((*ctrl)->control_padconf_core_base, core_padconf_array,
- sizeof(core_padconf_array) / sizeof(struct pad_conf_entry));
-}
-
-struct lpddr2_device_details *emif_get_device_details(u32 emif_nr, u8 cs,
- struct lpddr2_device_details *lpddr2_dev_details)
-{
- if (cs == CS1)
- return NULL;
-
- *lpddr2_dev_details = elpida_2G_S4_details;
-
- return lpddr2_dev_details;
-}
-
-void emif_get_device_timings(u32 emif_nr,
- const struct lpddr2_device_timings **cs0_device_timings,
- const struct lpddr2_device_timings **cs1_device_timings)
-{
- *cs0_device_timings = &elpida_2G_S4_timings;
- *cs1_device_timings = NULL;
-}
-
-int board_init(void)
-{
- /* GPMC init */
- gpmc_init();
-
- /* MACH number */
- gd->bd->bi_arch_number = MACH_TYPE_OMAP_4430SDP;
-
- /* ATAGs location */
- gd->bd->bi_boot_params = OMAP44XX_DRAM_ADDR_SPACE_START + 0x100;
-
- return 0;
-}
-
-int misc_init_r(void)
-{
- char reboot_mode[2] = { 0 };
- u32 data = 0;
- u32 value;
- int rc;
-
- /* Reboot mode */
-
- rc = omap_reboot_mode(reboot_mode, sizeof(reboot_mode));
-
- /* USB ID pin pull-up indicates factory (fastboot) cable detection. */
- gpio_request(KC1_GPIO_USB_ID, "USB_ID");
- gpio_dire
[PATCH 21/57] arm: Remove platinum_picon board
This board has not been converted to CONFIG_DM_MMC by the deadline.
Remove it.
Cc: Stefan Roese
Signed-off-by: Tom Rini
---
arch/arm/mach-imx/mx6/Kconfig| 9 -
board/barco/platinum/Kconfig | 31 ---
board/barco/platinum/MAINTAINERS | 7 -
board/barco/platinum/Makefile| 12 --
board/barco/platinum/platinum.c | 219
board/barco/platinum/platinum.h | 77 ---
board/barco/platinum/platinum_picon.c| 244 ---
board/barco/platinum/platinum_titanium.c | 209 ---
board/barco/platinum/spl_picon.c | 183 -
board/barco/platinum/spl_titanium.c | 186 -
configs/platinum_picon_defconfig | 67 ---
configs/platinum_titanium_defconfig | 69 ---
include/configs/platinum.h | 189 --
include/configs/platinum_picon.h | 25 ---
include/configs/platinum_titanium.h | 30 ---
15 files changed, 1557 deletions(-)
delete mode 100644 board/barco/platinum/Kconfig
delete mode 100644 board/barco/platinum/MAINTAINERS
delete mode 100644 board/barco/platinum/Makefile
delete mode 100644 board/barco/platinum/platinum.c
delete mode 100644 board/barco/platinum/platinum.h
delete mode 100644 board/barco/platinum/platinum_picon.c
delete mode 100644 board/barco/platinum/platinum_titanium.c
delete mode 100644 board/barco/platinum/spl_picon.c
delete mode 100644 board/barco/platinum/spl_titanium.c
delete mode 100644 configs/platinum_picon_defconfig
delete mode 100644 configs/platinum_titanium_defconfig
delete mode 100644 include/configs/platinum.h
delete mode 100644 include/configs/platinum_picon.h
delete mode 100644 include/configs/platinum_titanium.h
diff --git a/arch/arm/mach-imx/mx6/Kconfig b/arch/arm/mach-imx/mx6/Kconfig
index 221727411005..ca54da567389 100644
--- a/arch/arm/mach-imx/mx6/Kconfig
+++ b/arch/arm/mach-imx/mx6/Kconfig
@@ -499,14 +499,6 @@ config TARGET_LITEBOARD
select BOARD_LATE_INIT
select MX6UL_LITESOM
-config TARGET_PLATINUM_PICON
- bool "platinum-picon"
- select SUPPORT_SPL
-
-config TARGET_PLATINUM_TITANIUM
- bool "platinum-titanium"
- select SUPPORT_SPL
-
config TARGET_PCM058
bool "Phytec PCM058 i.MX6 Quad"
depends on MX6Q
@@ -690,7 +682,6 @@ source "board/ge/b1x5v2/Kconfig"
source "board/advantech/dms-ba16/Kconfig"
source "board/aristainetos/Kconfig"
source "board/armadeus/opos6uldev/Kconfig"
-source "board/barco/platinum/Kconfig"
source "board/barco/titanium/Kconfig"
source "board/boundary/nitrogen6x/Kconfig"
source "board/bticino/mamoj/Kconfig"
diff --git a/board/barco/platinum/Kconfig b/board/barco/platinum/Kconfig
deleted file mode 100644
index cc0648cd73b3..
--- a/board/barco/platinum/Kconfig
+++ /dev/null
@@ -1,31 +0,0 @@
-if TARGET_PLATINUM_PICON
-
-config SYS_CPU
- default "armv7"
-
-config SYS_VENDOR
- default "barco"
-
-config SYS_BOARD
- default "platinum"
-
-config SYS_CONFIG_NAME
- default "platinum_picon"
-
-endif
-
-if TARGET_PLATINUM_TITANIUM
-
-config SYS_CPU
- default "armv7"
-
-config SYS_VENDOR
- default "barco"
-
-config SYS_BOARD
- default "platinum"
-
-config SYS_CONFIG_NAME
- default "platinum_titanium"
-
-endif
diff --git a/board/barco/platinum/MAINTAINERS b/board/barco/platinum/MAINTAINERS
deleted file mode 100644
index a22584b5e586..
--- a/board/barco/platinum/MAINTAINERS
+++ /dev/null
@@ -1,7 +0,0 @@
-PLATINUM BOARD
-M: Stefan Roese
-S: Maintained
-F: board/barco/platinum/
-F: include/configs/platinum.h
-F: configs/platinum_picon_defconfig
-F: configs/platinum_titanium_defconfig
diff --git a/board/barco/platinum/Makefile b/board/barco/platinum/Makefile
deleted file mode 100644
index 1e1bf101a8b0..
--- a/board/barco/platinum/Makefile
+++ /dev/null
@@ -1,12 +0,0 @@
-# SPDX-License-Identifier: GPL-2.0+
-#
-# Copyright (C) 2014, Barco (www.barco.com)
-
-obj-y := platinum.o
-obj-$(CONFIG_TARGET_PLATINUM_PICON) += platinum_picon.o
-obj-$(CONFIG_TARGET_PLATINUM_TITANIUM) += platinum_titanium.o
-
-ifneq ($(CONFIG_SPL_BUILD),)
-obj-$(CONFIG_TARGET_PLATINUM_PICON) += spl_picon.o
-obj-$(CONFIG_TARGET_PLATINUM_TITANIUM) += spl_titanium.o
-endif
diff --git a/board/barco/platinum/platinum.c b/board/barco/platinum/platinum.c
deleted file mode 100644
index ec8d55288876..
--- a/board/barco/platinum/platinum.c
+++ /dev/null
@@ -1,219 +0,0 @@
-// SPDX-License-Identifier: GPL-2.0+
-/*
- * Copyright (C) 2014, Barco (www.barco.com)
- * Copyright (C) 2014 Stefan Roese
- */
-
-#include
-#include
-#include
-#include
-#include
-#include
-#include
-#include
-#include
-#include
-#include
-#include
-#include
-#include
-#include
-#include
-#include
-#include
-
-#include "platinum.h"
-
-DECLARE_GLOBAL_DATA_PTR;
-
-iomux_v3_cfg_t const usdhc3_pads[] = {
- MX6
[PATCH 22/57] arm: Remove embest mx6boards support
The marsboard and riotboard boards have not been converted to CONFIG_DM_MMC by the deadline. Remove them. Cc: Eric Bénard Signed-off-by: Tom Rini --- arch/arm/mach-imx/mx6/Kconfig | 1 - board/embest/mx6boards/Kconfig | 12 - board/embest/mx6boards/MAINTAINERS | 8 - board/embest/mx6boards/Makefile| 7 - board/embest/mx6boards/mx6boards.c | 663 - configs/marsboard_defconfig| 58 --- configs/riotboard_defconfig| 59 --- configs/riotboard_spl_defconfig| 70 --- include/configs/embestmx6boards.h | 131 -- 9 files changed, 1009 deletions(-) delete mode 100644 board/embest/mx6boards/Kconfig delete mode 100644 board/embest/mx6boards/MAINTAINERS delete mode 100644 board/embest/mx6boards/Makefile delete mode 100644 board/embest/mx6boards/mx6boards.c delete mode 100644 configs/marsboard_defconfig delete mode 100644 configs/riotboard_defconfig delete mode 100644 configs/riotboard_spl_defconfig delete mode 100644 include/configs/embestmx6boards.h diff --git a/arch/arm/mach-imx/mx6/Kconfig b/arch/arm/mach-imx/mx6/Kconfig index ca54da567389..83c5df416572 100644 --- a/arch/arm/mach-imx/mx6/Kconfig +++ b/arch/arm/mach-imx/mx6/Kconfig @@ -690,7 +690,6 @@ source "board/compulab/cm_fx6/Kconfig" source "board/congatec/cgtqmx6eval/Kconfig" source "board/dhelectronics/dh_imx6/Kconfig" source "board/el/el6x/Kconfig" -source "board/embest/mx6boards/Kconfig" source "board/engicam/imx6q/Kconfig" source "board/engicam/imx6ul/Kconfig" source "board/freescale/mx6qarm2/Kconfig" diff --git a/board/embest/mx6boards/Kconfig b/board/embest/mx6boards/Kconfig deleted file mode 100644 index 24d01f226648.. --- a/board/embest/mx6boards/Kconfig +++ /dev/null @@ -1,12 +0,0 @@ -if TARGET_EMBESTMX6BOARDS - -config SYS_BOARD - default "mx6boards" - -config SYS_VENDOR - default "embest" - -config SYS_CONFIG_NAME - default "embestmx6boards" - -endif diff --git a/board/embest/mx6boards/MAINTAINERS b/board/embest/mx6boards/MAINTAINERS deleted file mode 100644 index 02756c58b3c8.. --- a/board/embest/mx6boards/MAINTAINERS +++ /dev/null @@ -1,8 +0,0 @@ -MX6BOARDS BOARD -M: Eric Bénard -S: Maintained -F: board/embest/mx6boards/ -F: include/configs/embestmx6boards.h -F: configs/marsboard_defconfig -F: configs/riotboard_defconfig -F: configs/riotboard_spl_defconfig diff --git a/board/embest/mx6boards/Makefile b/board/embest/mx6boards/Makefile deleted file mode 100644 index a032a3df9f7e.. --- a/board/embest/mx6boards/Makefile +++ /dev/null @@ -1,7 +0,0 @@ -# SPDX-License-Identifier: GPL-2.0+ -# -# Copyright (C) 2007, Guennadi Liakhovetski -# -# (C) Copyright 2011 Freescale Semiconductor, Inc. - -obj-y := mx6boards.o diff --git a/board/embest/mx6boards/mx6boards.c b/board/embest/mx6boards/mx6boards.c deleted file mode 100644 index 65b3942e3991.. --- a/board/embest/mx6boards/mx6boards.c +++ /dev/null @@ -1,663 +0,0 @@ -// SPDX-License-Identifier: GPL-2.0+ -/* - * Copyright (C) 2014 Eukréa Electromatique - * Author: Eric Bénard - * Fabio Estevam - * Jon Nettleton - * - * based on sabresd.c which is : - * Copyright (C) 2012 Freescale Semiconductor, Inc. - * and on hummingboard.c which is : - * Copyright (C) 2013 SolidRun ltd. - * Copyright (C) 2013 Jon Nettleton . - */ - -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include - -DECLARE_GLOBAL_DATA_PTR; - -#define UART_PAD_CTRL (PAD_CTL_PUS_100K_UP | \ - PAD_CTL_SPEED_MED | PAD_CTL_DSE_40ohm | \ - PAD_CTL_SRE_FAST | PAD_CTL_HYS) - -#define USDHC_PAD_CTRL (PAD_CTL_PUS_47K_UP | \ - PAD_CTL_SPEED_LOW | PAD_CTL_DSE_80ohm | \ - PAD_CTL_SRE_FAST | PAD_CTL_HYS) - -#define USDHC_PAD_CLK_CTRL (PAD_CTL_SPEED_LOW |\ - PAD_CTL_DSE_80ohm | PAD_CTL_SRE_FAST | \ - PAD_CTL_HYS) - -#define ENET_PAD_CTRL (PAD_CTL_PUS_100K_UP | \ - PAD_CTL_SPEED_MED | PAD_CTL_DSE_40ohm | PAD_CTL_HYS) - -#define ENET_PAD_CTRL_PD (PAD_CTL_PUS_100K_DOWN | \ - PAD_CTL_SPEED_MED | PAD_CTL_DSE_40ohm | PAD_CTL_HYS) - -#define ENET_PAD_CTRL_CLK ((PAD_CTL_PUS_100K_UP & ~PAD_CTL_PKE) | \ - PAD_CTL_SPEED_MED | PAD_CTL_DSE_40ohm | PAD_CTL_SRE_FAST) - -#define I2C_PAD_CTRL (PAD_CTL_PUS_100K_UP | \ - PAD_CTL_SPEED_MED | PAD_CTL_DSE_40ohm | PAD_CTL_HYS | \ - PAD_CTL_ODE | PAD_CTL_SRE_FAST) - -#define SPI_PAD_CTRL (PAD_CTL_HYS | PAD_CTL_SPEED_MED | \ - PAD_CTL_DSE_40ohm | PAD_CTL_SRE_FAST) - -static int board_type = -1; -#define BOARD_IS_MARSBOARD 0 -#define BOARD_
[PATCH 19/57] arm: Remove warp board
This board has not been converted to CONFIG_DM_MMC by the deadline. Remove it. Cc: Otavio Salvador Signed-off-by: Tom Rini --- arch/arm/mach-imx/mx6/Kconfig | 6 -- board/warp/Kconfig| 9 -- board/warp/MAINTAINERS| 6 -- board/warp/Makefile | 6 -- board/warp/README | 56 --- board/warp/imximage.cfg | 123 board/warp/warp.c | 170 -- configs/warp_defconfig| 49 -- include/configs/warp.h| 145 - 9 files changed, 570 deletions(-) delete mode 100644 board/warp/Kconfig delete mode 100644 board/warp/MAINTAINERS delete mode 100644 board/warp/Makefile delete mode 100644 board/warp/README delete mode 100644 board/warp/imximage.cfg delete mode 100644 board/warp/warp.c delete mode 100644 configs/warp_defconfig delete mode 100644 include/configs/warp.h diff --git a/arch/arm/mach-imx/mx6/Kconfig b/arch/arm/mach-imx/mx6/Kconfig index 013468833984..221727411005 100644 --- a/arch/arm/mach-imx/mx6/Kconfig +++ b/arch/arm/mach-imx/mx6/Kconfig @@ -637,11 +637,6 @@ config TARGET_WANDBOARD select BOARD_LATE_INIT select SUPPORT_SPL -config TARGET_WARP - bool "WaRP" - depends on MX6SL - select BOARD_LATE_INIT - config TARGET_XPRESS bool "CCV xPress" depends on MX6UL @@ -740,7 +735,6 @@ source "board/k+p/kp_imx6q_tpc/Kconfig" source "board/udoo/Kconfig" source "board/udoo/neo/Kconfig" source "board/wandboard/Kconfig" -source "board/warp/Kconfig" source "board/BuR/brppt2/Kconfig" endif diff --git a/board/warp/Kconfig b/board/warp/Kconfig deleted file mode 100644 index dc0263631906.. --- a/board/warp/Kconfig +++ /dev/null @@ -1,9 +0,0 @@ -if TARGET_WARP - -config SYS_BOARD - default "warp" - -config SYS_CONFIG_NAME - default "warp" - -endif diff --git a/board/warp/MAINTAINERS b/board/warp/MAINTAINERS deleted file mode 100644 index ee2114d08235.. --- a/board/warp/MAINTAINERS +++ /dev/null @@ -1,6 +0,0 @@ -WaRP BOARD -M: Otavio Salvador -S: Maintained -F: board/warp/ -F: include/configs/warp.h -F: configs/warp_defconfig diff --git a/board/warp/Makefile b/board/warp/Makefile deleted file mode 100644 index 3a2373d7bf5b.. --- a/board/warp/Makefile +++ /dev/null @@ -1,6 +0,0 @@ -# SPDX-License-Identifier: GPL-2.0+ -# Copyright (C) 2014 O.S. Systems Software LTDA. -# Copyright (C) 2014 Kynetics LLC. -# Copyright (C) 2014 Revolution Robotics, Inc. - -obj-y := warp.o diff --git a/board/warp/README b/board/warp/README deleted file mode 100644 index 3cfd22ec761d.. --- a/board/warp/README +++ /dev/null @@ -1,56 +0,0 @@ -How to Update U-Boot on Warp board --- - -Required software on the host PC: - -- imx_usb_loader: https://github.com/boundarydevices/imx_usb_loader - -- dfu-util: http://dfu-util.sourceforge.net/releases/ - -Build U-Boot for Warp: - -$ make mrproper -$ make warp_config -$ make - -This will generate the U-Boot binary called u-boot.imx. - -Put warp board in USB download mode - -Connect a USB to serial adapter between the host PC and warp - -Connect a USB cable between the OTG warp port and the host PC - -Open a terminal program such as minicom - -Copy u-boot.imx to the imx_usb_loader folder. - -Load u-boot.imx via USB: - -$ sudo ./imx_usb u-boot.imx - -Then U-Boot should start and its messages will appear in the console program. - -Use the default environment variables: - -=> env default -f -a -=> saveenv - -Run the DFU command: -=> dfu 0 mmc 0 - -Transfer u-boot.imx that will be flashed into the eMMC: - -$ sudo dfu-util -D u-boot.imx -a boot - -Then on the U-Boot prompt the following message should be seen after a -successful upgrade: - -#DOWNLOAD ... OK -Ctrl+C to exit ... - -Remove power from the warp board. - -Put warp board into normal boot mode - -Power up the board and the new updated U-Boot should boot from eMMC diff --git a/board/warp/imximage.cfg b/board/warp/imximage.cfg deleted file mode 100644 index 619f6aa7b066.. --- a/board/warp/imximage.cfg +++ /dev/null @@ -1,123 +0,0 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ -/* - * Copyright (C) 2013 Freescale Semiconductor, Inc. - * - * Refer doc/imx/mkimage/imximage.txt for more details about how-to configure - * and create imximage boot image - * - * The syntax is taken as close as possible with the kwbimage - */ -#define __ASSEMBLY__ -#include - -/* image version */ - -IMAGE_VERSION 2 - -/* - * Boot Device : one of - * spi, sd (the board has no nand neither onenand) - */ - -BOOT_FROM sd - -/* - * Secure boot support - */ -#ifdef CONFIG__IMX_HAB -CSF CONFIG_CSF_SIZE -#endif - -/* - * Device Configuration Data (DCD) - * - * Each entry must have the format: - * Addr-type AddressValue - * - * where: - * Addr-type register length (1,2 or 4 bytes) - * Address absolut
[PATCH 20/57] arm: Remove Broadcom Cygnus boards
These boards have not been converted to CONFIG_DM by the deadline. Remove them. Cc: Steve Rae Signed-off-by: Tom Rini --- arch/arm/Kconfig | 8 +-- .../broadcom/bcm911360_entphn-ns/MAINTAINERS | 6 --- board/broadcom/bcm911360_entphn/MAINTAINERS | 6 --- board/broadcom/bcm911360k/MAINTAINERS | 6 --- board/broadcom/bcm958300k-ns/MAINTAINERS | 6 --- board/broadcom/bcm958300k/MAINTAINERS | 6 --- board/broadcom/bcm958305k/MAINTAINERS | 6 --- board/broadcom/bcm958622hr/MAINTAINERS| 6 --- board/broadcom/bcmcygnus/Kconfig | 15 -- board/broadcom/bcmnsp/Kconfig | 15 -- configs/bcm911360_entphn-ns_defconfig | 30 --- configs/bcm911360_entphn_defconfig| 30 --- configs/bcm911360k_defconfig | 30 --- configs/bcm958300k-ns_defconfig | 30 --- configs/bcm958300k_defconfig | 30 --- configs/bcm958305k_defconfig | 30 --- configs/bcm958622hr_defconfig | 29 --- include/configs/bcm_ep_board.h| 51 --- 18 files changed, 1 insertion(+), 339 deletions(-) delete mode 100644 board/broadcom/bcm911360_entphn-ns/MAINTAINERS delete mode 100644 board/broadcom/bcm911360_entphn/MAINTAINERS delete mode 100644 board/broadcom/bcm911360k/MAINTAINERS delete mode 100644 board/broadcom/bcm958300k-ns/MAINTAINERS delete mode 100644 board/broadcom/bcm958300k/MAINTAINERS delete mode 100644 board/broadcom/bcm958305k/MAINTAINERS delete mode 100644 board/broadcom/bcm958622hr/MAINTAINERS delete mode 100644 board/broadcom/bcmcygnus/Kconfig delete mode 100644 board/broadcom/bcmnsp/Kconfig delete mode 100644 configs/bcm911360_entphn-ns_defconfig delete mode 100644 configs/bcm911360_entphn_defconfig delete mode 100644 configs/bcm911360k_defconfig delete mode 100644 configs/bcm958300k-ns_defconfig delete mode 100644 configs/bcm958300k_defconfig delete mode 100644 configs/bcm958305k_defconfig delete mode 100644 configs/bcm958622hr_defconfig delete mode 100644 include/configs/bcm_ep_board.h diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index 9777dd6d4d9a..c70ce73bea12 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig @@ -346,7 +346,7 @@ config SYS_CACHELINE_SIZE choice prompt "Select the ARM data write cache policy" default SYS_ARM_CACHE_WRITETHROUGH if TARGET_BCMCYGNUS || \ - TARGET_BCMNSP || CPU_PXA || RZA1 + CPU_PXA || RZA1 default SYS_ARM_CACHE_WRITEBACK config SYS_ARM_CACHE_WRITEBACK @@ -667,10 +667,6 @@ config TARGET_BCMCYGNUS imply HASH_VERIFY imply NETDEVICES -config TARGET_BCMNSP - bool "Support bcmnsp" - select CPU_V7A - config TARGET_BCMNS2 bool "Support Broadcom Northstar2" select ARM64 @@ -1922,8 +1918,6 @@ source "board/cortina/presidio-asic/Kconfig" source "board/broadcom/bcm963158/Kconfig" source "board/broadcom/bcm968360bg/Kconfig" source "board/broadcom/bcm968580xref/Kconfig" -source "board/broadcom/bcmcygnus/Kconfig" -source "board/broadcom/bcmnsp/Kconfig" source "board/broadcom/bcmns3/Kconfig" source "board/cavium/thunderx/Kconfig" source "board/cirrus/edb93xx/Kconfig" diff --git a/board/broadcom/bcm911360_entphn-ns/MAINTAINERS b/board/broadcom/bcm911360_entphn-ns/MAINTAINERS deleted file mode 100644 index 8b831d8cb7a5.. --- a/board/broadcom/bcm911360_entphn-ns/MAINTAINERS +++ /dev/null @@ -1,6 +0,0 @@ -BCM911360_ENTPHN-NS BOARD -M: Steve Rae -S: Maintained -F: board/broadcom/bcmcygnus/ -F: include/configs/bcm_ep_board.h -F: configs/bcm911360_entphn-ns_defconfig diff --git a/board/broadcom/bcm911360_entphn/MAINTAINERS b/board/broadcom/bcm911360_entphn/MAINTAINERS deleted file mode 100644 index d4f6aefe4885.. --- a/board/broadcom/bcm911360_entphn/MAINTAINERS +++ /dev/null @@ -1,6 +0,0 @@ -BCM911360_ENTPHN BOARD -M: Steve Rae -S: Maintained -F: board/broadcom/bcmcygnus/ -F: include/configs/bcm_ep_board.h -F: configs/bcm911360_entphn_defconfig diff --git a/board/broadcom/bcm911360k/MAINTAINERS b/board/broadcom/bcm911360k/MAINTAINERS deleted file mode 100644 index 32e60327cfc3.. --- a/board/broadcom/bcm911360k/MAINTAINERS +++ /dev/null @@ -1,6 +0,0 @@ -BCM911360K BOARD -M: Steve Rae -S: Maintained -F: board/broadcom/bcmcygnus/ -F: include/configs/bcm_ep_board.h -F: configs/bcm911360k_defconfig diff --git a/board/broadcom/bcm958300k-ns/MAINTAINERS b/board/broadcom/bcm958300k-ns/MAINTAINERS deleted file mode 100644 index 237d3446292b.. --- a/board/broadcom/bcm958300k-ns/MAINTAINERS +++ /dev/null @@ -1,6 +0,0 @@ -BCM958300K-NS BOARD -M: Steve Rae -S: Maintained -F: board/broadcom/bcmcygnus/ -F: include/configs/bcm_ep
[PATCH 16/57] arm: Remove picosam9g45 board
This board has not been converted to CONFIG_DM_MMC by the deadline.
Remove it.
Cc: Erik van Luijk
Signed-off-by: Tom Rini
---
arch/arm/mach-at91/Kconfig | 6 -
board/mini-box/picosam9g45/Kconfig | 12 -
board/mini-box/picosam9g45/MAINTAINERS | 6 -
board/mini-box/picosam9g45/Makefile | 17 --
board/mini-box/picosam9g45/led.c | 22 --
board/mini-box/picosam9g45/picosam9g45.c | 347 ---
configs/picosam9g45_defconfig| 48
include/configs/picosam9g45.h| 118
8 files changed, 576 deletions(-)
delete mode 100644 board/mini-box/picosam9g45/Kconfig
delete mode 100644 board/mini-box/picosam9g45/MAINTAINERS
delete mode 100644 board/mini-box/picosam9g45/Makefile
delete mode 100644 board/mini-box/picosam9g45/led.c
delete mode 100644 board/mini-box/picosam9g45/picosam9g45.c
delete mode 100644 configs/picosam9g45_defconfig
delete mode 100644 include/configs/picosam9g45.h
diff --git a/arch/arm/mach-at91/Kconfig b/arch/arm/mach-at91/Kconfig
index 22f6e4114e8e..1adf09b9a148 100644
--- a/arch/arm/mach-at91/Kconfig
+++ b/arch/arm/mach-at91/Kconfig
@@ -134,11 +134,6 @@ config TARGET_PM9G45
bool "Ronetix pm9g45 board"
select AT91SAM9G45
-config TARGET_PICOSAM9G45
- bool "Mini-box picosam9g45 board"
- select AT91SAM9M10G45
- select SUPPORT_SPL
-
config TARGET_AT91SAM9N12EK
bool "Atmel AT91SAM9N12-EK board"
select AT91SAM9N12
@@ -338,7 +333,6 @@ source "board/egnite/ethernut5/Kconfig"
source "board/esd/meesc/Kconfig"
source "board/gardena/smart-gateway-at91sam/Kconfig"
source "board/l+g/vinco/Kconfig"
-source "board/mini-box/picosam9g45/Kconfig"
source "board/ronetix/pm9261/Kconfig"
source "board/ronetix/pm9263/Kconfig"
source "board/ronetix/pm9g45/Kconfig"
diff --git a/board/mini-box/picosam9g45/Kconfig
b/board/mini-box/picosam9g45/Kconfig
deleted file mode 100644
index 98ec0c457a62..
--- a/board/mini-box/picosam9g45/Kconfig
+++ /dev/null
@@ -1,12 +0,0 @@
-if TARGET_PICOSAM9G45
-
-config SYS_BOARD
- default "picosam9g45"
-
-config SYS_VENDOR
- default "mini-box"
-
-config SYS_CONFIG_NAME
- default "picosam9g45"
-
-endif
diff --git a/board/mini-box/picosam9g45/MAINTAINERS
b/board/mini-box/picosam9g45/MAINTAINERS
deleted file mode 100644
index a8cf01d70380..
--- a/board/mini-box/picosam9g45/MAINTAINERS
+++ /dev/null
@@ -1,6 +0,0 @@
-PICOSAM9G45 BOARD
-M: Erik van Luijk
-S: Maintained
-F: board/mini-box/picosam9g45/
-F: include/configs/picosam9g45.h
-F: configs/picosam9g45_defconfig
diff --git a/board/mini-box/picosam9g45/Makefile
b/board/mini-box/picosam9g45/Makefile
deleted file mode 100644
index 6e98997a7c31..
--- a/board/mini-box/picosam9g45/Makefile
+++ /dev/null
@@ -1,17 +0,0 @@
-# SPDX-License-Identifier: GPL-2.0+
-#
-# Makefile for mini-box PICOSAM9G45 (AT91SAM9G45) based board
-# (C) Copytight 2015 Inter Act B.V.
-#
-# Based on:
-# U-Boot file: board/atmel/at91sam9m10g45ek/Makefile
-#
-# (C) Copyright 2003-2008
-# Wolfgang Denk, DENX Software Engineering, w...@denx.de.
-#
-# (C) Copyright 2008
-# Stelian Pop
-# Lead Tech Design
-
-obj-y += picosam9g45.o
-obj-y += led.o
diff --git a/board/mini-box/picosam9g45/led.c b/board/mini-box/picosam9g45/led.c
deleted file mode 100644
index 8ce8b6bbeac2..
--- a/board/mini-box/picosam9g45/led.c
+++ /dev/null
@@ -1,22 +0,0 @@
-// SPDX-License-Identifier: GPL-2.0+
-/*
- * (C) Copyright 2007-2008
- * Stelian Pop
- * Lead Tech Design
- */
-
-#include
-#include
-#include
-#include
-#include
-#include
-
-void coloured_LED_init(void)
-{
- at91_periph_clk_enable(ATMEL_ID_PIODE);
-
- at91_set_gpio_output(CONFIG_GREEN_LED, 1);
-
- at91_set_gpio_value(CONFIG_GREEN_LED, 1);
-}
diff --git a/board/mini-box/picosam9g45/picosam9g45.c
b/board/mini-box/picosam9g45/picosam9g45.c
deleted file mode 100644
index 5d6cb24966d6..
--- a/board/mini-box/picosam9g45/picosam9g45.c
+++ /dev/null
@@ -1,347 +0,0 @@
-// SPDX-License-Identifier: GPL-2.0+
-/*
- * Board functions for mini-box PICOSAM9G45 (AT91SAM9G45) based board
- * (C) Copyright 2015 Inter Act B.V.
- *
- * Based on:
- * U-Boot file: board/atmel/at91sam9m10g45ek/at91sam9m10g45ek.c
- * (C) Copyright 2007-2008
- * Stelian Pop
- * Lead Tech Design
- */
-
-#include
-#include
-#include
-#include
-#include
-#include
-#include
-#include
-#include
-#include
-#include
-#include
-#include
-#include
-#include
-#if defined(CONFIG_RESET_PHY_R) && defined(CONFIG_MACB)
-#include
-#endif
-#include
-#include
-
-DECLARE_GLOBAL_DATA_PTR;
-
-/* - */
-/*
- * Miscelaneous platform dependent initialisations
- */
-
-#if defined(CONFIG_SPL_BUILD)
-#include
-
-void at91_spl_board_init(void)
-{
-#ifdef CONFIG_SYS_USE_MMC
- at91_mci_hw_init();
-#endif
-}
-
-#include
-static void ddr2_c
[PATCH 15/57] arm: Remove wb50n board
This board has not been converted to CONFIG_DM_MMC by the deadline.
Remove it.
Cc: Ben Whitten
Signed-off-by: Tom Rini
---
arch/arm/mach-at91/Kconfig| 9 --
board/laird/wb50n/Kconfig | 12 --
board/laird/wb50n/MAINTAINERS | 6 -
board/laird/wb50n/Makefile| 4 -
board/laird/wb50n/wb50n.c | 206 --
configs/wb50n_defconfig | 53 -
include/configs/wb50n.h | 96
7 files changed, 386 deletions(-)
delete mode 100644 board/laird/wb50n/Kconfig
delete mode 100644 board/laird/wb50n/MAINTAINERS
delete mode 100644 board/laird/wb50n/Makefile
delete mode 100644 board/laird/wb50n/wb50n.c
delete mode 100644 configs/wb50n_defconfig
delete mode 100644 include/configs/wb50n.h
diff --git a/arch/arm/mach-at91/Kconfig b/arch/arm/mach-at91/Kconfig
index 5880e651bafd..22f6e4114e8e 100644
--- a/arch/arm/mach-at91/Kconfig
+++ b/arch/arm/mach-at91/Kconfig
@@ -303,14 +303,6 @@ config TARGET_VINCO
select SUPPORT_SPL
imply CMD_DM
-config TARGET_WB50N
- bool "Support Laird WB50N"
- select BOARD_EARLY_INIT_F
- select BOARD_LATE_INIT
- select CPU_V7A
- select SUPPORT_SPL
- select ATMEL_SFR
-
endchoice
config ATMEL_SFR
@@ -353,7 +345,6 @@ source "board/ronetix/pm9g45/Kconfig"
source "board/siemens/corvus/Kconfig"
source "board/siemens/taurus/Kconfig"
source "board/siemens/smartweb/Kconfig"
-source "board/laird/wb50n/Kconfig"
config SPL_LDSCRIPT
default "arch/arm/mach-at91/arm926ejs/u-boot-spl.lds" if CPU_ARM926EJS
diff --git a/board/laird/wb50n/Kconfig b/board/laird/wb50n/Kconfig
deleted file mode 100644
index 2e7090ec34b2..
--- a/board/laird/wb50n/Kconfig
+++ /dev/null
@@ -1,12 +0,0 @@
-if TARGET_WB50N
-
-config SYS_BOARD
- default "wb50n"
-
-config SYS_VENDOR
- default "laird"
-
-config SYS_CONFIG_NAME
- default "wb50n"
-
-endif
diff --git a/board/laird/wb50n/MAINTAINERS b/board/laird/wb50n/MAINTAINERS
deleted file mode 100644
index 3d38fc4e9faf..
--- a/board/laird/wb50n/MAINTAINERS
+++ /dev/null
@@ -1,6 +0,0 @@
-WB50N CPU MODULE
-M: Ben Whitten
-S: Maintained
-F: board/laird/wb50n/
-F: include/configs/wb50n.h
-F: configs/wb50n_defconfig
diff --git a/board/laird/wb50n/Makefile b/board/laird/wb50n/Makefile
deleted file mode 100644
index f4c3831db462..
--- a/board/laird/wb50n/Makefile
+++ /dev/null
@@ -1,4 +0,0 @@
-# SPDX-License-Identifier: GPL-2.0+
-#
-
-obj-y += wb50n.o
diff --git a/board/laird/wb50n/wb50n.c b/board/laird/wb50n/wb50n.c
deleted file mode 100644
index 8fa989a2a4ff..
--- a/board/laird/wb50n/wb50n.c
+++ /dev/null
@@ -1,206 +0,0 @@
-// SPDX-License-Identifier: GPL-2.0+
-/*
- */
-
-#include
-#include
-#include
-#include
-#include
-#include
-#include
-#include
-#include
-#include
-#include
-#include
-#include
-#include
-#include
-#include
-#include
-#include
-
-DECLARE_GLOBAL_DATA_PTR;
-
-/* - */
-/*
- * Miscelaneous platform dependent initialisations
- */
-
-void wb50n_nand_hw_init(void)
-{
- struct at91_smc *smc = (struct at91_smc *)ATMEL_BASE_SMC;
-
- at91_periph_clk_enable(ATMEL_ID_SMC);
-
- /* Configure SMC CS3 for NAND/SmartMedia */
- writel(AT91_SMC_SETUP_NWE(2) | AT91_SMC_SETUP_NCS_WR(1) |
- AT91_SMC_SETUP_NRD(2) | AT91_SMC_SETUP_NCS_RD(1),
- &smc->cs[3].setup);
- writel(AT91_SMC_PULSE_NWE(3) | AT91_SMC_PULSE_NCS_WR(5) |
- AT91_SMC_PULSE_NRD(3) | AT91_SMC_PULSE_NCS_RD(5),
- &smc->cs[3].pulse);
- writel(AT91_SMC_CYCLE_NWE(8) | AT91_SMC_CYCLE_NRD(8),
- &smc->cs[3].cycle);
- writel(AT91_SMC_TIMINGS_TCLR(3) | AT91_SMC_TIMINGS_TADL(10) |
- AT91_SMC_TIMINGS_TAR(3) | AT91_SMC_TIMINGS_TRR(4) |
- AT91_SMC_TIMINGS_TWB(5) | AT91_SMC_TIMINGS_RBNSEL(3) |
- AT91_SMC_TIMINGS_NFSEL(1), &smc->cs[3].timings);
- writel(AT91_SMC_MODE_RM_NRD | AT91_SMC_MODE_WM_NWE |
- AT91_SMC_MODE_EXNW_DISABLE |
- AT91_SMC_MODE_DBW_8 |
- AT91_SMC_MODE_TDF_CYCLE(3), &smc->cs[3].mode);
-
- /* Disable Flash Write Protect Line */
- at91_set_pio_output(AT91_PIO_PORTE, 14, 1);
-}
-
-int board_early_init_f(void)
-{
- at91_periph_clk_enable(ATMEL_ID_PIOA);
- at91_periph_clk_enable(ATMEL_ID_PIOB);
- at91_periph_clk_enable(ATMEL_ID_PIOC);
- at91_periph_clk_enable(ATMEL_ID_PIOD);
- at91_periph_clk_enable(ATMEL_ID_PIOE);
-
- at91_seriald_hw_init();
-
- return 0;
-}
-
-int board_init(void)
-{
- /* adress of boot parameters */
- gd->bd->bi_boot_params = CONFIG_SYS_SDRAM_BASE + 0x100;
-
- wb50n_nand_hw_init();
-
- at91_macb_hw_init();
-
- return 0;
-}
-
-int dram_init(void)
-{
- gd->ram_size = get_ram_size((void *)CONFIG_SYS_SDRAM_BASE,
-
[PATCH 18/57] arm: Remove bcm23550_w1d board
This board has not been converted to CONFIG_DM_MMC by the deadline.
Remove it.
Cc: Steve Rae
Signed-off-by: Tom Rini
---
arch/arm/Kconfig | 7 --
board/broadcom/bcm23550_w1d/Kconfig| 15 ---
board/broadcom/bcm23550_w1d/MAINTAINERS| 6 -
board/broadcom/bcm23550_w1d/Makefile | 5 -
board/broadcom/bcm23550_w1d/bcm23550_w1d.c | 125 -
configs/bcm23550_w1d_defconfig | 47
include/configs/bcm23550_w1d.h | 100 -
7 files changed, 305 deletions(-)
delete mode 100644 board/broadcom/bcm23550_w1d/Kconfig
delete mode 100644 board/broadcom/bcm23550_w1d/MAINTAINERS
delete mode 100644 board/broadcom/bcm23550_w1d/Makefile
delete mode 100644 board/broadcom/bcm23550_w1d/bcm23550_w1d.c
delete mode 100644 configs/bcm23550_w1d_defconfig
delete mode 100644 include/configs/bcm23550_w1d.h
diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index 6cf49b8ef050..9777dd6d4d9a 100644
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -656,12 +656,6 @@ config ARCH_BCMSTB
This enables support for Broadcom ARM-based set-top box
chipsets, including the 7445 family of chips.
-config TARGET_BCM23550_W1D
- bool "Support bcm23550_w1d"
- select CPU_V7A
- imply CRC32_VERIFY
- imply FAT_WRITE
-
config TARGET_BCMCYGNUS
bool "Support bcmcygnus"
select CPU_V7A
@@ -1925,7 +1919,6 @@ source "board/Marvell/octeontx/Kconfig"
source "board/Marvell/octeontx2/Kconfig"
source "board/armltd/vexpress64/Kconfig"
source "board/cortina/presidio-asic/Kconfig"
-source "board/broadcom/bcm23550_w1d/Kconfig"
source "board/broadcom/bcm963158/Kconfig"
source "board/broadcom/bcm968360bg/Kconfig"
source "board/broadcom/bcm968580xref/Kconfig"
diff --git a/board/broadcom/bcm23550_w1d/Kconfig
b/board/broadcom/bcm23550_w1d/Kconfig
deleted file mode 100644
index 007a127250d6..
--- a/board/broadcom/bcm23550_w1d/Kconfig
+++ /dev/null
@@ -1,15 +0,0 @@
-if TARGET_BCM23550_W1D
-
-config SYS_BOARD
- default "bcm23550_w1d"
-
-config SYS_VENDOR
- default "broadcom"
-
-config SYS_SOC
- default "bcm235xx"
-
-config SYS_CONFIG_NAME
- default "bcm23550_w1d"
-
-endif
diff --git a/board/broadcom/bcm23550_w1d/MAINTAINERS
b/board/broadcom/bcm23550_w1d/MAINTAINERS
deleted file mode 100644
index bde6337ce34f..
--- a/board/broadcom/bcm23550_w1d/MAINTAINERS
+++ /dev/null
@@ -1,6 +0,0 @@
-BCM23550_W1D BOARD
-M: Steve Rae
-S: Maintained
-F: board/broadcom/bcm23550_w1d/
-F: include/configs/bcm23550_w1d.h
-F: configs/bcm23550_w1d_defconfig
diff --git a/board/broadcom/bcm23550_w1d/Makefile
b/board/broadcom/bcm23550_w1d/Makefile
deleted file mode 100644
index 0552f3762e80..
--- a/board/broadcom/bcm23550_w1d/Makefile
+++ /dev/null
@@ -1,5 +0,0 @@
-# SPDX-License-Identifier: GPL-2.0+
-#
-# Copyright 2013 Broadcom Corporation.
-
-obj-y += bcm23550_w1d.o
diff --git a/board/broadcom/bcm23550_w1d/bcm23550_w1d.c
b/board/broadcom/bcm23550_w1d/bcm23550_w1d.c
deleted file mode 100644
index 90685c072a3b..
--- a/board/broadcom/bcm23550_w1d/bcm23550_w1d.c
+++ /dev/null
@@ -1,125 +0,0 @@
-// SPDX-License-Identifier: GPL-2.0+
-/*
- * Copyright 2013 Broadcom Corporation.
- */
-
-#include
-#include
-#include
-#include
-#include
-#include
-#include
-#include
-#include
-#include
-#include
-
-#include
-#include
-#include
-
-#define SECWATCHDOG_SDOGCR_OFFSET 0x
-#define SECWATCHDOG_SDOGCR_EN_SHIFT27
-#define SECWATCHDOG_SDOGCR_SRSTEN_SHIFT26
-#define SECWATCHDOG_SDOGCR_CLKS_SHIFT 20
-#define SECWATCHDOG_SDOGCR_LD_SHIFT0
-
-#ifndef CONFIG_USB_SERIALNO
-#define CONFIG_USB_SERIALNO "1234567890"
-#endif
-
-DECLARE_GLOBAL_DATA_PTR;
-
-/*
- * board_init - early hardware init
- */
-int board_init(void)
-{
- printf("Relocation Offset is: %08lx\n", gd->reloc_off);
-
- /* adress of boot parameters */
- gd->bd->bi_boot_params = CONFIG_SYS_SDRAM_BASE + 0x100;
-
- clk_init();
-
- return 0;
-}
-
-/*
- * misc_init_r - miscellaneous platform dependent initializations
- */
-int misc_init_r(void)
-{
- return 0;
-}
-
-/*
- * dram_init - sets uboots idea of sdram size
- */
-int dram_init(void)
-{
- gd->ram_size = get_ram_size((long *)CONFIG_SYS_SDRAM_BASE,
- CONFIG_SYS_SDRAM_SIZE);
- return 0;
-}
-
-/* This is called after dram_init() so use get_ram_size result */
-int dram_init_banksize(void)
-{
- gd->bd->bi_dram[0].start = CONFIG_SYS_SDRAM_BASE;
- gd->bd->bi_dram[0].size = gd->ram_size;
-
- return 0;
-}
-
-#ifdef CONFIG_MMC_SDHCI_KONA
-/*
- * mmc_init - Initializes mmc
- */
-int board_mmc_init(struct bd_info *bis)
-{
- int ret = 0;
-
- /* Register eMMC - SDIO2 */
- ret = kona_sdhci_init(1, 40, 0);
- if (ret)
- return ret;
-
- /* Register SD Card - SDIO4 kona_mmc
[PATCH 10/57] arm: Remove vexpress_ca15_tc2 board
This board has not been converted to CONFIG_DM_MMC by the deadline. Remove it. Cc: Linus Walleij Signed-off-by: Tom Rini --- .azure-pipelines.yml| 6 - .gitlab-ci.yml | 14 - arch/arm/Kconfig| 18 - arch/arm/dts/Makefile | 4 - arch/arm/dts/vexpress-v2m-rs1.dtsi | 437 --- arch/arm/dts/vexpress-v2m.dtsi | 451 arch/arm/dts/vexpress-v2p-ca15_a7.dts | 682 arch/arm/dts/vexpress-v2p-ca5s.dts | 280 -- arch/arm/dts/vexpress-v2p-ca9.dts | 368 - board/armltd/vexpress/Kconfig | 38 -- board/armltd/vexpress/MAINTAINERS | 10 - board/armltd/vexpress/Makefile | 7 - board/armltd/vexpress/vexpress_common.c | 204 --- board/armltd/vexpress/vexpress_tc2.c| 84 --- configs/vexpress_ca15_tc2_defconfig | 40 -- configs/vexpress_ca5x2_defconfig| 38 -- configs/vexpress_ca9x4_defconfig| 39 -- drivers/i2c/Kconfig | 2 +- include/configs/vexpress_ca15_tc2.h | 19 - include/configs/vexpress_ca5x2.h| 16 - include/configs/vexpress_ca9x4.h| 16 - 21 files changed, 1 insertion(+), 2772 deletions(-) delete mode 100644 arch/arm/dts/vexpress-v2m-rs1.dtsi delete mode 100644 arch/arm/dts/vexpress-v2m.dtsi delete mode 100644 arch/arm/dts/vexpress-v2p-ca15_a7.dts delete mode 100644 arch/arm/dts/vexpress-v2p-ca5s.dts delete mode 100644 arch/arm/dts/vexpress-v2p-ca9.dts delete mode 100644 board/armltd/vexpress/Kconfig delete mode 100644 board/armltd/vexpress/MAINTAINERS delete mode 100644 board/armltd/vexpress/Makefile delete mode 100644 board/armltd/vexpress/vexpress_common.c delete mode 100644 board/armltd/vexpress/vexpress_tc2.c delete mode 100644 configs/vexpress_ca15_tc2_defconfig delete mode 100644 configs/vexpress_ca5x2_defconfig delete mode 100644 configs/vexpress_ca9x4_defconfig delete mode 100644 include/configs/vexpress_ca15_tc2.h delete mode 100644 include/configs/vexpress_ca5x2.h delete mode 100644 include/configs/vexpress_ca9x4.h diff --git a/.azure-pipelines.yml b/.azure-pipelines.yml index a6279427e138..8a89a7959ee9 100644 --- a/.azure-pipelines.yml +++ b/.azure-pipelines.yml @@ -192,12 +192,6 @@ jobs: evb_ast2500: TEST_PY_BD: "evb-ast2500" TEST_PY_ID: "--id qemu" -vexpress_ca15_tc2: - TEST_PY_BD: "vexpress_ca15_tc2" - TEST_PY_ID: "--id qemu" -vexpress_ca9x4: - TEST_PY_BD: "vexpress_ca9x4" - TEST_PY_ID: "--id qemu" integratorcp_cm926ejs: TEST_PY_BD: "integratorcp_cm926ejs" TEST_PY_ID: "--id qemu" diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 2cdcd864c86a..8e18c3d8fbdd 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -217,20 +217,6 @@ sandbox_flattree test.py: TEST_PY_BD: "sandbox_flattree" <<: *buildman_and_testpy_dfn -vexpress_ca15_tc2 test.py: - tags: [ 'all' ] - variables: -TEST_PY_BD: "vexpress_ca15_tc2" -TEST_PY_ID: "--id qemu" - <<: *buildman_and_testpy_dfn - -vexpress_ca9x4 test.py: - tags: [ 'all' ] - variables: -TEST_PY_BD: "vexpress_ca9x4" -TEST_PY_ID: "--id qemu" - <<: *buildman_and_testpy_dfn - integratorcp_cm926ejs test.py: tags: [ 'all' ] variables: diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index 3f4a4da9a538..cb9bca038a3e 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig @@ -645,13 +645,6 @@ config ARCH_BCM6858 select OF_CONTROL imply CMD_DM -config TARGET_VEXPRESS_CA15_TC2 - bool "Support vexpress_ca15_tc2" - select CPU_V7A - select CPU_V7_HAS_NONSEC - select CPU_V7_HAS_VIRT - select PL011_SERIAL - config ARCH_BCMSTB bool "Broadcom BCM7XXX family" select CPU_V7A @@ -663,16 +656,6 @@ config ARCH_BCMSTB This enables support for Broadcom ARM-based set-top box chipsets, including the 7445 family of chips. -config TARGET_VEXPRESS_CA5X2 - bool "Support vexpress_ca5x2" - select CPU_V7A - select PL011_SERIAL - -config TARGET_VEXPRESS_CA9X4 - bool "Support vexpress_ca9x4" - select CPU_V7A - select PL011_SERIAL - config TARGET_BCM23550_W1D bool "Support bcm23550_w1d" select CPU_V7A @@ -1951,7 +1934,6 @@ source "board/Marvell/aspenite/Kconfig" source "board/Marvell/gplugd/Kconfig" source "board/Marvell/octeontx/Kconfig" source "board/Marvell/octeontx2/Kconfig" -source "board/armltd/vexpress/Kconfig" source "board/armltd/vexpress64/Kconfig" source "board/cortina/presidio-asic/Kconfig" source "board/broadcom/bcm23550_w1d/Kconfig" diff --git a/arch/arm/dts/Makefile b/arch/arm/dts/Makefile index 92aa6c97960a..f56f8580657c 100644 --- a/arch/arm/dts/Makefile +++ b/arch/arm/dts/Makefile @@ -1015,10 +1015,6 @@ dtb-$(CONFIG_TARGET_GE_BX50V3) += \ dtb-$(CONFIG_TARGET_GE_B1X5V2) += imx6dl-b1x5v2.dtb
[PATCH 12/57] arm: Remove s32v234evb board
This board has not been converted to CONFIG_DM_MMC by the deadline. Remove it. Cc: Eddy Petrișor Signed-off-by: Tom Rini --- arch/arm/Kconfig | 6 - arch/arm/cpu/armv8/Kconfig| 2 +- arch/arm/cpu/armv8/s32v234/Makefile | 6 - arch/arm/cpu/armv8/s32v234/cpu.c | 102 - arch/arm/cpu/armv8/s32v234/cpu.h | 7 - arch/arm/cpu/armv8/s32v234/generic.c | 354 -- arch/arm/include/asm/arch-s32v234/clock.h | 31 -- arch/arm/include/asm/arch-s32v234/ddr.h | 156 arch/arm/include/asm/arch-s32v234/imx-regs.h | 328 arch/arm/include/asm/arch-s32v234/lpddr2.h| 74 .../include/asm/arch-s32v234/mc_cgm_regs.h| 253 - .../arm/include/asm/arch-s32v234/mc_me_regs.h | 198 -- .../include/asm/arch-s32v234/mc_rgm_regs.h| 30 -- arch/arm/include/asm/arch-s32v234/mmdc.h | 88 - arch/arm/include/asm/arch-s32v234/siul.h | 149 board/freescale/s32v234evb/Kconfig| 23 -- board/freescale/s32v234evb/MAINTAINERS| 8 - board/freescale/s32v234evb/Makefile | 9 - board/freescale/s32v234evb/clock.c| 343 - board/freescale/s32v234evb/lpddr2.c | 136 --- board/freescale/s32v234evb/s32v234evb.c | 184 - board/freescale/s32v234evb/s32v234evb.cfg | 28 -- configs/s32v234evb_defconfig | 25 -- drivers/mmc/Kconfig | 2 +- include/configs/s32v234evb.h | 167 - 25 files changed, 2 insertions(+), 2707 deletions(-) delete mode 100644 arch/arm/cpu/armv8/s32v234/Makefile delete mode 100644 arch/arm/cpu/armv8/s32v234/cpu.c delete mode 100644 arch/arm/cpu/armv8/s32v234/cpu.h delete mode 100644 arch/arm/cpu/armv8/s32v234/generic.c delete mode 100644 arch/arm/include/asm/arch-s32v234/clock.h delete mode 100644 arch/arm/include/asm/arch-s32v234/ddr.h delete mode 100644 arch/arm/include/asm/arch-s32v234/imx-regs.h delete mode 100644 arch/arm/include/asm/arch-s32v234/lpddr2.h delete mode 100644 arch/arm/include/asm/arch-s32v234/mc_cgm_regs.h delete mode 100644 arch/arm/include/asm/arch-s32v234/mc_me_regs.h delete mode 100644 arch/arm/include/asm/arch-s32v234/mc_rgm_regs.h delete mode 100644 arch/arm/include/asm/arch-s32v234/mmdc.h delete mode 100644 arch/arm/include/asm/arch-s32v234/siul.h delete mode 100644 board/freescale/s32v234evb/Kconfig delete mode 100644 board/freescale/s32v234evb/MAINTAINERS delete mode 100644 board/freescale/s32v234evb/Makefile delete mode 100644 board/freescale/s32v234evb/clock.c delete mode 100644 board/freescale/s32v234evb/lpddr2.c delete mode 100644 board/freescale/s32v234evb/s32v234evb.c delete mode 100644 board/freescale/s32v234evb/s32v234evb.cfg delete mode 100644 configs/s32v234evb_defconfig delete mode 100644 include/configs/s32v234evb.h diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index cb9bca038a3e..31eefc340923 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig @@ -921,11 +921,6 @@ config ARCH_RMOBILE imply SYS_THUMB_BUILD imply ARCH_MISC_INIT if DISPLAY_CPUINFO -config TARGET_S32V234EVB - bool "Support s32v234evb" - select ARM64 - select SYS_FSL_ERRATUM_ESDHC111 - config ARCH_SNAPDRAGON bool "Qualcomm Snapdragon SoCs" select ARM64 @@ -1966,7 +1961,6 @@ source "board/freescale/ls1012aqds/Kconfig" source "board/freescale/ls1012ardb/Kconfig" source "board/freescale/ls1012afrdm/Kconfig" source "board/freescale/lx2160a/Kconfig" -source "board/freescale/s32v234evb/Kconfig" source "board/grinn/chiliboard/Kconfig" source "board/hisilicon/hikey/Kconfig" source "board/hisilicon/hikey960/Kconfig" diff --git a/arch/arm/cpu/armv8/Kconfig b/arch/arm/cpu/armv8/Kconfig index 9cd6a8d642b5..b7a10a8e34e6 100644 --- a/arch/arm/cpu/armv8/Kconfig +++ b/arch/arm/cpu/armv8/Kconfig @@ -116,7 +116,7 @@ config PSCI_RESET !TARGET_LS1046AFRWY && \ !TARGET_LS2081ARDB && !TARGET_LX2160ARDB && \ !TARGET_LX2160AQDS && !TARGET_LX2162AQDS && \ - !ARCH_UNIPHIER && !TARGET_S32V234EVB + !ARCH_UNIPHIER help Most armv8 systems have PSCI support enabled in EL3, either through ARM Trusted Firmware or other firmware. diff --git a/arch/arm/cpu/armv8/s32v234/Makefile b/arch/arm/cpu/armv8/s32v234/Makefile deleted file mode 100644 index 3bdb98d995e1.. --- a/arch/arm/cpu/armv8/s32v234/Makefile +++ /dev/null @@ -1,6 +0,0 @@ -# SPDX-License-Identifier: GPL-2.0+ -# -# (C) Copyright 2013-2016, Freescale Semiconductor, Inc. - -obj-y += generic.o -obj-y += cpu.o diff --git a/arch/arm/cpu/armv8/s32v234/cpu.c b/arch/arm/cpu/armv8/s32v234/cpu.c deleted file mode 100644 index 8ee3adc80584.. --- a/arch/arm/cpu/armv8/s32v234/cpu.c +++ /dev/null @@ -1,102 +0,0 @@ -// SPDX-
[PATCH 17/57] arm: Remove bcm28155_ap board
This board has not been converted to CONFIG_DM_MMC by the deadline.
Remove it.
Cc: Steve Rae
Signed-off-by: Tom Rini
---
arch/arm/Kconfig | 7 --
board/broadcom/bcm28155_ap/Kconfig | 15 ---
board/broadcom/bcm28155_ap/MAINTAINERS | 6 --
board/broadcom/bcm28155_ap/Makefile | 5 -
board/broadcom/bcm28155_ap/bcm28155_ap.c | 132 ---
configs/bcm11130_defconfig | 38 ---
configs/bcm11130_nand_defconfig | 40 ---
configs/bcm28155_ap_defconfig| 46
configs/bcm28155_w1d_defconfig | 41 ---
include/configs/bcm28155_ap.h| 97 -
10 files changed, 427 deletions(-)
delete mode 100644 board/broadcom/bcm28155_ap/Kconfig
delete mode 100644 board/broadcom/bcm28155_ap/MAINTAINERS
delete mode 100644 board/broadcom/bcm28155_ap/Makefile
delete mode 100644 board/broadcom/bcm28155_ap/bcm28155_ap.c
delete mode 100644 configs/bcm11130_defconfig
delete mode 100644 configs/bcm11130_nand_defconfig
delete mode 100644 configs/bcm28155_ap_defconfig
delete mode 100644 configs/bcm28155_w1d_defconfig
delete mode 100644 include/configs/bcm28155_ap.h
diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index cc05393771fd..6cf49b8ef050 100644
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -662,12 +662,6 @@ config TARGET_BCM23550_W1D
imply CRC32_VERIFY
imply FAT_WRITE
-config TARGET_BCM28155_AP
- bool "Support bcm28155_ap"
- select CPU_V7A
- imply CRC32_VERIFY
- imply FAT_WRITE
-
config TARGET_BCMCYGNUS
bool "Support bcmcygnus"
select CPU_V7A
@@ -1932,7 +1926,6 @@ source "board/Marvell/octeontx2/Kconfig"
source "board/armltd/vexpress64/Kconfig"
source "board/cortina/presidio-asic/Kconfig"
source "board/broadcom/bcm23550_w1d/Kconfig"
-source "board/broadcom/bcm28155_ap/Kconfig"
source "board/broadcom/bcm963158/Kconfig"
source "board/broadcom/bcm968360bg/Kconfig"
source "board/broadcom/bcm968580xref/Kconfig"
diff --git a/board/broadcom/bcm28155_ap/Kconfig
b/board/broadcom/bcm28155_ap/Kconfig
deleted file mode 100644
index f1b4e089411c..
--- a/board/broadcom/bcm28155_ap/Kconfig
+++ /dev/null
@@ -1,15 +0,0 @@
-if TARGET_BCM28155_AP
-
-config SYS_BOARD
- default "bcm28155_ap"
-
-config SYS_VENDOR
- default "broadcom"
-
-config SYS_SOC
- default "bcm281xx"
-
-config SYS_CONFIG_NAME
- default "bcm28155_ap"
-
-endif
diff --git a/board/broadcom/bcm28155_ap/MAINTAINERS
b/board/broadcom/bcm28155_ap/MAINTAINERS
deleted file mode 100644
index e1e99d0784f3..
--- a/board/broadcom/bcm28155_ap/MAINTAINERS
+++ /dev/null
@@ -1,6 +0,0 @@
-BCM28155_AP BOARD
-M: Steve Rae
-S: Maintained
-F: board/broadcom/bcm28155_ap/
-F: include/configs/bcm28155_ap.h
-F: configs/bcm28155_ap_defconfig
diff --git a/board/broadcom/bcm28155_ap/Makefile
b/board/broadcom/bcm28155_ap/Makefile
deleted file mode 100644
index 06eba8fbfde8..
--- a/board/broadcom/bcm28155_ap/Makefile
+++ /dev/null
@@ -1,5 +0,0 @@
-# SPDX-License-Identifier: GPL-2.0+
-#
-# Copyright 2013 Broadcom Corporation.
-
-obj-y += bcm28155_ap.o
diff --git a/board/broadcom/bcm28155_ap/bcm28155_ap.c
b/board/broadcom/bcm28155_ap/bcm28155_ap.c
deleted file mode 100644
index 43726f79bde3..
--- a/board/broadcom/bcm28155_ap/bcm28155_ap.c
+++ /dev/null
@@ -1,132 +0,0 @@
-// SPDX-License-Identifier: GPL-2.0+
-/*
- * Copyright 2013 Broadcom Corporation.
- */
-
-#include
-#include
-#include
-#include
-#include
-#include
-#include
-#include
-#include
-#include
-#include
-
-#include
-#include
-#include
-
-#define SECWATCHDOG_SDOGCR_OFFSET 0x
-#define SECWATCHDOG_SDOGCR_EN_SHIFT27
-#define SECWATCHDOG_SDOGCR_SRSTEN_SHIFT26
-#define SECWATCHDOG_SDOGCR_CLKS_SHIFT 20
-#define SECWATCHDOG_SDOGCR_LD_SHIFT0
-
-#ifndef CONFIG_USB_SERIALNO
-#define CONFIG_USB_SERIALNO "1234567890"
-#endif
-
-DECLARE_GLOBAL_DATA_PTR;
-
-/*
- * board_init - early hardware init
- */
-int board_init(void)
-{
- printf("Relocation Offset is: %08lx\n", gd->reloc_off);
-
- /* adress of boot parameters */
- gd->bd->bi_boot_params = CONFIG_SYS_SDRAM_BASE + 0x100;
-
- clk_init();
-
- return 0;
-}
-
-/*
- * misc_init_r - miscellaneous platform dependent initializations
- */
-int misc_init_r(void)
-{
- /* Disable watchdog reset - watchdog unused */
- writel((0 << SECWATCHDOG_SDOGCR_EN_SHIFT) |
- (0 << SECWATCHDOG_SDOGCR_SRSTEN_SHIFT) |
- (4 << SECWATCHDOG_SDOGCR_CLKS_SHIFT) |
- (0x5a0 << SECWATCHDOG_SDOGCR_LD_SHIFT),
- (SECWD_BASE_ADDR + SECWATCHDOG_SDOGCR_OFFSET));
-
- return 0;
-}
-
-/*
- * dram_init - sets uboots idea of sdram size
- */
-int dram_init(void)
-{
- gd->ram_size = get_ram_size((long *)CONFIG_SYS_SDRAM_BASE,
- CONFIG_SYS_SDRAM_SIZE);
- r
[PATCH 14/57] arm: Remove wb45n board
This board has not been converted to CONFIG_DM_MMC by the deadline.
Remove it.
Cc: Ben Whitten
Signed-off-by: Tom Rini
---
arch/arm/mach-at91/Kconfig| 6 -
board/laird/wb45n/Kconfig | 12 --
board/laird/wb45n/MAINTAINERS | 6 -
board/laird/wb45n/Makefile| 4 -
board/laird/wb45n/wb45n.c | 200 --
configs/wb45n_defconfig | 51 -
include/configs/wb45n.h | 124 -
7 files changed, 403 deletions(-)
delete mode 100644 board/laird/wb45n/Kconfig
delete mode 100644 board/laird/wb45n/MAINTAINERS
delete mode 100644 board/laird/wb45n/Makefile
delete mode 100644 board/laird/wb45n/wb45n.c
delete mode 100644 configs/wb45n_defconfig
delete mode 100644 include/configs/wb45n.h
diff --git a/arch/arm/mach-at91/Kconfig b/arch/arm/mach-at91/Kconfig
index c78a308f4884..5880e651bafd 100644
--- a/arch/arm/mach-at91/Kconfig
+++ b/arch/arm/mach-at91/Kconfig
@@ -303,11 +303,6 @@ config TARGET_VINCO
select SUPPORT_SPL
imply CMD_DM
-config TARGET_WB45N
- bool "Support Laird WB45N"
- select CPU_ARM926EJS
- select SUPPORT_SPL
-
config TARGET_WB50N
bool "Support Laird WB50N"
select BOARD_EARLY_INIT_F
@@ -358,7 +353,6 @@ source "board/ronetix/pm9g45/Kconfig"
source "board/siemens/corvus/Kconfig"
source "board/siemens/taurus/Kconfig"
source "board/siemens/smartweb/Kconfig"
-source "board/laird/wb45n/Kconfig"
source "board/laird/wb50n/Kconfig"
config SPL_LDSCRIPT
diff --git a/board/laird/wb45n/Kconfig b/board/laird/wb45n/Kconfig
deleted file mode 100644
index 2a67337293ef..
--- a/board/laird/wb45n/Kconfig
+++ /dev/null
@@ -1,12 +0,0 @@
-if TARGET_WB45N
-
-config SYS_BOARD
- default "wb45n"
-
-config SYS_VENDOR
- default "laird"
-
-config SYS_CONFIG_NAME
- default "wb45n"
-
-endif
diff --git a/board/laird/wb45n/MAINTAINERS b/board/laird/wb45n/MAINTAINERS
deleted file mode 100644
index 60bb56320103..
--- a/board/laird/wb45n/MAINTAINERS
+++ /dev/null
@@ -1,6 +0,0 @@
-WB45N CPU MODULE
-M: Ben Whitten
-S: Maintained
-F: board/laird/wb45n/
-F: include/configs/wb45n.h
-F: configs/wb45n_defconfig
diff --git a/board/laird/wb45n/Makefile b/board/laird/wb45n/Makefile
deleted file mode 100644
index 2971c6c95286..
--- a/board/laird/wb45n/Makefile
+++ /dev/null
@@ -1,4 +0,0 @@
-# SPDX-License-Identifier: GPL-2.0+
-#
-
-obj-y += wb45n.o
diff --git a/board/laird/wb45n/wb45n.c b/board/laird/wb45n/wb45n.c
deleted file mode 100644
index 5e1ef8a49ac4..
--- a/board/laird/wb45n/wb45n.c
+++ /dev/null
@@ -1,200 +0,0 @@
-// SPDX-License-Identifier: GPL-2.0+
-/*
- */
-
-#include
-#include
-#include
-#include
-#include
-#include
-#include
-#include
-#include
-#include
-#include
-#include
-
-DECLARE_GLOBAL_DATA_PTR;
-
-/* - */
-/*
- * Miscelaneous platform dependent initialisations
- */
-static void wb45n_nand_hw_init(void)
-{
- struct at91_smc *smc = (struct at91_smc *)ATMEL_BASE_SMC;
- struct at91_matrix *matrix = (struct at91_matrix *)ATMEL_BASE_MATRIX;
- unsigned long csa;
-
- csa = readl(&matrix->ebicsa);
- /* Enable CS3 */
- csa |= AT91_MATRIX_EBI_CS3A_SMC_SMARTMEDIA;
- /* NAND flash on D0 */
- csa &= ~AT91_MATRIX_NFD0_ON_D16;
- writel(csa, &matrix->ebicsa);
-
- /* Configure SMC CS3 for NAND/SmartMedia */
- writel(AT91_SMC_SETUP_NWE(1) | AT91_SMC_SETUP_NCS_WR(0) |
- AT91_SMC_SETUP_NRD(1) | AT91_SMC_SETUP_NCS_RD(0),
- &smc->cs[3].setup);
- writel(AT91_SMC_PULSE_NWE(3) | AT91_SMC_PULSE_NCS_WR(5) |
- AT91_SMC_PULSE_NRD(4) | AT91_SMC_PULSE_NCS_RD(6),
- &smc->cs[3].pulse);
- writel(AT91_SMC_CYCLE_NWE(5) | AT91_SMC_CYCLE_NRD(6),
- &smc->cs[3].cycle);
- writel(AT91_SMC_MODE_RM_NRD | AT91_SMC_MODE_WM_NWE |
- AT91_SMC_MODE_EXNW_DISABLE |
- AT91_SMC_MODE_DBW_8 |
- AT91_SMC_MODE_TDF_CYCLE(1), &smc->cs[3].mode);
-
- at91_periph_clk_enable(ATMEL_ID_PIOCD);
-
- /* Configure RDY/BSY */
- at91_set_gpio_input(CONFIG_SYS_NAND_READY_PIN, 1);
- /* Enable NandFlash */
- at91_set_gpio_output(CONFIG_SYS_NAND_ENABLE_PIN, 1);
- /* Disable Flash Write Protect Line */
- at91_set_gpio_output(AT91_PIN_PD10, 1);
-
- at91_set_a_periph(AT91_PIO_PORTD, 0, 1);/* NAND OE */
- at91_set_a_periph(AT91_PIO_PORTD, 1, 1);/* NAND WE */
- at91_set_a_periph(AT91_PIO_PORTD, 2, 1);/* NAND ALE */
- at91_set_a_periph(AT91_PIO_PORTD, 3, 1);/* NAND CLE */
-}
-
-static void wb45n_gpio_hw_init(void)
-{
-
- /* Configure wifi gpio CHIP_PWD_L */
- at91_set_gpio_output(AT91_PIN_PA28, 0);
-
- /* Setup USB pins */
- at91_set_gpio_input(AT91_PIN_PB11, 0);
- at91_set_gpio_output(AT
[PATCH 13/57] arm: Remove bcm958712k board
This board has not been converted to CONFIG_DM_MMC by the deadline.
Remove it.
Cc: Jon Mason
Signed-off-by: Tom Rini
---
arch/arm/Kconfig | 1 -
board/broadcom/bcm958712k/MAINTAINERS | 6 ---
board/broadcom/bcmns2/Kconfig | 15 ---
board/broadcom/bcmns2/Makefile| 5 ---
board/broadcom/bcmns2/northstar2.c| 63 ---
configs/bcm958712k_defconfig | 14 --
include/configs/bcm_northstar2.h | 42 --
7 files changed, 146 deletions(-)
delete mode 100644 board/broadcom/bcm958712k/MAINTAINERS
delete mode 100644 board/broadcom/bcmns2/Kconfig
delete mode 100644 board/broadcom/bcmns2/Makefile
delete mode 100644 board/broadcom/bcmns2/northstar2.c
delete mode 100644 configs/bcm958712k_defconfig
delete mode 100644 include/configs/bcm_northstar2.h
diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index 31eefc340923..cc05393771fd 100644
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -1938,7 +1938,6 @@ source "board/broadcom/bcm968360bg/Kconfig"
source "board/broadcom/bcm968580xref/Kconfig"
source "board/broadcom/bcmcygnus/Kconfig"
source "board/broadcom/bcmnsp/Kconfig"
-source "board/broadcom/bcmns2/Kconfig"
source "board/broadcom/bcmns3/Kconfig"
source "board/cavium/thunderx/Kconfig"
source "board/cirrus/edb93xx/Kconfig"
diff --git a/board/broadcom/bcm958712k/MAINTAINERS
b/board/broadcom/bcm958712k/MAINTAINERS
deleted file mode 100644
index 024fb1447d23..
--- a/board/broadcom/bcm958712k/MAINTAINERS
+++ /dev/null
@@ -1,6 +0,0 @@
-BCM958712K BOARD
-M: Jon Mason
-S: Maintained
-F: board/broadcom/bcmns2/
-F: include/configs/bcm_northstar2.h
-F: configs/bcm958712k_defconfig
diff --git a/board/broadcom/bcmns2/Kconfig b/board/broadcom/bcmns2/Kconfig
deleted file mode 100644
index 3ac67249c4d7..
--- a/board/broadcom/bcmns2/Kconfig
+++ /dev/null
@@ -1,15 +0,0 @@
-if TARGET_BCMNS2
-
-config SYS_BOARD
- default "bcmns2"
-
-config SYS_VENDOR
- default "broadcom"
-
-config SYS_SOC
- default "ns2"
-
-config SYS_CONFIG_NAME
- default "bcm_northstar2"
-
-endif
diff --git a/board/broadcom/bcmns2/Makefile b/board/broadcom/bcmns2/Makefile
deleted file mode 100644
index 29274bd106ce..
--- a/board/broadcom/bcmns2/Makefile
+++ /dev/null
@@ -1,5 +0,0 @@
-# SPDX-License-Identifier: GPL-2.0+
-#
-# Copyright 2016 Broadcom Ltd.
-
-obj-y := northstar2.o
diff --git a/board/broadcom/bcmns2/northstar2.c
b/board/broadcom/bcmns2/northstar2.c
deleted file mode 100644
index 494e457ff65b..
--- a/board/broadcom/bcmns2/northstar2.c
+++ /dev/null
@@ -1,63 +0,0 @@
-// SPDX-License-Identifier: GPL-2.0+
-/*
- * (C) Copyright 2016 Broadcom Ltd.
- */
-#include
-#include
-#include
-#include
-#include
-#include
-#include
-
-static struct mm_region ns2_mem_map[] = {
- {
- .virt = 0x0UL,
- .phys = 0x0UL,
- .size = 0x8000UL,
- .attrs = PTE_BLOCK_MEMTYPE(MT_DEVICE_NGNRNE) |
-PTE_BLOCK_NON_SHARE |
-PTE_BLOCK_PXN | PTE_BLOCK_UXN
- }, {
- .virt = 0x8000UL,
- .phys = 0x8000UL,
- .size = 0xff8000UL,
- .attrs = PTE_BLOCK_MEMTYPE(MT_NORMAL) |
-PTE_BLOCK_INNER_SHARE
- }, {
- /* List terminator */
- 0,
- }
-};
-
-struct mm_region *mem_map = ns2_mem_map;
-
-DECLARE_GLOBAL_DATA_PTR;
-
-int board_init(void)
-{
- return 0;
-}
-
-int dram_init(void)
-{
- gd->ram_size = get_ram_size((long *)CONFIG_SYS_SDRAM_BASE,
- PHYS_SDRAM_1_SIZE + PHYS_SDRAM_2_SIZE);
- return 0;
-}
-
-int dram_init_banksize(void)
-{
- gd->bd->bi_dram[0].start = CONFIG_SYS_SDRAM_BASE;
- gd->bd->bi_dram[0].size = PHYS_SDRAM_1_SIZE;
-
- gd->bd->bi_dram[1].start = CONFIG_SYS_SDRAM_BASE + PHYS_SDRAM_1_SIZE;
- gd->bd->bi_dram[1].size = PHYS_SDRAM_2_SIZE;
-
- return 0;
-}
-
-void reset_cpu(ulong addr)
-{
- psci_system_reset();
-}
diff --git a/configs/bcm958712k_defconfig b/configs/bcm958712k_defconfig
deleted file mode 100644
index 74070f555b65..
--- a/configs/bcm958712k_defconfig
+++ /dev/null
@@ -1,14 +0,0 @@
-CONFIG_ARM=y
-CONFIG_TARGET_BCMNS2=y
-CONFIG_SYS_TEXT_BASE=0x8500
-CONFIG_NR_DRAM_BANKS=2
-CONFIG_ENV_SIZE=0x2000
-CONFIG_IDENT_STRING=" Broadcom Northstar 2"
-CONFIG_DISTRO_DEFAULTS=y
-CONFIG_BOOTDELAY=5
-# CONFIG_DISPLAY_CPUINFO is not set
-CONFIG_SYS_PROMPT="u-boot> "
-CONFIG_SYS_RELOC_GD_ENV_ADDR=y
-CONFIG_CONS_INDEX=4
-CONFIG_SYS_NS16550=y
-CONFIG_OF_LIBFDT=y
diff --git a/include/configs/bcm_northstar2.h b/include/configs/bcm_northstar2.h
deleted file mode 100644
index fbfab288b372..
--- a/include/configs/bcm_northstar2.h
+++ /dev/null
@@ -1,42 +0,0 @@
-/* SPDX-License-Identifier: GPL-2.0+ */
-/*
- * Configuration for Broadcom N
[PATCH 11/57] arm: Remove secomx6quq7 board
This board has not been converted to CONFIG_DM_MMC by the deadline.
Remove it.
Cc: Boris Brezillon
Signed-off-by: Tom Rini
---
arch/arm/mach-imx/mx6/Kconfig | 4 -
board/seco/Kconfig| 65 ---
board/seco/common/Makefile| 3 -
board/seco/common/mx6.c | 137 --
board/seco/common/mx6.h | 9 --
board/seco/mx6quq7/MAINTAINERS| 6 -
board/seco/mx6quq7/Makefile | 5 -
board/seco/mx6quq7/mx6quq7-2g.cfg | 172
board/seco/mx6quq7/mx6quq7.c | 181 --
configs/secomx6quq7_defconfig | 39 ---
include/configs/secomx6quq7.h | 81 -
11 files changed, 702 deletions(-)
delete mode 100644 board/seco/Kconfig
delete mode 100644 board/seco/common/Makefile
delete mode 100644 board/seco/common/mx6.c
delete mode 100644 board/seco/common/mx6.h
delete mode 100644 board/seco/mx6quq7/MAINTAINERS
delete mode 100644 board/seco/mx6quq7/Makefile
delete mode 100644 board/seco/mx6quq7/mx6quq7-2g.cfg
delete mode 100644 board/seco/mx6quq7/mx6quq7.c
delete mode 100644 configs/secomx6quq7_defconfig
delete mode 100644 include/configs/secomx6quq7.h
diff --git a/arch/arm/mach-imx/mx6/Kconfig b/arch/arm/mach-imx/mx6/Kconfig
index efd5ae054f6d..013468833984 100644
--- a/arch/arm/mach-imx/mx6/Kconfig
+++ b/arch/arm/mach-imx/mx6/Kconfig
@@ -546,9 +546,6 @@ config TARGET_PCL063_ULL
select DM_THERMAL
select SUPPORT_SPL
-config TARGET_SECOMX6
- bool "secomx6 boards"
-
config TARGET_SKSIMX6
bool "sks-imx6"
depends on MX6QDL
@@ -729,7 +726,6 @@ source "board/softing/vining_2000/Kconfig"
source "board/liebherr/display5/Kconfig"
source "board/liebherr/mccmon6/Kconfig"
source "board/logicpd/imx6/Kconfig"
-source "board/seco/Kconfig"
source "board/sks-kinkel/sksimx6/Kconfig"
source "board/solidrun/mx6cuboxi/Kconfig"
source "board/somlabs/visionsom-6ull/Kconfig"
diff --git a/board/seco/Kconfig b/board/seco/Kconfig
deleted file mode 100644
index 12dd965ad52a..
--- a/board/seco/Kconfig
+++ /dev/null
@@ -1,65 +0,0 @@
-if TARGET_SECOMX6
-
-choice
- prompt "SECO i.MX6 Board variant"
- optional
-
-config SECOMX6_Q7
- bool "Q7"
-
-config SECOMX6_UQ7
- bool "uQ7"
-
-config SECOMX6_USBC
- bool "uSBC"
-
-endchoice
-
-choice
- prompt "SECO i.MX6 SoC variant"
- optional
-
-config SECOMX6Q
- bool "i.MX6Q"
- depends on MX6Q
-
-config SECOMX6DL
- bool "i.MX6DL"
- depends on MX6DL
-
-config SECOMX6S
- bool "i.MX6S"
- depends on MX6S
-
-endchoice
-
-choice
- prompt "DDR size"
-
-config SECOMX6_512MB
- bool "512MB"
-
-config SECOMX6_1GB
- bool "1GB"
-
-config SECOMX6_2GB
- bool "2GB"
-
-config SECOMX6_4GB
- bool "4GB"
-
-endchoice
-
-config IMX_CONFIG
- default "board/seco/mx6quq7/mx6quq7-2g.cfg" if SECOMX6_UQ7 && SECOMX6Q
&& SECOMX6_2GB
-
-config SYS_BOARD
- default "mx6quq7" if SECOMX6_UQ7 && SECOMX6Q
-
-config SYS_VENDOR
- default "seco"
-
-config SYS_CONFIG_NAME
- default "secomx6quq7" if SECOMX6_UQ7 && SECOMX6Q
-
-endif
diff --git a/board/seco/common/Makefile b/board/seco/common/Makefile
deleted file mode 100644
index 4220e89bc5c0..
--- a/board/seco/common/Makefile
+++ /dev/null
@@ -1,3 +0,0 @@
-# SPDX-License-Identifier: GPL-2.0+
-
-obj-$(CONFIG_TARGET_SECOMX6) += mx6.o
diff --git a/board/seco/common/mx6.c b/board/seco/common/mx6.c
deleted file mode 100644
index 51832b9d082f..
--- a/board/seco/common/mx6.c
+++ /dev/null
@@ -1,137 +0,0 @@
-// SPDX-License-Identifier: GPL-2.0+
-/*
- * Copyright (C) 2013 Freescale Semiconductor, Inc.
- * Copyright (C) 2015 ECA Sinters
- *
- * Author: Fabio Estevam
- * Modified by: Boris Brezillon
- */
-
-#include
-#include
-#include
-#include
-#include
-#include
-#include
-#include
-#include
-#include
-#include
-#include
-#include
-#include
-#include
-#include
-#include
-#include
-#include
-#include
-#include
-
-#define UART_PAD_CTRL (PAD_CTL_PUS_100K_UP | \
- PAD_CTL_SPEED_MED | PAD_CTL_DSE_40ohm | \
- PAD_CTL_SRE_FAST | PAD_CTL_HYS)
-
-static iomux_v3_cfg_t const uart2_pads[] = {
- MX6_PAD_EIM_D26__UART2_TX_DATA | MUX_PAD_CTRL(UART_PAD_CTRL),
- MX6_PAD_EIM_D27__UART2_RX_DATA | MUX_PAD_CTRL(UART_PAD_CTRL),
-};
-
-void seco_mx6_setup_uart_iomux(void)
-{
- imx_iomux_v3_setup_multiple_pads(uart2_pads, ARRAY_SIZE(uart2_pads));
-}
-
-#define ENET_PAD_CTRL (PAD_CTL_PUS_47K_UP | \
-PAD_CTL_SPEED_MED |\
-PAD_CTL_DSE_40ohm |\
-PAD_CTL_HYS)
-
-static iomux_v3_cfg_t const enet_pads[] = {
- MX6_PAD_ENET_MDIO__ENET_MDIO| MUX_PAD_CTRL(ENET_PAD_CTRL),
- MX6_PAD_ENET_MDC__ENET_MDC | MUX_PAD_CTRL(ENET_PAD_CTRL),
- MX6_PAD_RGMII_TXC__RGMII_TXC
[PATCH 08/57] arm: Remove openrd board
This board has not been converted to CONFIG_DM_MMC by the deadline.
Remove it.
Cc: Stefan Roese
Signed-off-by: Tom Rini
---
arch/arm/dts/Makefile | 3 -
arch/arm/dts/kirkwood-openrd-base.dts | 39 --
arch/arm/dts/kirkwood-openrd-client.dts | 73 --
arch/arm/dts/kirkwood-openrd-ultimate.dts | 55
arch/arm/dts/kirkwood-openrd.dtsi | 122
arch/arm/mach-kirkwood/Kconfig| 4 -
board/Marvell/openrd/Kconfig | 12 --
board/Marvell/openrd/MAINTAINERS | 8 --
board/Marvell/openrd/Makefile | 12 --
board/Marvell/openrd/kwbimage.cfg | 150
board/Marvell/openrd/openrd.c | 163 --
board/Marvell/openrd/openrd.h | 29
configs/openrd_base_defconfig | 49 ---
configs/openrd_client_defconfig | 49 ---
configs/openrd_ultimate_defconfig | 49 ---
include/configs/openrd.h | 82 ---
16 files changed, 899 deletions(-)
delete mode 100644 arch/arm/dts/kirkwood-openrd-base.dts
delete mode 100644 arch/arm/dts/kirkwood-openrd-client.dts
delete mode 100644 arch/arm/dts/kirkwood-openrd-ultimate.dts
delete mode 100644 arch/arm/dts/kirkwood-openrd.dtsi
delete mode 100644 board/Marvell/openrd/Kconfig
delete mode 100644 board/Marvell/openrd/MAINTAINERS
delete mode 100644 board/Marvell/openrd/Makefile
delete mode 100644 board/Marvell/openrd/kwbimage.cfg
delete mode 100644 board/Marvell/openrd/openrd.c
delete mode 100644 board/Marvell/openrd/openrd.h
delete mode 100644 configs/openrd_base_defconfig
delete mode 100644 configs/openrd_client_defconfig
delete mode 100644 configs/openrd_ultimate_defconfig
delete mode 100644 include/configs/openrd.h
diff --git a/arch/arm/dts/Makefile b/arch/arm/dts/Makefile
index 4f879c86a2ae..bc00944acdf4 100644
--- a/arch/arm/dts/Makefile
+++ b/arch/arm/dts/Makefile
@@ -56,9 +56,6 @@ dtb-$(CONFIG_ARCH_KIRKWOOD) += \
kirkwood-ns2lite.dtb \
kirkwood-ns2max.dtb \
kirkwood-ns2mini.dtb \
- kirkwood-openrd-base.dtb \
- kirkwood-openrd-client.dtb \
- kirkwood-openrd-ultimate.dtb \
kirkwood-pogo_e02.dtb \
kirkwood-sheevaplug.dtb
diff --git a/arch/arm/dts/kirkwood-openrd-base.dts
b/arch/arm/dts/kirkwood-openrd-base.dts
deleted file mode 100644
index 094191ece3d7..
--- a/arch/arm/dts/kirkwood-openrd-base.dts
+++ /dev/null
@@ -1,39 +0,0 @@
-// SPDX-License-Identifier: GPL-2.0
-/*
- * Marvell OpenRD Base Board Description
- *
- * Andrew Lunn
- *
- * This file contains the definitions that are specific to OpenRD
- * base variant of the Marvell Kirkwood Development Board.
- */
-
-/dts-v1/;
-
-#include "kirkwood-openrd.dtsi"
-
-/ {
- model = "OpenRD Base";
- compatible = "marvell,openrd-base", "marvell,openrd",
"marvell,kirkwood-88f6281", "marvell,kirkwood";
-
- ocp@f100 {
- serial@12100 {
- status = "okay";
- };
- };
-};
-
-&mdio {
- status = "okay";
-
- ethphy0: ethernet-phy@8 {
- reg = <8>;
- };
-};
-
-ð0 {
- status = "okay";
- ethernet0-port@0 {
- phy-handle = <ðphy0>;
- };
-};
diff --git a/arch/arm/dts/kirkwood-openrd-client.dts
b/arch/arm/dts/kirkwood-openrd-client.dts
deleted file mode 100644
index 74dc23daf646..
--- a/arch/arm/dts/kirkwood-openrd-client.dts
+++ /dev/null
@@ -1,73 +0,0 @@
-// SPDX-License-Identifier: GPL-2.0
-/*
- * Marvell OpenRD Client Board Description
- *
- * Andrew Lunn
- *
- * This file contains the definitions that are specific to OpenRD
- * client variant of the Marvell Kirkwood Development Board.
- */
-
-/dts-v1/;
-
-#include "kirkwood-openrd.dtsi"
-
-/ {
- model = "OpenRD Client";
- compatible = "marvell,openrd-client", "marvell,openrd",
"marvell,kirkwood-88f6281", "marvell,kirkwood";
-
- ocp@f100 {
- audio-controller@a {
- status = "okay";
- };
- i2c@11000 {
- status = "okay";
- clock-frequency = <40>;
-
- cs42l51: cs42l51@4a {
- compatible = "cirrus,cs42l51";
- reg = <0x4a>;
- #sound-dai-cells = <0>;
- };
- };
- };
-
- sound {
- compatible = "simple-audio-card";
- simple-audio-card,format = "i2s";
- simple-audio-card,mclk-fs = <256>;
-
- simple-audio-card,cpu {
- sound-dai = <&audio0 0>;
- };
-
- simple-audio-card,codec {
- sound-dai = <&cs42l51>;
- };
- };
-};
-
-&mdio {
- status = "okay";
-
- ethphy0: ethernet-phy@8 {
-
[PATCH 09/57] arm: Remove sheevaplug board
This board has not been converted to CONFIG_DM_MMC by the deadline.
Remove it.
Cc: Prafulla Wadaskar
Signed-off-by: Tom Rini
---
arch/arm/dts/Makefile| 3 +-
arch/arm/dts/kirkwood-sheevaplug-common.dtsi | 104 --
arch/arm/dts/kirkwood-sheevaplug.dts | 42 --
arch/arm/mach-kirkwood/Kconfig | 4 -
board/Marvell/sheevaplug/Kconfig | 12 --
board/Marvell/sheevaplug/MAINTAINERS | 6 -
board/Marvell/sheevaplug/Makefile| 7 -
board/Marvell/sheevaplug/kwbimage.cfg| 144 ---
board/Marvell/sheevaplug/sheevaplug.c| 136 --
board/Marvell/sheevaplug/sheevaplug.h| 24
configs/sheevaplug_defconfig | 55 ---
include/configs/sheevaplug.h | 73 --
12 files changed, 1 insertion(+), 609 deletions(-)
delete mode 100644 arch/arm/dts/kirkwood-sheevaplug-common.dtsi
delete mode 100644 arch/arm/dts/kirkwood-sheevaplug.dts
delete mode 100644 board/Marvell/sheevaplug/Kconfig
delete mode 100644 board/Marvell/sheevaplug/MAINTAINERS
delete mode 100644 board/Marvell/sheevaplug/Makefile
delete mode 100644 board/Marvell/sheevaplug/kwbimage.cfg
delete mode 100644 board/Marvell/sheevaplug/sheevaplug.c
delete mode 100644 board/Marvell/sheevaplug/sheevaplug.h
delete mode 100644 configs/sheevaplug_defconfig
delete mode 100644 include/configs/sheevaplug.h
diff --git a/arch/arm/dts/Makefile b/arch/arm/dts/Makefile
index bc00944acdf4..92aa6c97960a 100644
--- a/arch/arm/dts/Makefile
+++ b/arch/arm/dts/Makefile
@@ -56,8 +56,7 @@ dtb-$(CONFIG_ARCH_KIRKWOOD) += \
kirkwood-ns2lite.dtb \
kirkwood-ns2max.dtb \
kirkwood-ns2mini.dtb \
- kirkwood-pogo_e02.dtb \
- kirkwood-sheevaplug.dtb
+ kirkwood-pogo_e02.dtb
dtb-$(CONFIG_MACH_S900) += \
bubblegum_96.dtb
diff --git a/arch/arm/dts/kirkwood-sheevaplug-common.dtsi
b/arch/arm/dts/kirkwood-sheevaplug-common.dtsi
deleted file mode 100644
index 0a698d3b7393..
--- a/arch/arm/dts/kirkwood-sheevaplug-common.dtsi
+++ /dev/null
@@ -1,104 +0,0 @@
-// SPDX-License-Identifier: GPL-2.0
-/*
- * kirkwood-sheevaplug-common.dtsi - Common parts for Sheevaplugs
- *
- * Copyright (C) 2013 Simon Baatz
- */
-
-#include "kirkwood.dtsi"
-#include "kirkwood-6281.dtsi"
-
-/ {
- memory {
- device_type = "memory";
- reg = <0x 0x2000>;
- };
-
- chosen {
- bootargs = "console=ttyS0,115200n8 earlyprintk";
- stdout-path = &uart0;
- };
-
- ocp@f100 {
- pinctrl: pin-controller@1 {
-
- pmx_usb_power_enable: pmx-usb-power-enable {
- marvell,pins = "mpp29";
- marvell,function = "gpio";
- };
- pmx_led_red: pmx-led-red {
- marvell,pins = "mpp46";
- marvell,function = "gpio";
- };
- pmx_led_blue: pmx-led-blue {
- marvell,pins = "mpp49";
- marvell,function = "gpio";
- };
- pmx_sdio_cd: pmx-sdio-cd {
- marvell,pins = "mpp44";
- marvell,function = "gpio";
- };
- pmx_sdio_wp: pmx-sdio-wp {
- marvell,pins = "mpp47";
- marvell,function = "gpio";
- };
- };
- serial@12000 {
- status = "okay";
- };
- };
-
- regulators {
- compatible = "simple-bus";
- #address-cells = <1>;
- #size-cells = <0>;
- pinctrl-0 = <&pmx_usb_power_enable>;
- pinctrl-names = "default";
-
- usb_power: regulator@1 {
- compatible = "regulator-fixed";
- reg = <1>;
- regulator-name = "USB Power";
- regulator-min-microvolt = <500>;
- regulator-max-microvolt = <500>;
- enable-active-high;
- regulator-always-on;
- regulator-boot-on;
- gpio = <&gpio0 29 0>;
- };
- };
-};
-
-&nand {
- status = "okay";
-
- partition@0 {
- label = "u-boot";
- reg = <0x000 0x10>;
- };
-
- partition@10 {
- label = "uImage";
- reg = <0x010 0x40>;
- };
-
- partition@50 {
- label = "root";
- reg = <0x050 0x1fb0>;
- };
-};
-
-&mdio {
- status = "okay";
-
-
[PATCH 06/57] arm: Remove apf27 board
This board has not been converted to CONFIG_DM_MMC by the deadline.
Remove it.
Cc: Philippe Reynes
Cc: Eric Jarrige
Signed-off-by: Tom Rini
---
arch/arm/Kconfig | 6 -
board/armadeus/apf27/Kconfig | 15 -
board/armadeus/apf27/MAINTAINERS | 7 -
board/armadeus/apf27/Makefile| 12 -
board/armadeus/apf27/apf27.c | 259 --
board/armadeus/apf27/apf27.h | 488 ---
board/armadeus/apf27/fpga.c | 226 -
board/armadeus/apf27/fpga.h | 24 --
board/armadeus/apf27/lowlevel_init.S | 166 -
configs/apf27_defconfig | 59
drivers/serial/Kconfig | 2 +-
include/configs/apf27.h | 266 ---
12 files changed, 1 insertion(+), 1529 deletions(-)
delete mode 100644 board/armadeus/apf27/Kconfig
delete mode 100644 board/armadeus/apf27/MAINTAINERS
delete mode 100644 board/armadeus/apf27/Makefile
delete mode 100644 board/armadeus/apf27/apf27.c
delete mode 100644 board/armadeus/apf27/apf27.h
delete mode 100644 board/armadeus/apf27/fpga.c
delete mode 100644 board/armadeus/apf27/fpga.h
delete mode 100644 board/armadeus/apf27/lowlevel_init.S
delete mode 100644 configs/apf27_defconfig
delete mode 100644 include/configs/apf27.h
diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index 3b51d666e7ca..3f4a4da9a538 100644
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -561,11 +561,6 @@ config ARCH_MVEBU
select SPI
imply CMD_DM
-config TARGET_APF27
- bool "Support apf27"
- select CPU_ARM926EJS
- select SUPPORT_SPL
-
config ARCH_ORION5X
bool "Marvell Orion"
select CPU_ARM926EJS
@@ -1956,7 +1951,6 @@ source "board/Marvell/aspenite/Kconfig"
source "board/Marvell/gplugd/Kconfig"
source "board/Marvell/octeontx/Kconfig"
source "board/Marvell/octeontx2/Kconfig"
-source "board/armadeus/apf27/Kconfig"
source "board/armltd/vexpress/Kconfig"
source "board/armltd/vexpress64/Kconfig"
source "board/cortina/presidio-asic/Kconfig"
diff --git a/board/armadeus/apf27/Kconfig b/board/armadeus/apf27/Kconfig
deleted file mode 100644
index 65544a844834..
--- a/board/armadeus/apf27/Kconfig
+++ /dev/null
@@ -1,15 +0,0 @@
-if TARGET_APF27
-
-config SYS_BOARD
- default "apf27"
-
-config SYS_VENDOR
- default "armadeus"
-
-config SYS_SOC
- default "mx27"
-
-config SYS_CONFIG_NAME
- default "apf27"
-
-endif
diff --git a/board/armadeus/apf27/MAINTAINERS b/board/armadeus/apf27/MAINTAINERS
deleted file mode 100644
index 09f0525c51b9..
--- a/board/armadeus/apf27/MAINTAINERS
+++ /dev/null
@@ -1,7 +0,0 @@
-APF27 BOARD
-M: Philippe Reynes
-M: Eric Jarrige
-S: Maintained
-F: board/armadeus/apf27/
-F: include/configs/apf27.h
-F: configs/apf27_defconfig
diff --git a/board/armadeus/apf27/Makefile b/board/armadeus/apf27/Makefile
deleted file mode 100644
index 57129718d5c5..
--- a/board/armadeus/apf27/Makefile
+++ /dev/null
@@ -1,12 +0,0 @@
-#
-# (C) Copyright 2000-2004
-# Wolfgang Denk, DENX Software Engineering, w...@denx.de.
-# (C) Copyright 2012-2013
-# Eric Jarrige
-#
-# SPDX-License-Identifier:GPL-2.0+
-#
-
-obj-y := apf27.o
-obj-y += lowlevel_init.o
-obj-$(CONFIG_FPGA) += fpga.o
diff --git a/board/armadeus/apf27/apf27.c b/board/armadeus/apf27/apf27.c
deleted file mode 100644
index 5e3fdd36fa21..
--- a/board/armadeus/apf27/apf27.c
+++ /dev/null
@@ -1,259 +0,0 @@
-// SPDX-License-Identifier: GPL-2.0+
-/*
- * Copyright (C) 2008-2013 Eric Jarrige
- *
- * based on the files by
- * Sascha Hauer, Pengutronix
- */
-
-#include
-#include
-#include
-#include
-#include
-#include
-#include
-#include
-#include
-#include
-#include
-#include
-#include
-#include "apf27.h"
-#include "fpga.h"
-
-DECLARE_GLOBAL_DATA_PTR;
-
-/*
- * Fuse bank 1 row 8 is "reserved for future use" and therefore available for
- * customer use. The APF27 board uses this fuse to store the board revision:
- * 0: initial board revision
- * 1: first revision - Presence of the second RAM chip on the board is blown in
- * fuse bank 1 row 9 bit 0 - No hardware change
- * N: to be defined
- */
-static u32 get_board_rev(void)
-{
- struct iim_regs *iim = (struct iim_regs *)IMX_IIM_BASE;
-
- return readl(&iim->bank[1].fuse_regs[8]);
-}
-
-/*
- * Fuse bank 1 row 9 is "reserved for future use" and therefore available for
- * customer use. The APF27 board revision 1 uses the bit 0 to permanently store
- * the presence of the second RAM chip
- * 0: AFP27 with 1 RAM of 64 MiB
- * 1: AFP27 with 2 RAM chips of 64 MiB each (128MB)
- */
-static int get_num_ram_bank(void)
-{
- struct iim_regs *iim = (struct iim_regs *)IMX_IIM_BASE;
- int nr_dram_banks = 1;
-
- if ((get_board_rev() > 0) && (CONFIG_NR_DRAM_BANKS > 1))
- nr_dram_banks += readl(&iim->bank[1].fuse_regs[9]) & 0x01;
- else
- nr_dr
[PATCH 07/57] arm: Remove mx25pdk board
This board has not been converted to CONFIG_DM_MMC by the deadline. Remove it. Cc: Fabio Estevam Signed-off-by: Tom Rini --- arch/arm/mach-imx/mx2/Kconfig| 7 - board/freescale/mx25pdk/Kconfig | 15 -- board/freescale/mx25pdk/MAINTAINERS | 6 - board/freescale/mx25pdk/Makefile | 7 - board/freescale/mx25pdk/imximage.cfg | 64 - board/freescale/mx25pdk/mx25pdk.c| 199 --- configs/mx25pdk_defconfig| 31 - include/configs/mx25pdk.h| 178 8 files changed, 507 deletions(-) delete mode 100644 board/freescale/mx25pdk/Kconfig delete mode 100644 board/freescale/mx25pdk/MAINTAINERS delete mode 100644 board/freescale/mx25pdk/Makefile delete mode 100644 board/freescale/mx25pdk/imximage.cfg delete mode 100644 board/freescale/mx25pdk/mx25pdk.c delete mode 100644 configs/mx25pdk_defconfig delete mode 100644 include/configs/mx25pdk.h diff --git a/arch/arm/mach-imx/mx2/Kconfig b/arch/arm/mach-imx/mx2/Kconfig index 30a331ae43b7..fad5dcc940aa 100644 --- a/arch/arm/mach-imx/mx2/Kconfig +++ b/arch/arm/mach-imx/mx2/Kconfig @@ -8,12 +8,6 @@ choice prompt "MX25 board select" optional -config TARGET_MX25PDK - bool "Support mx25pdk" - select BOARD_LATE_INIT - select CPU_ARM926EJS - select BOARD_EARLY_INIT_F - config TARGET_ZMX25 bool "Support zmx25" select BOARD_LATE_INIT @@ -24,7 +18,6 @@ endchoice config SYS_SOC default "mx25" -source "board/freescale/mx25pdk/Kconfig" source "board/syteco/zmx25/Kconfig" endif diff --git a/board/freescale/mx25pdk/Kconfig b/board/freescale/mx25pdk/Kconfig deleted file mode 100644 index af06b4c827e1.. --- a/board/freescale/mx25pdk/Kconfig +++ /dev/null @@ -1,15 +0,0 @@ -if TARGET_MX25PDK - -config SYS_BOARD - default "mx25pdk" - -config SYS_VENDOR - default "freescale" - -config SYS_SOC - default "mx25" - -config SYS_CONFIG_NAME - default "mx25pdk" - -endif diff --git a/board/freescale/mx25pdk/MAINTAINERS b/board/freescale/mx25pdk/MAINTAINERS deleted file mode 100644 index fa4651e2dfbc.. --- a/board/freescale/mx25pdk/MAINTAINERS +++ /dev/null @@ -1,6 +0,0 @@ -MX25PDK BOARD -M: Fabio Estevam -S: Maintained -F: board/freescale/mx25pdk/ -F: include/configs/mx25pdk.h -F: configs/mx25pdk_defconfig diff --git a/board/freescale/mx25pdk/Makefile b/board/freescale/mx25pdk/Makefile deleted file mode 100644 index d3697d3f5f09.. --- a/board/freescale/mx25pdk/Makefile +++ /dev/null @@ -1,7 +0,0 @@ -# SPDX-License-Identifier: GPL-2.0+ -# -# Copyright (C) 2007, Guennadi Liakhovetski -# -# (C) Copyright 2011 Freescale Semiconductor, Inc. - -obj-y := mx25pdk.o diff --git a/board/freescale/mx25pdk/imximage.cfg b/board/freescale/mx25pdk/imximage.cfg deleted file mode 100644 index 762ccd0ab3fb.. --- a/board/freescale/mx25pdk/imximage.cfg +++ /dev/null @@ -1,64 +0,0 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ -/* - * (C) Copyright 2009 - * Stefano Babic DENX Software Engineering sba...@denx.de. - * - * Refer doc/imx/mkimage/imximage.txt for more details about how-to configure - * and create imximage boot image - * - * The syntax is taken as close as possible with the kwbimage - */ - -/* - * Boot Device : one of - * spi, sd (the board has no nand neither onenand) - */ -BOOT_FROM sd - -/* - * Device Configuration Data (DCD) - * - * Each entry must have the format: - * Addr-type AddressValue - * - * where: - * Addr-type register length (1,2 or 4 bytes) - * Address absolute address of the register - * value value to be stored in the register - */ -/* EIM config-CS5 init -- CPLD */ -DATA 4 0xB8002050 0xD843 -DATA 4 0xB8002054 0x22252521 -DATA 4 0xB8002058 0x0A00 - -/* DDR2 init */ -DATA 4 0xB8001004 0x0076E83A -DATA 4 0xB8001010 0x0204 -DATA 4 0xB8001000 0x9221 -DATA 4 0x8f00 0x12344321 -DATA 4 0xB8001000 0xB221 -DATA 1 0x8200 0xda -DATA 1 0x8300 0xda -DATA 1 0x81000400 0xda -DATA 1 0x8333 0xda - -DATA 4 0xB8001000 0x9221 -DATA 1 0x8400 0x12345678 - -DATA 4 0xB8001000 0xA221 -DATA 4 0x8000 0x87654321 -DATA 4 0x8000 0x87654321 - -DATA 4 0xB8001000 0xB221 -DATA 1 0x8233 0xda -DATA 1 0x81000780 0xda -DATA 1 0x81000400 0xda -DATA 4 0xB8001000 0x82216080 -DATA 4 0x43FAC454 0x1000 - -DATA 4 0x53F80008 0x20034000 - -/* Enable the clocks */ -DATA 4 0x53f8000c 0x1fff -DATA 4 0x53f80010 0x -DATA 4 0x53f80014 0xfdfff diff --git a/board/freescale/mx25pdk/mx25pdk.c b/board/freescale/mx25pdk/mx25pdk.c deleted file mode 100644 index 3b445a46dd7b.. --- a/board/freescale/mx25pdk/mx25pdk.c +++ /dev/null @@ -1,199 +0,0 @@ -// SPDX-License-Identifier: GPL-2.0+ -/* - * (C) Copyright 2011 Freescale Semiconductor, Inc. - * - * Author: Fabio Estevam - */ - -#include -#include -#include -#include -#include -#include -
[PATCH 05/57] arm: Remove ts4600 board
This board has not been converted to CONFIG_DM_MMC by the deadline.
Remove it.
Cc: Sebastien Bourdelin
Signed-off-by: Tom Rini
---
arch/arm/mach-imx/mxs/Kconfig| 4 -
board/technologic/ts4600/Kconfig | 15 ---
board/technologic/ts4600/MAINTAINERS | 6 --
board/technologic/ts4600/Makefile| 9 --
board/technologic/ts4600/iomux.c | 148 ---
board/technologic/ts4600/ts4600.c| 91
configs/ts4600_defconfig | 30 --
include/configs/ts4600.h | 58 ---
8 files changed, 361 deletions(-)
delete mode 100644 board/technologic/ts4600/Kconfig
delete mode 100644 board/technologic/ts4600/MAINTAINERS
delete mode 100644 board/technologic/ts4600/Makefile
delete mode 100644 board/technologic/ts4600/iomux.c
delete mode 100644 board/technologic/ts4600/ts4600.c
delete mode 100644 configs/ts4600_defconfig
delete mode 100644 include/configs/ts4600.h
diff --git a/arch/arm/mach-imx/mxs/Kconfig b/arch/arm/mach-imx/mxs/Kconfig
index 74dcfdaa4baf..dbe0ea8b44c9 100644
--- a/arch/arm/mach-imx/mxs/Kconfig
+++ b/arch/arm/mach-imx/mxs/Kconfig
@@ -41,9 +41,6 @@ config TARGET_MX28EVK
bool "Support mx28evk"
select BOARD_EARLY_INIT_F
-config TARGET_TS4600
- bool "Support TS4600"
-
config TARGET_XEA
bool "Support XEA"
@@ -55,6 +52,5 @@ config SYS_SOC
source "board/freescale/mx28evk/Kconfig"
source "board/liebherr/xea/Kconfig"
source "board/ppcag/bg0900/Kconfig"
-source "board/technologic/ts4600/Kconfig"
endif
diff --git a/board/technologic/ts4600/Kconfig b/board/technologic/ts4600/Kconfig
deleted file mode 100644
index d0dc2e1b7340..
--- a/board/technologic/ts4600/Kconfig
+++ /dev/null
@@ -1,15 +0,0 @@
-if TARGET_TS4600
-
-config SYS_BOARD
- default "ts4600"
-
-config SYS_VENDOR
- default "technologic"
-
-config SYS_SOC
- default "mxs"
-
-config SYS_CONFIG_NAME
- default "ts4600"
-
-endif
diff --git a/board/technologic/ts4600/MAINTAINERS
b/board/technologic/ts4600/MAINTAINERS
deleted file mode 100644
index 6f683b5995ef..
--- a/board/technologic/ts4600/MAINTAINERS
+++ /dev/null
@@ -1,6 +0,0 @@
-TS4600 BOARD
-M: Sebastien Bourdelin
-S: Maintained
-F: board/technologic/ts4600/
-F: include/configs/ts4600.h
-F: configs/ts4600_defconfig
diff --git a/board/technologic/ts4600/Makefile
b/board/technologic/ts4600/Makefile
deleted file mode 100644
index ddf4a8ee1eeb..
--- a/board/technologic/ts4600/Makefile
+++ /dev/null
@@ -1,9 +0,0 @@
-# SPDX-License-Identifier: GPL-2.0+
-#
-# (C) Copyright 2016 Savoir-faire Linux
-
-ifndef CONFIG_SPL_BUILD
-obj-y := ts4600.o
-else
-obj-y := iomux.o
-endif
diff --git a/board/technologic/ts4600/iomux.c b/board/technologic/ts4600/iomux.c
deleted file mode 100644
index 9bd3eacb0bdc..
--- a/board/technologic/ts4600/iomux.c
+++ /dev/null
@@ -1,148 +0,0 @@
-// SPDX-License-Identifier: GPL-2.0+
-/*
- * (C) Copyright 2016 Savoir-faire Linux Inc.
- *
- * Author: Sebastien Bourdelin
- *
- * Based on work from TS7680 code by:
- * Kris Bahnsen
- * Mark Featherston
- * https://github.com/embeddedarm/u-boot/tree/master/board/technologic/ts7680
- *
- * Derived from MX28EVK code by
- * Freescale Semiconductor, Inc.
- */
-
-#include
-#include
-#include
-#include
-#include
-#include
-
-#defineMUX_CONFIG_SSP0 (MXS_PAD_3V3 | MXS_PAD_8MA | MXS_PAD_PULLUP)
-#defineMUX_CONFIG_EMI (MXS_PAD_3V3 | MXS_PAD_12MA | MXS_PAD_NOPULL)
-
-const iomux_cfg_t iomux_setup[] = {
- /* DUART */
- MX28_PAD_PWM0__DUART_RX,
- MX28_PAD_PWM1__DUART_TX,
-
- /* MMC0 */
- MX28_PAD_SSP0_DATA0__SSP0_D0 | MUX_CONFIG_SSP0,
- MX28_PAD_SSP0_DATA1__SSP0_D1 | MUX_CONFIG_SSP0,
- MX28_PAD_SSP0_DATA2__SSP0_D2 | MUX_CONFIG_SSP0,
- MX28_PAD_SSP0_DATA3__SSP0_D3 | MUX_CONFIG_SSP0,
- MX28_PAD_SSP0_CMD__SSP0_CMD | MUX_CONFIG_SSP0,
- MX28_PAD_SSP0_SCK__SSP0_SCK |
- (MXS_PAD_12MA | MXS_PAD_3V3 | MXS_PAD_NOPULL),
-
- /* MMC0 slot power enable */
- MX28_PAD_PWM3__GPIO_3_28 |
- (MXS_PAD_12MA | MXS_PAD_3V3 | MXS_PAD_PULLUP),
-
- /* EMI */
- MX28_PAD_EMI_D00__EMI_DATA0 | MUX_CONFIG_EMI,
- MX28_PAD_EMI_D01__EMI_DATA1 | MUX_CONFIG_EMI,
- MX28_PAD_EMI_D02__EMI_DATA2 | MUX_CONFIG_EMI,
- MX28_PAD_EMI_D03__EMI_DATA3 | MUX_CONFIG_EMI,
- MX28_PAD_EMI_D04__EMI_DATA4 | MUX_CONFIG_EMI,
- MX28_PAD_EMI_D05__EMI_DATA5 | MUX_CONFIG_EMI,
- MX28_PAD_EMI_D06__EMI_DATA6 | MUX_CONFIG_EMI,
- MX28_PAD_EMI_D07__EMI_DATA7 | MUX_CONFIG_EMI,
- MX28_PAD_EMI_D08__EMI_DATA8 | MUX_CONFIG_EMI,
- MX28_PAD_EMI_D09__EMI_DATA9 | MUX_CONFIG_EMI,
- MX28_PAD_EMI_D10__EMI_DATA10 | MUX_CONFIG_EMI,
- MX28_PAD_EMI_D11__EMI_DATA11 | MUX_CONFIG_EMI,
- MX28_PAD_EMI_D12__EMI_DATA12 | MUX_CONFIG_EMI,
- MX28_PAD_EMI_D13__EMI_DATA13 | MUX_CONFIG_EMI,
- MX28_PA
[PATCH 04/57] arm: Remove sc_sps_1 board
This board has not been converted to CONFIG_DM_MMC by the deadline.
Remove it.
Cc: Marek Vasut
Signed-off-by: Tom Rini
---
arch/arm/mach-imx/mxs/Kconfig | 4 -
board/schulercontrol/sc_sps_1/Kconfig | 15 ---
board/schulercontrol/sc_sps_1/MAINTAINERS | 6 -
board/schulercontrol/sc_sps_1/Makefile| 10 --
board/schulercontrol/sc_sps_1/sc_sps_1.c | 99 ---
board/schulercontrol/sc_sps_1/spl_boot.c | 148 --
configs/sc_sps_1_defconfig| 43 ---
include/configs/sc_sps_1.h| 57 -
8 files changed, 382 deletions(-)
delete mode 100644 board/schulercontrol/sc_sps_1/Kconfig
delete mode 100644 board/schulercontrol/sc_sps_1/MAINTAINERS
delete mode 100644 board/schulercontrol/sc_sps_1/Makefile
delete mode 100644 board/schulercontrol/sc_sps_1/sc_sps_1.c
delete mode 100644 board/schulercontrol/sc_sps_1/spl_boot.c
delete mode 100644 configs/sc_sps_1_defconfig
delete mode 100644 include/configs/sc_sps_1.h
diff --git a/arch/arm/mach-imx/mxs/Kconfig b/arch/arm/mach-imx/mxs/Kconfig
index aad7089a2003..74dcfdaa4baf 100644
--- a/arch/arm/mach-imx/mxs/Kconfig
+++ b/arch/arm/mach-imx/mxs/Kconfig
@@ -41,9 +41,6 @@ config TARGET_MX28EVK
bool "Support mx28evk"
select BOARD_EARLY_INIT_F
-config TARGET_SC_SPS_1
- bool "Support sc_sps_1"
-
config TARGET_TS4600
bool "Support TS4600"
@@ -58,7 +55,6 @@ config SYS_SOC
source "board/freescale/mx28evk/Kconfig"
source "board/liebherr/xea/Kconfig"
source "board/ppcag/bg0900/Kconfig"
-source "board/schulercontrol/sc_sps_1/Kconfig"
source "board/technologic/ts4600/Kconfig"
endif
diff --git a/board/schulercontrol/sc_sps_1/Kconfig
b/board/schulercontrol/sc_sps_1/Kconfig
deleted file mode 100644
index 2461d0cc5046..
--- a/board/schulercontrol/sc_sps_1/Kconfig
+++ /dev/null
@@ -1,15 +0,0 @@
-if TARGET_SC_SPS_1
-
-config SYS_BOARD
- default "sc_sps_1"
-
-config SYS_VENDOR
- default "schulercontrol"
-
-config SYS_SOC
- default "mxs"
-
-config SYS_CONFIG_NAME
- default "sc_sps_1"
-
-endif
diff --git a/board/schulercontrol/sc_sps_1/MAINTAINERS
b/board/schulercontrol/sc_sps_1/MAINTAINERS
deleted file mode 100644
index 74849cdfaf20..
--- a/board/schulercontrol/sc_sps_1/MAINTAINERS
+++ /dev/null
@@ -1,6 +0,0 @@
-SC_SPS_1 BOARD
-M: Marek Vasut
-S: Maintained
-F: board/schulercontrol/sc_sps_1/
-F: include/configs/sc_sps_1.h
-F: configs/sc_sps_1_defconfig
diff --git a/board/schulercontrol/sc_sps_1/Makefile
b/board/schulercontrol/sc_sps_1/Makefile
deleted file mode 100644
index 4fb32de6e8e8..
--- a/board/schulercontrol/sc_sps_1/Makefile
+++ /dev/null
@@ -1,10 +0,0 @@
-# SPDX-License-Identifier: GPL-2.0+
-#
-# (C) Copyright 2000-2012
-# Wolfgang Denk, DENX Software Engineering, w...@denx.de.
-
-ifndef CONFIG_SPL_BUILD
-obj-y := sc_sps_1.o
-else
-obj-y := spl_boot.o
-endif
diff --git a/board/schulercontrol/sc_sps_1/sc_sps_1.c
b/board/schulercontrol/sc_sps_1/sc_sps_1.c
deleted file mode 100644
index 3a04b1a634cc..
--- a/board/schulercontrol/sc_sps_1/sc_sps_1.c
+++ /dev/null
@@ -1,99 +0,0 @@
-// SPDX-License-Identifier: GPL-2.0+
-/*
- * SchulerControl GmbH, SC_SPS_1 module
- *
- * Copyright (C) 2012 Marek Vasut
- * on behalf of DENX Software Engineering GmbH
- */
-
-#include
-#include
-#include
-#include
-#include
-#include
-#include
-#include
-#include
-#include
-#include
-#include
-#include
-#include
-
-DECLARE_GLOBAL_DATA_PTR;
-
-/*
- * Functions
- */
-int board_early_init_f(void)
-{
- /* IO0 clock at 480MHz */
- mxs_set_ioclk(MXC_IOCLK0, 48);
- /* IO1 clock at 480MHz */
- mxs_set_ioclk(MXC_IOCLK1, 48);
-
- /* SSP0 clock at 96MHz */
- mxs_set_sspclk(MXC_SSPCLK0, 96000, 0);
- /* SSP2 clock at 96MHz */
- mxs_set_sspclk(MXC_SSPCLK2, 96000, 0);
-
-#ifdef CONFIG_CMD_USB
- mxs_iomux_setup_pad(MX28_PAD_AUART1_CTS__USB0_OVERCURRENT);
- mxs_iomux_setup_pad(MX28_PAD_AUART2_TX__GPIO_3_9 |
- MXS_PAD_4MA | MXS_PAD_3V3 | MXS_PAD_NOPULL);
- gpio_direction_output(MX28_PAD_AUART2_TX__GPIO_3_9, 1);
-#endif
-
- return 0;
-}
-
-int board_init(void)
-{
- /* Adress of boot parameters */
- gd->bd->bi_boot_params = PHYS_SDRAM_1 + 0x100;
-
- return 0;
-}
-
-int dram_init(void)
-{
- return mxs_dram_init();
-}
-
-#ifdef CONFIG_CMD_MMC
-int board_mmc_init(struct bd_info *bis)
-{
- return mxsmmc_initialize(bis, 0, NULL, NULL);
-}
-#endif
-
-#ifdef CONFIG_CMD_NET
-int board_eth_init(struct bd_info *bis)
-{
- struct mxs_clkctrl_regs *clkctrl_regs =
- (struct mxs_clkctrl_regs *)MXS_CLKCTRL_BASE;
- int ret;
-
- ret = cpu_eth_init(bis);
-
- clrsetbits_le32(&clkctrl_regs->hw_clkctrl_enet,
- CLKCTRL_ENET_TIME_SEL_MASK,
- CLKCTRL_ENET_TIME_SEL_RMII_CLK | CLKCTRL_ENET_CLK_OUT_EN);
-
-
[PATCH 03/57] arm: Remove SANSA_FUZE_PLUS board
This board has not been converted to CONFIG_DM_MMC by the deadline.
Remove it.
Cc: Marek Vasut
Signed-off-by: Tom Rini
---
arch/arm/mach-imx/mxs/Kconfig | 4 -
board/sandisk/sansa_fuze_plus/Kconfig | 15 -
board/sandisk/sansa_fuze_plus/MAINTAINERS | 6 -
board/sandisk/sansa_fuze_plus/Makefile| 10 -
board/sandisk/sansa_fuze_plus/sfp.c | 391 --
board/sandisk/sansa_fuze_plus/spl_boot.c | 139
configs/sansa_fuze_plus_defconfig | 46 ---
include/configs/sansa_fuze_plus.h | 39 ---
8 files changed, 650 deletions(-)
delete mode 100644 board/sandisk/sansa_fuze_plus/Kconfig
delete mode 100644 board/sandisk/sansa_fuze_plus/MAINTAINERS
delete mode 100644 board/sandisk/sansa_fuze_plus/Makefile
delete mode 100644 board/sandisk/sansa_fuze_plus/sfp.c
delete mode 100644 board/sandisk/sansa_fuze_plus/spl_boot.c
delete mode 100644 configs/sansa_fuze_plus_defconfig
delete mode 100644 include/configs/sansa_fuze_plus.h
diff --git a/arch/arm/mach-imx/mxs/Kconfig b/arch/arm/mach-imx/mxs/Kconfig
index 3e6d17598957..aad7089a2003 100644
--- a/arch/arm/mach-imx/mxs/Kconfig
+++ b/arch/arm/mach-imx/mxs/Kconfig
@@ -12,9 +12,6 @@ config TARGET_MX23EVK
bool "Support mx23evk"
select BOARD_EARLY_INIT_F
-config TARGET_SANSA_FUZE_PLUS
- bool "Support sansa_fuze_plus"
-
config TARGET_XFI3
bool "Support xfi3"
@@ -24,7 +21,6 @@ config SYS_SOC
default "mxs"
source "board/freescale/mx23evk/Kconfig"
-source "board/sandisk/sansa_fuze_plus/Kconfig"
endif
diff --git a/board/sandisk/sansa_fuze_plus/Kconfig
b/board/sandisk/sansa_fuze_plus/Kconfig
deleted file mode 100644
index ab4a29255cca..
--- a/board/sandisk/sansa_fuze_plus/Kconfig
+++ /dev/null
@@ -1,15 +0,0 @@
-if TARGET_SANSA_FUZE_PLUS
-
-config SYS_BOARD
- default "sansa_fuze_plus"
-
-config SYS_VENDOR
- default "sandisk"
-
-config SYS_SOC
- default "mxs"
-
-config SYS_CONFIG_NAME
- default "sansa_fuze_plus"
-
-endif
diff --git a/board/sandisk/sansa_fuze_plus/MAINTAINERS
b/board/sandisk/sansa_fuze_plus/MAINTAINERS
deleted file mode 100644
index ccfd3997084e..
--- a/board/sandisk/sansa_fuze_plus/MAINTAINERS
+++ /dev/null
@@ -1,6 +0,0 @@
-SANSA_FUZE_PLUS BOARD
-M: Marek Vasut
-S: Maintained
-F: board/sandisk/sansa_fuze_plus/
-F: include/configs/sansa_fuze_plus.h
-F: configs/sansa_fuze_plus_defconfig
diff --git a/board/sandisk/sansa_fuze_plus/Makefile
b/board/sandisk/sansa_fuze_plus/Makefile
deleted file mode 100644
index 5ac545dda341..
--- a/board/sandisk/sansa_fuze_plus/Makefile
+++ /dev/null
@@ -1,10 +0,0 @@
-# SPDX-License-Identifier: GPL-2.0+
-#
-# (C) Copyright 2000-2006
-# Wolfgang Denk, DENX Software Engineering, w...@denx.de.
-
-ifndef CONFIG_SPL_BUILD
-obj-y := sfp.o
-else
-obj-y := spl_boot.o
-endif
diff --git a/board/sandisk/sansa_fuze_plus/sfp.c
b/board/sandisk/sansa_fuze_plus/sfp.c
deleted file mode 100644
index f46b02e38e59..
--- a/board/sandisk/sansa_fuze_plus/sfp.c
+++ /dev/null
@@ -1,391 +0,0 @@
-// SPDX-License-Identifier: GPL-2.0+
-/*
- * SanDisk Sansa Fuze Plus board
- *
- * Copyright (C) 2013 Marek Vasut
- *
- * Hardware investigation done by:
- *
- * Amaury Pouly
- */
-
-#include
-#include
-#include
-#include
-#include
-#include
-#include
-#include
-#include
-#include
-#include
-#include
-
-DECLARE_GLOBAL_DATA_PTR;
-
-/*
- * Functions
- */
-int board_early_init_f(void)
-{
- /* IO0 clock at 480MHz */
- mxs_set_ioclk(MXC_IOCLK0, 48);
-
- /* SSP0 clock at 96MHz */
- mxs_set_sspclk(MXC_SSPCLK0, 96000, 0);
-
- return 0;
-}
-
-int dram_init(void)
-{
- return mxs_dram_init();
-}
-
-#ifdef CONFIG_CMD_MMC
-static int xfi3_mmc_cd(int id)
-{
- switch (id) {
- case 0:
- /* The SSP_DETECT is inverted on this board. */
- return gpio_get_value(MX23_PAD_SSP1_DETECT__GPIO_2_1);
- case 1:
- /* Internal eMMC always present */
- return 1;
- default:
- return 0;
- }
-}
-
-int board_mmc_init(struct bd_info *bis)
-{
- int ret;
-
- /* MicroSD slot */
- gpio_direction_input(MX23_PAD_SSP1_DETECT__GPIO_2_1);
- gpio_direction_output(MX23_PAD_GPMI_D08__GPIO_0_8, 0);
- ret = mxsmmc_initialize(bis, 0, NULL, xfi3_mmc_cd);
- if (ret)
- return ret;
-
- /* Internal eMMC */
- gpio_direction_output(MX23_PAD_PWM3__GPIO_1_29, 0);
- ret = mxsmmc_initialize(bis, 1, NULL, xfi3_mmc_cd);
-
- return ret;
-}
-#endif
-
-#ifdef CONFIG_VIDEO_MXS
-#defineMUX_CONFIG_LCD (MXS_PAD_3V3 | MXS_PAD_4MA | MXS_PAD_NOPULL)
-const iomux_cfg_t iomux_lcd_gpio[] = {
- MX23_PAD_LCD_D00__GPIO_1_0 | MUX_CONFIG_LCD,
- MX23_PAD_LCD_D01__GPIO_1_1 | MUX_CONFIG_LCD,
- MX23_PAD_LCD_D02__GPIO_1_2 | MUX_CONFIG_LCD,
- MX23_PAD_LCD_D03__GPIO_1_3 | MUX_CONF
[PATCH 02/57] arm: Remove MX23_OLINUXINO board
This board has not been converted to CONFIG_DM_MMC by the deadline.
Remove it.
Cc: Marek Vasut
Signed-off-by: Tom Rini
---
arch/arm/mach-imx/mxs/Kconfig| 5 -
board/olimex/mx23_olinuxino/Kconfig | 15 ---
board/olimex/mx23_olinuxino/MAINTAINERS | 6 -
board/olimex/mx23_olinuxino/Makefile | 10 --
board/olimex/mx23_olinuxino/mx23_olinuxino.c | 82 -
board/olimex/mx23_olinuxino/spl_boot.c | 120 ---
configs/mx23_olinuxino_defconfig | 47
include/configs/mx23_olinuxino.h | 118 --
8 files changed, 403 deletions(-)
delete mode 100644 board/olimex/mx23_olinuxino/Kconfig
delete mode 100644 board/olimex/mx23_olinuxino/MAINTAINERS
delete mode 100644 board/olimex/mx23_olinuxino/Makefile
delete mode 100644 board/olimex/mx23_olinuxino/mx23_olinuxino.c
delete mode 100644 board/olimex/mx23_olinuxino/spl_boot.c
delete mode 100644 configs/mx23_olinuxino_defconfig
delete mode 100644 include/configs/mx23_olinuxino.h
diff --git a/arch/arm/mach-imx/mxs/Kconfig b/arch/arm/mach-imx/mxs/Kconfig
index 57e69927a88f..3e6d17598957 100644
--- a/arch/arm/mach-imx/mxs/Kconfig
+++ b/arch/arm/mach-imx/mxs/Kconfig
@@ -8,10 +8,6 @@ choice
prompt "MX23 board select"
optional
-config TARGET_MX23_OLINUXINO
- bool "Support mx23_olinuxino"
- select BOARD_EARLY_INIT_F
-
config TARGET_MX23EVK
bool "Support mx23evk"
select BOARD_EARLY_INIT_F
@@ -27,7 +23,6 @@ endchoice
config SYS_SOC
default "mxs"
-source "board/olimex/mx23_olinuxino/Kconfig"
source "board/freescale/mx23evk/Kconfig"
source "board/sandisk/sansa_fuze_plus/Kconfig"
diff --git a/board/olimex/mx23_olinuxino/Kconfig
b/board/olimex/mx23_olinuxino/Kconfig
deleted file mode 100644
index 0b151c9bb815..
--- a/board/olimex/mx23_olinuxino/Kconfig
+++ /dev/null
@@ -1,15 +0,0 @@
-if TARGET_MX23_OLINUXINO
-
-config SYS_BOARD
- default "mx23_olinuxino"
-
-config SYS_VENDOR
- default "olimex"
-
-config SYS_SOC
- default "mxs"
-
-config SYS_CONFIG_NAME
- default "mx23_olinuxino"
-
-endif
diff --git a/board/olimex/mx23_olinuxino/MAINTAINERS
b/board/olimex/mx23_olinuxino/MAINTAINERS
deleted file mode 100644
index 25f4a10e9ae0..
--- a/board/olimex/mx23_olinuxino/MAINTAINERS
+++ /dev/null
@@ -1,6 +0,0 @@
-MX23_OLINUXINO BOARD
-M: Marek Vasut
-S: Maintained
-F: board/olimex/mx23_olinuxino/
-F: include/configs/mx23_olinuxino.h
-F: configs/mx23_olinuxino_defconfig
diff --git a/board/olimex/mx23_olinuxino/Makefile
b/board/olimex/mx23_olinuxino/Makefile
deleted file mode 100644
index b2ea89743440..
--- a/board/olimex/mx23_olinuxino/Makefile
+++ /dev/null
@@ -1,10 +0,0 @@
-# SPDX-License-Identifier: GPL-2.0+
-#
-# (C) Copyright 2000-2006
-# Wolfgang Denk, DENX Software Engineering, w...@denx.de.
-
-ifndef CONFIG_SPL_BUILD
-obj-y := mx23_olinuxino.o
-else
-obj-y := spl_boot.o
-endif
diff --git a/board/olimex/mx23_olinuxino/mx23_olinuxino.c
b/board/olimex/mx23_olinuxino/mx23_olinuxino.c
deleted file mode 100644
index d1e189cbb6eb..
--- a/board/olimex/mx23_olinuxino/mx23_olinuxino.c
+++ /dev/null
@@ -1,82 +0,0 @@
-// SPDX-License-Identifier: GPL-2.0+
-/*
- * Olimex MX23 Olinuxino board
- *
- * Copyright (C) 2013 Marek Vasut
- */
-
-#include
-#include
-#include
-#include
-#include
-#include
-#include
-#include
-#include
-#ifdef CONFIG_LED_STATUS
-#include
-#endif
-#include
-
-DECLARE_GLOBAL_DATA_PTR;
-
-/*
- * Functions
- */
-int board_early_init_f(void)
-{
- /* IO0 clock at 480MHz */
- mxs_set_ioclk(MXC_IOCLK0, 48);
-
- /* SSP0 clock at 96MHz */
- mxs_set_sspclk(MXC_SSPCLK0, 96000, 0);
-
- return 0;
-}
-
-#ifdef CONFIG_CMD_USB
-int board_ehci_hcd_init(int port)
-{
- /* Enable LAN9512 (Maxi) or GL850G (Mini) USB HUB power. */
- gpio_direction_output(MX23_PAD_GPMI_ALE__GPIO_0_17, 1);
- udelay(100);
- return 0;
-}
-
-int board_ehci_hcd_exit(int port)
-{
- /* Enable LAN9512 (Maxi) or GL850G (Mini) USB HUB power. */
- gpio_direction_output(MX23_PAD_GPMI_ALE__GPIO_0_17, 0);
- return 0;
-}
-#endif
-
-int dram_init(void)
-{
- return mxs_dram_init();
-}
-
-#ifdef CONFIG_CMD_MMC
-static int mx23_olx_mmc_cd(int id)
-{
- return 1; /* Card always present */
-}
-
-int board_mmc_init(struct bd_info *bis)
-{
- return mxsmmc_initialize(bis, 0, NULL, mx23_olx_mmc_cd);
-}
-#endif
-
-int board_init(void)
-{
- /* Adress of boot parameters */
- gd->bd->bi_boot_params = PHYS_SDRAM_1 + 0x100;
-
-#if defined(CONFIG_LED_STATUS) && defined(CONFIG_LED_STATUS_BOOT_ENABLE)
- status_led_set(CONFIG_LED_STATUS_BOOT, CONFIG_LED_STATUS_STATE);
-#endif
-
- return 0;
-}
diff --git a/board/olimex/mx23_olinuxino/spl_boot.c
b/board/olimex/mx23_olinuxino/spl_boot.c
deleted file mode 100644
index 248176c23cdc..000
[PATCH 01/57] arm: Remove xfi3 board
This board has not been converted to CONFIG_DM_MMC by the deadline.
Remove it.
Cc: Marek Vasut
Signed-off-by: Tom Rini
---
arch/arm/mach-imx/mxs/Kconfig | 1 -
board/creative/xfi3/Kconfig | 15 ---
board/creative/xfi3/MAINTAINERS | 6 -
board/creative/xfi3/Makefile| 10 --
board/creative/xfi3/spl_boot.c | 133 ---
board/creative/xfi3/xfi3.c | 227
configs/xfi3_defconfig | 43 --
include/configs/xfi3.h | 39 --
8 files changed, 474 deletions(-)
delete mode 100644 board/creative/xfi3/Kconfig
delete mode 100644 board/creative/xfi3/MAINTAINERS
delete mode 100644 board/creative/xfi3/Makefile
delete mode 100644 board/creative/xfi3/spl_boot.c
delete mode 100644 board/creative/xfi3/xfi3.c
delete mode 100644 configs/xfi3_defconfig
delete mode 100644 include/configs/xfi3.h
diff --git a/arch/arm/mach-imx/mxs/Kconfig b/arch/arm/mach-imx/mxs/Kconfig
index bcd8400af9c3..57e69927a88f 100644
--- a/arch/arm/mach-imx/mxs/Kconfig
+++ b/arch/arm/mach-imx/mxs/Kconfig
@@ -30,7 +30,6 @@ config SYS_SOC
source "board/olimex/mx23_olinuxino/Kconfig"
source "board/freescale/mx23evk/Kconfig"
source "board/sandisk/sansa_fuze_plus/Kconfig"
-source "board/creative/xfi3/Kconfig"
endif
diff --git a/board/creative/xfi3/Kconfig b/board/creative/xfi3/Kconfig
deleted file mode 100644
index 7b681cd81b04..
--- a/board/creative/xfi3/Kconfig
+++ /dev/null
@@ -1,15 +0,0 @@
-if TARGET_XFI3
-
-config SYS_BOARD
- default "xfi3"
-
-config SYS_VENDOR
- default "creative"
-
-config SYS_SOC
- default "mxs"
-
-config SYS_CONFIG_NAME
- default "xfi3"
-
-endif
diff --git a/board/creative/xfi3/MAINTAINERS b/board/creative/xfi3/MAINTAINERS
deleted file mode 100644
index fb8235a3295f..
--- a/board/creative/xfi3/MAINTAINERS
+++ /dev/null
@@ -1,6 +0,0 @@
-XFI3 BOARD
-M: Marek Vasut
-S: Maintained
-F: board/creative/xfi3/
-F: include/configs/xfi3.h
-F: configs/xfi3_defconfig
diff --git a/board/creative/xfi3/Makefile b/board/creative/xfi3/Makefile
deleted file mode 100644
index 67d68dd6218d..
--- a/board/creative/xfi3/Makefile
+++ /dev/null
@@ -1,10 +0,0 @@
-# SPDX-License-Identifier: GPL-2.0+
-#
-# (C) Copyright 2000-2006
-# Wolfgang Denk, DENX Software Engineering, w...@denx.de.
-
-ifndef CONFIG_SPL_BUILD
-obj-y := xfi3.o
-else
-obj-y := spl_boot.o
-endif
diff --git a/board/creative/xfi3/spl_boot.c b/board/creative/xfi3/spl_boot.c
deleted file mode 100644
index 67c1e9801b9b..
--- a/board/creative/xfi3/spl_boot.c
+++ /dev/null
@@ -1,133 +0,0 @@
-// SPDX-License-Identifier: GPL-2.0+
-/*
- * Creative ZEN X-Fi3 setup
- *
- * Copyright (C) 2013 Marek Vasut
- */
-
-#include
-#include
-#include
-#include
-#include
-#include
-
-#defineMUX_CONFIG_EMI (MXS_PAD_1V8 | MXS_PAD_12MA | MXS_PAD_PULLUP)
-#defineMUX_CONFIG_SSP (MXS_PAD_3V3 | MXS_PAD_8MA | MXS_PAD_PULLUP)
-#defineMUX_CONFIG_LCD (MXS_PAD_3V3 | MXS_PAD_4MA | MXS_PAD_NOPULL)
-
-const iomux_cfg_t iomux_setup[] = {
- /* EMI */
- MX23_PAD_EMI_D00__EMI_D00 | MUX_CONFIG_EMI,
- MX23_PAD_EMI_D01__EMI_D01 | MUX_CONFIG_EMI,
- MX23_PAD_EMI_D02__EMI_D02 | MUX_CONFIG_EMI,
- MX23_PAD_EMI_D03__EMI_D03 | MUX_CONFIG_EMI,
- MX23_PAD_EMI_D04__EMI_D04 | MUX_CONFIG_EMI,
- MX23_PAD_EMI_D05__EMI_D05 | MUX_CONFIG_EMI,
- MX23_PAD_EMI_D06__EMI_D06 | MUX_CONFIG_EMI,
- MX23_PAD_EMI_D07__EMI_D07 | MUX_CONFIG_EMI,
- MX23_PAD_EMI_D08__EMI_D08 | MUX_CONFIG_EMI,
- MX23_PAD_EMI_D09__EMI_D09 | MUX_CONFIG_EMI,
- MX23_PAD_EMI_D10__EMI_D10 | MUX_CONFIG_EMI,
- MX23_PAD_EMI_D11__EMI_D11 | MUX_CONFIG_EMI,
- MX23_PAD_EMI_D12__EMI_D12 | MUX_CONFIG_EMI,
- MX23_PAD_EMI_D13__EMI_D13 | MUX_CONFIG_EMI,
- MX23_PAD_EMI_D14__EMI_D14 | MUX_CONFIG_EMI,
- MX23_PAD_EMI_D15__EMI_D15 | MUX_CONFIG_EMI,
- MX23_PAD_EMI_DQM0__EMI_DQM0 | MUX_CONFIG_EMI,
- MX23_PAD_EMI_DQM1__EMI_DQM1 | MUX_CONFIG_EMI,
- MX23_PAD_EMI_DQS0__EMI_DQS0 | MUX_CONFIG_EMI,
- MX23_PAD_EMI_DQS1__EMI_DQS1 | MUX_CONFIG_EMI,
- MX23_PAD_EMI_CLK__EMI_CLK | MUX_CONFIG_EMI,
- MX23_PAD_EMI_CLKN__EMI_CLKN | MUX_CONFIG_EMI,
-
- MX23_PAD_EMI_A00__EMI_A00 | MUX_CONFIG_EMI,
- MX23_PAD_EMI_A01__EMI_A01 | MUX_CONFIG_EMI,
- MX23_PAD_EMI_A02__EMI_A02 | MUX_CONFIG_EMI,
- MX23_PAD_EMI_A03__EMI_A03 | MUX_CONFIG_EMI,
- MX23_PAD_EMI_A04__EMI_A04 | MUX_CONFIG_EMI,
- MX23_PAD_EMI_A05__EMI_A05 | MUX_CONFIG_EMI,
- MX23_PAD_EMI_A06__EMI_A06 | MUX_CONFIG_EMI,
- MX23_PAD_EMI_A07__EMI_A07 | MUX_CONFIG_EMI,
- MX23_PAD_EMI_A08__EMI_A08 | MUX_CONFIG_EMI,
- MX23_PAD_EMI_A09__EMI_A09 | MUX_CONFIG_EMI,
- MX23_PAD_EMI_A10__EMI_A10 | MUX_CONFIG_EMI,
- MX23_PAD_EMI_A11__EMI_A11 | MUX_CONFIG_EMI,
- MX23_PAD_EMI_A12__EMI_A12 | MUX_CONFIG_EMI,
- MX23_PAD_EMI_BA0__EMI_BA0 | MUX_CONFIG_E
[PATCH 00/57] Enforce DM_MMC migration and remove platforms
Hey all, First, the main point of this series is that after v2021.04 is release I intend to make something like this be merged, along with the series I posted earlier about other block drivers. There's some platforms that I've omitted here as people have said they will update them ASAP and I'm going to pick up those patches before this gets merged. And it's soon enough in the future that I expect the people that haven't posted them yet will be able to in time. Next, I'm going to do another series on top of this to pick another migration that's due by v2019.07, and I'm likely to do DM_PCI to see where that is with these removals taken care of. Finally, I am quite happy to have any of these platforms remain in tree, so long as someone is willing to maintain them. A few of the patches in here are re-posts, and I'll sort that out when applying the other migration. -- Tom
Re: [PATCH v3] video: sunxi_display: Convert to DM_VIDEO
On Sun, Feb 21, 2021 at 12:07:35AM +, Andre Przywara wrote: > On Sun, 7 Feb 2021 07:37:34 -0700 > Simon Glass wrote: > > Hi Simon, > > coming back to this patch, answering to the other comments I skipped > over the last time. > > In general this patch is the shortest way to get to some kind of DM > driver, in many ways it still looks like a non-DM driver on the inside, > which shows. For the record, I'm OK with pulling this patch in as-is and improving the situation rather than requiring further changes right now. -- Tom signature.asc Description: PGP signature
[PULL] u-boot-sh/master
The following changes since commit ea966d24ef3a9f7f32712a518a07374f9ae43905: Merge https://gitlab.denx.de/u-boot/custodians/u-boot-sunxi (2021-02-19 21:06:16 -0500) are available in the Git repository at: git://git.denx.de/u-boot-sh.git master for you to fetch changes up to c98cc9b2e8754587770d33bbd0189fefec39965a: ARM: rmobile: Enable CONFIG_PCI_REGION_MULTI_ENTRY on RCar3 (2021-02-20 22:38:28 +0100) Marek Vasut (4): pci: renesas: Add root bus handling on Gen3 pci: renesas: Make map address and mask power of two on Gen3 pci: renesas: Fix BAR mapping on Gen3 ARM: rmobile: Enable CONFIG_PCI_REGION_MULTI_ENTRY on RCar3 configs/rcar3_salvator-x_defconfig | 1 + drivers/pci/pci-rcar-gen3.c| 30 +++--- 2 files changed, 24 insertions(+), 7 deletions(-)
Re: [PATCH v3] video: sunxi_display: Convert to DM_VIDEO
On Sun, 7 Feb 2021 07:37:34 -0700 Simon Glass wrote: Hi Simon, coming back to this patch, answering to the other comments I skipped over the last time. In general this patch is the shortest way to get to some kind of DM driver, in many ways it still looks like a non-DM driver on the inside, which shows. > On Thu, 4 Feb 2021 at 18:08, Andre Przywara wrote: > > > > From: Jagan Teki > > > > DM_VIDEO migration deadline is already expired, but around > > 80 Allwinner boards are still using video in a legacy way. > > > > = WARNING == > > This board does not use CONFIG_DM_VIDEO Please update > > the board to use CONFIG_DM_VIDEO before the v2019.07 release. > > Failure to update by the deadline may result in board removal. > > See doc/driver-model/migration.rst for more info. > > > > > > Convert the legacy video driver over to the DM_VIDEO framework. This is > > a minimal conversion: it doesn't use the DT for finding its resources, > > nor does it use DM clocks or DM devices for the outputs (LCD, HDMI, CVBS). > > > > Tested in Bananapi M1+ Plus 1920x1200 HDMI out. (Jagan) > > > > Signed-off-by: Jagan Teki > > [Andre: rebase and smaller fixes] > > Signed-off-by: Andre Przywara > > --- > > Hi, > > > > I picked this one up to get rid of the warnings. I dropped the BMP > > support for now (v2 1/3 and v2 2/3), I need to have a closer look, as > > I am not convinced this was the right solution. > > > > Cheers, > > Andre > > > > Changelog v2 .. v3: > > - rebase against master, fixing up renamed variables and structs > > - replace enum with #define > > - remove BMP from Kconfig > > - fix memory node size calculation in simplefb setup > > > > arch/arm/mach-sunxi/Kconfig | 9 +- > > drivers/video/sunxi/sunxi_display.c | 262 > > include/configs/sunxi-common.h | 17 -- > > scripts/config_whitelist.txt| 1 - > > 4 files changed, 157 insertions(+), 132 deletions(-) > > > > Reviewed-by: Simon Glass > > Some thoughts below > > > diff --git a/arch/arm/mach-sunxi/Kconfig b/arch/arm/mach-sunxi/Kconfig > > index 0135575ca1e..a29d11505aa 100644 > > --- a/arch/arm/mach-sunxi/Kconfig > > +++ b/arch/arm/mach-sunxi/Kconfig > > @@ -816,13 +816,14 @@ config VIDEO_SUNXI > > depends on !MACH_SUN9I > > depends on !MACH_SUN50I > > depends on !SUN50I_GEN_H6 > > - select VIDEO > > + select DM_VIDEO > > I wonder whether instead VIDEO_SUNXI should depend on DM_VIDEO ? > > > + select DISPLAY > > imply VIDEO_DT_SIMPLEFB > > default y > > ---help--- > > - Say Y here to add support for using a cfb console on the HDMI, LCD > > - or VGA output found on most sunxi devices. See doc/README.video for > > - info on how to select the video output and mode. > > + Say Y here to add support for using a graphical console on the HDMI, > > + LCD or VGA output found on older sunxi devices. This will also > > provide > > + a simple_framebuffer device for Linux. > > > > config VIDEO_HDMI > > bool "HDMI output support" > > diff --git a/drivers/video/sunxi/sunxi_display.c > > b/drivers/video/sunxi/sunxi_display.c > > index f52aba4d21c..61498d1642f 100644 > > --- a/drivers/video/sunxi/sunxi_display.c > > +++ b/drivers/video/sunxi/sunxi_display.c > > @@ -7,6 +7,8 @@ > > */ > > > > #include > > +#include > > +#include > > #include > > #include > > #include > > @@ -28,7 +30,9 @@ > > #include > > #include > > #include > > +#include > > #include > > +#include > > Do you need that? Internal things should be avoided if posssible. That's a good point. This is needed for uclass_find_device_by_name() down in the simplefb setup function at the very end. This function will be called from a different context (from ft_board_setup() in board.c), and tries to find the (only) instance of this very driver to populate the simplefb DT node accordingly. This is the approach the sunxi_de2.c uses, and back at the time this was seemingly the best way to achieve this. Alternatives I see: 1) Keep a global static variable, pointing to the struct udevice, set in probe(). 2) Use uclass_get_device_by_name() instead, but prevent the double probe by keeping an indication of the probe status. 3) Gather all data needed for the simplefb setup already in probe(), and store them in global variables, to be picked up by sunxi_simplefb_setup() later. 4) as 3), but store the extra data (just the pipeline name to find the right DT node to enable?) in generic uclass storage. This has the potential of making this function platform and board agnostic (so meson could benefit as well?). We could then setup the simplefb in common code. Any ideas on this? Maybe something else entirely? > > > #include "../videomodes.h" > > #include "../anx9804.h" > > #include "../hitachi_tx18d42vm_lcd.h" > > @@ -45,6 +49,11 @@ >
Re: [PATCH 1/1] arm: qemu: support qfw
On Sat, Feb 20, 2021 at 04:54:41AM -0700, Simon Glass wrote: > Hi Asherah, > > On Fri, 19 Feb 2021 at 18:14, Asherah Connor wrote: > > > > On 21/02/19 06:02:p, Heinrich Schuchardt wrote: > > > drivers/misc/qfw.c should be converted to the driver model instead of > > > initializing the driver in arch_early_init_r() on qemu-arm and > > > qemu_chipset_init() on qemu-x86. > > > > > > Cf. https://u-boot.readthedocs.io/en/latest/driver-model/index.html > > > > > > Please, coordinate the change with Simon. > > > > Understood. I've played around a little bit with the DM and it > > shouldn't be too hard to convert. Probably the biggest question in my > > mind is, should it be slotted into UCLASS_MISC? Or do we create a qfw > > uclass? > > Probably create a uclass. I expect there are operations and some > private data. We also need to think about testing, since all uclasses > need a sandbox test. Well, need a test. Since this is something for qemu, which is already a virtual platform, I'd be quite happy to see this tested in the qemu platforms that will support it and then not sandbox. -- Tom signature.asc Description: PGP signature
Re: [PATCH 2/2] mx28evk: Convert to driver model
On Sat, Feb 20, 2021 at 06:08:19PM -0300, Fabio Estevam wrote: > On Sat, Feb 20, 2021 at 5:45 PM Tom Rini wrote: > > > You're missing: > > configs/mx28evk_auart_console_defconfig > > configs/mx28evk_nand_defconfig > > configs/mx28evk_spi_defconfig > > in conversion here. > > I am OK to drop the support for these 3 targets. Can you please do that in a follow-up to your series, as you're taking over the overall platform? Thanks! -- Tom signature.asc Description: PGP signature
Re: [PATCH] usb: kbd: Also accept keyboards with Interrupt OUT endpoint
On 2/20/21 5:26 PM, Stefan Brüns wrote: The OUT endpoint can just be ignored as it is not used, just as the corresponding Set_Report request for IN-only interfaces. E.g. the Linux gadget hid keyboard also provides an interrupt endpoint. Also cleanup confusing debug messages like "found set protocol", which is printed when a keyboard device is found, while the Set_Protocol request is issued quite some time later. Applied, thanks.
Re: [PATCH 2/2] mx28evk: Convert to driver model
On Sat, Feb 20, 2021 at 5:45 PM Tom Rini wrote: > You're missing: > configs/mx28evk_auart_console_defconfig > configs/mx28evk_nand_defconfig > configs/mx28evk_spi_defconfig > in conversion here. I am OK to drop the support for these 3 targets.
Re: [PATCH 2/2] mx28evk: Convert to driver model
On Wed, Feb 17, 2021 at 11:39:28PM -0300, Fabio Estevam wrote: > Make the conversion to driver model as it is mandatory. > > Successfully tested booting Linux from the SD card. > > Dropped support for networking and splash screen as these need > to be properly converted to DM and tested. > > Signed-off-by: Fabio Estevam > --- > I haven't had a chance to add DM_ETH and DM_VIDEO yet, but > these can be added later. > > arch/arm/dts/Makefile | 1 + > arch/arm/dts/imx28-evk-u-boot.dtsi | 10 > board/freescale/mx28evk/MAINTAINERS | 1 + > board/freescale/mx28evk/mx28evk.c | 77 - > configs/mx28evk_defconfig | 28 +-- You're missing: configs/mx28evk_auart_console_defconfig configs/mx28evk_nand_defconfig configs/mx28evk_spi_defconfig in conversion here. -- Tom signature.asc Description: PGP signature
[PATCH] tools/mkeficapsule.c: fix DEBUG build
Fix a missing comma sign (,) from a printf(), that is only
reachable if DEBUG is defined, in which case the build fails with:
tools/mkeficapsule.c:266:36: error: expected ‘)’ before ‘bin’
266 | printf("\tbin: %s\n\ttype: %pUl\n" bin, guid);
|^~~~
|)
Signed-off-by: Klaus Heinrich Kiwi
---
tools/mkeficapsule.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/tools/mkeficapsule.c b/tools/mkeficapsule.c
index 162494907a..1613e74ca7 100644
--- a/tools/mkeficapsule.c
+++ b/tools/mkeficapsule.c
@@ -263,7 +263,7 @@ static int create_fwbin(char *path, char *bin, efi_guid_t
*guid,
#ifdef DEBUG
printf("For output: %s\n", path);
- printf("\tbin: %s\n\ttype: %pUl\n" bin, guid);
+ printf("\tbin: %s\n\ttype: %pUl\n", bin, guid);
printf("\tindex: %ld\n\tinstance: %ld\n", index, instance);
#endif
--
2.25.1
[PATCH 2/2 v3] efi: ESRT creation tests
This commmit exercises the ESRT creation -- introduced in the previous
commit -- in two tests.
test 1:
A fake FMP, with TEST_ESRT_NUM_ENTRIES FW images, is installed in the
system leading to the corresponding ESRT entries being populated.
The ESRT entries are checked against the datastructure used to
initialize the FMP.
test 1 invocation:
make sandbox_capsule_defconfig all
./u-boot -d arch/sandbox/dts/test.dtb
ut lib
test 2:
The test is part of test_efi_capsule_fw3.
In order to run the test the following must be added to
sandbox_defconfig:
+CONFIG_CMD_SF=y
+CONFIG_CMD_MEMORY=y
+CONFIG_CMD_FAT=y
+CONFIG_DFU=y
The ESRT is printed in the u-boot shell by calling efidebug esrt.
The test ensures that, after the capsule is installed, the ESRT
contains entries with the GUIDs:
- EFI_FIRMWARE_IMAGE_TYPE_UBOOT_FIT_GUID;
- EFI_FIRMWARE_IMAGE_TYPE_UBOOT_RAW_GUID;
test 2 invocation:
sudo ./test/py/test.py --bd sandbox -k capsule_fw3 -l --build
Signed-off-by: Jose Marinho
CC: Heinrich Schuchardt
CC: Sughosh Ganu
CC: AKASHI Takahiro
CC: Ilias Apalodimas
CC: Andre Przywara
CC: Alexander Graf
CC: n...@arm.com
---
cmd/efidebug.c| 64 ++
test/lib/Makefile | 1 +
test/lib/efi_esrt.c | 191 ++
.../test_efi_capsule/test_capsule_firmware.py | 4 +
4 files changed, 260 insertions(+)
create mode 100644 test/lib/efi_esrt.c
diff --git a/cmd/efidebug.c b/cmd/efidebug.c
index a7dace2f80..5a9ff2bd9a 100644
--- a/cmd/efidebug.c
+++ b/cmd/efidebug.c
@@ -129,6 +129,61 @@ static int do_efi_capsule_show(struct cmd_tbl *cmdtp, int
flag,
return CMD_RET_SUCCESS;
}
+#ifdef CONFIG_EFI_ESRT
+/**
+ * do_efi_capsule_esrt() - manage UEFI capsules
+ *
+ * @cmdtp: Command table
+ * @flag: Command flag
+ * @argc: Number of arguments
+ * @argv: Argument array
+ * Return: CMD_RET_SUCCESS on success,
+ * CMD_RET_USAGE or CMD_RET_RET_FAILURE on failure
+ *
+ * Implement efidebug "capsule esrt" sub-command.
+ * The prints the current ESRT table.
+ *
+ * efidebug capsule esrt
+ */
+static int do_efi_capsule_esrt(struct cmd_tbl *cmdtp, int flag,
+ int argc, char * const argv[])
+{
+ struct efi_system_resource_table *esrt = NULL;
+
+ if (argc != 1)
+ return CMD_RET_USAGE;
+
+ for (int idx = 0; idx < systab.nr_tables; idx++)
+ if (!guidcmp(&efi_esrt_guid, &systab.tables[idx].guid))
+ esrt = (struct efi_system_resource_table
*)systab.tables[idx].table;
+
+ if (!esrt)
+ return CMD_RET_FAILURE;
+
+ printf("\n");
+ printf("ESRT: fw_resource_count=%d\n", esrt->fw_resource_count);
+ printf("ESRT: fw_resource_count_max=%d\n", esrt->fw_resource_count_max);
+ printf("ESRT: fw_resource_version=%lld\n", esrt->fw_resource_version);
+
+ for (int idx = 0; idx < esrt->fw_resource_count; idx++) {
+ printf("[entry %d]==\n", idx);
+ printf("ESRT: fw_class=%pUL\n", &esrt->entries[idx].fw_class);
+ printf("ESRT: fw_type=%d\n", esrt->entries[idx].fw_type);
+ printf("ESRT: fw_version=%d\n", esrt->entries[idx].fw_version);
+ printf("ESRT: lowest_supported_fw_version=%d\n",
+ esrt->entries[idx].lowest_supported_fw_version);
+ printf("ESRT: capsule_flags=%d\n",
+ esrt->entries[idx].capsule_flags);
+ printf("ESRT: last_attempt_version=%d\n",
+ esrt->entries[idx].last_attempt_version);
+ printf("ESRT: last_attempt_status=%d\n",
+ esrt->entries[idx].last_attempt_status);
+ }
+ printf("\n");
+
+ return CMD_RET_SUCCESS;
+}
+#endif /* CONFIG_EFI_ESRT */
/**
* do_efi_capsule_res() - show a capsule update result
*
@@ -221,6 +276,10 @@ static struct cmd_tbl cmd_efidebug_capsule_sub[] = {
"", ""),
U_BOOT_CMD_MKENT(show, CONFIG_SYS_MAXARGS, 1, do_efi_capsule_show,
"", ""),
+#ifdef CONFIG_EFI_ESRT
+ U_BOOT_CMD_MKENT(esrt, CONFIG_SYS_MAXARGS, 1, do_efi_capsule_esrt,
+"", ""),
+#endif
U_BOOT_CMD_MKENT(disk-update, 0, 0, do_efi_capsule_on_disk_update,
"", ""),
U_BOOT_CMD_MKENT(result, CONFIG_SYS_MAXARGS, 1, do_efi_capsule_res,
@@ -256,6 +315,7 @@ static int do_efi_capsule(struct cmd_tbl *cmdtp, int flag,
return cp->cmd(cmdtp, flag, argc, argv);
}
+
#endif /* CONFIG_EFI_HAVE_CAPSULE_SUPPORT */
/**
@@ -1580,6 +1640,10 @@ static char efidebug_help_text[] =
" - show capsule information\n"
"efidebug capsule result []\n"
" - show a capsule update result\n"
+#ifdef CONFI
[PATCH 1/2 v3] efi: Add ESRT to the EFI system table
The ESRT is initialised during efi_init_objlist after
efi_initialize_system_table().
The ESRT is initially created with size for 50 FW image entries.
The ESRT is resized when it runs out of space. Every resize adds 50
additional entries.
The ESRT is populated from information provided by FMP instances only.
Signed-off-by: Jose Marinho
CC: Heinrich Schuchardt
CC: Sughosh Ganu
CC: AKASHI Takahiro
CC: Ilias Apalodimas
CC: Andre Przywara
CC: Alexander Graf
CC: n...@arm.com
---
cmd/efidebug.c | 4 +
include/efi_api.h| 21 ++
include/efi_loader.h | 20 ++
lib/efi_loader/Kconfig | 7 +
lib/efi_loader/Makefile | 1 +
lib/efi_loader/efi_capsule.c | 8 +
lib/efi_loader/efi_esrt.c| 518 +++
lib/efi_loader/efi_setup.c | 6 +
8 files changed, 585 insertions(+)
create mode 100644 lib/efi_loader/efi_esrt.c
diff --git a/cmd/efidebug.c b/cmd/efidebug.c
index bbbcb0a546..a7dace2f80 100644
--- a/cmd/efidebug.c
+++ b/cmd/efidebug.c
@@ -459,6 +459,10 @@ static const struct {
"Block IO",
EFI_BLOCK_IO_PROTOCOL_GUID,
},
+ {
+ "EFI System Resource Table",
+ EFI_SYSTEM_RESOURCE_TABLE_GUID,
+ },
{
"Simple File System",
EFI_SIMPLE_FILE_SYSTEM_PROTOCOL_GUID,
diff --git a/include/efi_api.h b/include/efi_api.h
index 48e48a6263..fb53637419 100644
--- a/include/efi_api.h
+++ b/include/efi_api.h
@@ -1722,6 +1722,23 @@ struct efi_load_file_protocol {
void *buffer);
};
+struct efi_system_resource_entry {
+ efi_guid_t fw_class;
+ u32 fw_type;
+ u32 fw_version;
+ u32 lowest_supported_fw_version;
+ u32 capsule_flags;
+ u32 last_attempt_version;
+ u32 last_attempt_status;
+} __packed;
+
+struct efi_system_resource_table {
+ u32 fw_resource_count;
+ u32 fw_resource_count_max;
+ u64 fw_resource_version;
+ struct efi_system_resource_entry entries[];
+} __packed;
+
/* Boot manager load options */
#define LOAD_OPTION_ACTIVE 0x0001
#define LOAD_OPTION_FORCE_RECONNECT0x0002
@@ -1740,6 +1757,10 @@ struct efi_load_file_protocol {
#define ESRT_FW_TYPE_DEVICEFIRMWARE0x0002
#define ESRT_FW_TYPE_UEFIDRIVER0x0003
+#define EFI_SYSTEM_RESOURCE_TABLE_GUID\
+ EFI_GUID(0xb122a263, 0x3661, 0x4f68,\
+ 0x99, 0x29, 0x78, 0xf8, 0xb0, 0xd6, 0x21, 0x80)
+
/* Last Attempt Status Values */
#define LAST_ATTEMPT_STATUS_SUCCESS0x
#define LAST_ATTEMPT_STATUS_ERROR_UNSUCCESSFUL 0x0001
diff --git a/include/efi_loader.h b/include/efi_loader.h
index f470bbd636..c2720f2823 100644
--- a/include/efi_loader.h
+++ b/include/efi_loader.h
@@ -214,6 +214,8 @@ extern const efi_guid_t efi_guid_rng_protocol;
extern const efi_guid_t efi_guid_capsule_report;
/* GUID of firmware management protocol */
extern const efi_guid_t efi_guid_firmware_management_protocol;
+/* GUID for the ESRT */
+extern const efi_guid_t efi_esrt_guid;
extern unsigned int __efi_runtime_start, __efi_runtime_stop;
extern unsigned int __efi_runtime_rel_start, __efi_runtime_rel_stop;
@@ -884,4 +886,22 @@ static inline efi_status_t efi_launch_capsules(void)
#endif /* CONFIG_IS_ENABLED(EFI_LOADER) */
+/**
+ * Install the ESRT system table.
+ *
+ * @return status code
+ */
+efi_status_t efi_esrt_register(void);
+
+/**
+ * efi_esrt_populate() - Populates the ESRT entries from the FMP instances
+ * present in the system.
+ * If an ESRT already exists, the old ESRT is replaced in the system table.
+ * The memory of the old ESRT is deallocated.
+ *
+ * Return:
+ * - EFI_SUCCESS if the ESRT is correctly created
+ * - error code otherwise.
+ */
+efi_status_t efi_esrt_populate(void);
#endif /* _EFI_LOADER_H */
diff --git a/lib/efi_loader/Kconfig b/lib/efi_loader/Kconfig
index e729f727df..a96014ce18 100644
--- a/lib/efi_loader/Kconfig
+++ b/lib/efi_loader/Kconfig
@@ -347,4 +347,11 @@ config EFI_SECURE_BOOT
it is signed with a trusted key. To do that, you need to install,
at least, PK, KEK and db.
+config EFI_ESRT
+ bool "Enable the UEFI ESRT generation"
+ depends on EFI_CAPSULE_FIRMWARE_MANAGEMENT
+ default y
+ help
+ Enabling this option creates the ESRT UEFI system table.
+
endif
diff --git a/lib/efi_loader/Makefile b/lib/efi_loader/Makefile
index 10b42e8847..9a8127846f 100644
--- a/lib/efi_loader/Makefile
+++ b/lib/efi_loader/Makefile
@@ -52,6 +52,7 @@ obj-y += efi_variable.o
obj-$(CONFIG_EFI_VARIABLES_PRESEED) += efi_var_seed.o
endif
obj-y += efi_watchdog.o
+obj-$(CONFIG_EFI_ESRT) += efi_esrt.o
obj-$(CONFIG_LCD) += efi_gop.o
obj-$(CONFIG_DM_VIDEO) += efi_gop.o
obj-$(CONFIG_PARTITIONS) += efi_disk.o
diff --git a/lib/efi_loader/efi_capsule.c b/lib/efi_loader/efi_capsule.c
index b57f0302c5..a1a69e619d 100
[PATCH 0/2 v3] Add ESRT and test ESRT creation
The following 2 commits add the ESRT and provide a test of the functionality. The first commit adds the ESRT as defined in the UEFI 2.8 specification. An empty ESRT is created during the execution of the efi_init_obj_list(). The ESRT is updated when: 1) a FMP protocol is installed in the system: this will add the corresponding entries to the ESRT. 2) a capsule is installed via UpdateCapsule: this should update entries already present in the ESRT. This implementation of the ESRT creation takes input from FMP only. It is assumed that the FMP will maintain the following values across reboot: - LastAttemptVersion. - LastAttemptStatus. The second commit enables testing the ESRT creation in the sandbox platform. That commit is composed of 2 tests. - Test 1 executes from the u-boot shell with "ut lib". - Test 2 executes in the pytest environment. Patch v3: - Address v2 comments. Patch v2: - The ESRT is now regenerated from scratch at every FMP EVT_NOTIFY_SIGNAL and whenever a capsule is updated. - Extended TestEfiCapsuleFirmwareFit::test_efi_capsule_fw3 to verify that the ESRT is correctly populated after an UpdateCapsule. - Addressed v1 comments. Patch v1: - reworked the ESRT creation code, allowing table to resize as FMPs are installed. - registered a callback for the FMP protocol install. - Created a unit test running on the sandbox platform. rfc: initial patch submission CC: Heinrich Schuchardt CC: Sughosh Ganu CC: AKASHI Takahiro CC: Ilias Apalodimas CC: Andre Przywara CC: Alexander Graf CC: n...@arm.com Jose Marinho (2): efi: Add ESRT to the EFI system table efi: ESRT creation tests cmd/efidebug.c| 68 +++ include/efi_api.h | 21 + include/efi_loader.h | 20 + lib/efi_loader/Kconfig| 7 + lib/efi_loader/Makefile | 1 + lib/efi_loader/efi_capsule.c | 8 + lib/efi_loader/efi_esrt.c | 518 ++ lib/efi_loader/efi_setup.c| 6 + test/lib/Makefile | 1 + test/lib/efi_esrt.c | 191 +++ .../test_efi_capsule/test_capsule_firmware.py | 4 + 11 files changed, 845 insertions(+) create mode 100644 lib/efi_loader/efi_esrt.c create mode 100644 test/lib/efi_esrt.c -- 2.17.1
Re: [PATCH 1/2] efi: Add ESRT to the EFI system table
Hi Jose,
On Fri, Feb 19, 2021 at 06:04:20PM +, Jose Marinho wrote:
> The ESRT is initialised during efi_init_objlist after
> efi_initialize_system_table().
>
> The ESRT is initially created with size for 50 FW image entries.
> The ESRT is resized when it runs out of space. Every resize adds 50
> additional entries.
> The ESRT is populated from information provided by FMP instances only.
>
> Signed-off-by: Jose Marinho
>
> CC: Heinrich Schuchardt
> CC: Sughosh Ganu
> CC: AKASHI Takahiro
> CC: Ilias Apalodimas
> CC: Andre Przywara
> CC: Alexander Graf
> CC: n...@arm.com
>
> ---
> cmd/efidebug.c | 4 +
> include/efi_api.h| 21 ++
> include/efi_loader.h | 20 ++
> lib/efi_loader/Kconfig | 7 +
> lib/efi_loader/Makefile | 1 +
> lib/efi_loader/efi_capsule.c | 8 +
> lib/efi_loader/efi_esrt.c| 522 +++
> lib/efi_loader/efi_setup.c | 6 +
> 8 files changed, 589 insertions(+)
> create mode 100644 lib/efi_loader/efi_esrt.c
>
> diff --git a/cmd/efidebug.c b/cmd/efidebug.c
> index bbbcb0a546..a7dace2f80 100644
> --- a/cmd/efidebug.c
[...]
> +static efi_status_t
> +efi_esrt_image_info_to_entry(struct efi_firmware_image_descriptor *img_info,
> + struct efi_system_resource_entry *entry,
> + u32 desc_version, u32 image_type, u32 flags)
> +{
> + if (guidcmp(&entry->fw_class, &img_info->image_type_id)) {
> + EFI_PRINT("ESRT entry %pUL mismatches img_type_id %pUL\n",
> + &entry->fw_class, &img_info->image_type_id);
> + return EFI_INVALID_PARAMETER;
> + }
> +
> + entry->fw_version = img_info->version;
> +
> + entry->fw_type = image_type;
> + entry->capsule_flags = flags;
> +
> + /*
> + * The field lowest_supported_image_version is only present
> + * on image info structure of version 2 or greater.
> + * See the EFI_FIRMWARE_IMAGE_DESCRIPTOR definition in UEFI.
> + */
> + if (desc_version >= 2) {
> + entry->lowest_supported_fw_version =
> + img_info->lowest_supported_image_version;
> + } else {
> + entry->lowest_supported_fw_version = 0;
> + }
You can ditch the {} here
> +
> + /*
> + * The fields last_attempt_version and last_attempt_status
> + * are only present on image info structure of version 3 or
> + * greater.
> + * See the EFI_FIRMWARE_IMAGE_DESCRIPTOR definition in UEFI.
[...]
> +static
> +efi_status_t efi_esrt_allocate_install(struct efi_boot_services *bt,
> +u32 num_entries)
> +{
> + efi_status_t ret;
> + struct efi_system_resource_table *new_esrt;
> + u32 size = efi_esrt_entries_to_size(num_entries);
> + efi_guid_t esrt_guid = efi_esrt_guid;
> +
> + /* Allocated pages must be on the lower 32bit address space. */
> + new_esrt = (struct efi_system_resource_table *)(uintptr_t)U32_MAX;
I don't think this is needed
> +
> + /* Reserve num_pages for ESRT */
> + ret = bt->allocate_pool(EFI_BOOT_SERVICES_DATA, size,
> + (void **)&new_esrt);
allocate_pool will call allocate_pages with EFI_ALLOCATE_ANY_PAGES not
EFI_ALLOCATE_ADDRESS (which I assume it was your intention here).
So you either need to check the address after the allocation or just don't
require it to be in the lower 32bit space.
> +
> + if (ret != EFI_SUCCESS) {
> + EFI_PRINT("ESRT cannot allocate memory for %d entries (%d
> bytes)\n",
> + num_entries, efi_esrt_entries_to_size(num_entries));
> +
> + return ret;
> + }
> +
> + new_esrt->fw_resource_count_max = num_entries;
> + new_esrt->fw_resource_count = 0;
> + new_esrt->fw_resource_version = EFI_ESRT_VERSION;
> +
> + /* Install the ESRT in the system configuration table. */
> + ret = bt->install_configuration_table(&esrt_guid, (void *)new_esrt);
> + if (ret != EFI_SUCCESS) {
> + EFI_PRINT("ESRT failed to install the ESRT in the system
> table\n");
> + return ret;
> + }
> +
> + /* If there was a previous ESRT, deallocate its memory now. */
> + if (esrt)
> + ret = bt->free_pool(esrt);
> +
> + esrt = new_esrt;
> +
> + return EFI_SUCCESS;
> +}
[...]
Regards
/Ilias
[PATCH v2 2/2] clk: imx8mp Enable EQOS clock
Enable EQOS clock for imx8mp
V2 includes if CONFIG
Signed-off-by: Steffen Arendt
mailto:s.are...@sensopart.de>>
---
diff --git a/drivers/clk/imx/clk-imx8mp.c b/drivers/clk/imx/clk-imx8mp.c
index b31afb31c0..1ab5587e4e 100644
--- a/drivers/clk/imx/clk-imx8mp.c
+++ b/drivers/clk/imx/clk-imx8mp.c
@@ -130,6 +130,16 @@ static const char *imx8mp_ecspi3_sels[] = "osc_24m",
"sys_pll2_200m", "sys_pll1
"sys_pll2_250m", "audio_pll2_out", ;
#endif
+#if CONFIG_IS_ENABLED(DWC_ETH_QOS)
+static const char *imx8mp_enet_qos_sels[] = "osc_24m", "sys_pll2_125m",
"sys_pll2_50m",
+"sys_pll2_100m", "sys_pll1_160m",
"audio_pll1_out",
+"video_pll1_out", "clk_ext4", ;
+
+static const char *imx8mp_enet_qos_timer_sels[] = "osc_24m", "sys_pll2_100m",
"audio_pll1_out",
+ "clk_ext1", "clk_ext2",
"clk_ext3",
+ "clk_ext4",
"video_pll1_out", ;
+#endif
+
static const char *imx8mp_usdhc1_sels[] = "clock-osc-24m", "sys_pll1_400m",
"sys_pll1_800m",
"sys_pll2_500m", "sys_pll3_out",
"sys_pll1_266m",
"audio_pll2_out", "sys_pll1_100m", ;
@@ -426,6 +436,13 @@ static int imx8mp_clk_probe(struct udevice *dev)
imx_clk_gate4("ecspi3_root_clk", "ecspi3", base + 0x4090, 0));
#endif
+#if CONFIG_IS_ENABLED(DWC_ETH_QOS)
+ clk_dm(IMX8MP_CLK_ENET_QOS,
+ imx8m_clk_composite("enet_qos", imx8mp_enet_qos_sels,
base + 0xa880));
+ clk_dm(IMX8MP_CLK_ENET_QOS_TIMER,
+ imx8m_clk_composite("enet_qos_timer",
imx8mp_enet_qos_timer_sels, base + 0xa900));
+#endif
+
return 0;
_
SensoPart Industriesensorik GmbH
Am Wiedenbach 1
79695 Wieden
Deutschland
Telefon: +49 7673 821 0
Amtsgericht Freiburg HRB 660163
USt-IdNr.: DE 811614252
Gesch?ftsf?hrer: Dr. Theodor Wanner, Thorsten Wanner
Informationen gem. Art. 13 DSGVO f?r unsere Kunden, Partner, Lieferanten finden
Sie in unserer Erkl?rung zum Datenschutz unter
https://www.sensopart.com/de/datenschutz
Re: Pull request: u-boot-sunxi/master for v2021.04
On Sat, Feb 20, 2021 at 12:33:05AM +, Andre Przywara wrote: > Hi Tom, > > please pull the master branch from u-boot-sunxi, containing some fixes > for 2021.04: Applied to u-boot/master, thanks! -- Tom signature.asc Description: PGP signature
Re: [PATCH v2 01/38] pci: fsl_pci_init: Dynamically allocate the PCI regions
On Sat, Feb 20, 2021 at 04:54:50AM -0700, Simon Glass wrote:
> Hi Bin,
>
> On Thu, 18 Feb 2021 at 08:58, Bin Meng wrote:
> >
> > Commit e002474158d1 ("pci: pci-uclass: Dynamically allocate the PCI
> > regions")
> > changes 'struct pci_controller'.regions from pre-allocated array of
> > regions to dynamically allocated, which unfortunately broken lots of
> > boards that still use the non-DM PCI driver.
> >
> > This patch changes the non-DM fsl_pci_init driver to dynamically
> > allocate the regions, just like what's done in the pci uclass driver.
> >
> > Fixes: e002474158d1 ("pci: pci-uclass: Dynamically allocate the PCI
> > regions")
> > Signed-off-by: Bin Meng
> >
> > ---
> >
> > Changes in v2:
> > - drop the revert patch of commit e002474158d1
> > - new patch: pci: fsl_pci_init: Dynamically allocate the PCI regions
> >
> > drivers/pci/fsl_pci_init.c | 5 +
> > 1 file changed, 5 insertions(+)
>
> Reviewed-by: Simon Glass
>
> But I think it would be better to disable PCI on these devices
> (Kconfig depends on BROKEN) until the maintainer converts it to DM.
I don't think that will work here and I suspect disabling PCI will lead
to a ton of other build problems. I'm going to try and finish up a
branch that removes all of the DM_MMC fail to convert boards (which has
a lot of overlap with other fail to converts) and then we can see what's
missing still for DM_PCI and some others.
--
Tom
signature.asc
Description: PGP signature
[PATCH] sunxi: support asymmetric dual rank DRAM on A64/R40
From: Icenowy Zheng
Previously we have known that R40 has a configuration register for its
rank 1, which allows different configuration than rank 0. Reverse
engineering of newest libdram of A64 from Allwinner shows that A64 has
this register too. It's bit 0 (which enables dual rank in rank 0
configuration register) means a dedicated rank size setup is used for
rank 1.
Now, Pine64 scheduled to use a 3GiB LPDDR3 DRAM chip (which has 2GiB
rank 0 and 1GiB rank 1) on PinePhone, that makes asymmetric dual rank
DRAM support necessary.
Add this support. As we have gained knowledge of asymmetric dual rank,
we can now allow R40 dual rank memory setup to work too.
Signed-off-by: Icenowy Zheng
---
.../include/asm/arch-sunxi/dram_sunxi_dw.h| 11 +-
arch/arm/mach-sunxi/dram_sunxi_dw.c | 100 +-
2 files changed, 84 insertions(+), 27 deletions(-)
diff --git a/arch/arm/include/asm/arch-sunxi/dram_sunxi_dw.h
b/arch/arm/include/asm/arch-sunxi/dram_sunxi_dw.h
index a5a7ebde44..e843c14202 100644
--- a/arch/arm/include/asm/arch-sunxi/dram_sunxi_dw.h
+++ b/arch/arm/include/asm/arch-sunxi/dram_sunxi_dw.h
@@ -215,12 +215,17 @@ struct sunxi_mctl_ctl_reg {
#define NR_OF_BYTE_LANES (32 / BITS_PER_BYTE)
/* The eight data lines (DQn) plus DM, DQS and DQSN */
#define LINES_PER_BYTE_LANE(BITS_PER_BYTE + 3)
-struct dram_para {
+
+struct rank_para {
u16 page_size;
- u8 bus_full_width;
- u8 dual_rank;
u8 row_bits;
u8 bank_bits;
+};
+
+struct dram_para {
+ u8 dual_rank;
+ u8 bus_full_width;
+ struct rank_para ranks[2];
const u8 dx_read_delays[NR_OF_BYTE_LANES][LINES_PER_BYTE_LANE];
const u8 dx_write_delays[NR_OF_BYTE_LANES][LINES_PER_BYTE_LANE];
const u8 ac_delays[31];
diff --git a/arch/arm/mach-sunxi/dram_sunxi_dw.c
b/arch/arm/mach-sunxi/dram_sunxi_dw.c
index 85e7a1874e..b679f92e70 100644
--- a/arch/arm/mach-sunxi/dram_sunxi_dw.c
+++ b/arch/arm/mach-sunxi/dram_sunxi_dw.c
@@ -346,18 +346,24 @@ static void mctl_set_cr(uint16_t socid, struct dram_para
*para)
#else
#error Unsupported DRAM type!
#endif
- (para->bank_bits == 3 ? MCTL_CR_EIGHT_BANKS :
MCTL_CR_FOUR_BANKS) |
+ (para->ranks[0].bank_bits == 3 ? MCTL_CR_EIGHT_BANKS :
MCTL_CR_FOUR_BANKS) |
MCTL_CR_BUS_FULL_WIDTH(para->bus_full_width) |
(para->dual_rank ? MCTL_CR_DUAL_RANK : MCTL_CR_SINGLE_RANK) |
- MCTL_CR_PAGE_SIZE(para->page_size) |
- MCTL_CR_ROW_BITS(para->row_bits), &mctl_com->cr);
+ MCTL_CR_PAGE_SIZE(para->ranks[0].page_size) |
+ MCTL_CR_ROW_BITS(para->ranks[0].row_bits), &mctl_com->cr);
- if (socid == SOCID_R40) {
- if (para->dual_rank)
- panic("Dual rank memory not supported\n");
+ if (socid == SOCID_A64 || socid == SOCID_R40) {
+ writel((para->ranks[1].bank_bits == 3 ? MCTL_CR_EIGHT_BANKS :
MCTL_CR_FOUR_BANKS) |
+ MCTL_CR_BUS_FULL_WIDTH(para->bus_full_width) |
+ (para->dual_rank ? MCTL_CR_DUAL_RANK :
MCTL_CR_SINGLE_RANK) |
+ MCTL_CR_PAGE_SIZE(para->ranks[1].page_size) |
+ MCTL_CR_ROW_BITS(para->ranks[1].row_bits),
&mctl_com->cr_r1);
+ }
+ if (socid == SOCID_R40) {
/* Mux pin to A15 address line for single rank memory. */
- setbits_le32(&mctl_com->cr_r1, MCTL_CR_R1_MUX_A15);
+ if (!para->dual_rank)
+ setbits_le32(&mctl_com->cr_r1, MCTL_CR_R1_MUX_A15);
}
}
@@ -581,35 +587,63 @@ static int mctl_channel_init(uint16_t socid, struct
dram_para *para)
return 0;
}
-static void mctl_auto_detect_dram_size(uint16_t socid, struct dram_para *para)
+/*
+ * Test if memory at offset offset matches memory at a certain base
+ */
+static bool mctl_mem_matches_base(u32 offset, ulong base)
+{
+ /* Try to write different values to RAM at two addresses */
+ writel(0, base);
+ writel(0xaa55aa55, base + offset);
+ dsb();
+ /* Check if the same value is actually observed when reading back */
+ return readl(base) ==
+ readl(base + offset);
+}
+
+static void mctl_auto_detect_dram_size_rank(uint16_t socid, struct dram_para
*para, ulong base, struct rank_para *rank)
{
/* detect row address bits */
- para->page_size = 512;
- para->row_bits = 16;
- para->bank_bits = 2;
+ rank->page_size = 512;
+ rank->row_bits = 16;
+ rank->bank_bits = 2;
mctl_set_cr(socid, para);
- for (para->row_bits = 11; para->row_bits < 16; para->row_bits++)
- if (mctl_mem_matches((1 << (para->row_bits + para->bank_bits))
* para->page_size))
+ for (rank->row_bits = 11; rank->row_bits < 16; rank->row_bits++)
+ if (mctl_mem_matches_base((1 << (rank->row_bits +
rank->bank_bits)) * rank->page_size, base))
[PATCH] sunxi-common: support loading compressed kernel images on ARMv8
From: Arnaud Ferraris --- include/configs/sunxi-common.h | 15 +++ 1 file changed, 15 insertions(+) diff --git a/include/configs/sunxi-common.h b/include/configs/sunxi-common.h index 5b0bec0561..227284cd29 100644 --- a/include/configs/sunxi-common.h +++ b/include/configs/sunxi-common.h @@ -291,6 +291,8 @@ extern int soft_i2c_gpio_scl; */ #define BOOTM_SIZE __stringify(0xa00) #define KERNEL_ADDR_R __stringify(SDRAM_OFFSET(008)) +#define KERNEL_COMP_ADDR_R __stringify(SDRAM_OFFSET(400)) +#define KERNEL_COMP_SIZE __stringify(0x400) #define FDT_ADDR_R __stringify(SDRAM_OFFSET(FA0)) #define SCRIPT_ADDR_R __stringify(SDRAM_OFFSET(FC0)) #define PXEFILE_ADDR_R __stringify(SDRAM_OFFSET(FD0)) @@ -332,6 +334,18 @@ extern int soft_i2c_gpio_scl; "pxefile_addr_r=" PXEFILE_ADDR_R "\0" \ "ramdisk_addr_r=" RAMDISK_ADDR_R "\0" +#ifdef CONFIG_ARM64 + +#define MEM_LAYOUT_ENV_EXTRA_SETTINGS \ + "kernel_comp_addr_r=" KERNEL_COMP_ADDR_R "\0" \ + "kernel_comp_size=" KERNEL_COMP_SIZE "\0" + +#else + +#define MEM_LAYOUT_ENV_EXTRA_SETTINGS "" + +#endif + #define DFU_ALT_INFO_RAM \ "dfu_alt_info_ram=" \ "kernel ram " KERNEL_ADDR_R " 0x100;" \ @@ -487,6 +501,7 @@ extern int soft_i2c_gpio_scl; #define CONFIG_EXTRA_ENV_SETTINGS \ CONSOLE_ENV_SETTINGS \ MEM_LAYOUT_ENV_SETTINGS \ + MEM_LAYOUT_ENV_EXTRA_SETTINGS \ DFU_ALT_INFO_RAM \ "fdtfile=" FDTFILE "\0" \ "console=ttyS0,115200\0" \ -- 2.28.0
[PATCH] arm: dts: sun50i-a64-pinephone: fix random wifi mac address
From: Arnaud Ferraris
The wi-fi mac-address was previously changing at every reboot.
---
arch/arm/dts/sun50i-a64-pinephone.dtsi | 22 ++
1 file changed, 22 insertions(+)
diff --git a/arch/arm/dts/sun50i-a64-pinephone.dtsi
b/arch/arm/dts/sun50i-a64-pinephone.dtsi
index 25150aba74..86d55e38d8 100644
--- a/arch/arm/dts/sun50i-a64-pinephone.dtsi
+++ b/arch/arm/dts/sun50i-a64-pinephone.dtsi
@@ -14,6 +14,7 @@
/ {
aliases {
serial0 = &uart0;
+ ethernet0 = &rtl8723cs;
};
backlight: backlight {
@@ -49,6 +50,13 @@
};
};
+ reg_vbat_wifi: vbat-wifi {
+ compatible = "regulator-fixed";
+ regulator-min-microvolt = <330>;
+ regulator-max-microvolt = <330>;
+ regulator-name = "vbat-wifi";
+ };
+
speaker_amp: audio-amplifier {
compatible = "simple-audio-amplifier";
enable-gpios = <&pio 2 7 GPIO_ACTIVE_HIGH>; /* PC7 */
@@ -195,6 +203,20 @@
status = "okay";
};
+&mmc1 {
+ pinctrl-names = "default";
+ pinctrl-0 = <&mmc1_pins>;
+ vmmc-supply = <®_vbat_wifi>;
+ vqmmc-supply = <®_dldo4>;
+ bus-width = <4>;
+ non-removable;
+ status = "okay";
+
+ rtl8723cs: wifi@1 {
+ reg = <1>;
+ };
+};
+
&mmc2 {
pinctrl-names = "default";
pinctrl-0 = <&mmc2_pins>;
--
2.29.2
[PATCH 2/4] pinephone_defconfig: reduce boot delay
From: Arnaud Ferraris On a cellular phone, the vast majority of users can be expected to have no serial console connected and prefer a short boot. --- configs/pinephone_defconfig | 1 + 1 file changed, 1 insertion(+) diff --git a/configs/pinephone_defconfig b/configs/pinephone_defconfig index 9967cddab9..9b51a7a100 100644 --- a/configs/pinephone_defconfig +++ b/configs/pinephone_defconfig @@ -10,4 +10,5 @@ CONFIG_PINEPHONE_DT_SELECTION=y CONFIG_DEFAULT_DEVICE_TREE="sun50i-a64-pinephone-1.2" # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set +CONFIG_BOOTDELAY=0 CONFIG_OF_LIST="sun50i-a64-pinephone-1.1 sun50i-a64-pinephone-1.2" -- 2.20.1
[PATCH 20/20] Enable led on boot to notify user of boot status
From: Marius Gripsgard
---
arch/arm/mach-sunxi/Kconfig | 5 +
board/sunxi/board.c | 4 ++--
configs/pinephone_defconfig | 1 +
3 files changed, 8 insertions(+), 2 deletions(-)
diff --git a/arch/arm/mach-sunxi/Kconfig b/arch/arm/mach-sunxi/Kconfig
index 8421f3b685..2bfdf7738b 100644
--- a/arch/arm/mach-sunxi/Kconfig
+++ b/arch/arm/mach-sunxi/Kconfig
@@ -1,5 +1,10 @@
if ARCH_SUNXI
+config PINEPHONE_LEDS
+ bool "Notify boot status via LEDs on PinePhone"
+ ---help---
+ LED boot notification.
+
config SPL_LDSCRIPT
default "arch/arm/cpu/armv7/sunxi/u-boot-spl.lds" if !ARM64
diff --git a/board/sunxi/board.c b/board/sunxi/board.c
index abd7e390b2..a117b89ba2 100644
--- a/board/sunxi/board.c
+++ b/board/sunxi/board.c
@@ -637,6 +638,12 @@ void sunxi_board_init(void)
{
int power_failed = 0;
+#ifdef CONFIG_PINEPHONE_LEDS
+ /* PD18:G PD19:R PD20:B */
+ gpio_request(SUNXI_GPD(18), "led:green");
+ gpio_direction_output(SUNXI_GPD(18), 1);
+#endif
+
#ifdef CONFIG_SY8106A_POWER
power_failed = sy8106a_set_vout1(CONFIG_SY8106A_VOUT1_VOLT);
#endif
diff --git a/configs/pinephone_defconfig b/configs/pinephone_defconfig
index ff5da42ce0..9de6ab2316 100644
--- a/configs/pinephone_defconfig
+++ b/configs/pinephone_defconfig
@@ -1,6 +21,7 @@
CONFIG_ARM=y
CONFIG_ARCH_SUNXI=y
CONFIG_SPL=y
+CONFIG_PINEPHONE_LEDS=y
CONFIG_MACH_SUN50I=y
CONFIG_SUNXI_DRAM_LPDDR3_STOCK=y
CONFIG_DRAM_CLK=552
--
2.26.2
Re: [PATCH v2 03/38] common: fdt_support: Support special case of PCI address in fdt_read_prop()
Hi Simon,
On Sat, Feb 20, 2021 at 7:55 PM Simon Glass wrote:
>
> Hi Bin,
>
> On Thu, 18 Feb 2021 at 08:58, Bin Meng wrote:
> >
> > At present fdt_read_prop() can only handle 1 or 2 cells. It is
> > called by fdt_read_range() which may be used to read PCI address
> > from for a PCI bus node where the number of PCI address
> > cell is 3. The property is an array of:
> >
> > {}
> >
> > When trying to read from a PCI bus node using
> > fdt_read_prop(), as the codes below:
> >
> > /* Read */
> > if (child_addr) {
> > r = fdt_read_prop(ranges, ranges_len, cell, child_addr,
> > acells);
> > if (r)
> > return r;
> > }
> >
> > it will fail, because the PCI child address is made up of 3 cells
> > but fdt_read_prop() cannot handle it. We advance the cell offset
> > by 1 so that the can be correctly read.
> >
> > This adds the special handling of such case.
> >
> > Signed-off-by: Bin Meng
> >
> > ---
> >
> > Changes in v2:
> > - add more details in the commit message, and put some comments
> > in the codes to explain why
> >
> > common/fdt_support.c | 20 +---
> > 1 file changed, 17 insertions(+), 3 deletions(-)
> >
> > diff --git a/common/fdt_support.c b/common/fdt_support.c
> > index 638eca9..17c54a3 100644
> > --- a/common/fdt_support.c
> > +++ b/common/fdt_support.c
> > @@ -1602,22 +1602,36 @@ u64 fdt_get_base_address(const void *fdt, int node)
> > }
> >
> > /*
> > - * Read a property of size . Currently only supports 1 or 2
> > cells.
> > + * Read a property of size . Currently only supports 1 or 2
> > cells,
> > + * or 3 cells specially for a PCI address.
> > */
> > static int fdt_read_prop(const fdt32_t *prop, int prop_len, int cell_off,
> > uint64_t *val, int cells)
> > {
> > - const fdt32_t *prop32 = &prop[cell_off];
> > - const unaligned_fdt64_t *prop64 = (const fdt64_t *)&prop[cell_off];
> > + const fdt32_t *prop32;
> > + const unaligned_fdt64_t *prop64;
> >
> > if ((cell_off + cells) > prop_len)
> > return -FDT_ERR_NOSPACE;
> >
> > + prop32 = &prop[cell_off];
> > +
> > + /*
> > +* Special handling for PCI address in PCI bus
> > +*
> > +* PCI child address is made up of 3 cells. Advance the cell offset
> > +* by 1 so that the PCI child address can be correctly read.
> > +*/
> > + if (cells == 3)
> > + cell_off += 1;
> > + prop64 = (const fdt64_t *)&prop[cell_off];
> > +
> > switch (cells) {
> > case 1:
> > *val = fdt32_to_cpu(*prop32);
> > break;
> > case 2:
> > + case 3:
> > *val = fdt64_to_cpu(*prop64);
> > break;
> > default:
> > --
> > 2.7.4
> >
>
> I'm not sure whether this is needed once PPC PCI is converted to DM.
> If not, then perhaps we can revert it later. If it is then it would be
I think we can completely remove these APIs once PPC PCI is converted
to DM. We can revisit this later.
> nice to have a test.
>
> Reviewed-by: Simon Glass
Regards,
Bin
Re: [PATCH v2 14/38] test: cmd: Add a basic test for 'addrmap' command
Hi Simon, On Sat, Feb 20, 2021 at 7:55 PM Simon Glass wrote: > > On Thu, 18 Feb 2021 at 08:59, Bin Meng wrote: > > > > This adds a basic test for the newly introduced 'addrmap' command. > > > > Signed-off-by: Bin Meng > > > > --- > > > > Changes in v2: > > - new patch: test: cmd: Add a basic test for 'addrmap' command > > > > include/test/suites.h | 2 ++ > > test/cmd/Makefile | 1 + > > test/cmd/addrmap.c| 38 ++ > > test/cmd_ut.c | 6 ++ > > 4 files changed, 47 insertions(+) > > create mode 100644 test/cmd/addrmap.c > > Reviewed-by: Simon Glass > > Just checking this test is enabled for sandbox? Not yet. I don't think sandbox has enabled CONFIG_ADDR_MAP. Regards, Bin
Re: [PATCH 1/1] x86: sizeof-array-div error in lpc_common_early_init
On Sat, 20 Feb 2021 at 02:05, Heinrich Schuchardt wrote:
>
> Building qemu-x86_64_defconfig with GCC 11.0 fails with:
>
> arch/x86/cpu/intel_common/lpc.c:
> In function ‘lpc_common_early_init’:
> arch/x86/cpu/intel_common/lpc.c:56:40:
> error: expression does not compute the number of elements in this array;
> element type is ‘struct reg_info’, not ‘u32’ {aka ‘unsigned int’}
> [-Werror=sizeof-array-div]
>56 | sizeof(values) / sizeof(u32));
> |^
> arch/x86/cpu/intel_common/lpc.c:56:40: note: add parentheses around the
> second ‘sizeof’ to silence this warning
> arch/x86/cpu/intel_common/lpc.c:50:11: note: array ‘values’ declared here
>50 | } values[4], *ptr;
> | ^~
>
> Add parentheses to silence warning.
>
> Signed-off-by: Heinrich Schuchardt
> ---
> arch/x86/cpu/intel_common/lpc.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
Reviewed-by: Simon Glass
Re: [PATCH 1/1] dm: ddr: socfpga: don't assign values that are not used
On Sat, 20 Feb 2021 at 02:40, Heinrich Schuchardt wrote:
>
> The values of left_edge[0] and right_edge[0] are overwritten before they
> are used. Remove the superfluous assignments.
>
> Fixes: 285b3cb939a8 ("dm: ddr: socfpga: fix gen5 ddr driver to not use bss")
> Signed-off-by: Heinrich Schuchardt
> ---
> drivers/ddr/altera/sequencer.c | 7 ---
> 1 file changed, 7 deletions(-)
>
Reviewed-by: Simon Glass
Re: [PATCH v2 01/38] pci: fsl_pci_init: Dynamically allocate the PCI regions
Hi Bin,
On Thu, 18 Feb 2021 at 08:58, Bin Meng wrote:
>
> Commit e002474158d1 ("pci: pci-uclass: Dynamically allocate the PCI regions")
> changes 'struct pci_controller'.regions from pre-allocated array of
> regions to dynamically allocated, which unfortunately broken lots of
> boards that still use the non-DM PCI driver.
>
> This patch changes the non-DM fsl_pci_init driver to dynamically
> allocate the regions, just like what's done in the pci uclass driver.
>
> Fixes: e002474158d1 ("pci: pci-uclass: Dynamically allocate the PCI regions")
> Signed-off-by: Bin Meng
>
> ---
>
> Changes in v2:
> - drop the revert patch of commit e002474158d1
> - new patch: pci: fsl_pci_init: Dynamically allocate the PCI regions
>
> drivers/pci/fsl_pci_init.c | 5 +
> 1 file changed, 5 insertions(+)
Reviewed-by: Simon Glass
But I think it would be better to disable PCI on these devices
(Kconfig depends on BROKEN) until the maintainer converts it to DM.
Re: [PATCH v2 1/3] firmware: scmi: voltage regulator
On Fri, 19 Feb 2021 at 06:34, Etienne Carriere wrote: > > Implement voltage regulators interfaced by the SCMI voltage domain > protocol. The DT bindings are defined in the Linux kernel since > SCMI voltage domain and regulators patches [1] and [2] integration > in v5.11-rc7. > > Link: [1] > https://github.com/torvalds/linux/commit/0f80fcec08e9c50b8d2992cf26495673765ebaba > Link: [2] > https://github.com/torvalds/linux/commit/2add5cacff3531e54c50b0832128299faa9f0563 > > Signed-off-by: Etienne Carriere > --- > Changes in v2: > - no change > --- > doc/device-tree-bindings/arm/arm,scmi.txt | 34 + > drivers/firmware/scmi/scmi_agent-uclass.c | 35 - > drivers/power/regulator/Kconfig | 8 + > drivers/power/regulator/Makefile | 1 + > drivers/power/regulator/scmi_regulator.c | 170 ++ > include/scmi_protocols.h | 113 ++ > 6 files changed, 359 insertions(+), 2 deletions(-) > create mode 100644 drivers/power/regulator/scmi_regulator.c Reviewed-by: Simon Glass
Re: [PATCH v2 2/3] firmware: scmi: sandbox test for voltage regulator
On Fri, 19 Feb 2021 at 06:34, Etienne Carriere
wrote:
>
> Implement sandbox regulator devices for SCMI voltage domains
> and test them in DM scmi tests.
>
> Signed-off-by: Etienne Carriere
> ---
> Changes in v2:
> - don't test IS_ENABLED(CONFIG_DM_REGULATOR_SCMI) in test/dm/scmi.c,
>it's expected enabled when CONFIG_FIRMWARE_SCMI is enabled in sandbox.
> ---
> arch/sandbox/dts/test.dts| 23 +++
> arch/sandbox/include/asm/scmi_test.h | 20 ++
> configs/sandbox_defconfig| 1 +
> drivers/firmware/scmi/sandbox-scmi_agent.c | 203 ++-
> drivers/firmware/scmi/sandbox-scmi_devices.c | 25 ++-
> test/dm/scmi.c | 58 ++
> 6 files changed, 327 insertions(+), 3 deletions(-)
Reviewed-by: Simon Glass
thought below
[..]
> diff --git a/test/dm/scmi.c b/test/dm/scmi.c
> index be60b44b3..792410338 100644
> --- a/test/dm/scmi.c
> +++ b/test/dm/scmi.c
> @@ -20,6 +20,7 @@
> #include
> #include
> #include
> +#include
> #include
>
> static int ut_assert_scmi_state_preprobe(struct unit_test_state *uts)
> @@ -47,6 +48,7 @@ static int ut_assert_scmi_state_postprobe(struct
> unit_test_state *uts,
> ut_asserteq(3, scmi_devices->clk_count);
> if (IS_ENABLED(CONFIG_RESET_SCMI))
> ut_asserteq(1, scmi_devices->reset_count);
> + ut_asserteq(2, scmi_devices->regul_count);
>
> /* State of the simulated SCMI server exposed */
> scmi_ctx = sandbox_scmi_service_ctx();
> @@ -58,6 +60,8 @@ static int ut_assert_scmi_state_postprobe(struct
> unit_test_state *uts,
> ut_assertnonnull(scmi_ctx->agent[0]->clk);
> ut_asserteq(1, scmi_ctx->agent[0]->reset_count);
> ut_assertnonnull(scmi_ctx->agent[0]->reset);
> + ut_asserteq(2, scmi_ctx->agent[0]->voltd_count);
> + ut_assertnonnull(scmi_ctx->agent[0]->voltd);
>
> ut_assertnonnull(scmi_ctx->agent[1]);
> ut_assertnonnull(scmi_ctx->agent[1]->clk);
> @@ -201,3 +205,57 @@ static int dm_test_scmi_resets(struct unit_test_state
> *uts)
> }
>
> DM_TEST(dm_test_scmi_resets, UT_TESTF_SCAN_FDT);
> +
> +static int dm_test_scmi_voltage_domains(struct unit_test_state *uts)
> +{
> + struct sandbox_scmi_devices *scmi_devices;
> + struct sandbox_scmi_service *scmi_ctx;
> + struct sandbox_scmi_voltd *sandbox_voltd;
> + struct dm_regulator_uclass_plat *uc_pdata;
> + struct udevice *dev;
> + struct udevice *regul_dev;
> +
> + ut_assertok(load_sandbox_scmi_test_devices(uts, &dev));
> +
> + scmi_devices = sandbox_scmi_devices_ctx(dev);
> + scmi_ctx = sandbox_scmi_service_ctx();
> +
> + /* Set/Get an SCMI voltage domain level */
> + sandbox_voltd = &scmi_ctx->agent[0]->voltd[0];
> + regul_dev = scmi_devices->regul[0];
> + ut_assert(regul_dev);
> +
> + uc_pdata = dev_get_uclass_plat(regul_dev);
> + ut_assert(uc_pdata);
> +
> + ut_assertok(regulator_set_value(regul_dev, uc_pdata->min_uV));
> + ut_asserteq(sandbox_voltd->voltage_uv, uc_pdata->min_uV);
> +
> + ut_assert(regulator_get_value(regul_dev) == uc_pdata->min_uV);
> +
> + ut_assertok(regulator_set_value(regul_dev, uc_pdata->max_uV));
> + ut_asserteq(sandbox_voltd->voltage_uv, uc_pdata->max_uV);
> +
> + ut_assert(regulator_get_value(regul_dev) == uc_pdata->max_uV);
> +
> + /* Enable/disable SCMI voltage domains */
> + ut_assertok(regulator_set_enable(scmi_devices->regul[0], false));
> + ut_assertok(regulator_set_enable(scmi_devices->regul[1], false));
> + ut_assert(!scmi_ctx->agent[0]->voltd[0].enabled);
> + ut_assert(!scmi_ctx->agent[0]->voltd[1].enabled);
> +
> + ut_assertok(regulator_set_enable(scmi_devices->regul[0], true));
> + ut_assert(scmi_ctx->agent[0]->voltd[0].enabled);
> + ut_assert(!scmi_ctx->agent[0]->voltd[1].enabled);
You might add a local variable for this common scmi_ctx->agent[0]
> +
> + ut_assertok(regulator_set_enable(scmi_devices->regul[1], true));
> + ut_assert(scmi_ctx->agent[0]->voltd[0].enabled);
> + ut_assert(scmi_ctx->agent[0]->voltd[1].enabled);
> +
> + ut_assertok(regulator_set_enable(scmi_devices->regul[0], false));
> + ut_assert(!scmi_ctx->agent[0]->voltd[0].enabled);
> + ut_assert(scmi_ctx->agent[0]->voltd[1].enabled);
> +
> + return release_sandbox_scmi_test_devices(uts, dev);
> +}
> +DM_TEST(dm_test_scmi_voltage_domains, UT_TESTF_SCAN_FDT);
> --
> 2.17.1
>
Regards,
Simon
Re: [PATCH v6 11/11] test/py: ecdsa: Use mkimage keyfile instead of keydir argument
On Fri, 19 Feb 2021 at 11:45, Alexandru Gagniuc wrote: > > Originally, the ECDSA code path used 'keydir' as the key filename. > mkimage has since been updated to include a new 'keyfile' argument. > Use the new argument for passing in the key. > > Signed-off-by: Alexandru Gagniuc > --- > test/py/tests/test_fit_ecdsa.py | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) Reviewed-by: Simon Glass
Re: [PATCH v2 3/3] firmware: scmi: fix inline comments and minor coding style issues
On Fri, 19 Feb 2021 at 06:34, Etienne Carriere wrote: > > Fix inline comments and empty line in scmi driver and test files. > > Remove test on IS_ENABLED(CONFIG_*_SCMI) in test/dm/scmi.c since these > configuration are expected enabled when CONFIG_FIRMWARE_SCMI is enabled > in sandbox configuration. > > Signed-off-by: Etienne Carriere > --- > Changes in v2: > - discard adding tests on IS_ENABLED(CONFIG_*_SCMI) in test/dm/scmi.c >for the reason stated in commit log. > --- > arch/sandbox/include/asm/scmi_test.h | 5 +++-- > drivers/firmware/scmi/sandbox-scmi_agent.c | 4 ++-- > test/dm/scmi.c | 15 ++- > 3 files changed, 7 insertions(+), 17 deletions(-) Reviewed-by: Simon Glass
Re: [PATCH v2 13/38] cmd: Add a command to display the address map
On Thu, 18 Feb 2021 at 08:59, Bin Meng wrote: > > This adds a new command 'addrmap' to display the address map for > non-identity virtual-physical memory mappings. > > Signed-off-by: Bin Meng > > --- > > Changes in v2: > - add doc/usage/addrmap.rst > > cmd/Kconfig | 7 +++ > cmd/Makefile | 1 + > cmd/addrmap.c | 35 +++ > doc/usage/addrmap.rst | 41 + > doc/usage/index.rst | 1 + > 5 files changed, 85 insertions(+) > create mode 100644 cmd/addrmap.c > create mode 100644 doc/usage/addrmap.rst > Reviewed-by: Simon Glass
Re: [PATCH] button: add udevice forward declaration
On Fri, 19 Feb 2021 at 00:41, Neil Armstrong wrote:
>
> After 401d1c4f5d2d ("common: Drop asm/global_data.h from common header")
> build fails with :
>
> drivers/button/button-uclass.c:13:5: error: conflicting types for
> 'button_get_by_label'
> int button_get_by_label(const char *label, struct udevice **devp)
> ^~~
>
> Adding struct udevice forward declaration in button.h solves the build error.
>
> Fixes: 401d1c4f5d2d ("common: Drop asm/global_data.h from common header")
> Suggested-by: Heinrich Schuchardt
> Signed-off-by: Neil Armstrong
> ---
> Hi,
>
> This is needed to fix build on vim3/vim3l after [1] is applied.
>
> [1]
> https://patchwork.ozlabs.org/project/uboot/cover/20210218103318.18915-1-m.szyprow...@samsung.com/
>
> include/button.h | 2 ++
> 1 file changed, 2 insertions(+)
>
Reviewed-by: Simon Glass
