Re: [PATCH 1/6] arm: Remove flea3 board

On 09.09.21 13:54, Tom Rini wrote:

This board has not been converted to CONFIG_DM by the deadline. Remove it.

Cc: Stefano Babic sbabic@denx.de Signed-off-by: Tom Rini trini@konsulko.com

---

Acked-by: Stefano Babic sbabic@denx.de

Best regards, Stefano Babic

arch/arm/Kconfig | 6 - board/CarMediaLab/flea3/Kconfig | 15 -- board/CarMediaLab/flea3/MAINTAINERS | 6 - board/CarMediaLab/flea3/Makefile | 8 - board/CarMediaLab/flea3/flea3.c | 227 ------------------------ board/CarMediaLab/flea3/lowlevel_init.S | 24 --- configs/flea3_defconfig | 58 ------ drivers/serial/Kconfig | 3 +- include/configs/flea3.h | 155 ---------------- 9 files changed, 1 insertion(+), 501 deletions(-) delete mode 100644 board/CarMediaLab/flea3/Kconfig delete mode 100644 board/CarMediaLab/flea3/MAINTAINERS delete mode 100644 board/CarMediaLab/flea3/Makefile delete mode 100644 board/CarMediaLab/flea3/flea3.c delete mode 100644 board/CarMediaLab/flea3/lowlevel_init.S delete mode 100644 configs/flea3_defconfig delete mode 100644 include/configs/flea3.h

diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index 21f17c202f6c..909a308970b7 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig @@ -568,11 +568,6 @@ config TARGET_STV0991 select SPI_FLASH imply CMD_DM

-config TARGET_FLEA3

• bool "Support flea3"
• select CPU_ARM1136
• select GPIO_EXTRA_HEADER
• config ARCH_BCM283X bool "Broadcom BCM283X family" select DM

@@ -2107,7 +2102,6 @@ source "board/armltd/total_compute/Kconfig"

source "board/bosch/shc/Kconfig" source "board/bosch/guardian/Kconfig" -source "board/CarMediaLab/flea3/Kconfig" source "board/Marvell/aspenite/Kconfig" source "board/Marvell/octeontx/Kconfig" source "board/Marvell/octeontx2/Kconfig" diff --git a/board/CarMediaLab/flea3/Kconfig b/board/CarMediaLab/flea3/Kconfig deleted file mode 100644 index 7113f2b51f6a..000000000000 --- a/board/CarMediaLab/flea3/Kconfig +++ /dev/null @@ -1,15 +0,0 @@ -if TARGET_FLEA3

-config SYS_BOARD

• default "flea3"

-config SYS_VENDOR

• default "CarMediaLab"

-config SYS_SOC

• default "mx35"

-config SYS_CONFIG_NAME

• default "flea3"

-endif diff --git a/board/CarMediaLab/flea3/MAINTAINERS b/board/CarMediaLab/flea3/MAINTAINERS deleted file mode 100644 index c7b0df7bc429..000000000000 --- a/board/CarMediaLab/flea3/MAINTAINERS +++ /dev/null @@ -1,6 +0,0 @@ -FLEA3 BOARD -M: Stefano Babic sbabic@denx.de -S: Maintained -F: board/CarMediaLab/flea3/ -F: include/configs/flea3.h -F: configs/flea3_defconfig diff --git a/board/CarMediaLab/flea3/Makefile b/board/CarMediaLab/flea3/Makefile deleted file mode 100644 index edaac8683b36..000000000000 --- a/board/CarMediaLab/flea3/Makefile +++ /dev/null @@ -1,8 +0,0 @@ -# SPDX-License-Identifier: GPL-2.0+ -# -# Copyright (C) 2007, Guennadi Liakhovetski lg@denx.de -# -# (C) Copyright 2008-2009 Freescale Semiconductor, Inc.

-obj-y := flea3.o -obj-y += lowlevel_init.o diff --git a/board/CarMediaLab/flea3/flea3.c b/board/CarMediaLab/flea3/flea3.c deleted file mode 100644 index ecd70ecbdc41..000000000000 --- a/board/CarMediaLab/flea3/flea3.c +++ /dev/null @@ -1,227 +0,0 @@ -// SPDX-License-Identifier: GPL-2.0+ -/*

• • Copyright (C) 2007, Guennadi Liakhovetski lg@denx.de
• • (C) Copyright 2008-2010 Freescale Semiconductor, Inc.
• • Copyright (C) 2011, Stefano Babic sbabic@denx.de
• */

-#include <common.h> -#include <init.h> -#include <asm/global_data.h> -#include <asm/io.h> -#include <env.h> -#include <linux/delay.h> -#include <linux/errno.h> -#include <asm/arch/imx-regs.h> -#include <asm/arch/crm_regs.h> -#include <asm/arch/iomux-mx35.h> -#include <i2c.h> -#include <linux/types.h> -#include <asm/gpio.h> -#include <asm/arch/sys_proto.h> -#include <netdev.h> -#include <fdt_support.h> -#include <mtd_node.h> -#include <jffs2/load_kernel.h>

-#ifndef CONFIG_BOARD_EARLY_INIT_F -#error "CONFIG_BOARD_EARLY_INIT_F must be set for this board" -#endif

-#define CCM_CCMR_CONFIG 0x003F4208

-#define ESDCTL_DDR2_CONFIG 0x007FFC3F

-static inline void dram_wait(unsigned int count) -{

• volatile unsigned int wait = count;
• while (wait--)

• ;
  

-}

-DECLARE_GLOBAL_DATA_PTR;

-int dram_init(void) -{

• gd->ram_size = get_ram_size((long *)PHYS_SDRAM_1,

• PHYS_SDRAM_1_SIZE);
  

• return 0;

-}

-static void board_setup_sdram(void) -{

• struct esdc_regs *esdc = (struct esdc_regs *)ESDCTL_BASE_ADDR;
• /* Initialize with default values both CSD0/1 */
• writel(0x2000, &esdc->esdctl0);
• writel(0x2000, &esdc->esdctl1);
• mx3_setup_sdram_bank(CSD0_BASE_ADDR, ESDCTL_DDR2_CONFIG,

• 	     13, 10, 2, 0x8080);
  

-}

-static void setup_iomux_uart3(void) -{

• static const iomux_v3_cfg_t uart3_pads[] = {

• MX35_PAD_RTS2__UART3_RXD_MUX,
  

• MX35_PAD_CTS2__UART3_TXD_MUX,
  

• };
• imx_iomux_v3_setup_multiple_pads(uart3_pads, ARRAY_SIZE(uart3_pads));

-}

-#define I2C_PAD_CTRL (PAD_CTL_HYS | PAD_CTL_PUS_100K_DOWN | PAD_CTL_ODE)

-static void setup_iomux_i2c(void) -{

• static const iomux_v3_cfg_t i2c_pads[] = {

• NEW_PAD_CTRL(MX35_PAD_I2C1_CLK__I2C1_SCL, I2C_PAD_CTRL),
  

• NEW_PAD_CTRL(MX35_PAD_I2C1_DAT__I2C1_SDA, I2C_PAD_CTRL),
  

• NEW_PAD_CTRL(MX35_PAD_TX3_RX2__I2C3_SCL, I2C_PAD_CTRL),
  

• NEW_PAD_CTRL(MX35_PAD_TX2_RX3__I2C3_SDA, I2C_PAD_CTRL),
  

• };
• imx_iomux_v3_setup_multiple_pads(i2c_pads, ARRAY_SIZE(i2c_pads));

-}

-static void setup_iomux_spi(void) -{

• static const iomux_v3_cfg_t spi_pads[] = {

• MX35_PAD_CSPI1_MOSI__CSPI1_MOSI,
  

• MX35_PAD_CSPI1_MISO__CSPI1_MISO,
  

• MX35_PAD_CSPI1_SS0__CSPI1_SS0,
  

• MX35_PAD_CSPI1_SS1__CSPI1_SS1,
  

• MX35_PAD_CSPI1_SCLK__CSPI1_SCLK,
  

• };
• imx_iomux_v3_setup_multiple_pads(spi_pads, ARRAY_SIZE(spi_pads));

-}

-static void setup_iomux_fec(void) -{

• static const iomux_v3_cfg_t fec_pads[] = {

• MX35_PAD_FEC_TX_CLK__FEC_TX_CLK,
  

• MX35_PAD_FEC_RX_CLK__FEC_RX_CLK,
  

• MX35_PAD_FEC_RX_DV__FEC_RX_DV,
  

• MX35_PAD_FEC_COL__FEC_COL,
  

• MX35_PAD_FEC_RDATA0__FEC_RDATA_0,
  

• MX35_PAD_FEC_TDATA0__FEC_TDATA_0,
  

• MX35_PAD_FEC_TX_EN__FEC_TX_EN,
  

• MX35_PAD_FEC_MDC__FEC_MDC,
  

• MX35_PAD_FEC_MDIO__FEC_MDIO,
  

• MX35_PAD_FEC_TX_ERR__FEC_TX_ERR,
  

• MX35_PAD_FEC_RX_ERR__FEC_RX_ERR,
  

• MX35_PAD_FEC_CRS__FEC_CRS,
  

• MX35_PAD_FEC_RDATA1__FEC_RDATA_1,
  

• MX35_PAD_FEC_TDATA1__FEC_TDATA_1,
  

• MX35_PAD_FEC_RDATA2__FEC_RDATA_2,
  

• MX35_PAD_FEC_TDATA2__FEC_TDATA_2,
  

• MX35_PAD_FEC_RDATA3__FEC_RDATA_3,
  

• MX35_PAD_FEC_TDATA3__FEC_TDATA_3,
  

• /* GPIO used to power off ethernet */
  

• MX35_PAD_STXFS4__GPIO2_31,
  

• };
• /* setup pins for FEC */
• imx_iomux_v3_setup_multiple_pads(fec_pads, ARRAY_SIZE(fec_pads));

-}

-int board_early_init_f(void) -{

• struct ccm_regs *ccm =

• (struct ccm_regs *)IMX_CCM_BASE;
  

• /* setup GPIO3_1 to set HighVCore signal */
• imx_iomux_v3_setup_pad(MX35_PAD_ATA_DA1__GPIO3_1);
• gpio_direction_output(65, 1);
• /* initialize PLL and clock configuration */
• writel(CCM_CCMR_CONFIG, &ccm->ccmr);
• writel(CCM_MPLL_532_HZ, &ccm->mpctl);
• writel(CCM_PPLL_300_HZ, &ccm->ppctl);
• /* Set the core to run at 532 Mhz */
• writel(0x00001000, &ccm->pdr0);
• /* Set-up RAM */
• board_setup_sdram();
• /* enable clocks */
• writel(readl(&ccm->cgr0) |

• MXC_CCM_CGR0_EMI_MASK |
  

• MXC_CCM_CGR0_EDIO_MASK |
  

• MXC_CCM_CGR0_EPIT1_MASK,
  

• &ccm->cgr0);
  

• writel(readl(&ccm->cgr1) |

• MXC_CCM_CGR1_FEC_MASK |
  

• MXC_CCM_CGR1_GPIO1_MASK |
  

• MXC_CCM_CGR1_GPIO2_MASK |
  

• MXC_CCM_CGR1_GPIO3_MASK |
  

• MXC_CCM_CGR1_I2C1_MASK |
  

• MXC_CCM_CGR1_I2C2_MASK |
  

• MXC_CCM_CGR1_I2C3_MASK,
  

• &ccm->cgr1);
  

• /* Set-up NAND */
• __raw_writel(readl(&ccm->rcsr) | MXC_CCM_RCSR_NFC_FMS, &ccm->rcsr);
• /* Set pinmux for the required peripherals */
• setup_iomux_uart3();
• setup_iomux_i2c();
• setup_iomux_fec();
• setup_iomux_spi();
• return 0;

-}

-int board_init(void) -{

• /* address of boot parameters */
• gd->bd->bi_boot_params = PHYS_SDRAM_1 + 0x100;
• /* Enable power for ethernet */
• gpio_direction_output(63, 0);
• udelay(2000);
• return 0;

-}

-#ifdef CONFIG_REVISION_TAG -u32 get_board_rev(void) -{

• int rev = 0;
• return (get_cpu_rev() & ~(0xF << 8)) | (rev & 0xF) << 8;

-} -#endif

-/*

• • called prior to booting kernel or by 'fdt boardsetup' command
• */

-int ft_board_setup(void *blob, struct bd_info *bd) -{

• static const struct node_info nodes[] = {

• { "physmap-flash.0", MTD_DEV_TYPE_NOR, },  /* NOR flash */
  

• { "mxc_nand", MTD_DEV_TYPE_NAND, }, /* NAND flash */
  

• };
• if (env_get("fdt_noauto")) {

• puts("   Skiping ft_board_setup (fdt_noauto defined)\n");
  

• return 0;
  

• }
• fdt_fixup_mtdparts(blob, nodes, ARRAY_SIZE(nodes));
• return 0;

-} diff --git a/board/CarMediaLab/flea3/lowlevel_init.S b/board/CarMediaLab/flea3/lowlevel_init.S deleted file mode 100644 index 8186b3922bad..000000000000 --- a/board/CarMediaLab/flea3/lowlevel_init.S +++ /dev/null @@ -1,24 +0,0 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ -/*

• • Copyright (C) 2007, Guennadi Liakhovetski lg@denx.de
• • (C) Copyright 2008-2010 Freescale Semiconductor, Inc.
• • Copyright (C) 2011, Stefano Babic sbabic@denx.de
• */

-#include <config.h> -#include <asm/arch/lowlevel_macro.S>

-.globl lowlevel_init -lowlevel_init:

• core_init
• init_aips
• init_max
• init_m3if
• mov pc, lr

diff --git a/configs/flea3_defconfig b/configs/flea3_defconfig deleted file mode 100644 index 81e291a94160..000000000000 --- a/configs/flea3_defconfig +++ /dev/null @@ -1,58 +0,0 @@ -CONFIG_ARM=y -CONFIG_SYS_DCACHE_OFF=y -CONFIG_TARGET_FLEA3=y -CONFIG_SYS_TEXT_BASE=0xA0000000 -CONFIG_NR_DRAM_BANKS=1 -CONFIG_ENV_SIZE=0x10000 -CONFIG_ENV_SECT_SIZE=0x10000 -CONFIG_SYS_I2C_MXC_I2C1=y -CONFIG_SYS_I2C_MXC_I2C2=y -CONFIG_SYS_I2C_MXC_I2C3=y -CONFIG_SYS_MALLOC_LEN=0x110000 -CONFIG_SYS_LOAD_ADDR=0x80800000 -CONFIG_FIT=y -CONFIG_OF_BOARD_SETUP=y -CONFIG_BOOTDELAY=3 -# CONFIG_DISPLAY_BOARDINFO is not set -CONFIG_BOARD_EARLY_INIT_F=y -CONFIG_HUSH_PARSER=y -CONFIG_SYS_PROMPT="flea3 U-Boot > " -CONFIG_CMD_IMLS=y -CONFIG_CMD_I2C=y -CONFIG_CMD_SPI=y -# CONFIG_CMD_SETEXPR is not set -CONFIG_CMD_DHCP=y -CONFIG_CMD_MII=y -CONFIG_CMD_PING=y -CONFIG_CMD_CACHE=y -CONFIG_CMD_MTDPARTS=y -CONFIG_MTDIDS_DEFAULT="nand0=mxc_nand,nor0=physmap-flash.0" -CONFIG_MTDPARTS_DEFAULT="mtdparts=mxc_nand:50m(root1),32m(rootfb),64m(pcache),64m(app1),10m(app2),-(spool);physmap-flash.0:512k(u-boot),64k(env1),64k(env2),3776k(kernel1),3776k(kernel2)" -CONFIG_ENV_OVERWRITE=y -CONFIG_ENV_IS_IN_FLASH=y -CONFIG_SYS_REDUNDAND_ENVIRONMENT=y -CONFIG_ENV_ADDR=0xA0080000 -CONFIG_ENV_ADDR_REDUND=0xA0090000 -CONFIG_MXC_GPIO=y -CONFIG_SYS_I2C_LEGACY=y -CONFIG_SYS_I2C_MXC=y -CONFIG_SYS_MXC_I2C3_SLAVE=0xfe -# CONFIG_MMC is not set -CONFIG_MTD=y -CONFIG_MTD_NOR_FLASH=y -CONFIG_FLASH_CFI_DRIVER=y -CONFIG_SYS_FLASH_USE_BUFFER_WRITE=y -CONFIG_FLASH_CFI_MTD=y -CONFIG_SYS_FLASH_PROTECTION=y -CONFIG_SYS_FLASH_CFI=y -CONFIG_MTD_RAW_NAND=y -CONFIG_NAND_MXC=y -CONFIG_PHYLIB=y -CONFIG_PHY_MICREL=y -CONFIG_PHY_MICREL_KSZ8XXX=y -CONFIG_MII=y -CONFIG_MXC_UART=y -CONFIG_SPI=y -CONFIG_MXC_SPI=y -CONFIG_OF_LIBFDT=y -CONFIG_FDT_FIXUP_PARTITIONS=y diff --git a/drivers/serial/Kconfig b/drivers/serial/Kconfig index 36ee43210a9f..cbea165b9d54 100644 --- a/drivers/serial/Kconfig +++ b/drivers/serial/Kconfig @@ -645,8 +645,7 @@ config MCFUART

config MXC_UART bool "IMX serial port support"

• depends on ARCH_MX25 || ARCH_MX31 || TARGET_FLEA3 \

• || MX5 || MX6 || MX7 || IMX8M
  

• depends on ARCH_MX25 || ARCH_MX31 || MX5 || MX6 || MX7 || IMX8M help If you have a machine based on a Motorola IMX CPU you can enable its onboard serial port by enabling this option.

diff --git a/include/configs/flea3.h b/include/configs/flea3.h deleted file mode 100644 index 6c3b2c4bf554..000000000000 --- a/include/configs/flea3.h +++ /dev/null @@ -1,155 +0,0 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ -/*

• • (C) Copyright 2011, Stefano Babic sbabic@denx.de
• • (C) Copyright 2008-2010 Freescale Semiconductor, Inc.
• • Copyright (C) 2007, Guennadi Liakhovetski lg@denx.de
• • Configuration for the flea3 board.
• */

-#ifndef __CONFIG_H -#define __CONFIG_H

-#include <asm/arch/imx-regs.h>

• /* High Level Configuration Options */

-#define CONFIG_MX35

-/* Set TEXT at the beginning of the NOR flash */

-/* This is required to setup the ESDC controller */

-/*

• • Hardware drivers
• */

-#define CONFIG_SYS_SPD_BUS_NUM 2 /* I2C3 */

-/*

• • UART (console)
• */

-#define CONFIG_MXC_UART_BASE UART3_BASE

-/*

• • Command definition
• */

-#define CONFIG_NET_RETRY_COUNT 100

-/*

• • Ethernet on SOC (FEC)
• */

-#define CONFIG_FEC_MXC -#define IMX_FEC_BASE FEC_BASE_ADDR -#define CONFIG_FEC_MXC_PHYADDR 0x1

-#define CONFIG_ARP_TIMEOUT 200UL

-/*

• • Miscellaneous configurable options
• */

-#define CONFIG_SYS_CBSIZE 512 /* Console I/O Buffer Size */ -/* Print Buffer Size */ -#define CONFIG_SYS_MAXARGS 32 /* max number of command args */

-/*

• • Physical Memory Map
• */

-#define PHYS_SDRAM_1 CSD0_BASE_ADDR -#define PHYS_SDRAM_1_SIZE (128 * 1024 * 1024)

-#define CONFIG_SYS_SDRAM_BASE CSD0_BASE_ADDR -#define CONFIG_SYS_INIT_RAM_ADDR (IRAM_BASE_ADDR + 0x10000) -#define CONFIG_SYS_INIT_RAM_SIZE (IRAM_SIZE / 2) -#define CONFIG_SYS_GBL_DATA_OFFSET (CONFIG_SYS_INIT_RAM_SIZE - \

• 			GENERATED_GBL_DATA_SIZE)
  

-#define CONFIG_SYS_INIT_SP_ADDR (CONFIG_SYS_INIT_RAM_ADDR + \

• 			CONFIG_SYS_GBL_DATA_OFFSET)
  

-/*

• • MTD Command for mtdparts
• */

-/*

• • FLASH and environment organization
• */

-#define CONFIG_SYS_FLASH_BASE CS0_BASE_ADDR -#define CONFIG_SYS_MAX_FLASH_BANKS 1 /* max number of memory banks */ -#define CONFIG_SYS_MAX_FLASH_SECT 512 /* max number of sectors on one chip */ -/* Monitor at beginning of flash */ -#define CONFIG_SYS_MONITOR_BASE CONFIG_SYS_FLASH_BASE -#define CONFIG_SYS_MONITOR_LEN (512 * 1024)

-/* Address and size of Redundant Environment Sector */

-/*

• • CFI FLASH driver setup
• */

-/* A non-standard buffered write algorithm */

-/*

• • NAND FLASH driver setup
• */

-#define CONFIG_MXC_NAND_REGS_BASE (NFC_BASE_ADDR) -#define CONFIG_SYS_MAX_NAND_DEVICE 1 -#define CONFIG_SYS_NAND_BASE (NFC_BASE_ADDR) -#define CONFIG_MXC_NAND_HWECC -#define CONFIG_SYS_NAND_LARGEPAGE

-/*

• • Default environment and default scripts
• • to update uboot and load kernel
• */

-#define CONFIG_HOSTNAME "flea3" -#define CONFIG_EXTRA_ENV_SETTINGS \

• "netdev=eth0\0" \
• "nfsargs=setenv bootargs root=/dev/nfs rw " \

• "nfsroot=${serverip}:${rootpath}\0"			\
  

• "ramargs=setenv bootargs root=/dev/ram rw\0" \
• "addip_sta=setenv bootargs ${bootargs} " \

• "ip=${ipaddr}:${serverip}:${gatewayip}:${netmask}"	\
  

• ":${hostname}:${netdev}:off panic=1\0"			\
  

• "addip_dyn=setenv bootargs ${bootargs} ip=dhcp\0" \
• "addip=if test -n ${ipdyn};then run addip_dyn;" \

• "else run addip_sta;fi\0"				\
  

• "addmtd=setenv bootargs ${bootargs} ${mtdparts}\0" \
• "addtty=setenv bootargs ${bootargs}" \

• " console=ttymxc2,${baudrate}\0"			\
  

• "addmisc=setenv bootargs ${bootargs} ${misc}\0" \
• "loadaddr=80800000\0" \
• "kernel_addr_r=80800000\0" \
• "hostname=" CONFIG_HOSTNAME "\0" \
• "bootfile=" CONFIG_HOSTNAME "/uImage\0" \
• "ramdisk_file=" CONFIG_HOSTNAME "/uRamdisk\0" \
• "flash_self=run ramargs addip addtty addmtd addmisc;" \

• "bootm ${kernel_addr} ${ramdisk_addr}\0"		\
  

• "flash_nfs=run nfsargs addip addtty addmtd addmisc;" \

• "bootm ${kernel_addr}\0"				\
  

• "net_nfs=tftp ${kernel_addr_r} ${bootfile}; " \

• "run nfsargs addip addtty addmtd addmisc;"		\
  

• "bootm ${kernel_addr_r}\0"				\
  

• "net_self_load=tftp ${kernel_addr_r} ${bootfile};" \

• "tftp ${ramdisk_addr_r} ${ramdisk_file};\0"		\
  

• "net_self=if run net_self_load;then " \

• "run ramargs addip addtty addmtd addmisc;"		\
  

• "bootm ${kernel_addr_r} ${ramdisk_addr_r};"		\
  

• "else echo Images not loades;fi\0"			\
  

• "u-boot=" CONFIG_HOSTNAME "/u-boot.bin\0" \
• "load=tftp ${loadaddr} ${u-boot}\0" \
• "uboot_addr=" __stringify(CONFIG_SYS_MONITOR_BASE) "\0" \
• "update=protect off ${uboot_addr} +80000;" \

• "erase ${uboot_addr} +80000;"				\
  

• "cp.b ${loadaddr} ${uboot_addr} ${filesize}\0"		\
  

• "upd=if run load;then echo Updating u-boot;if run update;" \

• "then echo U-Boot updated;"				\
  

• 	"else echo Error updating u-boot !;"		\
  

• 	"echo Board without bootloader !!;"		\
  

• "fi;"							\
  

• "else echo U-Boot not downloaded..exiting;fi\0"		\
  

• "bootcmd=run net_nfs\0"

-#endif /* __CONFIG_H */