]> git.dujemihanovic.xyz Git - u-boot.git/commitdiff
arm: Remove pfla02 board
authorTom Rini <trini@konsulko.com>
Sun, 21 Feb 2021 01:06:09 +0000 (20:06 -0500)
committerTom Rini <trini@konsulko.com>
Sat, 10 Apr 2021 12:03:30 +0000 (08:03 -0400)
This board has not been converted to CONFIG_DM_MMC by the deadline.
Remove it.

Cc: Stefano Babic <sbabic@denx.de>
Signed-off-by: Tom Rini <trini@konsulko.com>
arch/arm/mach-imx/mx6/Kconfig
board/phytec/pfla02/Kconfig [deleted file]
board/phytec/pfla02/MAINTAINERS [deleted file]
board/phytec/pfla02/Makefile [deleted file]
board/phytec/pfla02/README [deleted file]
board/phytec/pfla02/pfla02.c [deleted file]
configs/pfla02_defconfig [deleted file]
include/configs/pfla02.h [deleted file]

index 7d22acd23e4af75f67bf632f6d6b203418b4fe47..2a522f8644616400a7079a67aa2703f6677d6656 100644 (file)
@@ -502,12 +502,6 @@ config TARGET_PCM058
        select OF_CONTROL
        imply CMD_DM
 
-config TARGET_PFLA02
-       bool "Phytec PFLA02 (PhyFlex) i.MX6 Quad"
-       depends on MX6QDL
-       select BOARD_LATE_INIT
-       select SUPPORT_SPL
-
 config TARGET_PCL063
        bool "PHYTEC PCL063 (phyCORE-i.MX6UL)"
        depends on MX6UL
@@ -671,7 +665,6 @@ source "board/freescale/mx6ul_14x14_evk/Kconfig"
 source "board/freescale/mx6ullevk/Kconfig"
 source "board/grinn/liteboard/Kconfig"
 source "board/phytec/pcm058/Kconfig"
-source "board/phytec/pfla02/Kconfig"
 source "board/phytec/pcl063/Kconfig"
 source "board/gateworks/gw_ventana/Kconfig"
 source "board/kosagi/novena/Kconfig"
diff --git a/board/phytec/pfla02/Kconfig b/board/phytec/pfla02/Kconfig
deleted file mode 100644 (file)
index f4da68b..0000000
+++ /dev/null
@@ -1,18 +0,0 @@
-if TARGET_PFLA02
-
-config SYS_BOARD
-       default "pfla02"
-
-config SYS_VENDOR
-       default "phytec"
-
-config SYS_CONFIG_NAME
-       default "pfla02"
-
-config SPL_DRAM_1_BANK
-       bool "DRAM on just one bank"
-       help
-         activate, if the module has just one bank
-         of RAM
-
-endif
diff --git a/board/phytec/pfla02/MAINTAINERS b/board/phytec/pfla02/MAINTAINERS
deleted file mode 100644 (file)
index 4b069a9..0000000
+++ /dev/null
@@ -1,6 +0,0 @@
-PHYTEC PHYFLEX
-M:     Stefano Babic <sbabic@denx.de>
-S:     Maintained
-F:     board/phytec/pfla02/
-F:     include/configs/pfla02.h
-F:     configs/pfla02_defconfig
diff --git a/board/phytec/pfla02/Makefile b/board/phytec/pfla02/Makefile
deleted file mode 100644 (file)
index c50f315..0000000
+++ /dev/null
@@ -1,7 +0,0 @@
-# SPDX-License-Identifier: GPL-2.0+
-#
-# Copyright (C) 2007, Guennadi Liakhovetski <lg@denx.de>
-#
-# (C) Copyright 2011 Freescale Semiconductor, Inc.
-
-obj-y  := pfla02.o
diff --git a/board/phytec/pfla02/README b/board/phytec/pfla02/README
deleted file mode 100644 (file)
index 0f46ab8..0000000
+++ /dev/null
@@ -1,24 +0,0 @@
-Board information
------------------
-
-The evaluation board "pbab01" is thought to be used
-together with the SOM.
-
-More information on the board can be found on manufacturer's
-website:
-
-http://www.phytec.de/produkt/system-on-modules/phyflex-imx-6/
-
-Building U-Boot
--------------------------------
-
-$ make pfla02_defconfig
-$ make
-
-This generates the artifacts SPL and u-boot.img.
-The SOM can boot from NAND or from SD-Card, having the SPI-NOR
-as second option.
-The dip switch "SW3" on the board let choose the boot device.
-
-SW3_1(on), SW3_2(on), SW3_3(off):      Boot first from SD, then try SPI
-SW3_1(off), SW3_2(on), SW3_3(off):     Boot from SPI
diff --git a/board/phytec/pfla02/pfla02.c b/board/phytec/pfla02/pfla02.c
deleted file mode 100644 (file)
index 076ce67..0000000
+++ /dev/null
@@ -1,714 +0,0 @@
-// SPDX-License-Identifier: GPL-2.0+
-/*
- * Copyright (C) 2017 Stefano Babic <sbabic@denx.de>
- */
-
-#include <common.h>
-#include <cpu_func.h>
-#include <init.h>
-#include <log.h>
-#include <net.h>
-#include <asm/global_data.h>
-#include <asm/io.h>
-#include <asm/arch/clock.h>
-#include <asm/arch/imx-regs.h>
-#include <asm/arch/iomux.h>
-#include <asm/arch/crm_regs.h>
-#include <asm/arch/iomux.h>
-#include <asm/arch/mx6-pins.h>
-#include <asm/mach-imx/iomux-v3.h>
-#include <asm/mach-imx/boot_mode.h>
-#include <asm/mach-imx/mxc_i2c.h>
-#include <asm/mach-imx/spi.h>
-#include <env.h>
-#include <linux/delay.h>
-#include <linux/errno.h>
-#include <asm/gpio.h>
-#include <mmc.h>
-#include <i2c.h>
-#include <fsl_esdhc_imx.h>
-#include <nand.h>
-#include <miiphy.h>
-#include <netdev.h>
-#include <asm/arch/sys_proto.h>
-#include <asm/sections.h>
-
-DECLARE_GLOBAL_DATA_PTR;
-
-#define UART_PAD_CTRL  (PAD_CTL_PUS_100K_UP |                  \
-       PAD_CTL_SPEED_MED | PAD_CTL_DSE_40ohm |                 \
-       PAD_CTL_SRE_FAST  | PAD_CTL_HYS)
-
-#define USDHC_PAD_CTRL (PAD_CTL_PUS_47K_UP |                   \
-       PAD_CTL_SPEED_LOW | PAD_CTL_DSE_80ohm |                 \
-       PAD_CTL_SRE_FAST  | PAD_CTL_HYS)
-
-#define ENET_PAD_CTRL  (PAD_CTL_PUS_100K_UP |                  \
-       PAD_CTL_SPEED_MED | PAD_CTL_DSE_40ohm | PAD_CTL_HYS)
-
-#define SPI_PAD_CTRL (PAD_CTL_HYS | PAD_CTL_SPEED_MED | \
-                     PAD_CTL_DSE_40ohm | PAD_CTL_SRE_FAST)
-
-#define I2C_PAD_CTRL  (PAD_CTL_PUS_100K_UP |                   \
-       PAD_CTL_SPEED_MED | PAD_CTL_DSE_40ohm | PAD_CTL_HYS |   \
-       PAD_CTL_ODE | PAD_CTL_SRE_FAST)
-
-#define I2C_PAD MUX_PAD_CTRL(I2C_PAD_CTRL)
-
-#define ASRC_PAD_CTRL (PAD_CTL_HYS | PAD_CTL_PUS_100K_UP  |    \
-                     PAD_CTL_DSE_40ohm | PAD_CTL_SRE_FAST)
-
-#define NAND_PAD_CTRL (PAD_CTL_PUS_100K_UP | PAD_CTL_SPEED_MED | \
-              PAD_CTL_DSE_40ohm | PAD_CTL_SRE_FAST)
-
-#define ENET_PHY_RESET_GPIO IMX_GPIO_NR(1, 14)
-#define USDHC2_CD_GPIO IMX_GPIO_NR(1, 4)
-#define GREEN_LED      IMX_GPIO_NR(2, 31)
-#define RED_LED                IMX_GPIO_NR(1, 30)
-#define IMX6Q_DRIVE_STRENGTH   0x30
-
-int dram_init(void)
-{
-       gd->ram_size = imx_ddr_size();
-       return 0;
-}
-
-static iomux_v3_cfg_t const uart4_pads[] = {
-       IOMUX_PADS(PAD_KEY_COL0__UART4_TX_DATA | MUX_PAD_CTRL(UART_PAD_CTRL)),
-       IOMUX_PADS(PAD_KEY_ROW0__UART4_RX_DATA | MUX_PAD_CTRL(UART_PAD_CTRL)),
-};
-
-static iomux_v3_cfg_t const enet_pads[] = {
-       IOMUX_PADS(PAD_ENET_MDIO__ENET_MDIO     | MUX_PAD_CTRL(ENET_PAD_CTRL)),
-       IOMUX_PADS(PAD_ENET_MDC__ENET_MDC       | MUX_PAD_CTRL(ENET_PAD_CTRL)),
-       IOMUX_PADS(PAD_RGMII_TXC__RGMII_TXC     | MUX_PAD_CTRL(ENET_PAD_CTRL)),
-       IOMUX_PADS(PAD_RGMII_TD0__RGMII_TD0     | MUX_PAD_CTRL(ENET_PAD_CTRL)),
-       IOMUX_PADS(PAD_RGMII_TD1__RGMII_TD1     | MUX_PAD_CTRL(ENET_PAD_CTRL)),
-       IOMUX_PADS(PAD_RGMII_TD2__RGMII_TD2     | MUX_PAD_CTRL(ENET_PAD_CTRL)),
-       IOMUX_PADS(PAD_RGMII_TD3__RGMII_TD3     | MUX_PAD_CTRL(ENET_PAD_CTRL)),
-       IOMUX_PADS(PAD_RGMII_TX_CTL__RGMII_TX_CTL |
-                       MUX_PAD_CTRL(ENET_PAD_CTRL)),
-       IOMUX_PADS(PAD_ENET_REF_CLK__ENET_TX_CLK |
-                       MUX_PAD_CTRL(ENET_PAD_CTRL)),
-       IOMUX_PADS(PAD_RGMII_RXC__RGMII_RXC     | MUX_PAD_CTRL(ENET_PAD_CTRL)),
-       IOMUX_PADS(PAD_RGMII_RD0__RGMII_RD0     | MUX_PAD_CTRL(ENET_PAD_CTRL)),
-       IOMUX_PADS(PAD_RGMII_RD1__RGMII_RD1     | MUX_PAD_CTRL(ENET_PAD_CTRL)),
-       IOMUX_PADS(PAD_RGMII_RD2__RGMII_RD2     | MUX_PAD_CTRL(ENET_PAD_CTRL)),
-       IOMUX_PADS(PAD_RGMII_RD3__RGMII_RD3     | MUX_PAD_CTRL(ENET_PAD_CTRL)),
-       IOMUX_PADS(PAD_RGMII_RX_CTL__RGMII_RX_CTL |
-                       MUX_PAD_CTRL(ENET_PAD_CTRL)),
-       IOMUX_PADS(PAD_SD2_DAT1__GPIO1_IO14     | MUX_PAD_CTRL(NO_PAD_CTRL)),
-};
-
-static iomux_v3_cfg_t const ecspi3_pads[] = {
-       IOMUX_PADS(PAD_DISP0_DAT0__ECSPI3_SCLK | MUX_PAD_CTRL(SPI_PAD_CTRL)),
-       IOMUX_PADS(PAD_DISP0_DAT1__ECSPI3_MOSI | MUX_PAD_CTRL(SPI_PAD_CTRL)),
-       IOMUX_PADS(PAD_DISP0_DAT2__ECSPI3_MISO | MUX_PAD_CTRL(SPI_PAD_CTRL)),
-       IOMUX_PADS(PAD_DISP0_DAT3__GPIO4_IO24  | MUX_PAD_CTRL(NO_PAD_CTRL)),
-};
-
-static iomux_v3_cfg_t const gpios_pads[] = {
-       IOMUX_PADS(PAD_SD4_DAT3__GPIO2_IO11 | MUX_PAD_CTRL(NO_PAD_CTRL)),
-       IOMUX_PADS(PAD_SD4_DAT4__GPIO2_IO12 | MUX_PAD_CTRL(NO_PAD_CTRL)),
-       IOMUX_PADS(PAD_SD4_DAT5__GPIO2_IO13 | MUX_PAD_CTRL(NO_PAD_CTRL)),
-       IOMUX_PADS(PAD_SD4_DAT6__GPIO2_IO14 | MUX_PAD_CTRL(NO_PAD_CTRL)),
-       IOMUX_PADS(PAD_SD4_DAT7__GPIO2_IO15 | MUX_PAD_CTRL(NO_PAD_CTRL)),
-       IOMUX_PADS(PAD_EIM_EB3__GPIO2_IO31 | MUX_PAD_CTRL(NO_PAD_CTRL)),
-       IOMUX_PADS(PAD_ENET_TXD0__GPIO1_IO30 | MUX_PAD_CTRL(NO_PAD_CTRL)),
-       IOMUX_PADS(PAD_SD4_DAT3__GPIO2_IO11 | MUX_PAD_CTRL(NO_PAD_CTRL)),
-};
-
-#if defined(CONFIG_CMD_NAND) && !defined(CONFIG_SPL_BUILD)
-/* NAND */
-static iomux_v3_cfg_t const nfc_pads[] = {
-       IOMUX_PADS(PAD_NANDF_CLE__NAND_CLE      | MUX_PAD_CTRL(NAND_PAD_CTRL)),
-       IOMUX_PADS(PAD_NANDF_ALE__NAND_ALE      | MUX_PAD_CTRL(NAND_PAD_CTRL)),
-       IOMUX_PADS(PAD_NANDF_WP_B__NAND_WP_B    | MUX_PAD_CTRL(NAND_PAD_CTRL)),
-       IOMUX_PADS(PAD_NANDF_RB0__NAND_READY_B  | MUX_PAD_CTRL(NAND_PAD_CTRL)),
-       IOMUX_PADS(PAD_NANDF_CS0__NAND_CE0_B    | MUX_PAD_CTRL(NAND_PAD_CTRL)),
-       IOMUX_PADS(PAD_NANDF_CS1__NAND_CE1_B    | MUX_PAD_CTRL(NAND_PAD_CTRL)),
-       IOMUX_PADS(PAD_NANDF_CS2__NAND_CE2_B    | MUX_PAD_CTRL(NAND_PAD_CTRL)),
-       IOMUX_PADS(PAD_NANDF_CS3__NAND_CE3_B    | MUX_PAD_CTRL(NAND_PAD_CTRL)),
-       IOMUX_PADS(PAD_SD4_CMD__NAND_RE_B       | MUX_PAD_CTRL(NAND_PAD_CTRL)),
-       IOMUX_PADS(PAD_SD4_CLK__NAND_WE_B       | MUX_PAD_CTRL(NAND_PAD_CTRL)),
-       IOMUX_PADS(PAD_NANDF_D0__NAND_DATA00    | MUX_PAD_CTRL(NAND_PAD_CTRL)),
-       IOMUX_PADS(PAD_NANDF_D1__NAND_DATA01    | MUX_PAD_CTRL(NAND_PAD_CTRL)),
-       IOMUX_PADS(PAD_NANDF_D2__NAND_DATA02    | MUX_PAD_CTRL(NAND_PAD_CTRL)),
-       IOMUX_PADS(PAD_NANDF_D3__NAND_DATA03    | MUX_PAD_CTRL(NAND_PAD_CTRL)),
-       IOMUX_PADS(PAD_NANDF_D4__NAND_DATA04    | MUX_PAD_CTRL(NAND_PAD_CTRL)),
-       IOMUX_PADS(PAD_NANDF_D5__NAND_DATA05    | MUX_PAD_CTRL(NAND_PAD_CTRL)),
-       IOMUX_PADS(PAD_NANDF_D6__NAND_DATA06    | MUX_PAD_CTRL(NAND_PAD_CTRL)),
-       IOMUX_PADS(PAD_NANDF_D7__NAND_DATA07    | MUX_PAD_CTRL(NAND_PAD_CTRL)),
-       IOMUX_PADS(PAD_SD4_DAT0__NAND_DQS       | MUX_PAD_CTRL(NAND_PAD_CTRL)),
-};
-#endif
-
-static struct i2c_pads_info i2c_pad_info = {
-       .scl = {
-               .i2c_mode = MX6Q_PAD_EIM_D21__I2C1_SCL | I2C_PAD,
-               .gpio_mode = MX6Q_PAD_EIM_D21__GPIO3_IO21 | I2C_PAD,
-               .gp = IMX_GPIO_NR(3, 21)
-       },
-       .sda = {
-               .i2c_mode = MX6Q_PAD_EIM_D28__I2C1_SDA | I2C_PAD,
-               .gpio_mode = MX6Q_PAD_EIM_D28__GPIO3_IO28 | I2C_PAD,
-               .gp = IMX_GPIO_NR(3, 28)
-       }
-};
-
-static struct fsl_esdhc_cfg usdhc_cfg[] = {
-       {USDHC3_BASE_ADDR,
-       .max_bus_width = 4},
-       {.esdhc_base = USDHC2_BASE_ADDR,
-       .max_bus_width = 4},
-};
-
-#if !defined(CONFIG_SPL_BUILD)
-static iomux_v3_cfg_t const usdhc2_pads[] = {
-       IOMUX_PADS(PAD_SD2_CLK__SD2_CLK | MUX_PAD_CTRL(USDHC_PAD_CTRL)),
-       IOMUX_PADS(PAD_SD2_CMD__SD2_CMD | MUX_PAD_CTRL(USDHC_PAD_CTRL)),
-       IOMUX_PADS(PAD_SD2_DAT0__SD2_DATA0      | MUX_PAD_CTRL(USDHC_PAD_CTRL)),
-       IOMUX_PADS(PAD_SD2_DAT1__SD2_DATA1      | MUX_PAD_CTRL(USDHC_PAD_CTRL)),
-       IOMUX_PADS(PAD_SD2_DAT2__SD2_DATA2      | MUX_PAD_CTRL(USDHC_PAD_CTRL)),
-       IOMUX_PADS(PAD_SD2_DAT3__SD2_DATA3      | MUX_PAD_CTRL(USDHC_PAD_CTRL)),
-       IOMUX_PADS(PAD_EIM_BCLK__GPIO6_IO31     | MUX_PAD_CTRL(NO_PAD_CTRL)),
-       IOMUX_PADS(PAD_GPIO_4__GPIO1_IO04       | MUX_PAD_CTRL(NO_PAD_CTRL)),
-};
-#endif
-
-static iomux_v3_cfg_t const usdhc3_pads[] = {
-       IOMUX_PADS(PAD_SD3_CLK__SD3_CLK | MUX_PAD_CTRL(USDHC_PAD_CTRL)),
-       IOMUX_PADS(PAD_SD3_CMD__SD3_CMD | MUX_PAD_CTRL(USDHC_PAD_CTRL)),
-       IOMUX_PADS(PAD_SD3_DAT0__SD3_DATA0      | MUX_PAD_CTRL(USDHC_PAD_CTRL)),
-       IOMUX_PADS(PAD_SD3_DAT1__SD3_DATA1      | MUX_PAD_CTRL(USDHC_PAD_CTRL)),
-       IOMUX_PADS(PAD_SD3_DAT2__SD3_DATA2      | MUX_PAD_CTRL(USDHC_PAD_CTRL)),
-       IOMUX_PADS(PAD_SD3_DAT3__SD3_DATA3      | MUX_PAD_CTRL(USDHC_PAD_CTRL)),
-       IOMUX_PADS(PAD_SD3_DAT4__SD3_DATA4      | MUX_PAD_CTRL(USDHC_PAD_CTRL)),
-       IOMUX_PADS(PAD_SD3_DAT5__SD3_DATA5      | MUX_PAD_CTRL(USDHC_PAD_CTRL)),
-       IOMUX_PADS(PAD_SD3_DAT6__SD3_DATA6      | MUX_PAD_CTRL(USDHC_PAD_CTRL)),
-       IOMUX_PADS(PAD_SD3_DAT7__SD3_DATA7      | MUX_PAD_CTRL(USDHC_PAD_CTRL)),
-};
-
-int board_mmc_get_env_dev(int devno)
-{
-       return devno - 1;
-}
-
-int board_mmc_getcd(struct mmc *mmc)
-{
-       struct fsl_esdhc_cfg *cfg = (struct fsl_esdhc_cfg *)mmc->priv;
-       int ret = 0;
-
-       switch (cfg->esdhc_base) {
-       case USDHC2_BASE_ADDR:
-               ret = !gpio_get_value(USDHC2_CD_GPIO);
-               ret = 1;
-               break;
-       case USDHC3_BASE_ADDR:
-               ret = 1;
-               break;
-       }
-
-       return ret;
-}
-
-#ifndef CONFIG_SPL_BUILD
-int board_mmc_init(struct bd_info *bis)
-{
-       int ret;
-       int i;
-
-       for (i = 0; i < CONFIG_SYS_FSL_USDHC_NUM; i++) {
-               switch (i) {
-               case 0:
-                       SETUP_IOMUX_PADS(usdhc3_pads);
-                       usdhc_cfg[0].sdhc_clk = mxc_get_clock(MXC_ESDHC3_CLK);
-                       break;
-               case 1:
-                       SETUP_IOMUX_PADS(usdhc2_pads);
-                       gpio_direction_input(USDHC2_CD_GPIO);
-                       usdhc_cfg[1].sdhc_clk = mxc_get_clock(MXC_ESDHC2_CLK);
-                       break;
-               default:
-                       printf("Warning: you configured more USDHC controllers"
-                              "(%d) then supported by the board (%d)\n",
-                              i + 1, CONFIG_SYS_FSL_USDHC_NUM);
-                       return -EINVAL;
-               }
-
-               ret = fsl_esdhc_initialize(bis, &usdhc_cfg[i]);
-               if (ret)
-                       return ret;
-       }
-
-       return 0;
-}
-#endif
-
-static void setup_iomux_uart(void)
-{
-       SETUP_IOMUX_PADS(uart4_pads);
-}
-
-static void setup_iomux_enet(void)
-{
-       SETUP_IOMUX_PADS(enet_pads);
-
-       gpio_direction_output(ENET_PHY_RESET_GPIO, 0);
-       mdelay(10);
-       gpio_set_value(ENET_PHY_RESET_GPIO, 1);
-       mdelay(30);
-}
-
-static void setup_spi(void)
-{
-       gpio_request(IMX_GPIO_NR(4, 24), "spi_cs0");
-       gpio_direction_output(IMX_GPIO_NR(4, 24), 1);
-
-       SETUP_IOMUX_PADS(ecspi3_pads);
-
-       enable_spi_clk(true, 2);
-}
-
-static void setup_gpios(void)
-{
-       SETUP_IOMUX_PADS(gpios_pads);
-}
-
-#if defined(CONFIG_CMD_NAND) && !defined(CONFIG_SPL_BUILD)
-static void setup_gpmi_nand(void)
-{
-       struct mxc_ccm_reg *mxc_ccm = (struct mxc_ccm_reg *)CCM_BASE_ADDR;
-
-       /* config gpmi nand iomux */
-       SETUP_IOMUX_PADS(nfc_pads);
-
-       /* gate ENFC_CLK_ROOT clock first,before clk source switch */
-       clrbits_le32(&mxc_ccm->CCGR2, MXC_CCM_CCGR2_IOMUX_IPT_CLK_IO_MASK);
-
-       /* config gpmi and bch clock to 100 MHz */
-       clrsetbits_le32(&mxc_ccm->cs2cdr,
-                       MXC_CCM_CS2CDR_ENFC_CLK_PODF_MASK |
-                       MXC_CCM_CS2CDR_ENFC_CLK_PRED_MASK |
-                       MXC_CCM_CS2CDR_ENFC_CLK_SEL_MASK,
-                       MXC_CCM_CS2CDR_ENFC_CLK_PODF(0) |
-                       MXC_CCM_CS2CDR_ENFC_CLK_PRED(3) |
-                       MXC_CCM_CS2CDR_ENFC_CLK_SEL(3));
-
-       /* enable ENFC_CLK_ROOT clock */
-       setbits_le32(&mxc_ccm->CCGR2, MXC_CCM_CCGR2_IOMUX_IPT_CLK_IO_MASK);
-
-       /* enable gpmi and bch clock gating */
-       setbits_le32(&mxc_ccm->CCGR4,
-                    MXC_CCM_CCGR4_RAWNAND_U_BCH_INPUT_APB_MASK |
-                    MXC_CCM_CCGR4_RAWNAND_U_GPMI_BCH_INPUT_BCH_MASK |
-                    MXC_CCM_CCGR4_RAWNAND_U_GPMI_BCH_INPUT_GPMI_IO_MASK |
-                    MXC_CCM_CCGR4_RAWNAND_U_GPMI_INPUT_APB_MASK |
-                    MXC_CCM_CCGR4_PL301_MX6QPER1_BCH_OFFSET);
-
-       /* enable apbh clock gating */
-       setbits_le32(&mxc_ccm->CCGR0, MXC_CCM_CCGR0_APBHDMA_MASK);
-}
-#endif
-
-/*
- * Board revision is coded in 4 GPIOs
- */
-u32 get_board_rev(void)
-{
-       u32 rev;
-       int i;
-
-       for (i = 0, rev = 0; i < 4; i++)
-               rev |= (gpio_get_value(IMX_GPIO_NR(2, 12 + i)) << i);
-
-       return 16 - rev;
-}
-
-int board_spi_cs_gpio(unsigned bus, unsigned cs)
-{
-       if (bus != 2 || (cs != 0))
-               return -EINVAL;
-
-       return IMX_GPIO_NR(4, 24);
-}
-
-int board_eth_init(struct bd_info *bis)
-{
-       setup_iomux_enet();
-
-       return cpu_eth_init(bis);
-}
-
-int board_early_init_f(void)
-{
-       setup_iomux_uart();
-
-       return 0;
-}
-
-int board_init(void)
-{
-       /* address of boot parameters */
-       gd->bd->bi_boot_params = PHYS_SDRAM + 0x100;
-
-#ifdef CONFIG_SYS_I2C_MXC
-       setup_i2c(0, CONFIG_SYS_I2C_SPEED, 0x7f, &i2c_pad_info);
-#endif
-
-#ifdef CONFIG_MXC_SPI
-       setup_spi();
-#endif
-
-       setup_gpios();
-
-#if defined(CONFIG_CMD_NAND) && !defined(CONFIG_SPL_BUILD)
-       setup_gpmi_nand();
-#endif
-       return 0;
-}
-
-
-#ifdef CONFIG_CMD_BMODE
-/*
- * BOOT_CFG1, BOOT_CFG2, BOOT_CFG3, BOOT_CFG4
- * see Table 8-11 and Table 5-9
- *  BOOT_CFG1[7] = 1 (boot from NAND)
- *  BOOT_CFG1[5] = 0 - raw NAND
- *  BOOT_CFG1[4] = 0 - default pad settings
- *  BOOT_CFG1[3:2] = 00 - devices = 1
- *  BOOT_CFG1[1:0] = 00 - Row Address Cycles = 3
- *  BOOT_CFG2[4:3] = 00 - Boot Search Count = 2
- *  BOOT_CFG2[2:1] = 01 - Pages In Block = 64
- *  BOOT_CFG2[0] = 0 - Reset time 12ms
- */
-static const struct boot_mode board_boot_modes[] = {
-       /* NAND: 64pages per block, 3 row addr cycles, 2 copies of FCB/DBBT */
-       {"nand", MAKE_CFGVAL(0x80, 0x02, 0x00, 0x00)},
-       {"mmc0",  MAKE_CFGVAL(0x40, 0x20, 0x00, 0x00)},
-       {NULL, 0},
-};
-#endif
-
-int board_late_init(void)
-{
-       char buf[10];
-#ifdef CONFIG_CMD_BMODE
-       add_board_boot_modes(board_boot_modes);
-#endif
-
-       snprintf(buf, sizeof(buf), "%d", get_board_rev());
-       env_set("board_rev", buf);
-
-       return 0;
-}
-
-#ifdef CONFIG_SPL_BUILD
-#include <asm/arch/mx6-ddr.h>
-#include <spl.h>
-#include <linux/libfdt.h>
-
-#define MX6_PHYFLEX_ERR006282  IMX_GPIO_NR(2, 11)
-static void phyflex_err006282_workaround(void)
-{
-       /*
-        * Boards beginning with 1362.2 have the SD4_DAT3 pin connected
-        * to the CMIC. If this pin isn't toggled within 10s the boards
-        * reset. The pin is unconnected on older boards, so we do not
-        * need a check for older boards before applying this fixup.
-        */
-
-       gpio_direction_output(MX6_PHYFLEX_ERR006282, 0);
-       mdelay(2);
-       gpio_direction_output(MX6_PHYFLEX_ERR006282, 1);
-       mdelay(2);
-       gpio_set_value(MX6_PHYFLEX_ERR006282, 0);
-
-       gpio_direction_input(MX6_PHYFLEX_ERR006282);
-}
-
-static const struct mx6dq_iomux_ddr_regs mx6_ddr_ioregs = {
-       .dram_sdclk_0 = 0x00000030,
-       .dram_sdclk_1 = 0x00000030,
-       .dram_cas = 0x00000030,
-       .dram_ras = 0x00000030,
-       .dram_reset = 0x00000030,
-       .dram_sdcke0 = 0x00003000,
-       .dram_sdcke1 = 0x00003000,
-       .dram_sdba2 = 0x00000030,
-       .dram_sdodt0 = 0x00000030,
-       .dram_sdodt1 = 0x00000030,
-
-       .dram_sdqs0 = 0x00000028,
-       .dram_sdqs1 = 0x00000028,
-       .dram_sdqs2 = 0x00000028,
-       .dram_sdqs3 = 0x00000028,
-       .dram_sdqs4 = 0x00000028,
-       .dram_sdqs5 = 0x00000028,
-       .dram_sdqs6 = 0x00000028,
-       .dram_sdqs7 = 0x00000028,
-       .dram_dqm0 = 0x00000028,
-       .dram_dqm1 = 0x00000028,
-       .dram_dqm2 = 0x00000028,
-       .dram_dqm3 = 0x00000028,
-       .dram_dqm4 = 0x00000028,
-       .dram_dqm5 = 0x00000028,
-       .dram_dqm6 = 0x00000028,
-       .dram_dqm7 = 0x00000028,
-};
-
-static const struct mx6dq_iomux_grp_regs mx6_grp_ioregs = {
-       .grp_ddr_type =  0x000C0000,
-       .grp_ddrmode_ctl =  0x00020000,
-       .grp_ddrpke =  0x00000000,
-       .grp_addds = IMX6Q_DRIVE_STRENGTH,
-       .grp_ctlds = IMX6Q_DRIVE_STRENGTH,
-       .grp_ddrmode =  0x00020000,
-       .grp_b0ds = 0x00000028,
-       .grp_b1ds = 0x00000028,
-       .grp_b2ds = 0x00000028,
-       .grp_b3ds = 0x00000028,
-       .grp_b4ds = 0x00000028,
-       .grp_b5ds = 0x00000028,
-       .grp_b6ds = 0x00000028,
-       .grp_b7ds = 0x00000028,
-};
-
-static const struct mx6_mmdc_calibration mx6_mmcd_calib = {
-       .p0_mpwldectrl0 =  0x00110011,
-       .p0_mpwldectrl1 =  0x00240024,
-       .p1_mpwldectrl0 =  0x00260038,
-       .p1_mpwldectrl1 =  0x002C0038,
-       .p0_mpdgctrl0 =  0x03400350,
-       .p0_mpdgctrl1 =  0x03440340,
-       .p1_mpdgctrl0 =  0x034C0354,
-       .p1_mpdgctrl1 =  0x035C033C,
-       .p0_mprddlctl =  0x322A2A2A,
-       .p1_mprddlctl =  0x302C2834,
-       .p0_mpwrdlctl =  0x34303834,
-       .p1_mpwrdlctl =  0x422A3E36,
-};
-
-/* Index in RAM Chip array */
-enum {
-       RAM_MT64K,
-       RAM_MT128K,
-       RAM_MT256K
-};
-
-static struct mx6_ddr3_cfg mt41k_xx[] = {
-/* MT41K64M16JT-125 (1Gb density) */
-       {
-       .mem_speed = 1600,
-       .density = 1,
-       .width = 16,
-       .banks = 8,
-       .rowaddr = 13,
-       .coladdr = 10,
-       .pagesz = 2,
-       .trcd = 1375,
-       .trcmin = 4875,
-       .trasmin = 3500,
-       .SRT       = 1,
-       },
-
-/* MT41K256M16JT-125 (2Gb density) */
-       {
-       .mem_speed = 1600,
-       .density = 2,
-       .width = 16,
-       .banks = 8,
-       .rowaddr = 14,
-       .coladdr = 10,
-       .pagesz = 2,
-       .trcd = 1375,
-       .trcmin = 4875,
-       .trasmin = 3500,
-       .SRT       = 1,
-       },
-
-/* MT41K256M16JT-125 (4Gb density) */
-       {
-       .mem_speed = 1600,
-       .density = 4,
-       .width = 16,
-       .banks = 8,
-       .rowaddr = 15,
-       .coladdr = 10,
-       .pagesz = 2,
-       .trcd = 1375,
-       .trcmin = 4875,
-       .trasmin = 3500,
-       .SRT       = 1,
-       }
-};
-
-static void ccgr_init(void)
-{
-       struct mxc_ccm_reg *ccm = (struct mxc_ccm_reg *)CCM_BASE_ADDR;
-
-       writel(0x00C03F3F, &ccm->CCGR0);
-       writel(0x0030FC03, &ccm->CCGR1);
-       writel(0x0FFFC000, &ccm->CCGR2);
-       writel(0x3FF00000, &ccm->CCGR3);
-       writel(0x00FFF300, &ccm->CCGR4);
-       writel(0x0F0000C3, &ccm->CCGR5);
-       writel(0x000003FF, &ccm->CCGR6);
-}
-
-static void spl_dram_init(struct mx6_ddr_sysinfo *sysinfo,
-                               struct mx6_ddr3_cfg *mem_ddr)
-{
-       mx6dq_dram_iocfg(64, &mx6_ddr_ioregs, &mx6_grp_ioregs);
-       mx6_dram_cfg(sysinfo, &mx6_mmcd_calib, mem_ddr);
-}
-
-int board_mmc_init(struct bd_info *bis)
-{
-       if (spl_boot_device() == BOOT_DEVICE_SPI)
-               printf("MMC SEtup, Boot SPI");
-
-       SETUP_IOMUX_PADS(usdhc3_pads);
-       usdhc_cfg[0].esdhc_base = USDHC3_BASE_ADDR;
-       usdhc_cfg[0].sdhc_clk = mxc_get_clock(MXC_ESDHC3_CLK);
-       usdhc_cfg[0].max_bus_width = 4;
-       gd->arch.sdhc_clk = usdhc_cfg[0].sdhc_clk;
-
-       return fsl_esdhc_initialize(bis, &usdhc_cfg[0]);
-}
-
-
-void board_boot_order(u32 *spl_boot_list)
-{
-       spl_boot_list[0] = spl_boot_device();
-       printf("Boot device %x\n", spl_boot_list[0]);
-       switch (spl_boot_list[0]) {
-       case BOOT_DEVICE_SPI:
-               spl_boot_list[1] = BOOT_DEVICE_UART;
-               break;
-       case BOOT_DEVICE_MMC1:
-               spl_boot_list[1] = BOOT_DEVICE_SPI;
-               spl_boot_list[2] = BOOT_DEVICE_UART;
-               break;
-       default:
-               printf("Boot device %x\n", spl_boot_list[0]);
-       }
-}
-
-/*
- * This is used because get_ram_size() does not
- * take care of cache, resulting a wrong size
- * pfla02 has just 1, 2 or 4 GB option
- * Function checks for mirrors in the first CS
- */
-#define RAM_TEST_PATTERN       0xaa5555aa
-#define MIN_BANK_SIZE          (512 * 1024 * 1024)
-
-static unsigned int pfla02_detect_chiptype(void)
-{
-       u32 *p, *p1;
-       unsigned int offset = MIN_BANK_SIZE;
-       int i;
-
-       for (i = 0; i < 2; i++) {
-               p = (u32 *)PHYS_SDRAM;
-               p1 = (u32 *)(PHYS_SDRAM + (i + 1) * offset);
-
-               *p1 = 0;
-               *p = RAM_TEST_PATTERN;
-
-               /*
-                *  This is required to detect mirroring
-                *  else we read back values from cache
-                */
-               flush_dcache_all();
-
-               if (*p == *p1)
-                       return i;
-       }
-       return RAM_MT256K;
-}
-
-void board_init_f(ulong dummy)
-{
-       unsigned int ramchip;
-
-       struct mx6_ddr_sysinfo sysinfo = {
-               /* width of data bus:0=16,1=32,2=64 */
-               .dsize = 2,
-               /* config for full 4GB range so that get_mem_size() works */
-               .cs_density = 32, /* 512 MB */
-               /* single chip select */
-#if IS_ENABLED(CONFIG_SPL_DRAM_1_BANK)
-               .ncs = 1,
-#else
-               .ncs = 2,
-#endif
-               .cs1_mirror = 1,
-               .rtt_wr = 1 /*DDR3_RTT_60_OHM*/,        /* RTT_Wr = RZQ/4 */
-               .rtt_nom = 1 /*DDR3_RTT_60_OHM*/,       /* RTT_Nom = RZQ/4 */
-               .walat = 1,     /* Write additional latency */
-               .ralat = 5,     /* Read additional latency */
-               .mif3_mode = 3, /* Command prediction working mode */
-               .bi_on = 1,     /* Bank interleaving enabled */
-               .sde_to_rst = 0x10,     /* 14 cycles, 200us (JEDEC default) */
-               .rst_to_cke = 0x23,     /* 33 cycles, 500us (JEDEC default) */
-               .ddr_type = DDR_TYPE_DDR3,
-               .refsel = 1,    /* Refresh cycles at 32KHz */
-               .refr = 7,      /* 8 refresh commands per refresh cycle */
-       };
-
-#if defined(CONFIG_CMD_NAND) && !defined(CONFIG_SPL_BUILD)
-       /* Enable NAND */
-       setup_gpmi_nand();
-#endif
-
-       /* setup clock gating */
-       ccgr_init();
-
-       /* setup AIPS and disable watchdog */
-       arch_cpu_init();
-
-       /* setup AXI */
-       gpr_init();
-
-       board_early_init_f();
-
-       /* setup GP timer */
-       timer_init();
-
-       /* UART clocks enabled and gd valid - init serial console */
-       preloader_console_init();
-
-       setup_spi();
-
-       setup_gpios();
-
-       /* DDR initialization */
-       spl_dram_init(&sysinfo, &mt41k_xx[RAM_MT256K]);
-       ramchip = pfla02_detect_chiptype();
-       debug("Detected chip %d\n", ramchip);
-#if !IS_ENABLED(CONFIG_SPL_DRAM_1_BANK)
-       switch (ramchip) {
-               case RAM_MT64K:
-                       sysinfo.cs_density = 6;
-                       break;
-               case RAM_MT128K:
-                       sysinfo.cs_density = 10;
-                       break;
-               case RAM_MT256K:
-                       sysinfo.cs_density = 18;
-                       break;
-       }
-#endif
-       spl_dram_init(&sysinfo, &mt41k_xx[ramchip]);
-
-       /* Clear the BSS. */
-       memset(__bss_start, 0, __bss_end - __bss_start);
-
-       phyflex_err006282_workaround();
-
-       /* load/boot image from boot device */
-       board_init_r(NULL, 0);
-}
-#endif
diff --git a/configs/pfla02_defconfig b/configs/pfla02_defconfig
deleted file mode 100644 (file)
index fa8ed31..0000000
+++ /dev/null
@@ -1,75 +0,0 @@
-CONFIG_ARM=y
-CONFIG_ARCH_MX6=y
-CONFIG_SYS_TEXT_BASE=0x17800000
-CONFIG_SPL_GPIO_SUPPORT=y
-CONFIG_SPL_LIBCOMMON_SUPPORT=y
-CONFIG_SPL_LIBGENERIC_SUPPORT=y
-CONFIG_NR_DRAM_BANKS=1
-CONFIG_ENV_SIZE=0x4000
-CONFIG_ENV_OFFSET=0x100000
-CONFIG_ENV_SECT_SIZE=0x10000
-CONFIG_SYS_SPI_U_BOOT_OFFS=0x10000
-CONFIG_MX6QDL=y
-CONFIG_TARGET_PFLA02=y
-CONFIG_SPL_TEXT_BASE=0x00908000
-CONFIG_SPL_MMC_SUPPORT=y
-CONFIG_SPL_SERIAL_SUPPORT=y
-CONFIG_SPL=y
-CONFIG_ENV_OFFSET_REDUND=0x110000
-CONFIG_SPL_LIBDISK_SUPPORT=y
-CONFIG_SPL_SPI_FLASH_SUPPORT=y
-CONFIG_SPL_SPI_SUPPORT=y
-CONFIG_CMD_HDMIDETECT=y
-CONFIG_DISTRO_DEFAULTS=y
-CONFIG_FIT=y
-CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/mach-imx/spl_sd.cfg"
-CONFIG_BOOTDELAY=3
-# CONFIG_USE_BOOTCOMMAND is not set
-CONFIG_DISPLAY_BOARDINFO_LATE=y
-CONFIG_BOARD_EARLY_INIT_F=y
-CONFIG_SPL_DMA=y
-CONFIG_SPL_FS_EXT4=y
-CONFIG_SPL_I2C_SUPPORT=y
-CONFIG_SPL_SPI_LOAD=y
-CONFIG_SPL_WATCHDOG_SUPPORT=y
-CONFIG_SPL_YMODEM_SUPPORT=y
-# CONFIG_CMD_FLASH is not set
-CONFIG_CMD_GPIO=y
-CONFIG_CMD_I2C=y
-CONFIG_CMD_MMC=y
-CONFIG_CMD_NAND_TRIMFFS=y
-CONFIG_CMD_SF=y
-CONFIG_CMD_CACHE=y
-CONFIG_CMD_EXT4_WRITE=y
-CONFIG_CMD_MTDPARTS=y
-CONFIG_MTDIDS_DEFAULT="nand0=gpmi-nand"
-CONFIG_MTDPARTS_DEFAULT="mtdparts=gpmi-nand:-(nand);spi2.0:1024k(bootloader),64k(env1),64k(env2),-(rescue)"
-CONFIG_CMD_UBI=y
-# CONFIG_SPL_PARTITION_UUIDS is not set
-CONFIG_ENV_OVERWRITE=y
-CONFIG_ENV_IS_IN_SPI_FLASH=y
-CONFIG_SYS_REDUNDAND_ENVIRONMENT=y
-CONFIG_SYS_RELOC_GD_ENV_ADDR=y
-CONFIG_DM=y
-CONFIG_BOUNCE_BUFFER=y
-CONFIG_FSL_USDHC=y
-CONFIG_MTD=y
-CONFIG_DM_MTD=y
-CONFIG_MTD_RAW_NAND=y
-CONFIG_NAND_MXS=y
-CONFIG_SPI_FLASH=y
-CONFIG_SF_DEFAULT_BUS=2
-CONFIG_SF_DEFAULT_MODE=0
-CONFIG_SF_DEFAULT_SPEED=20000000
-CONFIG_SPI_FLASH_STMICRO=y
-CONFIG_PHYLIB=y
-CONFIG_PHY_MICREL=y
-CONFIG_PHY_MICREL_KSZ90X1=y
-CONFIG_FEC_MXC=y
-CONFIG_MII=y
-CONFIG_MXC_UART=y
-CONFIG_SPI=y
-CONFIG_MXC_SPI=y
-CONFIG_DM_THERMAL=y
-CONFIG_IMX_THERMAL=y
-CONFIG_OF_LIBFDT=y
diff --git a/include/configs/pfla02.h b/include/configs/pfla02.h
deleted file mode 100644 (file)
index e964290..0000000
+++ /dev/null
@@ -1,127 +0,0 @@
-/* SPDX-License-Identifier: GPL-2.0+ */
-/*
- * Copyright (C) Stefano Babic <sbabic@denx.de>
- */
-
-
-#ifndef __PCM058_CONFIG_H
-#define __PCM058_CONFIG_H
-
-#ifdef CONFIG_SPL
-#include "imx6_spl.h"
-#endif
-
-#include "mx6_common.h"
-
-/* Serial */
-#define CONFIG_MXC_UART_BASE          UART4_BASE
-#define CONSOLE_DEV            "ttymxc3"
-
-/* Early setup */
-
-
-/* Size of malloc() pool */
-#define CONFIG_SYS_MALLOC_LEN          (8 * SZ_1M)
-
-/* Ethernet */
-#define IMX_FEC_BASE                   ENET_BASE_ADDR
-#define CONFIG_FEC_XCV_TYPE            RGMII
-#define CONFIG_ETHPRIME                        "FEC"
-#define CONFIG_FEC_MXC_PHYADDR         3
-
-/* SPI Flash */
-
-/* I2C Configs */
-#define CONFIG_SYS_I2C
-#define CONFIG_SYS_I2C_MXC
-#define CONFIG_SYS_I2C_MXC_I2C1                /* enable I2C bus 0 */
-#define CONFIG_SYS_I2C_SPEED             100000
-
-/* Enable NAND support */
-#define CONFIG_SYS_MAX_NAND_DEVICE     1
-#define CONFIG_SYS_NAND_BASE           0x40000000
-#define CONFIG_SYS_NAND_5_ADDR_CYCLE
-#define CONFIG_SYS_NAND_ONFI_DETECTION
-
-/* DMA stuff, needed for GPMI/MXS NAND support */
-
-/* Filesystem support */
-
-/* Various command support */
-
-/* Physical Memory Map */
-#define PHYS_SDRAM                     MMDC0_ARB_BASE_ADDR
-
-#define CONFIG_SYS_SDRAM_BASE          PHYS_SDRAM
-#define CONFIG_SYS_INIT_RAM_ADDR       IRAM_BASE_ADDR
-#define CONFIG_SYS_INIT_RAM_SIZE       IRAM_SIZE
-
-#define CONFIG_SYS_INIT_SP_OFFSET \
-       (CONFIG_SYS_INIT_RAM_SIZE - GENERATED_GBL_DATA_SIZE)
-#define CONFIG_SYS_INIT_SP_ADDR \
-       (CONFIG_SYS_INIT_RAM_ADDR + CONFIG_SYS_INIT_SP_OFFSET)
-
-/* MMC Configs */
-#define CONFIG_SYS_FSL_ESDHC_ADDR      0
-#define CONFIG_SYS_FSL_USDHC_NUM       2
-
-/* Environment organization */
-
-/* Default environment */
-#define CONFIG_EXTRA_ENV_SETTINGS \
-       "addcons=setenv bootargs ${bootargs} "                          \
-               "console=${console},${baudrate}\0"                      \
-       "addip=setenv bootargs ${bootargs} "                            \
-               "ip=${ipaddr}:${serverip}:${gatewayip}:"                \
-               "${netmask}:${hostname}:${netdev}:off\0"                \
-       "addmisc=setenv bootargs ${bootargs} ${miscargs}\0"             \
-       "addmtd=run mtdnand;run mtdspi;"                                \
-               "setenv bootargs ${bootargs} ${mtdparts}\0"             \
-       "mtdnand=setenv mtdparts mtdparts=gpmi-nand:"                   \
-               "40m(Kernels),400m(root),-(nand)\0"                     \
-       "mtdspi=setenv mtdparts ${mtdparts}"                            \
-               "';spi2.0:1024k(bootloader),"                           \
-                       "64k(env1),64k(env2),-(rescue)'\0"              \
-       "bootcmd=if test -n ${rescue};"                                 \
-               "then run swupdate;fi;run nandboot;run swupdate\0"      \
-       "bootfile=uImage\0"                                             \
-       "bootimage=uImage\0"                                            \
-       "console=ttymxc3\0"                                             \
-       "fdt_addr_r=0x18000000\0"                                       \
-       "fdt_file=pfla02.dtb\0"                                         \
-       "fdt_high=0xffffffff\0"                                         \
-       "initrd_high=0xffffffff\0"                                      \
-       "kernel_addr_r=" __stringify(CONFIG_LOADADDR) "\0"              \
-       "miscargs=panic=1 quiet\0"                                      \
-       "mmcargs=setenv bootargs root=${mmcroot} rw rootwait\0"         \
-       "mmcboot=if run mmcload;then "                                  \
-               "run mmcargs addcons addmisc;"                          \
-                       "bootm;fi\0"                                    \
-       "mmcload=mmc rescan;"                                           \
-               "load mmc 0:${mmcpart} ${kernel_addr_r} boot/fitImage\0"\
-       "mmcpart=1\0"                                                   \
-       "mmcroot=/dev/mmcblk0p1\0"                                      \
-       "ubiroot=1\0"                                                   \
-       "nandargs=setenv bootargs ubi.mtd=1 "                           \
-               "root=ubi0:rootfs${ubiroot} rootfstype=ubifs\0"         \
-       "nandboot=run mtdnand;ubi part nand0,0;"                        \
-               "ubi readvol ${kernel_addr_r} kernel${ubiroot};"        \
-               "run nandargs addip addcons addmtd addmisc;"            \
-               "bootm ${kernel_addr_r}\0"                              \
-       "net_nfs=tftp ${kernel_addr_r} ${board_name}/${bootfile};"      \
-               "tftp ${fdt_addr_r} ${board_name}/${fdt_file};"         \
-               "run nfsargs addip addcons addmtd addmisc;"             \
-               "bootm ${kernel_addr_r} - ${fdt_addr_r}\0"              \
-       "net_nfs_fit=tftp ${kernel_addr_r} ${board_name}/${fitfile};"   \
-               "run nfsargs addip addcons addmtd addmisc;"             \
-               "bootm ${kernel_addr_r}\0"                              \
-       "nfsargs=setenv bootargs root=/dev/nfs"                         \
-               " nfsroot=${serverip}:${nfsroot},v3 panic=1\0"          \
-       "swupdate=setenv bootargs root=/dev/ram;"                       \
-               "run addip addcons addmtd addmisc;"                     \
-               "sf probe;"                                             \
-               "sf read ${kernel_addr_r} 120000 600000;"               \
-               "sf read 14000000 730000 800000;"                       \
-               "bootm ${kernel_addr_r} 14000000\0"
-
-#endif