Migrate to DM_USB and OF_CONTROL support
Subsystems (13)
cover Migrate to DM_USB and OF_CONTROL support
As I have mentioned in various release emails, now that various migration deadlines are reaching the 3+ year mark, I'm taking more drastic measures and removing boards or removing functionality from boards, in order to complete migrations. This series depends on the DM_PCI migration series I had posted earlier and can be seen here:
https://patchwork.ozlabs.org/project/uboot/list/?series=243894&state=*
With this series, I'm doing the DM_USB + OF_CONTROL migration. A number of kirkwood platforms already had OF_CONTROL support done, so a very minimal DM enablement is done, but should be tested on real hardware. I would guess that if they don't work, disabling CONFIG_SYS_MALLOC_F is wrong and it needs to be enabled and a LEN of 0x2000 used as well if the default is not large enough. In another set of cases, the boards are removed as other bigger migrations are also missing.
This series, as well as the DM_PCI one and the DM_VIDEO and CONFIG_DM_SPI_FLASH series that will follow are intended to be applied after v2021.07 is released, and based on how the DM_MMC migration series was done for this release, probably around the -rc2 or -rc3 time-frame. So there is some time left yet to migrate boards, but the deadline is fast approaching. Thanks all!
Signature · 1 line
Tom
PATCH 1/18 snapper9260/snapper9g20: Disable USB
These boards have not converted to DM_USB by the deadline, disable USB support as they do not enable CONFIG_OF_CONTROL.
Cc: Simon Glass <[email protected]>
[email protected] (open list)
--- configs/snapper9260_defconfig | 3 --- configs/snapper9g20_defconfig | 3 --- 2 files changed, 6 deletions(-)
configs/snapper9260_defconfig +0 -3
@@ -21,7 +21,6 @@ CONFIG_CMD_GPIO=y CONFIG_CMD_I2C=y # CONFIG_CMD_LOADS is not set CONFIG_CMD_NAND=y -CONFIG_CMD_USB=y # CONFIG_CMD_SOURCE is not set # CONFIG_CMD_SETEXPR is not set CONFIG_CMD_DHCP=y
@@ -39,5 +38,3 @@ CONFIG_MTD_RAW_NAND=y # CONFIG_SYS_NAND_USE_FLASH_BBT is not set CONFIG_NAND_ATMEL=y CONFIG_ATMEL_USART=y -CONFIG_USB=y -CONFIG_USB_STORAGE=y
configs/snapper9g20_defconfig +0 -3
@@ -20,7 +20,6 @@ CONFIG_CMD_GPIO=y CONFIG_CMD_I2C=y # CONFIG_CMD_LOADS is not set CONFIG_CMD_NAND=y -CONFIG_CMD_USB=y # CONFIG_CMD_SOURCE is not set # CONFIG_CMD_SETEXPR is not set CONFIG_CMD_DHCP=y
@@ -38,5 +37,3 @@ CONFIG_MTD_RAW_NAND=y # CONFIG_SYS_NAND_USE_FLASH_BBT is not set CONFIG_NAND_ATMEL=y CONFIG_ATMEL_USART=y -CONFIG_USB=y -CONFIG_USB_STORAGE=y
Signature · 1 line
2.17.1
Re: [PATCH 01/18] snapper9260/snapper9g20: Disable USB
Quoted 5 lines · Tom Rini
These boards have not converted to
DM_USBby the deadline, disable USB support as they do not enableCONFIG_OF_CONTROL.Cc: Simon Glass <[email protected]>
[email protected] (open list)
Applied to u-boot/master, thanks!
Signature · 1 line
Tom
PATCH 2/18 openrd: Perform base CONFIG_DM enablement
In reply to Tom RiniAs these boards support CONFIG_OF_CONTROL today, perform a basic CONFIG_DM migration.
---
Checking this on some form of the real hardware would be good, along with likely enabling a bunch of other DM subsystems.
--- configs/openrd_base_defconfig | 2 ++ configs/openrd_client_defconfig | 2 ++ configs/openrd_ultimate_defconfig | 2 ++ 3 files changed, 6 insertions(+)
configs/openrd_base_defconfig +2 -0
@@ -10,6 +10,7 @@ CONFIG_ENV_SIZE=0x20000 CONFIG_ENV_OFFSET=0x80000 CONFIG_IDENT_STRING="\nOpenRD-Base" CONFIG_DEFAULT_DEVICE_TREE="kirkwood-openrd-base" +# CONFIG_SYS_MALLOC_F is not set CONFIG_SYS_EXTRA_OPTIONS="BOARD_IS_OPENRD_BASE" CONFIG_BOOTDELAY=3 CONFIG_USE_PREBOOT=y
@@ -37,6 +38,7 @@ CONFIG_ENV_OVERWRITE=y CONFIG_ENV_IS_IN_NAND=y CONFIG_SYS_RELOC_GD_ENV_ADDR=y CONFIG_NETCONSOLE=y +CONFIG_DM=y # CONFIG_MMC_HW_PARTITIONING is not set CONFIG_MTD=y CONFIG_MTD_RAW_NAND=y
configs/openrd_client_defconfig +2 -0
@@ -10,6 +10,7 @@ CONFIG_ENV_SIZE=0x20000 CONFIG_ENV_OFFSET=0x80000 CONFIG_IDENT_STRING="\nOpenRD-Client" CONFIG_DEFAULT_DEVICE_TREE="kirkwood-openrd-client" +# CONFIG_SYS_MALLOC_F is not set CONFIG_SYS_EXTRA_OPTIONS="BOARD_IS_OPENRD_CLIENT" CONFIG_BOOTDELAY=3 CONFIG_USE_PREBOOT=y
@@ -37,6 +38,7 @@ CONFIG_ENV_OVERWRITE=y CONFIG_ENV_IS_IN_NAND=y CONFIG_SYS_RELOC_GD_ENV_ADDR=y CONFIG_NETCONSOLE=y +CONFIG_DM=y # CONFIG_MMC_HW_PARTITIONING is not set CONFIG_MTD=y CONFIG_MTD_RAW_NAND=y
configs/openrd_ultimate_defconfig +2 -0
@@ -10,6 +10,7 @@ CONFIG_ENV_SIZE=0x20000 CONFIG_ENV_OFFSET=0x80000 CONFIG_IDENT_STRING="\nOpenRD-Ultimate" CONFIG_DEFAULT_DEVICE_TREE="kirkwood-openrd-ultimate" +# CONFIG_SYS_MALLOC_F is not set CONFIG_SYS_EXTRA_OPTIONS="BOARD_IS_OPENRD_ULTIMATE" CONFIG_BOOTDELAY=3 CONFIG_USE_PREBOOT=y
@@ -37,6 +38,7 @@ CONFIG_ENV_OVERWRITE=y CONFIG_ENV_IS_IN_NAND=y CONFIG_SYS_RELOC_GD_ENV_ADDR=y CONFIG_NETCONSOLE=y +CONFIG_DM=y # CONFIG_MMC_HW_PARTITIONING is not set CONFIG_MTD=y CONFIG_MTD_RAW_NAND=y
Signature · 1 line
2.17.1
Re: [PATCH 02/18] openrd: Perform base CONFIG_DM enablement
Quoted 5 lines · Tom Rini
As these boards support
CONFIG_OF_CONTROLtoday, perform a basicCONFIG_DMmigration.Cc Stefan Roese <[email protected]>Signed-off-by Tom Rini <[email protected]>
Applied to u-boot/master, thanks!
Signature · 1 line
Tom
PATCH 3/18 pogo_e02: Perform base CONFIG_DM enablement
In reply to Tom RiniAs these boards support CONFIG_OF_CONTROL today, perform a basic CONFIG_DM migration.
---
Checking this on some form of the real hardware would be good, along with likely enabling a bunch of other DM subsystems.
--- configs/pogo_e02_defconfig | 2 ++ 1 file changed, 2 insertions(+)
configs/pogo_e02_defconfig +2 -0
@@ -9,6 +9,7 @@ CONFIG_ENV_SIZE=0x20000 CONFIG_ENV_OFFSET=0x60000 CONFIG_IDENT_STRING="\nPogo E02" CONFIG_DEFAULT_DEVICE_TREE="kirkwood-pogo_e02" +# CONFIG_SYS_MALLOC_F is not set CONFIG_BOOTDELAY=3 CONFIG_USE_PREBOOT=y # CONFIG_DISPLAY_BOARDINFO is not set
@@ -31,6 +32,7 @@ CONFIG_ENV_OVERWRITE=y CONFIG_ENV_IS_IN_NAND=y CONFIG_SYS_RELOC_GD_ENV_ADDR=y CONFIG_NETCONSOLE=y +CONFIG_DM=y # CONFIG_MMC is not set CONFIG_MTD=y CONFIG_MTD_RAW_NAND=y
Signature · 1 line
2.17.1
Re: [PATCH 03/18] pogo_e02: Perform base CONFIG_DM enablement
Quoted 5 lines · Tom Rini
As these boards support
CONFIG_OF_CONTROLtoday, perform a basicCONFIG_DMmigration.Cc Dave Purdy <[email protected]>Signed-off-by Tom Rini <[email protected]>
Applied to u-boot/master, thanks!
Signature · 1 line
Tom
PATCH 4/18 iconnect: Perform base CONFIG_DM enablement
In reply to Tom RiniAs these boards support CONFIG_OF_CONTROL today, perform a basic CONFIG_DM migration.
---
Checking this on some form of the real hardware would be good, along with likely enabling a bunch of other DM subsystems.
--- configs/iconnect_defconfig | 2 ++ 1 file changed, 2 insertions(+)
configs/iconnect_defconfig +2 -0
@@ -9,6 +9,7 @@ CONFIG_ENV_SIZE=0x20000 CONFIG_ENV_OFFSET=0x80000 CONFIG_IDENT_STRING=" Iomega iConnect" CONFIG_DEFAULT_DEVICE_TREE="kirkwood-iconnect" +# CONFIG_SYS_MALLOC_F is not set CONFIG_BOOTDELAY=3 CONFIG_USE_PREBOOT=y # CONFIG_DISPLAY_BOARDINFO is not set
@@ -31,6 +32,7 @@ CONFIG_ENV_OVERWRITE=y CONFIG_ENV_IS_IN_NAND=y CONFIG_SYS_RELOC_GD_ENV_ADDR=y CONFIG_NETCONSOLE=y +CONFIG_DM=y # CONFIG_MMC is not set CONFIG_MTD=y CONFIG_MTD_RAW_NAND=y
Signature · 1 line
2.17.1
Re: [PATCH 04/18] iconnect: Perform base CONFIG_DM enablement
Quoted 5 lines · Tom Rini
As these boards support
CONFIG_OF_CONTROLtoday, perform a basicCONFIG_DMmigration.Cc Luka Perkov <[email protected]>Signed-off-by Tom Rini <[email protected]>
Applied to u-boot/master, thanks!
Signature · 1 line
Tom
PATCH 5/18 ib62x0: Perform base CONFIG_DM enablement
In reply to Tom RiniAs these boards support CONFIG_OF_CONTROL today, perform a basic CONFIG_DM migration.
---
Checking this on some form of the real hardware would be good, along with likely enabling a bunch of other DM subsystems.
--- configs/ib62x0_defconfig | 2 ++ 1 file changed, 2 insertions(+)
configs/ib62x0_defconfig +2 -0
@@ -9,6 +9,7 @@ CONFIG_ENV_SIZE=0x20000 CONFIG_ENV_OFFSET=0xE0000 CONFIG_IDENT_STRING=" RaidSonic ICY BOX IB-NAS62x0" CONFIG_DEFAULT_DEVICE_TREE="kirkwood-ib62x0" +# CONFIG_SYS_MALLOC_F is not set CONFIG_BOOTDELAY=3 CONFIG_USE_PREBOOT=y # CONFIG_DISPLAY_BOARDINFO is not set
@@ -35,6 +36,7 @@ CONFIG_ENV_OVERWRITE=y CONFIG_ENV_IS_IN_NAND=y CONFIG_SYS_RELOC_GD_ENV_ADDR=y CONFIG_NETCONSOLE=y +CONFIG_DM=y # CONFIG_MMC is not set CONFIG_MTD=y CONFIG_MTD_RAW_NAND=y
Signature · 1 line
2.17.1
Re: [PATCH 05/18] ib62x0: Perform base CONFIG_DM enablement
Quoted 5 lines · Tom Rini
As these boards support
CONFIG_OF_CONTROLtoday, perform a basicCONFIG_DMmigration.Cc Luka Perkov <[email protected]>Signed-off-by Tom Rini <[email protected]>
Applied to u-boot/master, thanks!
Signature · 1 line
Tom
PATCH 6/18 dockstar: Perform base CONFIG_DM enablement
In reply to Tom RiniAs these boards support CONFIG_OF_CONTROL today, perform a basic CONFIG_DM migration.
---
Checking this on some form of the real hardware would be good, along with likely enabling a bunch of other DM subsystems.
--- configs/dockstar_defconfig | 2 ++ 1 file changed, 2 insertions(+)
configs/dockstar_defconfig +2 -0
@@ -9,6 +9,7 @@ CONFIG_ENV_SIZE=0x20000 CONFIG_ENV_OFFSET=0x80000 CONFIG_IDENT_STRING="\nSeagate FreeAgent DockStar" CONFIG_DEFAULT_DEVICE_TREE="kirkwood-dockstar" +# CONFIG_SYS_MALLOC_F is not set CONFIG_BOOTDELAY=3 CONFIG_USE_PREBOOT=y # CONFIG_DISPLAY_BOARDINFO is not set
@@ -31,6 +32,7 @@ CONFIG_OF_CONTROL=y CONFIG_ENV_OVERWRITE=y CONFIG_ENV_IS_IN_NAND=y CONFIG_NETCONSOLE=y +CONFIG_DM=y # CONFIG_MMC is not set CONFIG_MTD=y CONFIG_MTD_RAW_NAND=y
Signature · 1 line
2.17.1
Re: [PATCH 06/18] dockstar: Perform base CONFIG_DM enablement
Quoted 5 lines · Tom Rini
As these boards support
CONFIG_OF_CONTROLtoday, perform a basicCONFIG_DMmigration.Cc Eric Cooper <[email protected]>Signed-off-by Tom Rini <[email protected]>
Applied to u-boot/master, thanks!
Signature · 1 line
Tom
PATCH 7/18 mx6memcal: Disable USB GADGET in SPL
In reply to Tom RiniAs this board does not use CONFIG_OF_CONTROL and the DM_USB migration deadline has passed, disable USB_GADGET support.
---
I realize this removes an important functional part of the board. I suspect the path forward here is to make a generic mx6 device tree to use here, so that the USB functionality keeps working.
--- configs/mx6memcal_defconfig | 9 --------- 1 file changed, 9 deletions(-)
configs/mx6memcal_defconfig +0 -9
@@ -16,9 +16,6 @@ CONFIG_SPL=y CONFIG_SUPPORT_RAW_INITRD=y CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/mach-imx/spl_sd.cfg,SPL" CONFIG_SPL_USB_HOST_SUPPORT=y -CONFIG_SPL_USB_GADGET=y -CONFIG_SPL_USB_ETHER=y -CONFIG_SPL_USB_SDP_SUPPORT=y CONFIG_SPL_WATCHDOG_SUPPORT=y CONFIG_HUSH_PARSER=y # CONFIG_CMD_BOOTD is not set
@@ -45,11 +42,5 @@ CONFIG_BOUNCE_BUFFER=y # CONFIG_MMC is not set CONFIG_FSL_USDHC=y CONFIG_MXC_UART=y -CONFIG_USB=y -CONFIG_USB_GADGET=y -CONFIG_USB_GADGET_MANUFACTURER="FSL" -CONFIG_USB_GADGET_VENDOR_NUM=0x0525 -CONFIG_USB_GADGET_PRODUCT_NUM=0xa4a5 -CONFIG_CI_UDC=y CONFIG_OF_LIBFDT=y # CONFIG_EFI_LOADER is not set
Signature · 1 line
2.17.1
Re: [PATCH 07/18] mx6memcal: Disable USB GADGET in SPL
Since the proper U-Boot doesn't do anything at the moment, I don't think this hurts much.
My usage of mx6memcal generally ends after SPL spits out calibration values, and I suspect the same is true for other users, so
Quoted 41 lines · Tom Rini
As this board does not use
CONFIG_OF_CONTROLand theDM_USBmigration deadline has passed, disableUSB_GADGETsupport.Cc Eric Nelson <[email protected]>Cc Stefano Babic <[email protected]>Signed-off-by Tom Rini <[email protected]>---
I realize this removes an important functional part of the board. I suspect the path forward here is to make a generic mx6 device tree to use here, so that the USB functionality keeps working.--- configs/mx6memcal_defconfig | 9 --------- 1 file changed, 9 deletions(-)configs/mx6memcal_defconfig +0
-9@@ -16,9 +16,6 @@ CONFIG_SPL=y CONFIG_SUPPORT_RAW_INITRD=y CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/mach-imx/spl_sd.cfg,SPL" CONFIG_SPL_USB_HOST_SUPPORT=y -CONFIG_SPL_USB_GADGET=y -CONFIG_SPL_USB_ETHER=y -CONFIG_SPL_USB_SDP_SUPPORT=y CONFIG_SPL_WATCHDOG_SUPPORT=y CONFIG_HUSH_PARSER=y # CONFIG_CMD_BOOTD is not set@@ -45,11 +42,5 @@ CONFIG_BOUNCE_BUFFER=y # CONFIG_MMC is not set CONFIG_FSL_USDHC=y CONFIG_MXC_UART=y -CONFIG_USB=y -CONFIG_USB_GADGET=y -CONFIG_USB_GADGET_MANUFACTURER="FSL" -CONFIG_USB_GADGET_VENDOR_NUM=0x0525 -CONFIG_USB_GADGET_PRODUCT_NUM=0xa4a5 -CONFIG_CI_UDC=y CONFIG_OF_LIBFDT=y # CONFIG_EFI_LOADER is not set
Re: [PATCH 07/18] mx6memcal: Disable USB GADGET in SPL
Quoted 7 lines · Eric Nelson
Since the proper U-Boot doesn't do anything at the moment, I don't think this hurts much.
My usage of mx6memcal generally ends after SPL spits out calibration values, and I suspect the same is true for other users, so
Acked-by Eric Nelson <[email protected]>
But don't you need SPL gadget support to easily load this in?
Signature · 1 line
Tom
Re: [PATCH 07/18] mx6memcal: Disable USB GADGET in SPL
Hi Tom,
Quoted 11 lines · Tom Rini
Quoted 7 lines · Eric Nelson
Since the proper U-Boot doesn't do anything at the moment, I don't think this hurts much.
My usage of mx6memcal generally ends after SPL spits out calibration values, and I suspect the same is true for other users, so
Acked-by Eric Nelson <[email protected]>But don't you need SPL gadget support to easily load this in?
No. The calibration is done by the SPL running in internal RAM.
Re: [PATCH 07/18] mx6memcal: Disable USB GADGET in SPL
Quoted 8 lines · Eric Nelson
Hi Tom,
Quoted 5 lines · Tom Rini
Quoted 3 lines · Eric Nelson
Since the proper U-Boot doesn't do anything at the moment, I don't think this hurts much.
Quoted 7 lines
Quoted 6 lines
Quoted 4 lines
My usage of mx6memcal generally ends after SPL spits out calibration values, and I suspect the same is true for other users, so
Acked-by Eric Nelson <[email protected]>But don't you need SPL gadget support to easily load this in?
No. The calibration is done by the SPL running in internal RAM.
... ah, yes, sorry, I'm with you now. ROM loads via gadget, SPL runs, does memcalc, displays values, then you move on to the real board. Thanks!
Signature · 1 line
Tom
Re: [PATCH 07/18] mx6memcal: Disable USB GADGET in SPL
Hi Tom,
Quoted 12 lines · Tom Rini
Quoted 11 lines · Eric Nelson
Hi Tom,
Quoted 8 lines · Tom Rini
Quoted 6 lines · Eric Nelson
Since the proper U-Boot doesn't do anything at the moment, I don't think this hurts much.
My usage of mx6memcal generally ends after SPL spits out calibration values, and I suspect the same is true for other users, so
Quoted 7 lines
Quoted 4 lines
Quoted 3 lines
Quoted 1 line
Acked-by Eric Nelson <[email protected]>But don't you need SPL gadget support to easily load this in?
No. The calibration is done by the SPL running in internal RAM.
... ah, yes, sorry, I'm with you now. ROM loads via gadget, SPL runs, does memcalc, displays values, then you move on to the real board.
And test under Linux, where you can exercise things with the GPU and VPU active.
Testing under U-Boot doesn't tend to find calibration errors.
It would be helpful to test under U-Boot by adding support for changing up the DDR frequencies (as done in the NXP test), but that's something for another day.
Re: [PATCH 07/18] mx6memcal: Disable USB GADGET in SPL
In reply to Tom RiniQuoted 7 lines · Tom Rini
As this board does not use
CONFIG_OF_CONTROLand theDM_USBmigration deadline has passed, disableUSB_GADGETsupport.Cc Eric Nelson <[email protected]>Cc Stefano Babic <[email protected]>Signed-off-by Tom Rini <[email protected]>Acked-by Eric Nelson <[email protected]>
Applied to u-boot/master, thanks!
Signature · 1 line
Tom
PATCH 8/18 arm: Remove at91rm9200ek boards
In reply to Tom RiniThese boards have not been converted to CONFIG_DM_USB by the deadline and is also missing conversion to CONFIG_DM. Remove them.
--- arch/arm/cpu/arm920t/start.S | 2 +- arch/arm/mach-at91/Kconfig | 5 - board/atmel/at91rm9200ek/Kconfig | 12 -- board/atmel/at91rm9200ek/MAINTAINERS | 7 - board/atmel/at91rm9200ek/Makefile | 7 - board/atmel/at91rm9200ek/at91rm9200ek.c | 63 --------- board/atmel/at91rm9200ek/led.c | 71 ----------- configs/at91rm9200ek_defconfig | 37 ------ configs/at91rm9200ek_ram_defconfig | 38 ------ include/configs/at91rm9200ek.h | 162 ------------------------ 10 files changed, 1 insertion(+), 403 deletions(-) delete mode 100644 board/atmel/at91rm9200ek/Kconfig delete mode 100644 board/atmel/at91rm9200ek/MAINTAINERS delete mode 100644 board/atmel/at91rm9200ek/Makefile delete mode 100644 board/atmel/at91rm9200ek/at91rm9200ek.c delete mode 100644 board/atmel/at91rm9200ek/led.c delete mode 100644 configs/at91rm9200ek_defconfig delete mode 100644 configs/at91rm9200ek_ram_defconfig delete mode 100644 include/configs/at91rm9200ek.h
arch/arm/cpu/arm920t/start.S +1 -1
@@ -35,7 +35,7 @@ reset: orr r0, r0, #0xd3 msr cpsr, r0 -#if defined(CONFIG_AT91RM9200DK) || defined(CONFIG_AT91RM9200EK) +#if defined(CONFIG_AT91RM9200DK) /* * relocate exception table */
arch/arm/mach-at91/Kconfig +0 -5
@@ -69,10 +69,6 @@ choice prompt "Atmel AT91 board select" optional -config TARGET_AT91RM9200EK - bool "Atmel AT91RM9200 evaluation kit" - select CPU_ARM920T - config TARGET_AT91SAM9260EK bool "Atmel at91sam9260 reference board" select AT91SAM9260
@@ -307,7 +303,6 @@ config ATMEL_SFR config SYS_SOC default "at91" -source "board/atmel/at91rm9200ek/Kconfig" source "board/atmel/at91sam9260ek/Kconfig" source "board/atmel/at91sam9261ek/Kconfig" source "board/atmel/at91sam9263ek/Kconfig"
board/atmel/at91rm9200ek/Kconfig deleted +0 -12
@@ -1,12 +0,0 @@ -if TARGET_AT91RM9200EK - -config SYS_BOARD - default "at91rm9200ek" - -config SYS_VENDOR - default "atmel" - -config SYS_CONFIG_NAME - default "at91rm9200ek" - -endif
board/atmel/at91rm9200ek/MAINTAINERS deleted +0 -7
@@ -1,7 +0,0 @@ -AT91RM9200EK BOARD -M: Andreas Bießmann <[email protected]> -S: Maintained -F: board/atmel/at91rm9200ek/ -F: include/configs/at91rm9200ek.h -F: configs/at91rm9200ek_defconfig -F: configs/at91rm9200ek_ram_defconfig
board/atmel/at91rm9200ek/Makefile deleted +0 -7
@@ -1,7 +0,0 @@ -# SPDX-License-Identifier: GPL-2.0+ -# -# (C) Copyright 2003-2008 -# Wolfgang Denk, DENX Software Engineering, [email protected]. - -obj-y += at91rm9200ek.o -obj-y += led.o
board/atmel/at91rm9200ek/at91rm9200ek.c deleted +0 -63
63 lines not on this page · raw message
board/atmel/at91rm9200ek/led.c deleted +0 -71
71 lines not on this page · raw message
configs/at91rm9200ek_defconfig deleted +0 -37
@@ -1,37 +0,0 @@ -CONFIG_ARM=y -CONFIG_ARCH_CPU_INIT=y -CONFIG_ARCH_AT91=y -CONFIG_SYS_TEXT_BASE=0x10000000 -CONFIG_TARGET_AT91RM9200EK=y -CONFIG_NR_DRAM_BANKS=1 -CONFIG_ENV_SIZE=0x10000 -CONFIG_ENV_SECT_SIZE=0x10000 -CONFIG_BOOTDELAY=3 -# CONFIG_DISPLAY_CPUINFO is not set -# CONFIG_DISPLAY_BOARDINFO is not set -CONFIG_BOARD_EARLY_INIT_F=y -CONFIG_HUSH_PARSER=y -CONFIG_SYS_PROMPT="U-Boot> " -CONFIG_CMD_BOOTZ=y -CONFIG_CMD_IMLS=y -CONFIG_CMD_USB=y -# CONFIG_CMD_SETEXPR is not set -CONFIG_CMD_DHCP=y -CONFIG_CMD_MII=y -CONFIG_CMD_PING=y -CONFIG_CMD_FAT=y -CONFIG_ENV_OVERWRITE=y -CONFIG_ENV_IS_IN_FLASH=y -CONFIG_ENV_ADDR=0x10040000 -CONFIG_AT91_GPIO=y -# CONFIG_MMC is not set -CONFIG_MTD_NOR_FLASH=y -CONFIG_FLASH_CFI_DRIVER=y -CONFIG_SYS_FLASH_PROTECTION=y -CONFIG_SYS_FLASH_CFI=y -CONFIG_MII=y -CONFIG_ATMEL_USART=y -CONFIG_USB=y -CONFIG_USB_STORAGE=y -CONFIG_USB_KEYBOARD=y -CONFIG_OF_LIBFDT=y
configs/at91rm9200ek_ram_defconfig deleted +0 -38
@@ -1,38 +0,0 @@ -CONFIG_ARM=y -CONFIG_ARCH_CPU_INIT=y -CONFIG_ARCH_AT91=y -CONFIG_SYS_TEXT_BASE=0x20100000 -CONFIG_TARGET_AT91RM9200EK=y -CONFIG_NR_DRAM_BANKS=1 -CONFIG_ENV_SIZE=0x10000 -CONFIG_ENV_SECT_SIZE=0x10000 -CONFIG_SYS_EXTRA_OPTIONS="RAMBOOT" -CONFIG_BOOTDELAY=3 -# CONFIG_DISPLAY_CPUINFO is not set -# CONFIG_DISPLAY_BOARDINFO is not set -CONFIG_BOARD_EARLY_INIT_F=y -CONFIG_HUSH_PARSER=y -CONFIG_SYS_PROMPT="U-Boot> " -CONFIG_CMD_BOOTZ=y -CONFIG_CMD_IMLS=y -CONFIG_CMD_USB=y -# CONFIG_CMD_SETEXPR is not set -CONFIG_CMD_DHCP=y -CONFIG_CMD_MII=y -CONFIG_CMD_PING=y -CONFIG_CMD_FAT=y -CONFIG_ENV_OVERWRITE=y -CONFIG_ENV_IS_IN_FLASH=y -CONFIG_ENV_ADDR=0x10040000 -CONFIG_AT91_GPIO=y -# CONFIG_MMC is not set -CONFIG_MTD_NOR_FLASH=y -CONFIG_FLASH_CFI_DRIVER=y -CONFIG_SYS_FLASH_PROTECTION=y -CONFIG_SYS_FLASH_CFI=y -CONFIG_MII=y -CONFIG_ATMEL_USART=y -CONFIG_USB=y -CONFIG_USB_STORAGE=y -CONFIG_USB_KEYBOARD=y -CONFIG_OF_LIBFDT=y
include/configs/at91rm9200ek.h deleted +0 -162
162 lines not on this page · raw message
Signature · 1 line
2.17.1
Re: [PATCH 08/18] arm: Remove at91rm9200ek boards
Quoted 5 lines · Tom Rini
These boards have not been converted to
CONFIG_DM_USBby the deadline and is also missing conversion toCONFIG_DM. Remove them.Cc Andreas Bießmann <[email protected]>Signed-off-by Tom Rini <[email protected]>
Applied to u-boot/master, thanks!
Signature · 1 line
Tom
PATCH 9/18 arm: Remove edb9315a board
In reply to Tom RiniThese boards have not been converted to CONFIG_DM_USB by the deadline and is also missing conversion to CONFIG_DM. Remove it.
This is also the last PL010_SERIAL using board, so remove those references.
--- README | 4 - arch/arm/Kconfig | 5 - board/cirrus/edb93xx/Kconfig | 15 -- board/cirrus/edb93xx/MAINTAINERS | 6 - board/cirrus/edb93xx/Makefile | 10 -- board/cirrus/edb93xx/edb93xx.c | 292 ------------------------------- board/cirrus/edb93xx/u-boot.lds | 115 ------------ configs/edb9315a_defconfig | 54 ------ drivers/serial/Kconfig | 6 - drivers/serial/Makefile | 1 - drivers/serial/serial_pl01x.c | 4 +- include/configs/edb93xx.h | 184 ------------------- 12 files changed, 1 insertion(+), 695 deletions(-) delete mode 100644 board/cirrus/edb93xx/Kconfig delete mode 100644 board/cirrus/edb93xx/MAINTAINERS delete mode 100644 board/cirrus/edb93xx/Makefile delete mode 100644 board/cirrus/edb93xx/edb93xx.c delete mode 100644 board/cirrus/edb93xx/u-boot.lds delete mode 100644 configs/edb9315a_defconfig delete mode 100644 include/configs/edb93xx.h
README +0 -4
@@ -629,10 +629,6 @@ The following options need to be configured: controller register space - Serial Ports: - CONFIG_PL010_SERIAL - - Define this if you want support for Amba PrimeCell PL010 UARTs. - CONFIG_PL011_SERIAL Define this if you want support for Amba PrimeCell PL011 UARTs.
arch/arm/Kconfig +0 -5
@@ -521,10 +521,6 @@ config ARCH_AT91 select SPL_BOARD_INIT if SPL && !TARGET_SMARTWEB select SPL_SEPARATE_BSS if SPL -config TARGET_EDB93XX - bool "Support edb93xx" - select CPU_ARM920T - select PL010_SERIAL config TARGET_ASPENITE bool "Support aspenite"
@@ -1981,7 +1977,6 @@ source "board/broadcom/bcm968360bg/Kconfig" source "board/broadcom/bcm968580xref/Kconfig" source "board/broadcom/bcmns3/Kconfig" source "board/cavium/thunderx/Kconfig" -source "board/cirrus/edb93xx/Kconfig" source "board/eets/pdu001/Kconfig" source "board/emulation/qemu-arm/Kconfig" source "board/freescale/ls2080aqds/Kconfig"
board/cirrus/edb93xx/Kconfig deleted +0 -15
@@ -1,15 +0,0 @@ -if TARGET_EDB93XX - -config SYS_BOARD - default "edb93xx" - -config SYS_VENDOR - default "cirrus" - -config SYS_SOC - default "ep93xx" - -config SYS_CONFIG_NAME - default "edb93xx" - -endif
board/cirrus/edb93xx/MAINTAINERS deleted +0 -6
@@ -1,6 +0,0 @@ -EDB93XX BOARD -M: Sergey Kostanbaev <[email protected]> -S: Maintained -F: board/cirrus/edb93xx/ -F: include/configs/edb93xx.h -F: configs/edb9315a_defconfig
board/cirrus/edb93xx/Makefile deleted +0 -10
@@ -1,10 +0,0 @@ -# SPDX-License-Identifier: GPL-2.0+ -# -# (C) Copyright 2013 -# Sergey Kostanbaev <sergey.kostanbaev <at> fairwaves.ru> -# -# (C) Copyright 2003-2006 -# Wolfgang Denk, DENX Software Engineering, wd <at> denx.de. -# - -obj-y := edb93xx.o
board/cirrus/edb93xx/edb93xx.c deleted +0 -292
292 lines not on this page · raw message
board/cirrus/edb93xx/u-boot.lds deleted +0 -115
115 lines not on this page · raw message
configs/edb9315a_defconfig deleted +0 -54
54 lines not on this page · raw message
drivers/serial/Kconfig +0 -6
@@ -695,12 +695,6 @@ config INTEL_MID_SERIAL Select this to enable a UART for Intel MID platforms. This uses the ns16550 driver as a library. -config PL010_SERIAL - bool "ARM PL010 driver" - depends on !DM_SERIAL - help - Select this to enable a UART for platforms using PL010. - config PL011_SERIAL bool "ARM PL011 driver" depends on !DM_SERIAL
drivers/serial/Makefile +0 -1
@@ -24,7 +24,6 @@ endif ifdef CONFIG_DM_SERIAL obj-$(CONFIG_PL01X_SERIAL) += serial_pl01x.o else -obj-$(CONFIG_PL010_SERIAL) += serial_pl01x.o obj-$(CONFIG_PL011_SERIAL) += serial_pl01x.o obj-$(CONFIG_SYS_NS16550_SERIAL) += serial_ns16550.o endif
drivers/serial/serial_pl01x.c +1 -3
@@ -191,9 +191,7 @@ static void pl01x_serial_init_baud(int baudrate) {int clock =0 ; -#if defined(CONFIG_PL010_SERIAL ) - pl01x_type =TYPE_PL010 ; -#elif defined(CONFIG_PL011_SERIAL ) +#if defined(CONFIG_PL011_SERIAL ) pl01x_type =TYPE_PL011 ; clock =CONFIG_PL011_CLOCK ;#endif
include/configs/edb93xx.h deleted +0 -184
184 lines not on this page · raw message
Signature · 1 line
2.17.1
Re: [PATCH 09/18] arm: Remove edb9315a board
Quoted 8 lines · Tom Rini
These boards have not been converted to
CONFIG_DM_USBby the deadline and is also missing conversion toCONFIG_DM. Remove it.This is also the last
PL010_SERIALusing board, so remove those references.Cc Sergey Kostanbaev <[email protected]>Signed-off-by Tom Rini <[email protected]>
Applied to u-boot/master, thanks!
Signature · 1 line
Tom
PATCH 10/18 arm: Remove gplugd board
In reply to Tom RiniThese boards have not been converted to CONFIG_DM_USB by the deadline and is also missing conversion to CONFIG_DM. Remove it
--- arch/arm/Kconfig | 5 -- board/Marvell/gplugd/Kconfig | 15 ---- board/Marvell/gplugd/MAINTAINERS | 6 -- board/Marvell/gplugd/Makefile | 13 --- board/Marvell/gplugd/gplugd.c | 134 ------------------------------- configs/gplugd_defconfig | 28 ------- include/configs/gplugd.h | 75 ----------------- 7 files changed, 276 deletions(-) delete mode 100644 board/Marvell/gplugd/Kconfig delete mode 100644 board/Marvell/gplugd/MAINTAINERS delete mode 100644 board/Marvell/gplugd/Makefile delete mode 100644 board/Marvell/gplugd/gplugd.c delete mode 100644 configs/gplugd_defconfig delete mode 100644 include/configs/gplugd.h
arch/arm/Kconfig +0 -5
@@ -526,10 +526,6 @@ config TARGET_ASPENITE bool "Support aspenite" select CPU_ARM926EJS -config TARGET_GPLUGD - bool "Support gplugd" - select CPU_ARM926EJS - config ARCH_DAVINCI bool "TI DaVinci" select CPU_ARM926EJS
@@ -1967,7 +1963,6 @@ source "board/bosch/shc/Kconfig" source "board/bosch/guardian/Kconfig" source "board/CarMediaLab/flea3/Kconfig" source "board/Marvell/aspenite/Kconfig" -source "board/Marvell/gplugd/Kconfig" source "board/Marvell/octeontx/Kconfig" source "board/Marvell/octeontx2/Kconfig" source "board/armltd/vexpress64/Kconfig"
board/Marvell/gplugd/Kconfig deleted +0 -15
@@ -1,15 +0,0 @@ -if TARGET_GPLUGD - -config SYS_BOARD - default "gplugd" - -config SYS_VENDOR - default "Marvell" - -config SYS_SOC - default "armada100" - -config SYS_CONFIG_NAME - default "gplugd" - -endif
board/Marvell/gplugd/MAINTAINERS deleted +0 -6
@@ -1,6 +0,0 @@ -GPLUGD BOARD -M: Ajay Bhargav <[email protected]> -S: Maintained -F: board/Marvell/gplugd/ -F: include/configs/gplugd.h -F: configs/gplugd_defconfig
board/Marvell/gplugd/Makefile deleted +0 -13
@@ -1,13 +0,0 @@ -# SPDX-License-Identifier: GPL-2.0+ -# -# (C) Copyright 2011 -# eInfochips Ltd. <www.einfochips.com> -# Written-by: Ajay Bhargav <[email protected]> -# -# Based on Aspenite: -# (C) Copyright 2010 -# Marvell Semiconductor <www.marvell.com> -# Written-by: Prafulla Wadaskar <[email protected]> -# Contributor: Mahavir Jain <[email protected]> - -obj-y := gplugd.o
board/Marvell/gplugd/gplugd.c deleted +0 -134
134 lines not on this page · raw message
configs/gplugd_defconfig deleted +0 -28
@@ -1,28 +0,0 @@ -CONFIG_ARM=y -CONFIG_SYS_DCACHE_OFF=y -CONFIG_ARCH_CPU_INIT=y -CONFIG_TARGET_GPLUGD=y -CONFIG_SYS_TEXT_BASE=0x00f00000 -CONFIG_NR_DRAM_BANKS=2 -CONFIG_ENV_SIZE=0x4000 -CONFIG_IDENT_STRING="\nMarvell-gplugD" -CONFIG_BOOTDELAY=3 -CONFIG_USE_PREBOOT=y -# CONFIG_DISPLAY_BOARDINFO is not set -CONFIG_BOARD_EARLY_INIT_F=y -CONFIG_CMD_USB=y -# CONFIG_CMD_SETEXPR is not set -CONFIG_CMD_DHCP=y -CONFIG_CMD_MII=y -CONFIG_CMD_PING=y -CONFIG_CMD_EXT2=y -CONFIG_CMD_FAT=y -CONFIG_ISO_PARTITION=y -CONFIG_SYS_RELOC_GD_ENV_ADDR=y -# CONFIG_MMC is not set -CONFIG_MII=y -CONFIG_SYS_NS16550=y -CONFIG_USB=y -CONFIG_USB_EHCI_HCD=y -CONFIG_USB_STORAGE=y -CONFIG_OF_LIBFDT=y
include/configs/gplugd.h deleted +0 -75
75 lines not on this page · raw message
Signature · 1 line
2.17.1
Re: [PATCH 10/18] arm: Remove gplugd board
Quoted 5 lines · Tom Rini
These boards have not been converted to
CONFIG_DM_USBby the deadline and is also missing conversion toCONFIG_DM. Remove itCc Ajay Bhargav <[email protected]>Signed-off-by Tom Rini <[email protected]>
Applied to u-boot/master, thanks!
Signature · 1 line
Tom
PATCH 11/18 arm: Remove nsa310s board
In reply to Tom RiniThese boards have not been converted to CONFIG_DM_USB by the deadline and is also missing conversion to CONFIG_DM. Remove it
--- arch/arm/mach-kirkwood/Kconfig | 4 - board/zyxel/nsa310s/Kconfig | 18 ----- board/zyxel/nsa310s/MAINTAINERS | 8 -- board/zyxel/nsa310s/Makefile | 7 -- board/zyxel/nsa310s/kwbimage.cfg | 41 ---------- board/zyxel/nsa310s/nsa310s.c | 135 ------------------------------- board/zyxel/nsa310s/nsa310s.h | 46 ----------- configs/nsa310s_defconfig | 46 ----------- include/configs/nsa310s.h | 59 -------------- 9 files changed, 364 deletions(-) delete mode 100644 board/zyxel/nsa310s/Kconfig delete mode 100644 board/zyxel/nsa310s/MAINTAINERS delete mode 100644 board/zyxel/nsa310s/Makefile delete mode 100644 board/zyxel/nsa310s/kwbimage.cfg delete mode 100644 board/zyxel/nsa310s/nsa310s.c delete mode 100644 board/zyxel/nsa310s/nsa310s.h delete mode 100644 configs/nsa310s_defconfig delete mode 100644 include/configs/nsa310s.h
arch/arm/mach-kirkwood/Kconfig +0 -4
@@ -53,9 +53,6 @@ config TARGET_GOFLEXHOME config TARGET_NAS220 bool "BlackArmor NAS220" -config TARGET_NSA310S - bool "Zyxel NSA310S" - config TARGET_SBx81LIFKW bool "Allied Telesis SBx81GS24/SBx81GT40/SBx81XS6/SBx81XS16"
@@ -83,7 +80,6 @@ source "board/raidsonic/ib62x0/Kconfig" source "board/Seagate/dockstar/Kconfig" source "board/Seagate/goflexhome/Kconfig" source "board/Seagate/nas220/Kconfig" -source "board/zyxel/nsa310s/Kconfig" source "board/alliedtelesis/SBx81LIFKW/Kconfig" source "board/alliedtelesis/SBx81LIFXCAT/Kconfig"
board/zyxel/nsa310s/Kconfig deleted +0 -18
@@ -1,18 +0,0 @@ -# SPDX-License-Identifier: GPL-2.0+ -# -# Copyright (C) 2015 -# Gerald Kerma <[email protected]> -# Tony Dinh <[email protected]> - -if TARGET_NSA310S - -config SYS_BOARD - default "nsa310s" - -config SYS_VENDOR - default "zyxel" - -config SYS_CONFIG_NAME - default "nsa310s" - -endif
board/zyxel/nsa310s/MAINTAINERS deleted +0 -8
@@ -1,8 +0,0 @@ -NSA310S BOARD -M: Gerald Kerma <[email protected]> -M: Tony Dinh <[email protected]> -M: Luka Perkov <[email protected]> -S: Maintained -F: board/zyxel/nsa310s/ -F: include/configs/nsa310s.h -F: configs/nsa310s_defconfig
board/zyxel/nsa310s/Makefile deleted +0 -7
@@ -1,7 +0,0 @@ -# SPDX-License-Identifier: GPL-2.0+ -# -# Copyright (C) 2015 -# Gerald Kerma <[email protected]> -# Tony Dinh <[email protected]> - -obj-y := nsa310s.o
board/zyxel/nsa310s/kwbimage.cfg deleted +0 -41
41 lines not on this page · raw message
board/zyxel/nsa310s/nsa310s.c deleted +0 -135
135 lines not on this page · raw message
board/zyxel/nsa310s/nsa310s.h deleted +0 -46
46 lines not on this page · raw message
configs/nsa310s_defconfig deleted +0 -46
46 lines not on this page · raw message
include/configs/nsa310s.h deleted +0 -59
59 lines not on this page · raw message
Signature · 1 line
2.17.1
Re: [PATCH 11/18] arm: Remove nsa310s board
Hi Tom,
I'm still actively supporting this board, and will do the rebase and DM conversion.
I'm not sure about the process from here. Will I need to submit the patches like for a new board again?
Thanks,
Tony Dinh
Quoted 469 lines · Tom Rini
These boards have not been converted to
CONFIG_DM_USBby the deadline and is also missing conversion toCONFIG_DM. Remove itCc Gerald Kerma <[email protected]>Cc Tony Dinh <[email protected]>Cc Luka Perkov <[email protected]>Signed-off-by Tom Rini <[email protected]>--- arch/arm/mach-kirkwood/Kconfig | 4 - board/zyxel/nsa310s/Kconfig | 18 ----- board/zyxel/nsa310s/MAINTAINERS | 8 -- board/zyxel/nsa310s/Makefile | 7 -- board/zyxel/nsa310s/kwbimage.cfg | 41 ---------- board/zyxel/nsa310s/nsa310s.c | 135 ------------------------------- board/zyxel/nsa310s/nsa310s.h | 46 ----------- configs/nsa310s_defconfig | 46 ----------- include/configs/nsa310s.h | 59 -------------- 9 files changed, 364 deletions(-) delete mode 100644 board/zyxel/nsa310s/Kconfig delete mode 100644 board/zyxel/nsa310s/MAINTAINERS delete mode 100644 board/zyxel/nsa310s/Makefile delete mode 100644 board/zyxel/nsa310s/kwbimage.cfg delete mode 100644 board/zyxel/nsa310s/nsa310s.c delete mode 100644 board/zyxel/nsa310s/nsa310s.h delete mode 100644 configs/nsa310s_defconfig delete mode 100644 include/configs/nsa310s.harch/arm/mach-kirkwood/Kconfig +0
-4@@ -53,9 +53,6 @@ config TARGET_GOFLEXHOME config TARGET_NAS220 bool "BlackArmor NAS220" -config TARGET_NSA310S - bool "Zyxel NSA310S" - config TARGET_SBx81LIFKW bool "Allied Telesis SBx81GS24/SBx81GT40/SBx81XS6/SBx81XS16"@@ -83,7 +80,6 @@ source "board/raidsonic/ib62x0/Kconfig" source "board/Seagate/dockstar/Kconfig" source "board/Seagate/goflexhome/Kconfig" source "board/Seagate/nas220/Kconfig" -source "board/zyxel/nsa310s/Kconfig" source "board/alliedtelesis/SBx81LIFKW/Kconfig" source "board/alliedtelesis/SBx81LIFXCAT/Kconfig"board/zyxel/nsa310s/Kconfig deleted +0
-18@@ -1,18 +0,0 @@ -# SPDX-License-Identifier: GPL-2.0+ -# -# Copyright (C) 2015 -# Gerald Kerma <[email protected]> -# Tony Dinh <[email protected]> - -if TARGET_NSA310S - -config SYS_BOARD - default "nsa310s" - -config SYS_VENDOR - default "zyxel" - -config SYS_CONFIG_NAME - default "nsa310s" - -endifboard/zyxel/nsa310s/MAINTAINERS deleted +0
-8@@ -1,8 +0,0 @@ -NSA310S BOARD -M: Gerald Kerma <[email protected]> -M: Tony Dinh <[email protected]> -M: Luka Perkov <[email protected]> -S: Maintained -F: board/zyxel/nsa310s/ -F: include/configs/nsa310s.h -F: configs/nsa310s_defconfigboard/zyxel/nsa310s/Makefile deleted +0
-7@@ -1,7 +0,0 @@ -# SPDX-License-Identifier: GPL-2.0+ -# -# Copyright (C) 2015 -# Gerald Kerma <[email protected]> -# Tony Dinh <[email protected]> - -obj-y := nsa310s.oboard/zyxel/nsa310s/kwbimage.cfg deleted +0
-41@@ -1,41 +0,0 @@ -# SPDX-License-Identifier: GPL-2.0+ -# -# Copyright (C) 2015 -# Gerald Kerma <[email protected]> -# Tony Dinh <[email protected]> -# Refer to doc/README.kwbimage for more details about how-to -# configure and create kirkwood boot images. -# - -# Boot Media configurations -BOOT_FROM nand -NAND_ECC_MODE default -NAND_PAGE_SIZE 0x0800 - -# Configure RGMII-0 interface pad voltage to 1.8V -DATA 0xFFD100e0 0x1b1b1b9b - -DATA 0xFFD01400 0x43010c30 -DATA 0xFFD01404 0x39543000 -DATA 0xFFD01408 0x22125451 -DATA 0xFFD0140C 0x00000833 -DATA 0xFFD01410 0x0000000C -DATA 0xFFD01414 0x00000000 -DATA 0xFFD01418 0x00000000 -DATA 0xFFD0141C 0x00000652 -DATA 0xFFD01420 0x00000004 -DATA 0xFFD01424 0x0000F17F -DATA 0xFFD01428 0x00085520 -DATA 0xFFD0147c 0x00008552 -DATA 0xFFD01504 0x0FFFFFF1 -DATA 0xFFD01508 0x10000000 -DATA 0xFFD0150C 0x00000000 -DATA 0xFFD01514 0x00000000 -DATA 0xFFD0151C 0x00000000 -DATA 0xFFD01494 0x00010000 -DATA 0xFFD01498 0x00000000 -DATA 0xFFD0149C 0x0000E403 -DATA 0xFFD01480 0x00000001 -DATA 0xFFD20134 0x66666666 -DATA 0xFFD20138 0x66666666 -DATA 0x0 0x0board/zyxel/nsa310s/nsa310s.c deleted +0
-25@@ -1,135 +0,0 @@ -// SPDX-License-Identifier: GPL-2.0+ -/* -* Copyright (C) 2015 -* Gerald Kerma <[email protected]> -* Tony Dinh <[email protected]> -*/ - -#include <common.h> -#include <init.h> -#include <miiphy.h> -#include <net.h> -#include <asm/arch/cpu.h> -#include <asm/arch/soc.h> -#include <asm/arch/mpp.h> -#include <asm/global_data.h> -#include <asm/io.h> -#include "nsa310s.h" - -DECLARE_GLOBAL_DATA_PTR ; - -int board_early_init_f (void ) -{ -/* -* default gpio configuration -* There are maximum 64 gpios controlled through 2 sets of registers
board/zyxel/nsa310s/nsa310s.c deleted +0
-76-* the below configuration configures mainly initial LED status -*/ -mvebu_config_gpio (NSA310S_VAL_LOW ,NSA310S_VAL_HIGH , -NSA310S_OE_LOW ,NSA310S_OE_HIGH ); - -/* (all LEDs & power off active high) */ -/* Multi-Purpose Pins Functionality configuration */ -static const u32 kwmpp_config[] = { -MPP0_NF_IO2 , -MPP1_NF_IO3 , -MPP2_NF_IO4 , -MPP3_NF_IO5 , -MPP4_NF_IO6 , -MPP5_NF_IO7 , - MPP6_SYSRST_OUTn, -MPP7_GPO , -MPP8_TW_SDA , -MPP9_TW_SCK , -MPP10_UART0_TXD , -MPP11_UART0_RXD , -MPP12_GPO , -MPP13_GPIO , -MPP14_GPIO , -MPP15_GPIO , -MPP16_GPIO , -MPP17_GPIO , -MPP18_NF_IO0 , -MPP19_NF_IO1 , -MPP20_GPIO , -MPP21_GPIO , -MPP22_GPIO , -MPP23_GPIO , -MPP24_GPIO , -MPP25_GPIO , -MPP26_GPIO , -MPP27_GPIO , -MPP28_GPIO , -MPP29_GPIO , -MPP30_GPIO , -MPP31_GPIO , -MPP32_GPIO , -MPP33_GPIO , -MPP34_GPIO , -MPP35_GPIO , -0 - }; -kirkwood_mpp_conf (kwmpp_config,NULL ); -return 0 ; -} - -int board_init (void ) -{ -/* address of boot parameters */ - gd->bd->bi_boot_params =mvebu_sdram_bar (0 ) +0x100 ; - -return 0 ; -} - -#ifdef CONFIG_RESET_PHY_R -void reset_phy (void ) -{ -u16 reg; -u16 phyaddr; -char *name ="egiga0" ; - -if (miiphy_set_current_dev (name)) -return ; - -/* read PHY dev address */ -if (miiphy_read (name,0xee ,0xee , (u16 *) &phyaddr)) { -printf ("could not read PHY dev address\n" ); -return ; - } - -/* set RGMII delay */ - miiphy_write(name, phyaddr, MV88E1318_PGADR_REG,
MV88E1318_MAC_CTRL_PG);board/zyxel/nsa310s/nsa310s.c deleted +0
-11-miiphy_read (name, phyaddr,MV88E1318_MAC_CTRL_REG , ®); - reg |= (MV88E1318_RGMII_RX_CTRL |MV88E1318_RGMII_TX_CTRL ); -miiphy_write (name, phyaddr,MV88E1318_MAC_CTRL_REG , reg); -miiphy_write (name, phyaddr,MV88E1318_PGADR_REG ,0 ); - -/* reset PHY */ -if (miiphy_reset (name, phyaddr)) -return ; - -/* -* ZyXEL NSA310S uses the 88E1310S Alaska (interface identical to 88E1318)
board/zyxel/nsa310s/nsa310s.c deleted +0
-23-* and has an MCU attached to the LED[2] via tristate interrupt -*/ - -/* switch to LED register page */ -miiphy_write (name, phyaddr,MV88E1318_PGADR_REG ,MV88E1318_LED_PG ); -/* read out LED polarity register */ -miiphy_read (name, phyaddr,MV88E1318_LED_POL_REG , ®); -/* clear 4, set 5 - LED2 low, tri-state */ - reg &= ~(MV88E1318_LED2_4 ); - reg |= (MV88E1318_LED2_5 ); -/* write back LED polarity register */ -miiphy_write (name, phyaddr,MV88E1318_LED_POL_REG , reg); -/* jump back to page 0, per the PHY chip documenation. */ -miiphy_write (name, phyaddr,MV88E1318_PGADR_REG ,0 ); - -/* set PHY back to auto-negotiation mode */ -miiphy_write (name, phyaddr,0x4 ,0x1e1 ); -miiphy_write (name, phyaddr,0x9 ,0x300 ); -/* downshift */ -miiphy_write (name, phyaddr,0x10 ,0x3860 ); - miiphy_write(name, phyaddr, 0x0, 0x9140); -} -#endif /* CONFIG_RESET_PHY_R */ board/zyxel/nsa310s/nsa310s.h deleted +0
-46@@ -1,46 +0,0 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ -/* -* Copyright (C) 2015 -* Gerald Kerma <[email protected]> -* Tony Dinh <[email protected]> -*/ - -#ifndef __NSA310S_H -#define __NSA310S_H - -/* low GPIO's */ -#define HDD1_GREEN_LED (1 << 16) -#define HDD1_RED_LED (1 << 13) -#define USB_GREEN_LED (1 << 15) -#define USB_POWER (1 << 21) -#define SYS_GREEN_LED (1 << 28) -#define SYS_ORANGE_LED (1 << 29) - -#define COPY_GREEN_LED (1 << 22) -#define COPY_RED_LED (1 << 23) - -#define PIN_USB_GREEN_LED 15 -#define PIN_USB_POWER 21 - -#define NSA310S_OE_LOW (~(0)) -#define NSA310S_VAL_LOW (SYS_GREEN_LED | USB_POWER) - -/* high GPIO's */ -#define HDD2_GREEN_LED (1 << 2) -#define HDD2_POWER (1 << 1) - -#define NSA310S_OE_HIGH (~(0)) -#define NSA310S_VAL_HIGH (HDD2_POWER) - -/* PHY related */ -#define MV88E1318_PGADR_REG 22 -#define MV88E1318_MAC_CTRL_PG 2 -#define MV88E1318_MAC_CTRL_REG 21 -#define MV88E1318_RGMII_TX_CTRL (1 << 4) -#define MV88E1318_RGMII_RX_CTRL (1 << 5) -#define MV88E1318_LED_PG 3 -#define MV88E1318_LED_POL_REG 17 -#define MV88E1318_LED2_4 (1 << 4) -#define MV88E1318_LED2_5 (1 << 5) - -#endif /* __NSA310S_H */ configs/nsa310s_defconfig deleted +0
-28@@ -1,46 +0,0 @@ -CONFIG_ARM=y -CONFIG_SYS_DCACHE_OFF=y -CONFIG_ARCH_CPU_INIT=y -CONFIG_ARCH_KIRKWOOD=y -CONFIG_SYS_TEXT_BASE=0x600000 -CONFIG_NR_DRAM_BANKS=2 -CONFIG_TARGET_NSA310S=y -CONFIG_ENV_SIZE=0x20000 -CONFIG_ENV_OFFSET=0xE0000 -CONFIG_BOOTDELAY=3 -CONFIG_USE_PREBOOT=y -# CONFIG_DISPLAY_BOARDINFO is not set -CONFIG_HUSH_PARSER=y -CONFIG_SYS_PROMPT="nsa310s => " -CONFIG_CMD_BOOTZ=y -# CONFIG_CMD_FLASH is not set -CONFIG_CMD_IDE=y -CONFIG_CMD_NAND=y -CONFIG_CMD_USB=y -# CONFIG_CMD_SETEXPR is not set -CONFIG_CMD_DHCP=y -CONFIG_CMD_MII=y -CONFIG_CMD_PING=y -CONFIG_CMD_EXT2=y -CONFIG_CMD_FAT=y -CONFIG_CMD_JFFS2=y -CONFIG_CMD_MTDPARTS=y -CONFIG_MTDPARTS_DEFAULT="mtdparts=orion_nand:0xe0000@0x0(uboot),0x20000@0xe0000(uboot_env),0x100000@0x100000 (second_stage_uboot),-@0x200000(root)"
configs/nsa310s_defconfig deleted +0
-18-CONFIG_CMD_UBI=y -CONFIG_ISO_PARTITION=y -CONFIG_ENV_OVERWRITE=y -CONFIG_ENV_IS_IN_NAND=y -CONFIG_SYS_RELOC_GD_ENV_ADDR=y -CONFIG_NETCONSOLE=y -# CONFIG_MMC is not set -CONFIG_MTD=y -CONFIG_MTD_RAW_NAND=y -CONFIG_MVGBE=y -CONFIG_MII=y -CONFIG_SYS_NS16550=y -CONFIG_USB=y -CONFIG_USB_EHCI_HCD=y -CONFIG_USB_STORAGE=y -CONFIG_LZMA=y -CONFIG_BZIP2=y -CONFIG_OF_LIBFDT=yinclude/configs/nsa310s.h deleted +0
-60@@ -1,59 +0,0 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ -/* -* Copyright (C) 2015 -* Gerald Kerma <[email protected]> -* Tony Dinh <[email protected]> -* Luka Perkov <[email protected]> -*/ - -#ifndef _CONFIG_NSA310S_H -#define _CONFIG_NSA310S_H - -/* high level configuration options */ -#define CONFIG_FEROCEON_88FR131 1/* CPU Core subversion */ -#define CONFIG_KW88F6192 1/* SOC Name */ -#define CONFIG_KW88F6702 1/* SOC Name */ -#define CONFIG_SKIP_LOWLEVEL_INIT /* disable board lowlevel_init */ - -#include "mv-common.h" - -/* environment variables configuration */ - -/* default environment variables */ -#define CONFIG_BOOTCOMMAND \ - "setenv bootargs ${console} ${mtdparts} ${bootargs_root}; " \ - "ubi part root; " \ - "ubifsmount ubi:rootfs; " \ - "ubifsload 0x800000 ${kernel}; " \ - "ubifsload 0x700000 ${fdt}; " \ - "ubifsumount; " \ - "fdt addr 0x700000; fdt resize; fdt chosen; " \ - "bootz 0x800000 - 0x700000" - -#define CONFIG_EXTRA_ENV_SETTINGS \ - "console=console=ttyS0,115200\0" \ - "mtdids=nand0=orion_nand\0" \ - "mtdparts="CONFIG_MTDPARTS_DEFAULT \ - "kernel=/boot/zImage\0" \ - "fdt=/boot/nsa310s.dtb\0" \ - "bootargs_root=ubi.mtd=3 root=ubi0:rootfs rootfstype=ubifs rw\0" - -/* Ethernet driver configuration */ -#ifdef CONFIG_CMD_NET -#define CONFIG_MVGBE_PORTS {1, 0}/* enable port 0 only */ -#define CONFIG_PHY_BASE_ADR 1 -#define CONFIG_RESET_PHY_R -#endif /* CONFIG_CMD_NET */ - -/* SATA driver configuration */ -#ifdef CONFIG_IDE -#define __io -#define CONFIG_SYS_ATA_IDE0_OFFSET MV_SATA_PORT0_OFFSET -#endif /* CONFIG_IDE */ - -/* RTC driver configuration */ -#ifdef CONFIG_CMD_DATE -#define CONFIG_RTC_MV -#endif /* CONFIG_CMD_DATE */ - -#endif /* _CONFIG_NSA310S_H */ --2.17.1
Re: [PATCH 11/18] arm: Remove nsa310s board
Quoted 7 lines · Tony (bodhi)
Hi Tom,
I'm still actively supporting this board, and will do the rebase and DM conversion.
I'm not sure about the process from here. Will I need to submit the patches like for a new board again?
Hi,
So the deadline for DM_USB conversion was v2019.07, and after the v2021.07 release is when I plan to merge the series to remove the boards that still haven't been converted. Based on how the series for DM_MMC conversion removals went (v2019.04 deadline, and removed around v2021.07-rc2), you have 2 months or so left to convert the boards to DM and DM_USB. The deadline for DM_ETH is v2020.07, which means that removal would end up after v2022.07, but if it can be converted now, doing it now would be best.
So long as you get the patches done in time, they can be on top of what's in tree as I won't be deleting things yet, but time is running out. Thanks!
Signature · 1 line
Tom
Re: [PATCH 11/18] arm: Remove nsa310s board
In reply to Tom RiniQuoted 7 lines · Tom Rini
These boards have not been converted to
CONFIG_DM_USBby the deadline and is also missing conversion toCONFIG_DM. Remove itCc Gerald Kerma <[email protected]>Cc Tony Dinh <[email protected]>Cc Luka Perkov <[email protected]>Signed-off-by Tom Rini <[email protected]>
Applied to u-boot/master, thanks!
Signature · 1 line
Tom
Re: [PATCH 11/18] arm: Remove nsa310s board
Quoted 11 lines · Tom Rini
Quoted 7 lines · Tom Rini
These boards have not been converted to
CONFIG_DM_USBby the deadline and is also missing conversion toCONFIG_DM. Remove itCc Gerald Kerma <[email protected]>Cc Tony Dinh <[email protected]>Cc Luka Perkov <[email protected]>Signed-off-by Tom Rini <[email protected]>Applied to u-boot/master, thanks!
Apologies, I only realized there had been a recent series to address this as I was hitting send. I have reverted the removal, sorry!
Signature · 1 line
Tom
Re: [PATCH 11/18] arm: Remove nsa310s board
Thanks Tom!
I think we are almost done with the DM conversion for NSA310S. I'm waiting for Setfan's feedback on one last patch revision.
-Tony
Quoted 20 lines · Tom Rini
Quoted 11 lines · Tom Rini
Quoted 7 lines · Tom Rini
These boards have not been converted to
CONFIG_DM_USBby the deadline and is also missing conversion toCONFIG_DM. Remove itCc Gerald Kerma <[email protected]>Cc Tony Dinh <[email protected]>Cc Luka Perkov <[email protected]>Signed-off-by Tom Rini <[email protected]>Applied to u-boot/master, thanks!
Apologies, I only realized there had been a recent series to address this as I was hitting send. I have reverted the removal, sorry!
--
Tom
PATCH 12/18 arm: Remove spear300 boards
In reply to Tom RiniThese boards have not been converted to CONFIG_DM_USB by the deadline and is also missing conversion to CONFIG_DM. Remove them.
--- arch/arm/Kconfig | 8 -- arch/arm/cpu/arm926ejs/spear/cpu.c | 4 +- arch/arm/cpu/arm926ejs/spear/spl.c | 4 +- arch/arm/include/asm/arch-spear/hardware.h | 3 - board/spear/spear300/Kconfig | 15 --- board/spear/spear300/MAINTAINERS | 13 -- board/spear/spear300/Makefile | 6 - board/spear/spear300/spear300.c | 61 --------- configs/spear300_defconfig | 35 ----- configs/spear300_nand_defconfig | 35 ----- configs/spear300_usbtty_defconfig | 37 ------ configs/spear300_usbtty_nand_defconfig | 37 ------ drivers/i2c/Kconfig | 2 +- include/configs/spear-common.h | 2 - include/configs/spear3xx_evb.h | 141 --------------------- 15 files changed, 3 insertions(+), 400 deletions(-) delete mode 100644 board/spear/spear300/Kconfig delete mode 100644 board/spear/spear300/MAINTAINERS delete mode 100644 board/spear/spear300/Makefile delete mode 100644 board/spear/spear300/spear300.c delete mode 100644 configs/spear300_defconfig delete mode 100644 configs/spear300_nand_defconfig delete mode 100644 configs/spear300_usbtty_defconfig delete mode 100644 configs/spear300_usbtty_nand_defconfig delete mode 100644 include/configs/spear3xx_evb.h
arch/arm/Kconfig +0 -8
@@ -558,13 +558,6 @@ config ARCH_ORION5X bool "Marvell Orion" select CPU_ARM926EJS -config TARGET_SPEAR300 - bool "Support spear300" - select BOARD_EARLY_INIT_F - select CPU_ARM926EJS - select PL011_SERIAL - imply CMD_SAVES - config TARGET_SPEAR310 bool "Support spear310" select BOARD_EARLY_INIT_F
@@ -1998,7 +1991,6 @@ source "board/hisilicon/poplar/Kconfig" source "board/isee/igep003x/Kconfig" source "board/kontron/sl28/Kconfig" source "board/myir/mys_6ulx/Kconfig" -source "board/spear/spear300/Kconfig" source "board/spear/spear310/Kconfig" source "board/spear/spear320/Kconfig" source "board/spear/spear600/Kconfig"
arch/arm/cpu/arm926ejs/spear/cpu.c +1 -3
@@ -66,9 +66,7 @@ int arch_cpu_init(void)#ifdef CONFIG_DISPLAY_CPUINFO int print_cpuinfo (void ) { -#ifdef CONFIG_SPEAR300 -printf ("CPU: SPEAr300\n" ); -#elif defined(CONFIG_SPEAR310 ) +#if defined(CONFIG_SPEAR310 )printf ("CPU: SPEAr310\n" );#elif defined(CONFIG_SPEAR320 )printf ("CPU: SPEAr320\n" );
arch/arm/cpu/arm926ejs/spear/spl.c +1 -3
@@ -205,9 +205,7 @@ int get_socrev(void)return SOC_SPEAR600_BA ; else return SOC_SPEAR_NA; -#elif defined(CONFIG_SPEAR300 ) -return SOC_SPEAR300 ; -#elif defined(CONFIG_SPEAR310 ) +#if defined(CONFIG_SPEAR310 )return SOC_SPEAR310 ;#elif defined(CONFIG_SPEAR320 )return SOC_SPEAR320 ;
arch/arm/include/asm/arch-spear/hardware.h +0 -3
@@ -41,9 +41,6 @@#define CONFIG_SPEAR_MPMCREGS 100 -#elif defined(CONFIG_SPEAR300 ) -#define CONFIG_SYS_FSMC_BASE 0x94000000 -#elif defined(CONFIG_SPEAR310 )#define CONFIG_SYS_FSMC_BASE 0x44000000
board/spear/spear300/Kconfig deleted +0 -15
@@ -1,15 +0,0 @@ -if TARGET_SPEAR300 - -config SYS_BOARD - default "spear300" - -config SYS_VENDOR - default "spear" - -config SYS_SOC - default "spear" - -config SYS_CONFIG_NAME - default "spear3xx_evb" - -endif
board/spear/spear300/MAINTAINERS deleted +0 -13
@@ -1,13 +0,0 @@ -SPEAR300 BOARD -M: Vipin Kumar <[email protected]> -S: Maintained -F: board/spear/spear300/ -F: include/configs/spear3xx_evb.h -F: configs/spear300_defconfig - -SPEAR300_NAND BOARD -#M: - -S: Maintained -F: configs/spear300_nand_defconfig -F: configs/spear300_usbtty_defconfig -F: configs/spear300_usbtty_nand_defconfig
board/spear/spear300/Makefile deleted +0 -6
@@ -1,6 +0,0 @@ -# SPDX-License-Identifier: GPL-2.0+ -# -# (C) Copyright 2000-2004 -# Wolfgang Denk, DENX Software Engineering, [email protected]. - -obj-y := spear300.o
board/spear/spear300/spear300.c deleted +0 -61
61 lines not on this page · raw message
configs/spear300_defconfig deleted +0 -35
@@ -1,35 +0,0 @@ -CONFIG_ARM=y -CONFIG_ARCH_CPU_INIT=y -CONFIG_TARGET_SPEAR300=y -CONFIG_SYS_TEXT_BASE=0x00700000 -CONFIG_NR_DRAM_BANKS=1 -CONFIG_ENV_SIZE=0x2000 -CONFIG_ENV_SECT_SIZE=0x10000 -CONFIG_IDENT_STRING="-SPEAr" -CONFIG_SYS_EXTRA_OPTIONS="SPEAR300" -CONFIG_BOOTDELAY=1 -CONFIG_USE_BOOTARGS=y -CONFIG_BOOTARGS="console=ttyAMA0,115200 mem=128M root=/dev/mtdblock3 rootfstype=jffs2" -CONFIG_SYS_CONSOLE_INFO_QUIET=y -# CONFIG_DISPLAY_BOARDINFO is not set -CONFIG_MISC_INIT_R=y -# CONFIG_AUTO_COMPLETE is not set -CONFIG_CMD_IMLS=y -CONFIG_CMD_I2C=y -CONFIG_CMD_NAND=y -# CONFIG_CMD_SETEXPR is not set -CONFIG_CMD_DHCP=y -CONFIG_CMD_MII=y -CONFIG_CMD_PING=y -CONFIG_ENV_OVERWRITE=y -CONFIG_ENV_IS_IN_FLASH=y -CONFIG_ENV_ADDR=0xF8040000 -CONFIG_SYS_I2C_DW=y -# CONFIG_MMC is not set -CONFIG_MTD=y -CONFIG_MTD_NOR_FLASH=y -CONFIG_MTD_RAW_NAND=y -CONFIG_PHY_GIGE=y -CONFIG_ETH_DESIGNWARE=y -CONFIG_MII=y -CONFIG_CONS_INDEX=0
configs/spear300_nand_defconfig deleted +0 -35
@@ -1,35 +0,0 @@ -CONFIG_ARM=y -CONFIG_ARCH_CPU_INIT=y -CONFIG_TARGET_SPEAR300=y -CONFIG_SYS_TEXT_BASE=0x00700000 -CONFIG_NR_DRAM_BANKS=1 -CONFIG_ENV_SIZE=0x2000 -CONFIG_ENV_OFFSET=0x60000 -CONFIG_IDENT_STRING="-SPEAr" -CONFIG_SYS_EXTRA_OPTIONS="SPEAR300" -CONFIG_BOOTDELAY=1 -CONFIG_USE_BOOTARGS=y -CONFIG_BOOTARGS="console=ttyAMA0,115200 mem=128M root=/dev/mtdblock7 rootfstype=jffs2" -CONFIG_SYS_CONSOLE_INFO_QUIET=y -# CONFIG_DISPLAY_BOARDINFO is not set -CONFIG_MISC_INIT_R=y -# CONFIG_AUTO_COMPLETE is not set -CONFIG_CMD_IMLS=y -CONFIG_CMD_I2C=y -CONFIG_CMD_NAND=y -# CONFIG_CMD_SETEXPR is not set -CONFIG_CMD_DHCP=y -CONFIG_CMD_MII=y -CONFIG_CMD_PING=y -CONFIG_ENV_OVERWRITE=y -CONFIG_ENV_IS_IN_NAND=y -CONFIG_SYS_RELOC_GD_ENV_ADDR=y -CONFIG_SYS_I2C_DW=y -# CONFIG_MMC is not set -CONFIG_MTD=y -CONFIG_MTD_NOR_FLASH=y -CONFIG_MTD_RAW_NAND=y -CONFIG_PHY_GIGE=y -CONFIG_ETH_DESIGNWARE=y -CONFIG_MII=y -CONFIG_CONS_INDEX=0
configs/spear300_usbtty_defconfig deleted +0 -37
@@ -1,37 +0,0 @@ -CONFIG_ARM=y -CONFIG_ARCH_CPU_INIT=y -CONFIG_TARGET_SPEAR300=y -CONFIG_SYS_TEXT_BASE=0x00700000 -CONFIG_NR_DRAM_BANKS=1 -CONFIG_ENV_SIZE=0x2000 -CONFIG_ENV_SECT_SIZE=0x10000 -CONFIG_IDENT_STRING="-SPEAr" -CONFIG_SYS_EXTRA_OPTIONS="SPEAR300,USBTTY" -CONFIG_BOOTDELAY=-1 -CONFIG_USE_BOOTARGS=y -CONFIG_BOOTARGS="console=ttyAMA0,115200 mem=128M root=/dev/mtdblock3 rootfstype=jffs2" -CONFIG_SYS_CONSOLE_INFO_QUIET=y -# CONFIG_DISPLAY_BOARDINFO is not set -CONFIG_MISC_INIT_R=y -# CONFIG_AUTO_COMPLETE is not set -CONFIG_CMD_IMLS=y -CONFIG_CMD_I2C=y -CONFIG_CMD_NAND=y -# CONFIG_CMD_SETEXPR is not set -CONFIG_CMD_DHCP=y -CONFIG_CMD_MII=y -CONFIG_CMD_PING=y -CONFIG_ENV_OVERWRITE=y -CONFIG_ENV_IS_IN_FLASH=y -CONFIG_ENV_ADDR=0xF8040000 -CONFIG_SYS_I2C_DW=y -# CONFIG_MMC is not set -CONFIG_MTD=y -CONFIG_MTD_NOR_FLASH=y -CONFIG_MTD_RAW_NAND=y -CONFIG_PHY_GIGE=y -CONFIG_ETH_DESIGNWARE=y -CONFIG_MII=y -CONFIG_CONS_INDEX=0 -CONFIG_USB=y -CONFIG_USB_GADGET=y
configs/spear300_usbtty_nand_defconfig deleted +0 -37
@@ -1,37 +0,0 @@ -CONFIG_ARM=y -CONFIG_ARCH_CPU_INIT=y -CONFIG_TARGET_SPEAR300=y -CONFIG_SYS_TEXT_BASE=0x00700000 -CONFIG_NR_DRAM_BANKS=1 -CONFIG_ENV_SIZE=0x2000 -CONFIG_ENV_OFFSET=0x60000 -CONFIG_IDENT_STRING="-SPEAr" -CONFIG_SYS_EXTRA_OPTIONS="SPEAR300,USBTTY" -CONFIG_BOOTDELAY=-1 -CONFIG_USE_BOOTARGS=y -CONFIG_BOOTARGS="console=ttyAMA0,115200 mem=128M root=/dev/mtdblock7 rootfstype=jffs2" -CONFIG_SYS_CONSOLE_INFO_QUIET=y -# CONFIG_DISPLAY_BOARDINFO is not set -CONFIG_MISC_INIT_R=y -# CONFIG_AUTO_COMPLETE is not set -CONFIG_CMD_IMLS=y -CONFIG_CMD_I2C=y -CONFIG_CMD_NAND=y -# CONFIG_CMD_SETEXPR is not set -CONFIG_CMD_DHCP=y -CONFIG_CMD_MII=y -CONFIG_CMD_PING=y -CONFIG_ENV_OVERWRITE=y -CONFIG_ENV_IS_IN_NAND=y -CONFIG_SYS_RELOC_GD_ENV_ADDR=y -CONFIG_SYS_I2C_DW=y -# CONFIG_MMC is not set -CONFIG_MTD=y -CONFIG_MTD_NOR_FLASH=y -CONFIG_MTD_RAW_NAND=y -CONFIG_PHY_GIGE=y -CONFIG_ETH_DESIGNWARE=y -CONFIG_MII=y -CONFIG_CONS_INDEX=0 -CONFIG_USB=y -CONFIG_USB_GADGET=y
drivers/i2c/Kconfig +1 -1
@@ -138,7 +138,7 @@ config SYS_I2C_DW config SYS_I2C_DW_ENABLE_STATUS_UNSUPPORTED bool "DW I2C Enable Status Register not supported" - depends on SYS_I2C_DW && (TARGET_SPEAR300 || TARGET_SPEAR310 || \ + depends on SYS_I2C_DW && (TARGET_SPEAR310 || \ TARGET_SPEAR320 || TARGET_SPEAR600 || TARGET_X600) default y help
include/configs/spear-common.h +0 -2
@@ -33,8 +33,6 @@#define CONFIG_SYS_I2C #if defined(CONFIG_SPEAR600 )#define CONFIG_SYS_I2C_BASE 0xD0200000 -#elif defined(CONFIG_SPEAR300 ) -#define CONFIG_SYS_I2C_BASE 0xD0180000#elif defined(CONFIG_SPEAR310 )#define CONFIG_SYS_I2C_BASE 0xD0180000#elif defined(CONFIG_SPEAR320 )
include/configs/spear3xx_evb.h deleted +0 -141
141 lines not on this page · raw message
Signature · 1 line
2.17.1
Re: [PATCH 12/18] arm: Remove spear300 boards
Quoted 5 lines · Tom Rini
These boards have not been converted to
CONFIG_DM_USBby the deadline and is also missing conversion toCONFIG_DM. Remove them.Cc Vipin Kumar <[email protected]>Signed-off-by Tom Rini <[email protected]>
Applied to u-boot/master, thanks!
Signature · 1 line
Tom
PATCH 13/18 arm: Remove spear310 boards
In reply to Tom RiniThese boards have not been converted to CONFIG_DM_USB by the deadline and is also missing conversion to CONFIG_DM. Remove them.
--- arch/arm/Kconfig | 8 --- arch/arm/cpu/arm926ejs/spear/cpu.c | 4 +- arch/arm/cpu/arm926ejs/spear/spl.c | 4 +- arch/arm/include/asm/arch-spear/hardware.h | 16 ----- board/spear/spear310/Kconfig | 15 ---- board/spear/spear310/MAINTAINERS | 15 ---- board/spear/spear310/Makefile | 6 -- board/spear/spear310/spear310.c | 79 ---------------------- configs/spear310_defconfig | 35 ---------- configs/spear310_nand_defconfig | 35 ---------- configs/spear310_pnor_defconfig | 38 ----------- configs/spear310_usbtty_defconfig | 37 ---------- configs/spear310_usbtty_nand_defconfig | 37 ---------- configs/spear310_usbtty_pnor_defconfig | 40 ----------- drivers/i2c/Kconfig | 4 +- include/configs/spear-common.h | 2 - 16 files changed, 4 insertions(+), 371 deletions(-) delete mode 100644 board/spear/spear310/Kconfig delete mode 100644 board/spear/spear310/MAINTAINERS delete mode 100644 board/spear/spear310/Makefile delete mode 100644 board/spear/spear310/spear310.c delete mode 100644 configs/spear310_defconfig delete mode 100644 configs/spear310_nand_defconfig delete mode 100644 configs/spear310_pnor_defconfig delete mode 100644 configs/spear310_usbtty_defconfig delete mode 100644 configs/spear310_usbtty_nand_defconfig delete mode 100644 configs/spear310_usbtty_pnor_defconfig
arch/arm/Kconfig +0 -8
@@ -558,13 +558,6 @@ config ARCH_ORION5X bool "Marvell Orion" select CPU_ARM926EJS -config TARGET_SPEAR310 - bool "Support spear310" - select BOARD_EARLY_INIT_F - select CPU_ARM926EJS - select PL011_SERIAL - imply CMD_SAVES - config TARGET_SPEAR320 bool "Support spear320" select BOARD_EARLY_INIT_F
@@ -1991,7 +1984,6 @@ source "board/hisilicon/poplar/Kconfig" source "board/isee/igep003x/Kconfig" source "board/kontron/sl28/Kconfig" source "board/myir/mys_6ulx/Kconfig" -source "board/spear/spear310/Kconfig" source "board/spear/spear320/Kconfig" source "board/spear/spear600/Kconfig" source "board/spear/x600/Kconfig"
arch/arm/cpu/arm926ejs/spear/cpu.c +1 -3
@@ -66,9 +66,7 @@ int arch_cpu_init(void)#ifdef CONFIG_DISPLAY_CPUINFO int print_cpuinfo (void ) { -#if defined(CONFIG_SPEAR310 ) -printf ("CPU: SPEAr310\n" ); -#elif defined(CONFIG_SPEAR320 ) +#if defined(CONFIG_SPEAR320 )printf ("CPU: SPEAr320\n" );#elif defined(CONFIG_SPEAR600 )printf ("CPU: SPEAr600\n" );
arch/arm/cpu/arm926ejs/spear/spl.c +1 -3
@@ -205,9 +205,7 @@ int get_socrev(void)return SOC_SPEAR600_BA ; else return SOC_SPEAR_NA; -#if defined(CONFIG_SPEAR310 ) -return SOC_SPEAR310 ; -#elif defined(CONFIG_SPEAR320 ) +#if defined(CONFIG_SPEAR320 )return SOC_SPEAR320 ;#endif }
arch/arm/include/asm/arch-spear/hardware.h +0 -16
@@ -41,22 +41,6 @@#define CONFIG_SPEAR_MPMCREGS 100 -#elif defined(CONFIG_SPEAR310 ) -#define CONFIG_SYS_FSMC_BASE 0x44000000 - -#undef CONFIG_SYS_NAND_CLE -#undef CONFIG_SYS_NAND_ALE -#define CONFIG_SYS_NAND_CLE (1 << 17) -#define CONFIG_SYS_NAND_ALE (1 << 16) - -#define CONFIG_SPEAR_EMIBASE 0x4F000000 -#define CONFIG_SPEAR_RASBASE 0xB4000000 - -#define CONFIG_SYS_MACB0_BASE 0xB0000000 -#define CONFIG_SYS_MACB1_BASE 0xB0800000 -#define CONFIG_SYS_MACB2_BASE 0xB1000000 -#define CONFIG_SYS_MACB3_BASE 0xB1800000 -#elif defined(CONFIG_SPEAR320 )#define CONFIG_SYS_FSMC_BASE 0x4C000000
board/spear/spear310/Kconfig deleted +0 -15
@@ -1,15 +0,0 @@ -if TARGET_SPEAR310 - -config SYS_BOARD - default "spear310" - -config SYS_VENDOR - default "spear" - -config SYS_SOC - default "spear" - -config SYS_CONFIG_NAME - default "spear3xx_evb" - -endif
board/spear/spear310/MAINTAINERS deleted +0 -15
@@ -1,15 +0,0 @@ -SPEAR310 BOARD -M: Vipin Kumar <[email protected]> -S: Maintained -F: board/spear/spear310/ -F: include/configs/spear3xx_evb.h -F: configs/spear310_defconfig - -SPEAR310_NAND BOARD -#M: - -S: Maintained -F: configs/spear310_nand_defconfig -F: configs/spear310_pnor_defconfig -F: configs/spear310_usbtty_defconfig -F: configs/spear310_usbtty_nand_defconfig -F: configs/spear310_usbtty_pnor_defconfig
board/spear/spear310/Makefile deleted +0 -6
@@ -1,6 +0,0 @@ -# SPDX-License-Identifier: GPL-2.0+ -# -# (C) Copyright 2000-2004 -# Wolfgang Denk, DENX Software Engineering, [email protected]. - -obj-y := spear310.o
board/spear/spear310/spear310.c deleted +0 -79
79 lines not on this page · raw message
configs/spear310_defconfig deleted +0 -35
@@ -1,35 +0,0 @@ -CONFIG_ARM=y -CONFIG_ARCH_CPU_INIT=y -CONFIG_TARGET_SPEAR310=y -CONFIG_SYS_TEXT_BASE=0x00700000 -CONFIG_NR_DRAM_BANKS=1 -CONFIG_ENV_SIZE=0x2000 -CONFIG_ENV_SECT_SIZE=0x10000 -CONFIG_IDENT_STRING="-SPEAr" -CONFIG_SYS_EXTRA_OPTIONS="SPEAR310" -CONFIG_BOOTDELAY=1 -CONFIG_USE_BOOTARGS=y -CONFIG_BOOTARGS="console=ttyAMA0,115200 mem=128M root=/dev/mtdblock3 rootfstype=jffs2" -CONFIG_SYS_CONSOLE_INFO_QUIET=y -# CONFIG_DISPLAY_BOARDINFO is not set -CONFIG_MISC_INIT_R=y -# CONFIG_AUTO_COMPLETE is not set -CONFIG_CMD_IMLS=y -CONFIG_CMD_I2C=y -CONFIG_CMD_NAND=y -# CONFIG_CMD_SETEXPR is not set -CONFIG_CMD_DHCP=y -CONFIG_CMD_MII=y -CONFIG_CMD_PING=y -CONFIG_ENV_OVERWRITE=y -CONFIG_ENV_IS_IN_FLASH=y -CONFIG_ENV_ADDR=0xF8040000 -CONFIG_SYS_I2C_DW=y -# CONFIG_MMC is not set -CONFIG_MTD=y -CONFIG_MTD_NOR_FLASH=y -CONFIG_MTD_RAW_NAND=y -CONFIG_PHY_GIGE=y -CONFIG_ETH_DESIGNWARE=y -CONFIG_MII=y -CONFIG_CONS_INDEX=0
configs/spear310_nand_defconfig deleted +0 -35
@@ -1,35 +0,0 @@ -CONFIG_ARM=y -CONFIG_ARCH_CPU_INIT=y -CONFIG_TARGET_SPEAR310=y -CONFIG_SYS_TEXT_BASE=0x00700000 -CONFIG_NR_DRAM_BANKS=1 -CONFIG_ENV_SIZE=0x2000 -CONFIG_ENV_OFFSET=0x60000 -CONFIG_IDENT_STRING="-SPEAr" -CONFIG_SYS_EXTRA_OPTIONS="SPEAR310" -CONFIG_BOOTDELAY=1 -CONFIG_USE_BOOTARGS=y -CONFIG_BOOTARGS="console=ttyAMA0,115200 mem=128M root=/dev/mtdblock7 rootfstype=jffs2" -CONFIG_SYS_CONSOLE_INFO_QUIET=y -# CONFIG_DISPLAY_BOARDINFO is not set -CONFIG_MISC_INIT_R=y -# CONFIG_AUTO_COMPLETE is not set -CONFIG_CMD_IMLS=y -CONFIG_CMD_I2C=y -CONFIG_CMD_NAND=y -# CONFIG_CMD_SETEXPR is not set -CONFIG_CMD_DHCP=y -CONFIG_CMD_MII=y -CONFIG_CMD_PING=y -CONFIG_ENV_OVERWRITE=y -CONFIG_ENV_IS_IN_NAND=y -CONFIG_SYS_RELOC_GD_ENV_ADDR=y -CONFIG_SYS_I2C_DW=y -# CONFIG_MMC is not set -CONFIG_MTD=y -CONFIG_MTD_NOR_FLASH=y -CONFIG_MTD_RAW_NAND=y -CONFIG_PHY_GIGE=y -CONFIG_ETH_DESIGNWARE=y -CONFIG_MII=y -CONFIG_CONS_INDEX=0
configs/spear310_pnor_defconfig deleted +0 -38
@@ -1,38 +0,0 @@ -CONFIG_ARM=y -CONFIG_ARCH_CPU_INIT=y -CONFIG_TARGET_SPEAR310=y -CONFIG_SYS_TEXT_BASE=0x00700000 -CONFIG_NR_DRAM_BANKS=1 -CONFIG_ENV_SIZE=0x2000 -CONFIG_ENV_SECT_SIZE=0x20000 -CONFIG_IDENT_STRING="-SPEAr" -CONFIG_SYS_EXTRA_OPTIONS="SPEAR310,FLASH_PNOR" -CONFIG_BOOTDELAY=1 -CONFIG_USE_BOOTARGS=y -CONFIG_BOOTARGS="console=ttyAMA0,115200 mem=128M root=/dev/mtdblock3 rootfstype=jffs2" -CONFIG_SYS_CONSOLE_INFO_QUIET=y -# CONFIG_DISPLAY_BOARDINFO is not set -CONFIG_MISC_INIT_R=y -# CONFIG_AUTO_COMPLETE is not set -CONFIG_CMD_IMLS=y -CONFIG_CMD_I2C=y -CONFIG_CMD_NAND=y -# CONFIG_CMD_SETEXPR is not set -CONFIG_CMD_DHCP=y -CONFIG_CMD_MII=y -CONFIG_CMD_PING=y -CONFIG_ENV_OVERWRITE=y -CONFIG_ENV_IS_IN_FLASH=y -CONFIG_ENV_ADDR=0x50060000 -CONFIG_SYS_I2C_DW=y -# CONFIG_MMC is not set -CONFIG_MTD=y -CONFIG_MTD_NOR_FLASH=y -CONFIG_FLASH_CFI_DRIVER=y -CONFIG_SYS_FLASH_PROTECTION=y -CONFIG_SYS_FLASH_CFI=y -CONFIG_MTD_RAW_NAND=y -CONFIG_PHY_GIGE=y -CONFIG_ETH_DESIGNWARE=y -CONFIG_MII=y -CONFIG_CONS_INDEX=0
configs/spear310_usbtty_defconfig deleted +0 -37
@@ -1,37 +0,0 @@ -CONFIG_ARM=y -CONFIG_ARCH_CPU_INIT=y -CONFIG_TARGET_SPEAR310=y -CONFIG_SYS_TEXT_BASE=0x00700000 -CONFIG_NR_DRAM_BANKS=1 -CONFIG_ENV_SIZE=0x2000 -CONFIG_ENV_SECT_SIZE=0x10000 -CONFIG_IDENT_STRING="-SPEAr" -CONFIG_SYS_EXTRA_OPTIONS="SPEAR310,USBTTY" -CONFIG_BOOTDELAY=-1 -CONFIG_USE_BOOTARGS=y -CONFIG_BOOTARGS="console=ttyAMA0,115200 mem=128M root=/dev/mtdblock3 rootfstype=jffs2" -CONFIG_SYS_CONSOLE_INFO_QUIET=y -# CONFIG_DISPLAY_BOARDINFO is not set -CONFIG_MISC_INIT_R=y -# CONFIG_AUTO_COMPLETE is not set -CONFIG_CMD_IMLS=y -CONFIG_CMD_I2C=y -CONFIG_CMD_NAND=y -# CONFIG_CMD_SETEXPR is not set -CONFIG_CMD_DHCP=y -CONFIG_CMD_MII=y -CONFIG_CMD_PING=y -CONFIG_ENV_OVERWRITE=y -CONFIG_ENV_IS_IN_FLASH=y -CONFIG_ENV_ADDR=0xF8040000 -CONFIG_SYS_I2C_DW=y -# CONFIG_MMC is not set -CONFIG_MTD=y -CONFIG_MTD_NOR_FLASH=y -CONFIG_MTD_RAW_NAND=y -CONFIG_PHY_GIGE=y -CONFIG_ETH_DESIGNWARE=y -CONFIG_MII=y -CONFIG_CONS_INDEX=0 -CONFIG_USB=y -CONFIG_USB_GADGET=y
configs/spear310_usbtty_nand_defconfig deleted +0 -37
@@ -1,37 +0,0 @@ -CONFIG_ARM=y -CONFIG_ARCH_CPU_INIT=y -CONFIG_TARGET_SPEAR310=y -CONFIG_SYS_TEXT_BASE=0x00700000 -CONFIG_NR_DRAM_BANKS=1 -CONFIG_ENV_SIZE=0x2000 -CONFIG_ENV_OFFSET=0x60000 -CONFIG_IDENT_STRING="-SPEAr" -CONFIG_SYS_EXTRA_OPTIONS="SPEAR310,USBTTY" -CONFIG_BOOTDELAY=-1 -CONFIG_USE_BOOTARGS=y -CONFIG_BOOTARGS="console=ttyAMA0,115200 mem=128M root=/dev/mtdblock7 rootfstype=jffs2" -CONFIG_SYS_CONSOLE_INFO_QUIET=y -# CONFIG_DISPLAY_BOARDINFO is not set -CONFIG_MISC_INIT_R=y -# CONFIG_AUTO_COMPLETE is not set -CONFIG_CMD_IMLS=y -CONFIG_CMD_I2C=y -CONFIG_CMD_NAND=y -# CONFIG_CMD_SETEXPR is not set -CONFIG_CMD_DHCP=y -CONFIG_CMD_MII=y -CONFIG_CMD_PING=y -CONFIG_ENV_OVERWRITE=y -CONFIG_ENV_IS_IN_NAND=y -CONFIG_SYS_RELOC_GD_ENV_ADDR=y -CONFIG_SYS_I2C_DW=y -# CONFIG_MMC is not set -CONFIG_MTD=y -CONFIG_MTD_NOR_FLASH=y -CONFIG_MTD_RAW_NAND=y -CONFIG_PHY_GIGE=y -CONFIG_ETH_DESIGNWARE=y -CONFIG_MII=y -CONFIG_CONS_INDEX=0 -CONFIG_USB=y -CONFIG_USB_GADGET=y
configs/spear310_usbtty_pnor_defconfig deleted +0 -40
@@ -1,40 +0,0 @@ -CONFIG_ARM=y -CONFIG_ARCH_CPU_INIT=y -CONFIG_TARGET_SPEAR310=y -CONFIG_SYS_TEXT_BASE=0x00700000 -CONFIG_NR_DRAM_BANKS=1 -CONFIG_ENV_SIZE=0x2000 -CONFIG_ENV_SECT_SIZE=0x20000 -CONFIG_IDENT_STRING="-SPEAr" -CONFIG_SYS_EXTRA_OPTIONS="SPEAR310,USBTTY,FLASH_PNOR" -CONFIG_BOOTDELAY=-1 -CONFIG_USE_BOOTARGS=y -CONFIG_BOOTARGS="console=ttyAMA0,115200 mem=128M root=/dev/mtdblock3 rootfstype=jffs2" -CONFIG_SYS_CONSOLE_INFO_QUIET=y -# CONFIG_DISPLAY_BOARDINFO is not set -CONFIG_MISC_INIT_R=y -# CONFIG_AUTO_COMPLETE is not set -CONFIG_CMD_IMLS=y -CONFIG_CMD_I2C=y -CONFIG_CMD_NAND=y -# CONFIG_CMD_SETEXPR is not set -CONFIG_CMD_DHCP=y -CONFIG_CMD_MII=y -CONFIG_CMD_PING=y -CONFIG_ENV_OVERWRITE=y -CONFIG_ENV_IS_IN_FLASH=y -CONFIG_ENV_ADDR=0x50060000 -CONFIG_SYS_I2C_DW=y -# CONFIG_MMC is not set -CONFIG_MTD=y -CONFIG_MTD_NOR_FLASH=y -CONFIG_FLASH_CFI_DRIVER=y -CONFIG_SYS_FLASH_PROTECTION=y -CONFIG_SYS_FLASH_CFI=y -CONFIG_MTD_RAW_NAND=y -CONFIG_PHY_GIGE=y -CONFIG_ETH_DESIGNWARE=y -CONFIG_MII=y -CONFIG_CONS_INDEX=0 -CONFIG_USB=y -CONFIG_USB_GADGET=y
drivers/i2c/Kconfig +2 -2
@@ -138,8 +138,8 @@ config SYS_I2C_DW config SYS_I2C_DW_ENABLE_STATUS_UNSUPPORTED bool "DW I2C Enable Status Register not supported" - depends on SYS_I2C_DW && (TARGET_SPEAR310 || \ - TARGET_SPEAR320 || TARGET_SPEAR600 || TARGET_X600) + depends on SYS_I2C_DW && \ + (TARGET_SPEAR320 || TARGET_SPEAR600 || TARGET_X600) default y help Some versions of the Designware I2C controller do not support the
include/configs/spear-common.h +0 -2
@@ -33,8 +33,6 @@#define CONFIG_SYS_I2C #if defined(CONFIG_SPEAR600 )#define CONFIG_SYS_I2C_BASE 0xD0200000 -#elif defined(CONFIG_SPEAR310 ) -#define CONFIG_SYS_I2C_BASE 0xD0180000#elif defined(CONFIG_SPEAR320 )#define CONFIG_SYS_I2C_BASE 0xD0180000#endif
Signature · 1 line
2.17.1
Re: [PATCH 13/18] arm: Remove spear310 boards
Quoted 5 lines · Tom Rini
These boards have not been converted to
CONFIG_DM_USBby the deadline and is also missing conversion toCONFIG_DM. Remove them.Cc Vipin Kumar <[email protected]>Signed-off-by Tom Rini <[email protected]>
Applied to u-boot/master, thanks!
Signature · 1 line
Tom
PATCH 14/18 arm: Remove spear320 boards
In reply to Tom RiniThese boards have not been converted to CONFIG_DM_USB by the deadline and is also missing conversion to CONFIG_DM. Remove them. As this is also the last SPEAR3XX platform, remove that symbol as well.
--- arch/arm/Kconfig | 8 --- arch/arm/cpu/arm926ejs/spear/cpu.c | 8 +-- arch/arm/cpu/arm926ejs/spear/spl.c | 2 - arch/arm/cpu/arm926ejs/spear/timer.c | 5 +- arch/arm/include/asm/arch-spear/hardware.h | 8 --- arch/arm/include/asm/arch-spear/spr_misc.h | 5 +- board/spear/spear320/Kconfig | 15 ----- board/spear/spear320/MAINTAINERS | 15 ----- board/spear/spear320/Makefile | 6 -- board/spear/spear320/spear320.c | 78 ---------------------- configs/spear320_defconfig | 35 ---------- configs/spear320_nand_defconfig | 35 ---------- configs/spear320_pnor_defconfig | 38 ----------- configs/spear320_usbtty_defconfig | 37 ---------- configs/spear320_usbtty_nand_defconfig | 37 ---------- configs/spear320_usbtty_pnor_defconfig | 40 ----------- drivers/i2c/Kconfig | 2 +- include/configs/spear-common.h | 2 - 18 files changed, 5 insertions(+), 371 deletions(-) delete mode 100644 board/spear/spear320/Kconfig delete mode 100644 board/spear/spear320/MAINTAINERS delete mode 100644 board/spear/spear320/Makefile delete mode 100644 board/spear/spear320/spear320.c delete mode 100644 configs/spear320_defconfig delete mode 100644 configs/spear320_nand_defconfig delete mode 100644 configs/spear320_pnor_defconfig delete mode 100644 configs/spear320_usbtty_defconfig delete mode 100644 configs/spear320_usbtty_nand_defconfig delete mode 100644 configs/spear320_usbtty_pnor_defconfig
arch/arm/Kconfig +0 -8
@@ -558,13 +558,6 @@ config ARCH_ORION5X bool "Marvell Orion" select CPU_ARM926EJS -config TARGET_SPEAR320 - bool "Support spear320" - select BOARD_EARLY_INIT_F - select CPU_ARM926EJS - select PL011_SERIAL - imply CMD_SAVES - config TARGET_SPEAR600 bool "Support spear600" select BOARD_EARLY_INIT_F
@@ -1984,7 +1977,6 @@ source "board/hisilicon/poplar/Kconfig" source "board/isee/igep003x/Kconfig" source "board/kontron/sl28/Kconfig" source "board/myir/mys_6ulx/Kconfig" -source "board/spear/spear320/Kconfig" source "board/spear/spear600/Kconfig" source "board/spear/x600/Kconfig" source "board/st/stv0991/Kconfig"
arch/arm/cpu/arm926ejs/spear/cpu.c +2 -6
@@ -19,9 +19,7 @@ int arch_cpu_init(void) periph1_clken =readl (&misc_p->periph1_clken); -#if defined(CONFIG_SPEAR3XX ) - periph1_clken |=MISC_GPT2ENB ; -#elif defined(CONFIG_SPEAR600 ) +#if defined(CONFIG_SPEAR600 ) periph1_clken |=MISC_GPT3ENB ;#endif
@@ -66,9 +64,7 @@ int arch_cpu_init(void)#ifdef CONFIG_DISPLAY_CPUINFO int print_cpuinfo (void ) { -#if defined(CONFIG_SPEAR320 ) -printf ("CPU: SPEAr320\n" ); -#elif defined(CONFIG_SPEAR600 ) +#if defined(CONFIG_SPEAR600 )printf ("CPU: SPEAr600\n" );#else #error CPU not supported in spear platform
arch/arm/cpu/arm926ejs/spear/spl.c +0 -2
@@ -205,8 +205,6 @@ int get_socrev(void)return SOC_SPEAR600_BA ; else return SOC_SPEAR_NA; -#if defined(CONFIG_SPEAR320 ) -return SOC_SPEAR320 ;#endif }
arch/arm/cpu/arm926ejs/spear/timer.c +1 -4
@@ -36,10 +36,7 @@ int timer_init(void)u32 synth;/* Prescaler setting */ -#if defined(CONFIG_SPEAR3XX ) -writel (MISC_PRSC_CFG , &misc_regs_p->prsc2_clk_cfg); - synth =MISC_GPT4SYNTH ; -#elif defined(CONFIG_SPEAR600 ) +#if defined(CONFIG_SPEAR600 )writel (MISC_PRSC_CFG , &misc_regs_p->prsc1_clk_cfg); synth =MISC_GPT3SYNTH ;#else
arch/arm/include/asm/arch-spear/hardware.h +0 -8
@@ -41,13 +41,5 @@#define CONFIG_SPEAR_MPMCREGS 100 -#elif defined(CONFIG_SPEAR320 ) -#define CONFIG_SYS_FSMC_BASE 0x4C000000 - -#define CONFIG_SPEAR_EMIBASE 0x40000000 -#define CONFIG_SPEAR_RASBASE 0xB3000000 - -#define CONFIG_SYS_MACB0_BASE 0xAA000000 -#endif #endif /* _ASM_ARCH_HARDWARE_H */
arch/arm/include/asm/arch-spear/spr_misc.h +1 -4
@@ -88,10 +88,7 @@ struct misc_regs {#define SYNTH23 0x00020003/* PLLx_FRQ value */ -#if defined(CONFIG_SPEAR3XX ) -#define FREQ_332 0xA600010C -#define FREQ_266 0x8500010C -#elif defined(CONFIG_SPEAR600 ) +#if defined(CONFIG_SPEAR600 )#define FREQ_332 0xA600010F#define FREQ_266 0x8500010F#endif
board/spear/spear320/Kconfig deleted +0 -15
@@ -1,15 +0,0 @@ -if TARGET_SPEAR320 - -config SYS_BOARD - default "spear320" - -config SYS_VENDOR - default "spear" - -config SYS_SOC - default "spear" - -config SYS_CONFIG_NAME - default "spear3xx_evb" - -endif
board/spear/spear320/MAINTAINERS deleted +0 -15
@@ -1,15 +0,0 @@ -SPEAR320 BOARD -M: Vipin Kumar <[email protected]> -S: Maintained -F: board/spear/spear320/ -F: include/configs/spear3xx_evb.h -F: configs/spear320_defconfig - -SPEAR320_NAND BOARD -#M: - -S: Maintained -F: configs/spear320_nand_defconfig -F: configs/spear320_pnor_defconfig -F: configs/spear320_usbtty_defconfig -F: configs/spear320_usbtty_nand_defconfig -F: configs/spear320_usbtty_pnor_defconfig
board/spear/spear320/Makefile deleted +0 -6
@@ -1,6 +0,0 @@ -# SPDX-License-Identifier: GPL-2.0+ -# -# (C) Copyright 2000-2004 -# Wolfgang Denk, DENX Software Engineering, [email protected]. - -obj-y := spear320.o
board/spear/spear320/spear320.c deleted +0 -78
78 lines not on this page · raw message
configs/spear320_defconfig deleted +0 -35
@@ -1,35 +0,0 @@ -CONFIG_ARM=y -CONFIG_ARCH_CPU_INIT=y -CONFIG_TARGET_SPEAR320=y -CONFIG_SYS_TEXT_BASE=0x00700000 -CONFIG_NR_DRAM_BANKS=1 -CONFIG_ENV_SIZE=0x2000 -CONFIG_ENV_SECT_SIZE=0x10000 -CONFIG_IDENT_STRING="-SPEAr" -CONFIG_SYS_EXTRA_OPTIONS="SPEAR320" -CONFIG_BOOTDELAY=1 -CONFIG_USE_BOOTARGS=y -CONFIG_BOOTARGS="console=ttyAMA0,115200 mem=128M root=/dev/mtdblock3 rootfstype=jffs2" -CONFIG_SYS_CONSOLE_INFO_QUIET=y -# CONFIG_DISPLAY_BOARDINFO is not set -CONFIG_MISC_INIT_R=y -# CONFIG_AUTO_COMPLETE is not set -CONFIG_CMD_IMLS=y -CONFIG_CMD_I2C=y -CONFIG_CMD_NAND=y -# CONFIG_CMD_SETEXPR is not set -CONFIG_CMD_DHCP=y -CONFIG_CMD_MII=y -CONFIG_CMD_PING=y -CONFIG_ENV_OVERWRITE=y -CONFIG_ENV_IS_IN_FLASH=y -CONFIG_ENV_ADDR=0xF8040000 -CONFIG_SYS_I2C_DW=y -# CONFIG_MMC is not set -CONFIG_MTD=y -CONFIG_MTD_NOR_FLASH=y -CONFIG_MTD_RAW_NAND=y -CONFIG_PHY_GIGE=y -CONFIG_ETH_DESIGNWARE=y -CONFIG_MII=y -CONFIG_CONS_INDEX=0
configs/spear320_nand_defconfig deleted +0 -35
@@ -1,35 +0,0 @@ -CONFIG_ARM=y -CONFIG_ARCH_CPU_INIT=y -CONFIG_TARGET_SPEAR320=y -CONFIG_SYS_TEXT_BASE=0x00700000 -CONFIG_NR_DRAM_BANKS=1 -CONFIG_ENV_SIZE=0x2000 -CONFIG_ENV_OFFSET=0x60000 -CONFIG_IDENT_STRING="-SPEAr" -CONFIG_SYS_EXTRA_OPTIONS="SPEAR320" -CONFIG_BOOTDELAY=1 -CONFIG_USE_BOOTARGS=y -CONFIG_BOOTARGS="console=ttyAMA0,115200 mem=128M root=/dev/mtdblock7 rootfstype=jffs2" -CONFIG_SYS_CONSOLE_INFO_QUIET=y -# CONFIG_DISPLAY_BOARDINFO is not set -CONFIG_MISC_INIT_R=y -# CONFIG_AUTO_COMPLETE is not set -CONFIG_CMD_IMLS=y -CONFIG_CMD_I2C=y -CONFIG_CMD_NAND=y -# CONFIG_CMD_SETEXPR is not set -CONFIG_CMD_DHCP=y -CONFIG_CMD_MII=y -CONFIG_CMD_PING=y -CONFIG_ENV_OVERWRITE=y -CONFIG_ENV_IS_IN_NAND=y -CONFIG_SYS_RELOC_GD_ENV_ADDR=y -CONFIG_SYS_I2C_DW=y -# CONFIG_MMC is not set -CONFIG_MTD=y -CONFIG_MTD_NOR_FLASH=y -CONFIG_MTD_RAW_NAND=y -CONFIG_PHY_GIGE=y -CONFIG_ETH_DESIGNWARE=y -CONFIG_MII=y -CONFIG_CONS_INDEX=0
configs/spear320_pnor_defconfig deleted +0 -38
@@ -1,38 +0,0 @@ -CONFIG_ARM=y -CONFIG_ARCH_CPU_INIT=y -CONFIG_TARGET_SPEAR320=y -CONFIG_SYS_TEXT_BASE=0x00700000 -CONFIG_NR_DRAM_BANKS=1 -CONFIG_ENV_SIZE=0x2000 -CONFIG_ENV_SECT_SIZE=0x20000 -CONFIG_IDENT_STRING="-SPEAr" -CONFIG_SYS_EXTRA_OPTIONS="SPEAR320,FLASH_PNOR" -CONFIG_BOOTDELAY=1 -CONFIG_USE_BOOTARGS=y -CONFIG_BOOTARGS="console=ttyAMA0,115200 mem=128M root=/dev/mtdblock3 rootfstype=jffs2" -CONFIG_SYS_CONSOLE_INFO_QUIET=y -# CONFIG_DISPLAY_BOARDINFO is not set -CONFIG_MISC_INIT_R=y -# CONFIG_AUTO_COMPLETE is not set -CONFIG_CMD_IMLS=y -CONFIG_CMD_I2C=y -CONFIG_CMD_NAND=y -# CONFIG_CMD_SETEXPR is not set -CONFIG_CMD_DHCP=y -CONFIG_CMD_MII=y -CONFIG_CMD_PING=y -CONFIG_ENV_OVERWRITE=y -CONFIG_ENV_IS_IN_FLASH=y -CONFIG_ENV_ADDR=0x44060000 -CONFIG_SYS_I2C_DW=y -# CONFIG_MMC is not set -CONFIG_MTD=y -CONFIG_MTD_NOR_FLASH=y -CONFIG_FLASH_CFI_DRIVER=y -CONFIG_SYS_FLASH_PROTECTION=y -CONFIG_SYS_FLASH_CFI=y -CONFIG_MTD_RAW_NAND=y -CONFIG_PHY_GIGE=y -CONFIG_ETH_DESIGNWARE=y -CONFIG_MII=y -CONFIG_CONS_INDEX=0
configs/spear320_usbtty_defconfig deleted +0 -37
@@ -1,37 +0,0 @@ -CONFIG_ARM=y -CONFIG_ARCH_CPU_INIT=y -CONFIG_TARGET_SPEAR320=y -CONFIG_SYS_TEXT_BASE=0x00700000 -CONFIG_NR_DRAM_BANKS=1 -CONFIG_ENV_SIZE=0x2000 -CONFIG_ENV_SECT_SIZE=0x10000 -CONFIG_IDENT_STRING="-SPEAr" -CONFIG_SYS_EXTRA_OPTIONS="SPEAR320,USBTTY" -CONFIG_BOOTDELAY=-1 -CONFIG_USE_BOOTARGS=y -CONFIG_BOOTARGS="console=ttyAMA0,115200 mem=128M root=/dev/mtdblock3 rootfstype=jffs2" -CONFIG_SYS_CONSOLE_INFO_QUIET=y -# CONFIG_DISPLAY_BOARDINFO is not set -CONFIG_MISC_INIT_R=y -# CONFIG_AUTO_COMPLETE is not set -CONFIG_CMD_IMLS=y -CONFIG_CMD_I2C=y -CONFIG_CMD_NAND=y -# CONFIG_CMD_SETEXPR is not set -CONFIG_CMD_DHCP=y -CONFIG_CMD_MII=y -CONFIG_CMD_PING=y -CONFIG_ENV_OVERWRITE=y -CONFIG_ENV_IS_IN_FLASH=y -CONFIG_ENV_ADDR=0xF8040000 -CONFIG_SYS_I2C_DW=y -# CONFIG_MMC is not set -CONFIG_MTD=y -CONFIG_MTD_NOR_FLASH=y -CONFIG_MTD_RAW_NAND=y -CONFIG_PHY_GIGE=y -CONFIG_ETH_DESIGNWARE=y -CONFIG_MII=y -CONFIG_CONS_INDEX=0 -CONFIG_USB=y -CONFIG_USB_GADGET=y
configs/spear320_usbtty_nand_defconfig deleted +0 -37
@@ -1,37 +0,0 @@ -CONFIG_ARM=y -CONFIG_ARCH_CPU_INIT=y -CONFIG_TARGET_SPEAR320=y -CONFIG_SYS_TEXT_BASE=0x00700000 -CONFIG_NR_DRAM_BANKS=1 -CONFIG_ENV_SIZE=0x2000 -CONFIG_ENV_OFFSET=0x60000 -CONFIG_IDENT_STRING="-SPEAr" -CONFIG_SYS_EXTRA_OPTIONS="SPEAR320,USBTTY" -CONFIG_BOOTDELAY=-1 -CONFIG_USE_BOOTARGS=y -CONFIG_BOOTARGS="console=ttyAMA0,115200 mem=128M root=/dev/mtdblock7 rootfstype=jffs2" -CONFIG_SYS_CONSOLE_INFO_QUIET=y -# CONFIG_DISPLAY_BOARDINFO is not set -CONFIG_MISC_INIT_R=y -# CONFIG_AUTO_COMPLETE is not set -CONFIG_CMD_IMLS=y -CONFIG_CMD_I2C=y -CONFIG_CMD_NAND=y -# CONFIG_CMD_SETEXPR is not set -CONFIG_CMD_DHCP=y -CONFIG_CMD_MII=y -CONFIG_CMD_PING=y -CONFIG_ENV_OVERWRITE=y -CONFIG_ENV_IS_IN_NAND=y -CONFIG_SYS_RELOC_GD_ENV_ADDR=y -CONFIG_SYS_I2C_DW=y -# CONFIG_MMC is not set -CONFIG_MTD=y -CONFIG_MTD_NOR_FLASH=y -CONFIG_MTD_RAW_NAND=y -CONFIG_PHY_GIGE=y -CONFIG_ETH_DESIGNWARE=y -CONFIG_MII=y -CONFIG_CONS_INDEX=0 -CONFIG_USB=y -CONFIG_USB_GADGET=y
configs/spear320_usbtty_pnor_defconfig deleted +0 -40
@@ -1,40 +0,0 @@ -CONFIG_ARM=y -CONFIG_ARCH_CPU_INIT=y -CONFIG_TARGET_SPEAR320=y -CONFIG_SYS_TEXT_BASE=0x00700000 -CONFIG_NR_DRAM_BANKS=1 -CONFIG_ENV_SIZE=0x2000 -CONFIG_ENV_SECT_SIZE=0x20000 -CONFIG_IDENT_STRING="-SPEAr" -CONFIG_SYS_EXTRA_OPTIONS="SPEAR320,USBTTY,FLASH_PNOR" -CONFIG_BOOTDELAY=-1 -CONFIG_USE_BOOTARGS=y -CONFIG_BOOTARGS="console=ttyAMA0,115200 mem=128M root=/dev/mtdblock3 rootfstype=jffs2" -CONFIG_SYS_CONSOLE_INFO_QUIET=y -# CONFIG_DISPLAY_BOARDINFO is not set -CONFIG_MISC_INIT_R=y -# CONFIG_AUTO_COMPLETE is not set -CONFIG_CMD_IMLS=y -CONFIG_CMD_I2C=y -CONFIG_CMD_NAND=y -# CONFIG_CMD_SETEXPR is not set -CONFIG_CMD_DHCP=y -CONFIG_CMD_MII=y -CONFIG_CMD_PING=y -CONFIG_ENV_OVERWRITE=y -CONFIG_ENV_IS_IN_FLASH=y -CONFIG_ENV_ADDR=0x44060000 -CONFIG_SYS_I2C_DW=y -# CONFIG_MMC is not set -CONFIG_MTD=y -CONFIG_MTD_NOR_FLASH=y -CONFIG_FLASH_CFI_DRIVER=y -CONFIG_SYS_FLASH_PROTECTION=y -CONFIG_SYS_FLASH_CFI=y -CONFIG_MTD_RAW_NAND=y -CONFIG_PHY_GIGE=y -CONFIG_ETH_DESIGNWARE=y -CONFIG_MII=y -CONFIG_CONS_INDEX=0 -CONFIG_USB=y -CONFIG_USB_GADGET=y
drivers/i2c/Kconfig +1 -1
@@ -139,7 +139,7 @@ config SYS_I2C_DW config SYS_I2C_DW_ENABLE_STATUS_UNSUPPORTED bool "DW I2C Enable Status Register not supported" depends on SYS_I2C_DW && \ - (TARGET_SPEAR320 || TARGET_SPEAR600 || TARGET_X600) + (TARGET_SPEAR600 || TARGET_X600) default y help Some versions of the Designware I2C controller do not support the
include/configs/spear-common.h +0 -2
@@ -33,8 +33,6 @@#define CONFIG_SYS_I2C #if defined(CONFIG_SPEAR600 )#define CONFIG_SYS_I2C_BASE 0xD0200000 -#elif defined(CONFIG_SPEAR320 ) -#define CONFIG_SYS_I2C_BASE 0xD0180000#endif #define CONFIG_SYS_I2C_SPEED 400000#define CONFIG_SYS_I2C_SLAVE 0x02
Signature · 1 line
2.17.1
Re: [PATCH 14/18] arm: Remove spear320 boards
Quoted 6 lines · Tom Rini
These boards have not been converted to
CONFIG_DM_USBby the deadline and is also missing conversion toCONFIG_DM. Remove them. As this is also the last SPEAR3XX platform, remove that symbol as well.Cc Vipin Kumar <[email protected]>Signed-off-by Tom Rini <[email protected]>
Applied to u-boot/master, thanks!
Signature · 1 line
Tom
PATCH 15/18 arm: Remove spear600 boards and the rest of SPEAr support
In reply to Tom RiniThese boards have not been converted to CONFIG_DM_USB by the deadline and is also missing conversion to CONFIG_DM. Remove them. As this is the last of the SPEAr platforms, so remove the rest of the remaining support as well.
--- Makefile | 11 - arch/arm/Kconfig | 16 - arch/arm/cpu/arm926ejs/spear/Makefile | 21 -- arch/arm/cpu/arm926ejs/spear/cpu.c | 108 ------- arch/arm/cpu/arm926ejs/spear/reset.c | 39 --- arch/arm/cpu/arm926ejs/spear/spear600.c | 223 ------------- arch/arm/cpu/arm926ejs/spear/spl.c | 296 ------------------ .../spear/spr600_mt47h128m8_3_266_cl5_async.c | 113 ------- .../spear/spr600_mt47h32m16_333_cl5_psync.c | 118 ------- .../spr600_mt47h32m16_37e_166_cl4_sync.c | 113 ------- .../spear/spr600_mt47h64m16_3_333_cl5_psync.c | 127 -------- .../cpu/arm926ejs/spear/spr_lowlevel_init.S | 173 ---------- arch/arm/cpu/arm926ejs/spear/spr_misc.c | 253 --------------- arch/arm/cpu/arm926ejs/spear/start.S | 65 ---- arch/arm/cpu/arm926ejs/spear/timer.c | 121 ------- arch/arm/cpu/arm926ejs/spear/u-boot-spl.lds | 54 ---- arch/arm/include/asm/arch-spear/clk.h | 10 - arch/arm/include/asm/arch-spear/gpio.h | 23 -- arch/arm/include/asm/arch-spear/hardware.h | 45 --- arch/arm/include/asm/arch-spear/spr_defs.h | 50 --- arch/arm/include/asm/arch-spear/spr_emi.h | 37 --- arch/arm/include/asm/arch-spear/spr_gpt.h | 68 ---- arch/arm/include/asm/arch-spear/spr_misc.h | 257 --------------- arch/arm/include/asm/arch-spear/spr_ssp.h | 28 -- arch/arm/include/asm/arch-spear/spr_syscntl.h | 35 --- board/spear/spear600/Kconfig | 15 - board/spear/spear600/MAINTAINERS | 13 - board/spear/spear600/Makefile | 6 - board/spear/spear600/spear600.c | 56 ---- board/spear/x600/Kconfig | 18 -- board/spear/x600/MAINTAINERS | 6 - board/spear/x600/Makefile | 11 - board/spear/x600/fpga.c | 265 ---------------- board/spear/x600/fpga.h | 6 - board/spear/x600/x600.c | 150 --------- configs/spear600_defconfig | 39 --- configs/spear600_nand_defconfig | 36 --- configs/spear600_usbtty_defconfig | 38 --- configs/spear600_usbtty_nand_defconfig | 38 --- configs/x600_defconfig | 71 ----- doc/README.spear | 74 ----- drivers/gpio/Makefile | 1 - drivers/gpio/spear_gpio.c | 89 ------ drivers/i2c/Kconfig | 10 - drivers/i2c/designware_i2c.c | 11 - drivers/mtd/nand/raw/fsmc_nand.c | 49 --- drivers/usb/host/Makefile | 1 - drivers/usb/host/ehci-spear.c | 77 ----- include/configs/spear-common.h | 162 ---------- include/configs/spear6xx_evb.h | 36 --- include/configs/x600.h | 228 -------------- 51 files changed, 3910 deletions(-) delete mode 100644 arch/arm/cpu/arm926ejs/spear/Makefile delete mode 100644 arch/arm/cpu/arm926ejs/spear/cpu.c delete mode 100644 arch/arm/cpu/arm926ejs/spear/reset.c delete mode 100644 arch/arm/cpu/arm926ejs/spear/spear600.c delete mode 100644 arch/arm/cpu/arm926ejs/spear/spl.c delete mode 100644 arch/arm/cpu/arm926ejs/spear/spr600_mt47h128m8_3_266_cl5_async.c delete mode 100644 arch/arm/cpu/arm926ejs/spear/spr600_mt47h32m16_333_cl5_psync.c delete mode 100644 arch/arm/cpu/arm926ejs/spear/spr600_mt47h32m16_37e_166_cl4_sync.c delete mode 100644 arch/arm/cpu/arm926ejs/spear/spr600_mt47h64m16_3_333_cl5_psync.c delete mode 100644 arch/arm/cpu/arm926ejs/spear/spr_lowlevel_init.S delete mode 100644 arch/arm/cpu/arm926ejs/spear/spr_misc.c delete mode 100644 arch/arm/cpu/arm926ejs/spear/start.S delete mode 100644 arch/arm/cpu/arm926ejs/spear/timer.c delete mode 100644 arch/arm/cpu/arm926ejs/spear/u-boot-spl.lds delete mode 100644 arch/arm/include/asm/arch-spear/clk.h delete mode 100644 arch/arm/include/asm/arch-spear/gpio.h delete mode 100644 arch/arm/include/asm/arch-spear/hardware.h delete mode 100644 arch/arm/include/asm/arch-spear/spr_defs.h delete mode 100644 arch/arm/include/asm/arch-spear/spr_emi.h delete mode 100644 arch/arm/include/asm/arch-spear/spr_gpt.h delete mode 100644 arch/arm/include/asm/arch-spear/spr_misc.h delete mode 100644 arch/arm/include/asm/arch-spear/spr_ssp.h delete mode 100644 arch/arm/include/asm/arch-spear/spr_syscntl.h delete mode 100644 board/spear/spear600/Kconfig delete mode 100644 board/spear/spear600/MAINTAINERS delete mode 100644 board/spear/spear600/Makefile delete mode 100644 board/spear/spear600/spear600.c delete mode 100644 board/spear/x600/Kconfig delete mode 100644 board/spear/x600/MAINTAINERS delete mode 100644 board/spear/x600/Makefile delete mode 100644 board/spear/x600/fpga.c delete mode 100644 board/spear/x600/fpga.h delete mode 100644 board/spear/x600/x600.c delete mode 100644 configs/spear600_defconfig delete mode 100644 configs/spear600_nand_defconfig delete mode 100644 configs/spear600_usbtty_defconfig delete mode 100644 configs/spear600_usbtty_nand_defconfig delete mode 100644 configs/x600_defconfig delete mode 100644 doc/README.spear delete mode 100644 drivers/gpio/spear_gpio.c delete mode 100644 drivers/usb/host/ehci-spear.c delete mode 100644 include/configs/spear-common.h delete mode 100644 include/configs/spear6xx_evb.h delete mode 100644 include/configs/x600.h
Makefile +0 -11
@@ -1529,22 +1529,11 @@ u-boot-signed.sb: u-boot.bin spl/u-boot-spl.bin u-boot.sb: u-boot.bin spl/u-boot-spl.bin $(Q)$(MAKE) $(build)=arch/arm/cpu/arm926ejs/mxs u-boot.sb -# On x600 (SPEAr600) U-Boot is appended to U-Boot SPL. -# Both images are created using mkimage (crc etc), so that the ROM -# bootloader can check its integrity. Padding needs to be done to the -# SPL image (with mkimage header) and not the binary. Otherwise the resulting image -# which is loaded/copied by the ROM bootloader to SRAM doesn't fit. -# The resulting image containing both U-Boot images is called u-boot.spr MKIMAGEFLAGS_u-boot-spl.img = -A $(ARCH) -T firmware -C none \ -a $(CONFIG_SPL_TEXT_BASE) -e $(CONFIG_SPL_TEXT_BASE) -n XLOADER spl/u-boot-spl.img: spl/u-boot-spl.bin FORCE $(call if_changed,mkimage) -OBJCOPYFLAGS_u-boot.spr = -I binary -O binary --pad-to=$(CONFIG_SPL_PAD_TO) \ - --gap-fill=0xff -u-boot.spr: spl/u-boot-spl.img u-boot.img FORCE - $(call if_changed,pad_cat) - ifneq ($(CONFIG_ARCH_SOCFPGA),) quiet_cmd_gensplx4 = GENSPLX4 $@ cmd_gensplx4 = $(OBJCOPY) -I binary -O binary --gap-fill=0x0 \
arch/arm/Kconfig +0 -16
@@ -558,13 +558,6 @@ config ARCH_ORION5X bool "Marvell Orion" select CPU_ARM926EJS -config TARGET_SPEAR600 - bool "Support spear600" - select BOARD_EARLY_INIT_F - select CPU_ARM926EJS - select PL011_SERIAL - imply CMD_SAVES - config TARGET_STV0991 bool "Support stv0991" select CPU_V7A
@@ -577,13 +570,6 @@ config TARGET_STV0991 select SPI_FLASH imply CMD_DM -config TARGET_X600 - bool "Support x600" - select BOARD_LATE_INIT - select CPU_ARM926EJS - select PL011_SERIAL - select SUPPORT_SPL - config TARGET_FLEA3 bool "Support flea3" select CPU_ARM1136
@@ -1977,8 +1963,6 @@ source "board/hisilicon/poplar/Kconfig" source "board/isee/igep003x/Kconfig" source "board/kontron/sl28/Kconfig" source "board/myir/mys_6ulx/Kconfig" -source "board/spear/spear600/Kconfig" -source "board/spear/x600/Kconfig" source "board/st/stv0991/Kconfig" source "board/tcl/sl50/Kconfig" source "board/toradex/colibri_pxa270/Kconfig"
arch/arm/cpu/arm926ejs/spear/Makefile deleted +0 -21
@@ -1,21 +0,0 @@ -# SPDX-License-Identifier: GPL-2.0+ -# -# (C) Copyright 2000-2006 -# Wolfgang Denk, DENX Software Engineering, [email protected]. - -obj-y := cpu.o \ - reset.o \ - timer.o - -ifdef CONFIG_SPL_BUILD -obj-y += spl.o -obj-$(CONFIG_SPEAR600) += spear600.o -obj-$(CONFIG_DDR_MT47H64M16) += spr600_mt47h64m16_3_333_cl5_psync.o -obj-$(CONFIG_DDR_MT47H32M16) += spr600_mt47h32m16_333_cl5_psync.o -obj-$(CONFIG_DDR_MT47H32M16) += spr600_mt47h32m16_37e_166_cl4_sync.o -obj-$(CONFIG_DDR_MT47H128M8) += spr600_mt47h128m8_3_266_cl5_async.o -else -obj-y += spr_misc.o spr_lowlevel_init.o -endif - -extra-$(CONFIG_SPL_BUILD) := start.o
arch/arm/cpu/arm926ejs/spear/cpu.c deleted +0 -108
108 lines not on this page · raw message
arch/arm/cpu/arm926ejs/spear/reset.c deleted +0 -39
@@ -1,39 +0,0 @@ -// SPDX-License-Identifier: GPL-2.0+ -/* -* (C) Copyright 2009 -* Vipin Kumar, ST Micoelectronics, [email protected]. -*/ - -#include <common.h> -#include <cpu_func.h> -#include <asm/io.h> -#include <asm/arch/hardware.h> -#include <asm/arch/spr_syscntl.h> -#include <linux/delay.h> - -void reset_cpu (void ) -{ -struct syscntl_regs *syscntl_regs_p = - (struct syscntl_regs *)CONFIG_SPEAR_SYSCNTLBASE ; - -printf ("System is going to reboot ...\n" ); - -/* -* This 1 second delay will allow the above message -* to be printed before reset -*/ -udelay ((1000 *1000 )); - -/* Going into slow mode before resetting SOC */ -writel (0x02 , &syscntl_regs_p->scctrl); - -/* -* Writing any value to the system status register will -* reset the SoC -*/ -writel (0x00 , &syscntl_regs_p->scsysstat); - -/* system will restart */ -while (1 ) - ; -}
arch/arm/cpu/arm926ejs/spear/spear600.c deleted +0 -223
223 lines not on this page · raw message
arch/arm/cpu/arm926ejs/spear/spl.c deleted +0 -296
296 lines not on this page · raw message
arch/arm/cpu/arm926ejs/spear/spr600_mt47h128m8_3_266_cl5_async.c deleted +0 -113
113 lines not on this page · raw message
arch/arm/cpu/arm926ejs/spear/spr600_mt47h32m16_333_cl5_psync.c deleted +0 -118
118 lines not on this page · raw message
arch/arm/cpu/arm926ejs/spear/spr600_mt47h32m16_37e_166_cl4_sync.c deleted +0 -113
113 lines not on this page · raw message
arch/arm/cpu/arm926ejs/spear/spr600_mt47h64m16_3_333_cl5_psync.c deleted +0 -127
127 lines not on this page · raw message
arch/arm/cpu/arm926ejs/spear/spr_lowlevel_init.S deleted +0 -173
173 lines not on this page · raw message
arch/arm/cpu/arm926ejs/spear/spr_misc.c deleted +0 -253
253 lines not on this page · raw message
arch/arm/cpu/arm926ejs/spear/start.S deleted +0 -65
65 lines not on this page · raw message
arch/arm/cpu/arm926ejs/spear/timer.c deleted +0 -121
121 lines not on this page · raw message
arch/arm/cpu/arm926ejs/spear/u-boot-spl.lds deleted +0 -54
54 lines not on this page · raw message
arch/arm/include/asm/arch-spear/clk.h deleted +0 -10
@@ -1,10 +0,0 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ -/* -* Copyright (C) 2010, STMicroelectronics - All Rights Reserved -* Author(s): Vipin Kumar, <[email protected]> for STMicroelectronics. -*/ - -static inline unsigned long get_macb_pclk_rate (unsigned int dev_id) -{ -return 83000000 ; -}
arch/arm/include/asm/arch-spear/gpio.h deleted +0 -23
@@ -1,23 +0,0 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ -/* -* Copyright (C) 2012 Stefan Roese <[email protected]> -*/ - - -#ifndef __ASM_ARCH_SPEAR_GPIO_H -#define __ASM_ARCH_SPEAR_GPIO_H - -enum gpio_direction { -GPIO_DIRECTION_IN , -GPIO_DIRECTION_OUT , -}; - -struct gpio_regs { -u32 gpiodata[0x100 ];/* 0x000 ... 0x3fc */ -u32 gpiodir;/* 0x400 */ -}; - -#define SPEAR_GPIO_COUNT 8 -#define DATA_REG_ADDR (gpio) (1 << (gpio + 2)) - -#endif /* __ASM_ARCH_SPEAR_GPIO_H */
arch/arm/include/asm/arch-spear/hardware.h deleted +0 -45
45 lines not on this page · raw message
arch/arm/include/asm/arch-spear/spr_defs.h deleted +0 -50
50 lines not on this page · raw message
arch/arm/include/asm/arch-spear/spr_emi.h deleted +0 -37
@@ -1,37 +0,0 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ -/* -* (C) Copyright 2009 -* Ryan CHEN, ST Micoelectronics, [email protected] -*/ - -#ifndef __SPEAR_EMI_H__ -#define __SPEAR_EMI_H__ - -#ifdef CONFIG_SPEAR_EMI - -struct emi_bank_regs { -u32 tap; -u32 tsdp; -u32 tdpw; -u32 tdpr; -u32 tdcs; -u32 control; -}; - -struct emi_regs { -struct emi_bank_regs bank_regs[CONFIG_SYS_MAX_FLASH_BANKS ]; -u32 tout; -u32 ack; -u32 irq; -}; - -#define EMI_ACKMSK 0x40 - -/* control register definitions */ -#define EMI_CNTL_ENBBYTEW (1 << 2) -#define EMI_CNTL_ENBBYTER (1 << 3) -#define EMI_CNTL_ENBBYTERW (EMI_CNTL_ENBBYTER | EMI_CNTL_ENBBYTEW) - -#endif - -#endif
arch/arm/include/asm/arch-spear/spr_gpt.h deleted +0 -68
68 lines not on this page · raw message
arch/arm/include/asm/arch-spear/spr_misc.h deleted +0 -257
257 lines not on this page · raw message
arch/arm/include/asm/arch-spear/spr_ssp.h deleted +0 -28
@@ -1,28 +0,0 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ -/* -* Copyright (C) 2012 Stefan Roese <[email protected]> -*/ - -#ifndef _SPR_SSP_H -#define _SPR_SSP_H - -struct ssp_regs { -u32 sspcr0; -u32 sspcr1; -u32 sspdr; -u32 sspsr; -u32 sspcpsr; -u32 sspimsc; -u32 sspicr; -u32 sspdmacr; -}; - -#define SSPCR0_FRF_MOT_SPI 0x0000 -#define SSPCR0_DSS_16BITS 0x000f - -#define SSPCR1_SSE 0x0002 - -#define SSPSR_TNF 0x2 -#define SSPSR_TFE 0x1 - -#endif
arch/arm/include/asm/arch-spear/spr_syscntl.h deleted +0 -35
@@ -1,35 +0,0 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ -/* -* (C) Copyright 2009 -* Ryan CHEN, ST Micoelectronics, [email protected] -*/ - -#ifndef __SYSCTRL_H -#define __SYSCTRL_H - -struct syscntl_regs { -u32 scctrl; -u32 scsysstat; -u32 scimctrl; -u32 scimsysstat; -u32 scxtalctrl; -u32 scpllctrl; -u32 scpllfctrl; -u32 scperctrl0; -u32 scperctrl1; -u32 scperen; -u32 scperdis; -const u32 scperclken; -const u32 scperstat; -}; - -#define MODE_SHIFT 0x00000003 - -#define NORMAL 0x00000004 -#define SLOW 0x00000002 -#define DOZE 0x00000001 -#define SLEEP 0x00000000 - -#define PLL_TIM 0x01FFFFFF - -#endif
board/spear/spear600/Kconfig deleted +0 -15
@@ -1,15 +0,0 @@ -if TARGET_SPEAR600 - -config SYS_BOARD - default "spear600" - -config SYS_VENDOR - default "spear" - -config SYS_SOC - default "spear" - -config SYS_CONFIG_NAME - default "spear6xx_evb" - -endif
board/spear/spear600/MAINTAINERS deleted +0 -13
@@ -1,13 +0,0 @@ -SPEAR600 BOARD -M: Vipin Kumar <[email protected]> -S: Maintained -F: board/spear/spear600/ -F: include/configs/spear6xx_evb.h -F: configs/spear600_defconfig - -SPEAR600_NAND BOARD -#M: - -S: Maintained -F: configs/spear600_nand_defconfig -F: configs/spear600_usbtty_defconfig -F: configs/spear600_usbtty_nand_defconfig
board/spear/spear600/Makefile deleted +0 -6
@@ -1,6 +0,0 @@ -# SPDX-License-Identifier: GPL-2.0+ -# -# (C) Copyright 2000-2004 -# Wolfgang Denk, DENX Software Engineering, [email protected]. - -obj-y += spear600.o
board/spear/spear600/spear600.c deleted +0 -56
56 lines not on this page · raw message
board/spear/x600/Kconfig deleted +0 -18
@@ -1,18 +0,0 @@ -if TARGET_X600 - -config SPL_LDSCRIPT - default "arch/arm/cpu/arm926ejs/spear/u-boot-spl.lds" - -config SYS_BOARD - default "x600" - -config SYS_VENDOR - default "spear" - -config SYS_SOC - default "spear" - -config SYS_CONFIG_NAME - default "x600" - -endif
board/spear/x600/MAINTAINERS deleted +0 -6
@@ -1,6 +0,0 @@ -X600 BOARD -M: Stefan Roese <[email protected]> -S: Maintained -F: board/spear/x600/ -F: include/configs/x600.h -F: configs/x600_defconfig
board/spear/x600/Makefile deleted +0 -11
@@ -1,11 +0,0 @@ -# SPDX-License-Identifier: GPL-2.0+ -# -# (C) Copyright 2000-2004 -# Wolfgang Denk, DENX Software Engineering, [email protected]. - -ifdef CONFIG_SPL_BUILD -# necessary to create built-in.o -obj- := __dummy__.o -else -obj-y := fpga.o x600.o -endif
board/spear/x600/fpga.c deleted +0 -265
265 lines not on this page · raw message
board/spear/x600/fpga.h deleted +0 -6
@@ -1,6 +0,0 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ -/* -* Copyright (C) 2012 Stefan Roese <[email protected]> -*/ - -int x600_init_fpga (void );
board/spear/x600/x600.c deleted +0 -150
150 lines not on this page · raw message
configs/spear600_defconfig deleted +0 -39
@@ -1,39 +0,0 @@ -CONFIG_ARM=y -CONFIG_ARCH_CPU_INIT=y -CONFIG_TARGET_SPEAR600=y -CONFIG_SYS_TEXT_BASE=0x00700000 -CONFIG_NR_DRAM_BANKS=1 -CONFIG_ENV_SIZE=0x2000 -CONFIG_ENV_SECT_SIZE=0x10000 -CONFIG_IDENT_STRING="-SPEAr" -CONFIG_SYS_EXTRA_OPTIONS="SPEAR600" -CONFIG_BOOTDELAY=1 -CONFIG_AUTOBOOT_KEYED=y -CONFIG_AUTOBOOT_PROMPT="Hit SPACE in %d seconds to stop autoboot.\n" -CONFIG_AUTOBOOT_STOP_STR=" " -CONFIG_USE_BOOTARGS=y -CONFIG_BOOTARGS="console=ttyAMA0,115200 mem=128M root=/dev/mtdblock3 rootfstype=jffs2" -CONFIG_SYS_CONSOLE_INFO_QUIET=y -# CONFIG_DISPLAY_BOARDINFO is not set -CONFIG_MISC_INIT_R=y -# CONFIG_AUTO_COMPLETE is not set -CONFIG_CMD_IMLS=y -CONFIG_CMD_I2C=y
Lines of this file are not shown. View the raw message.
configs/spear600_nand_defconfig deleted +0 -36
Lines of this file are not shown. View the raw message.
configs/spear600_usbtty_defconfig deleted +0 -38
Lines of this file are not shown. View the raw message.
configs/spear600_usbtty_nand_defconfig deleted +0 -38
Lines of this file are not shown. View the raw message.
configs/x600_defconfig deleted +0 -71
71 lines not on this page · raw message
doc/README.spear deleted +0 -74
74 lines not on this page · raw message
drivers/gpio/spear_gpio.c deleted +0 -89
89 lines not on this page · raw message
drivers/mtd/nand/raw/fsmc_nand.c +0 -49
49 lines not on this page · raw message
drivers/usb/host/ehci-spear.c deleted +0 -77
77 lines not on this page · raw message
include/configs/spear-common.h deleted +0 -162
162 lines not on this page · raw message
include/configs/spear6xx_evb.h deleted +0 -36
Lines of this file are not shown. View the raw message.
include/configs/x600.h deleted +0 -228
228 lines not on this page · raw message
The rest of this diff is not shown. View the raw message.
Signature · 1 line
2.17.1
Part of the diff is not shown here. View the raw message.
Re: [PATCH 15/18] arm: Remove spear600 boards and the rest of SPEAr support
Quoted 7 lines · Tom Rini
These boards have not been converted to
CONFIG_DM_USBby the deadline and is also missing conversion toCONFIG_DM. Remove them. As this is the last of the SPEAr platforms, so remove the rest of the remaining support as well.Cc Vipin Kumar <[email protected]>Signed-off-by Tom Rini <[email protected]>
Applied to u-boot/master, thanks!
Signature · 1 line
Tom
PATCH 16/18 sniper: Add build guards around MUSB support code
In reply to Tom RiniIf MUSB support is disabled, these parts of the code will fail to build.
--- board/lg/sniper/sniper.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)
board/lg/sniper/sniper.c +4 -1
@@ -43,6 +43,7 @@ U_BOOT_DRVINFO(sniper_serial) = { .plat = &serial_omap_plat }; +#if defined(CONFIG_USB_MUSB_HOST ) || defined(CONFIG_USB_MUSB_GADGET )static struct musb_hdrc_config musb_config = { .multipoint =1 , .dyn_fifo = 1,
@@ -61,6 +62,7 @@ static struct musb_hdrc_platform_data musb_platform_data = { .platform_ops = &omap2430_ops, .board_data = &musb_board_data, }; +#endif void set_muxconf_regs (void ) {
@@ -147,8 +149,9 @@ int misc_init_r(void)omap_die_id_serial ();/* MUSB */ - +#if defined(CONFIG_USB_MUSB_HOST ) || defined(CONFIG_USB_MUSB_GADGET )musb_register (&musb_platform_data, &musb_board_data, (void *)MUSB_BASE ); +#endif return 0 ; }
Signature · 1 line
2.17.1
Re: [PATCH 16/18] sniper: Add build guards around MUSB support code
Quoted 4 lines · Tom Rini
If MUSB support is disabled, these parts of the code will fail to build.
Cc Paul Kocialkowski <[email protected]>Signed-off-by Tom Rini <[email protected]>
Applied to u-boot/master, thanks!
Signature · 1 line
Tom
PATCH 17/18 usb: Add correct depends for CMD_USB_MASS_STORAGE
In reply to Tom RiniWe cannot build this without USB_GADGET_DOWNLOAD support enabled, add the appropriate depends line.
--- cmd/Kconfig | 1 + 1 file changed, 1 insertion(+)
cmd/Kconfig +1 -0
@@ -1345,6 +1345,7 @@ config CMD_ROCKUSB config CMD_USB_MASS_STORAGE bool "UMS usb mass storage" + depends on USB_GADGET_DOWNLOAD select USB_FUNCTION_MASS_STORAGE help USB mass storage support
Signature · 1 line
2.17.1
Re: [PATCH 17/18] usb: Add correct depends for CMD_USB_MASS_STORAGE
Quoted 4 lines · Tom Rini
We cannot build this without
USB_GADGET_DOWNLOADsupport enabled, add the appropriate depends line.Signed-off-by Tom Rini <[email protected]>
Applied to u-boot/master, thanks!
Signature · 1 line
Tom
PATCH 18/18 usb: Require migration to DM_USB and OF_CONTROL for non-SPL cases
In reply to Tom RiniAs the deadline for migration passed with v2019.07, make support for USB depend on DM and OF_CONTROL to be enabled. Rework the Kconfig logic slightly in a few places so that SPL gadget support can exist without SPL_DM being required. Update a few defconfigs to maintain their DM_USB
+ !SPL_DM_USB support.
--- Makefile | 2 -- configs/devkit3250_defconfig | 1 + configs/draco_defconfig | 1 + configs/etamin_defconfig | 1 + configs/imx6dl_mamoj_defconfig | 1 + configs/pxm2_defconfig | 1 + configs/rastaban_defconfig | 1 + configs/rut_defconfig | 1 + configs/thuban_defconfig | 1 + drivers/block/Kconfig | 2 +- drivers/usb/Kconfig | 9 +++++---- 11 files changed, 14 insertions(+), 7 deletions(-)
Makefile +0 -2
@@ -1087,8 +1087,6 @@ ifneq ($(CONFIG_DM),y) @echo >&2 "See doc/driver-model/migration.rst for more info." @echo >&2 "====================================================" endif - $(call deprecated,CONFIG_DM_USB CONFIG_OF_CONTROL CONFIG_BLK,\ - USB,v2019.07,$(CONFIG_USB)) $(call deprecated,CONFIG_DM_VIDEO,video,v2019.07,\ $(CONFIG_LCD)$(CONFIG_VIDEO)) $(call deprecated,CONFIG_DM_SPI_FLASH,SPI flash,v2019.07,\
configs/devkit3250_defconfig +1 -0
@@ -54,5 +54,6 @@ CONFIG_PHY_SMSC=y CONFIG_SYS_NS16550=y CONFIG_SPI=y CONFIG_USB=y +# CONFIG_SPL_DM_USB is not set CONFIG_USB_STORAGE=y CONFIG_OF_LIBFDT=y
configs/draco_defconfig +1 -0
@@ -89,6 +89,7 @@ CONFIG_SPI=y CONFIG_DM_SPI=y CONFIG_OMAP3_SPI=y CONFIG_USB=y +# CONFIG_SPL_DM_USB is not set CONFIG_USB_MUSB_HOST=y CONFIG_USB_MUSB_GADGET=y CONFIG_USB_MUSB_DSPS=y
configs/etamin_defconfig +1 -0
@@ -90,6 +90,7 @@ CONFIG_SPI=y CONFIG_DM_SPI=y CONFIG_OMAP3_SPI=y CONFIG_USB=y +# CONFIG_SPL_DM_USB is not set CONFIG_USB_MUSB_HOST=y CONFIG_USB_MUSB_GADGET=y CONFIG_USB_MUSB_DSPS=y
configs/imx6dl_mamoj_defconfig +1 -0
@@ -52,6 +52,7 @@ CONFIG_PINCTRL_IMX6=y CONFIG_MXC_UART=y CONFIG_IMX_THERMAL=y CONFIG_USB=y +# CONFIG_SPL_DM_USB is not set CONFIG_USB_GADGET=y CONFIG_USB_GADGET_MANUFACTURER="FSL" CONFIG_USB_GADGET_VENDOR_NUM=0x0525
configs/pxm2_defconfig +1 -0
@@ -91,6 +91,7 @@ CONFIG_SPI=y CONFIG_DM_SPI=y CONFIG_OMAP3_SPI=y CONFIG_USB=y +# CONFIG_SPL_DM_USB is not set CONFIG_USB_MUSB_HOST=y CONFIG_USB_MUSB_GADGET=y CONFIG_USB_MUSB_DSPS=y
configs/rastaban_defconfig +1 -0
@@ -89,6 +89,7 @@ CONFIG_SPI=y CONFIG_DM_SPI=y CONFIG_OMAP3_SPI=y CONFIG_USB=y +# CONFIG_SPL_DM_USB is not set CONFIG_USB_MUSB_HOST=y CONFIG_USB_MUSB_GADGET=y CONFIG_USB_MUSB_DSPS=y
configs/rut_defconfig +1 -0
@@ -92,6 +92,7 @@ CONFIG_SPI=y CONFIG_DM_SPI=y CONFIG_OMAP3_SPI=y CONFIG_USB=y +# CONFIG_SPL_DM_USB is not set CONFIG_USB_MUSB_HOST=y CONFIG_USB_MUSB_GADGET=y CONFIG_USB_MUSB_DSPS=y
configs/thuban_defconfig +1 -0
@@ -89,6 +89,7 @@ CONFIG_SPI=y CONFIG_DM_SPI=y CONFIG_OMAP3_SPI=y CONFIG_USB=y +# CONFIG_SPL_DM_USB is not set CONFIG_USB_MUSB_HOST=y CONFIG_USB_MUSB_GADGET=y CONFIG_USB_MUSB_DSPS=y
drivers/block/Kconfig +1 -1
@@ -1,7 +1,7 @@ config BLK bool "Support block devices" depends on DM - default y if DM_MMC + default y if DM_MMC || DM_USB help Enable support for block devices, such as SCSI, MMC and USB flash sticks. These provide a block-level interface which permits
drivers/usb/Kconfig +5 -4
@@ -1,5 +1,7 @@ menuconfig USB bool "USB support" + depends on DM && OF_CONTROL + select DM_USB ---help--- Universal Serial Bus (USB) is a specification for a serial bus subsystem which offers higher speeds and more features than the
@@ -31,11 +33,8 @@ menuconfig USB in <file:Documentation/usb/> and especially the links given in <file:Documentation/usb/usb-help.txt>. -if USB - config DM_USB - bool "Enable driver model for USB" - depends on USB && DM + bool help Enable driver model for USB. The USB interface is then implemented by the USB uclass. Multiple USB controllers of different types
@@ -47,6 +46,8 @@ config DM_USB declared with the U_BOOT_USB_DEVICE() macro and will be automatically probed when found on the bus. +if USB + config SPL_DM_USB bool "Enable driver model for USB in SPL" depends on SPL_DM && DM_USB
Signature · 1 line
2.17.1