]> git.dujemihanovic.xyz Git - u-boot.git/commitdiff
powerpc: Remove TWR-P1025_defconfig board
authorJagan Teki <jagan@amarulasolutions.com>
Sat, 13 Jun 2020 07:56:46 +0000 (13:26 +0530)
committerJagan Teki <jagan@amarulasolutions.com>
Thu, 18 Jun 2020 16:17:08 +0000 (21:47 +0530)
DM_SPI and other driver model migration deadlines
are expired for this board.

Remove it.

Patch-cc: Xiaobo Xie <xiaobo.xie@nxp.com>
Signed-off-by: Jagan Teki <jagan@amarulasolutions.com>
Reviewed-by: Priyanka Jain <priyanka.jain@nxp.com>
arch/powerpc/cpu/mpc85xx/Kconfig
board/freescale/p1_twr/Kconfig [deleted file]
board/freescale/p1_twr/MAINTAINERS [deleted file]
board/freescale/p1_twr/Makefile [deleted file]
board/freescale/p1_twr/ddr.c [deleted file]
board/freescale/p1_twr/law.c [deleted file]
board/freescale/p1_twr/p1_twr.c [deleted file]
board/freescale/p1_twr/tlb.c [deleted file]
configs/TWR-P1025_defconfig [deleted file]
include/configs/p1_twr.h [deleted file]

index 9801055e54d038c509373dfc35ed0dcd87578522..753d0750b2ba182c8c5e212b6c839a5a5cd35e3e 100644 (file)
@@ -188,10 +188,6 @@ config TARGET_P2020RDB
        imply CMD_SATA
        imply SATA_SIL
 
-config TARGET_P1_TWR
-       bool "Support p1_twr"
-       select ARCH_P1025
-
 config TARGET_P2041RDB
        bool "Support P2041RDB"
        select ARCH_P2041
@@ -1512,7 +1508,6 @@ source "board/freescale/mpc8572ds/Kconfig"
 source "board/freescale/p1010rdb/Kconfig"
 source "board/freescale/p1023rdb/Kconfig"
 source "board/freescale/p1_p2_rdb_pc/Kconfig"
-source "board/freescale/p1_twr/Kconfig"
 source "board/freescale/p2041rdb/Kconfig"
 source "board/freescale/qemu-ppce500/Kconfig"
 source "board/freescale/t102xrdb/Kconfig"
diff --git a/board/freescale/p1_twr/Kconfig b/board/freescale/p1_twr/Kconfig
deleted file mode 100644 (file)
index 8f9a8d4..0000000
+++ /dev/null
@@ -1,12 +0,0 @@
-if TARGET_P1_TWR
-
-config SYS_BOARD
-       default "p1_twr"
-
-config SYS_VENDOR
-       default "freescale"
-
-config SYS_CONFIG_NAME
-       default "p1_twr"
-
-endif
diff --git a/board/freescale/p1_twr/MAINTAINERS b/board/freescale/p1_twr/MAINTAINERS
deleted file mode 100644 (file)
index 0f9f98f..0000000
+++ /dev/null
@@ -1,6 +0,0 @@
-P1_TWR BOARD
-M:     Xiaobo Xie <xiaobo.xie@nxp.com>
-S:     Maintained
-F:     board/freescale/p1_twr/
-F:     include/configs/p1_twr.h
-F:     configs/TWR-P1025_defconfig
diff --git a/board/freescale/p1_twr/Makefile b/board/freescale/p1_twr/Makefile
deleted file mode 100644 (file)
index 5e6c658..0000000
+++ /dev/null
@@ -1,9 +0,0 @@
-# SPDX-License-Identifier: GPL-2.0+
-#
-# Copyright 2013 Freescale Semiconductor, Inc.
-#
-
-obj-y        += p1_twr.o
-obj-y        += ddr.o
-obj-y        += law.o
-obj-y        += tlb.o
diff --git a/board/freescale/p1_twr/ddr.c b/board/freescale/p1_twr/ddr.c
deleted file mode 100644 (file)
index 85f1f63..0000000
+++ /dev/null
@@ -1,69 +0,0 @@
-// SPDX-License-Identifier: GPL-2.0+
-/*
- * Copyright 2013 Freescale Semiconductor, Inc.
- */
-
-#include <common.h>
-#include <vsprintf.h>
-#include <asm/mmu.h>
-#include <asm/immap_85xx.h>
-#include <asm/processor.h>
-#include <fsl_ddr_sdram.h>
-#include <fsl_ddr_dimm_params.h>
-#include <asm/io.h>
-#include <asm/fsl_law.h>
-
-/* Fixed sdram init -- doesn't use serial presence detect. */
-phys_size_t fixed_sdram(void)
-{
-       sys_info_t sysinfo;
-       char buf[32];
-       size_t ddr_size;
-       fsl_ddr_cfg_regs_t ddr_cfg_regs = {
-               .cs[0].bnds = CONFIG_SYS_DDR_CS0_BNDS,
-               .cs[0].config = CONFIG_SYS_DDR_CS0_CONFIG,
-               .cs[0].config_2 = CONFIG_SYS_DDR_CS0_CONFIG_2,
-#if CONFIG_CHIP_SELECTS_PER_CTRL > 1
-               .cs[1].bnds = CONFIG_SYS_DDR_CS1_BNDS,
-               .cs[1].config = CONFIG_SYS_DDR_CS1_CONFIG,
-               .cs[1].config_2 = CONFIG_SYS_DDR_CS1_CONFIG_2,
-#endif
-               .timing_cfg_3 = CONFIG_SYS_DDR_TIMING_3,
-               .timing_cfg_0 = CONFIG_SYS_DDR_TIMING_0,
-               .timing_cfg_1 = CONFIG_SYS_DDR_TIMING_1,
-               .timing_cfg_2 = CONFIG_SYS_DDR_TIMING_2,
-               .ddr_sdram_cfg = CONFIG_SYS_DDR_CONTROL,
-               .ddr_sdram_cfg_2 = CONFIG_SYS_DDR_CONTROL_2,
-               .ddr_sdram_mode = CONFIG_SYS_DDR_MODE_1,
-               .ddr_sdram_mode_2 = CONFIG_SYS_DDR_MODE_2,
-               .ddr_sdram_md_cntl = CONFIG_SYS_DDR_MODE_CONTROL,
-               .ddr_sdram_interval = CONFIG_SYS_DDR_INTERVAL,
-               .ddr_data_init = CONFIG_SYS_DDR_DATA_INIT,
-               .ddr_sdram_clk_cntl = CONFIG_SYS_DDR_CLK_CTRL,
-               .ddr_init_addr = CONFIG_SYS_DDR_INIT_ADDR,
-               .ddr_init_ext_addr = CONFIG_SYS_DDR_INIT_EXT_ADDR,
-               .timing_cfg_4 = CONFIG_SYS_DDR_TIMING_4,
-               .timing_cfg_5 = CONFIG_SYS_DDR_TIMING_5,
-               .ddr_zq_cntl = CONFIG_SYS_DDR_ZQ_CONTROL,
-               .ddr_wrlvl_cntl = CONFIG_SYS_DDR_WRLVL_CONTROL,
-               .ddr_sr_cntr = CONFIG_SYS_DDR_SR_CNTR,
-               .ddr_sdram_rcw_1 = CONFIG_SYS_DDR_RCW_1,
-               .ddr_sdram_rcw_2 = CONFIG_SYS_DDR_RCW_2
-       };
-
-       get_sys_info(&sysinfo);
-       printf("Configuring DDR for %s MT/s data rate\n",
-                       strmhz(buf, sysinfo.freq_ddrbus));
-
-       ddr_size = CONFIG_SYS_SDRAM_SIZE * 1024 * 1024;
-
-       fsl_ddr_set_memctl_regs(&ddr_cfg_regs, 0, 0);
-
-       if (set_ddr_laws(CONFIG_SYS_DDR_SDRAM_BASE,
-                               ddr_size, LAW_TRGT_IF_DDR_1) < 0) {
-               printf("ERROR setting Local Access Windows for DDR\n");
-               return 0;
-       };
-
-       return ddr_size;
-}
diff --git a/board/freescale/p1_twr/law.c b/board/freescale/p1_twr/law.c
deleted file mode 100644 (file)
index 45721f6..0000000
+++ /dev/null
@@ -1,15 +0,0 @@
-// SPDX-License-Identifier: GPL-2.0+
-/*
- * Copyright 2013 Freescale Semiconductor, Inc.
- */
-
-#include <common.h>
-#include <asm/fsl_law.h>
-#include <asm/mmu.h>
-
-struct law_entry law_table[] = {
-       SET_LAW(CONFIG_SYS_FLASH_BASE_PHYS, LAW_SIZE_64M, LAW_TRGT_IF_LBC),
-       SET_LAW(CONFIG_SYS_SSD_BASE_PHYS, LAW_SIZE_1M, LAW_TRGT_IF_LBC)
-};
-
-int num_law_entries = ARRAY_SIZE(law_table);
diff --git a/board/freescale/p1_twr/p1_twr.c b/board/freescale/p1_twr/p1_twr.c
deleted file mode 100644 (file)
index 8e1522a..0000000
+++ /dev/null
@@ -1,292 +0,0 @@
-// SPDX-License-Identifier: GPL-2.0+
-/*
- * Copyright 2013 Freescale Semiconductor, Inc.
- */
-
-#include <common.h>
-#include <command.h>
-#include <env.h>
-#include <hwconfig.h>
-#include <image.h>
-#include <init.h>
-#include <net.h>
-#include <pci.h>
-#include <i2c.h>
-#include <asm/processor.h>
-#include <asm/mmu.h>
-#include <asm/cache.h>
-#include <asm/immap_85xx.h>
-#include <asm/fsl_pci.h>
-#include <fsl_ddr_sdram.h>
-#include <asm/io.h>
-#include <asm/fsl_law.h>
-#include <asm/fsl_lbc.h>
-#include <asm/mp.h>
-#include <miiphy.h>
-#include <linux/libfdt.h>
-#include <fdt_support.h>
-#include <fsl_mdio.h>
-#include <tsec.h>
-#include <ioports.h>
-#include <asm/fsl_serdes.h>
-#include <netdev.h>
-
-#define SYSCLK_64      64000000
-#define SYSCLK_66      66666666
-
-unsigned long get_board_sys_clk(ulong dummy)
-{
-       ccsr_gur_t *gur = (void __iomem *)(CONFIG_SYS_MPC85xx_GUTS_ADDR);
-       par_io_t *par_io = (par_io_t *) &(gur->qe_par_io);
-       unsigned int cpdat_val = 0;
-
-       /* Set-up up pin muxing based on board switch settings */
-       cpdat_val = par_io[1].cpdat;
-
-       /* Check switch setting for SYSCLK select (PB3)  */
-       if (cpdat_val & 0x10000000)
-               return SYSCLK_64;
-       else
-               return SYSCLK_66;
-
-       return 0;
-}
-
-#ifdef CONFIG_QE
-
-#define PCA_IOPORT_I2C_ADDR            0x23
-#define PCA_IOPORT_OUTPUT_CMD          0x2
-#define PCA_IOPORT_CFG_CMD             0x6
-
-const qe_iop_conf_t qe_iop_conf_tab[] = {
-
-#ifdef CONFIG_TWR_P1025
-       /* GPIO */
-       {1,  0, 1, 0, 0},
-       {1,  18, 1, 0, 0},
-
-       /* GPIO for switch options */
-       {1,  2, 2, 0, 0}, /* PROFIBUS_MODE_SEL */
-       {1,  3, 2, 0, 0}, /* SYS_CLK_SELECT */
-       {1,  29, 2, 0, 0}, /* LOCALBUS_QE_MUXSEL */
-       {1,  30, 2, 0, 0}, /* ETH_TDM_SEL */
-
-       /* QE_MUX_MDC */
-       {1,  19, 1, 0, 1}, /* QE_MUX_MDC */
-
-       /* QE_MUX_MDIO */
-       {1,  20, 3, 0, 1}, /* QE_MUX_MDIO */
-
-       /* UCC_1_MII */
-       {0, 23, 2, 0, 2}, /* CLK12 */
-       {0, 24, 2, 0, 1}, /* CLK9 */
-       {0,  7, 1, 0, 2}, /* ENET1_TXD0_SER1_TXD0 */
-       {0,  9, 1, 0, 2}, /* ENET1_TXD1_SER1_TXD1 */
-       {0, 11, 1, 0, 2}, /* ENET1_TXD2_SER1_TXD2 */
-       {0, 12, 1, 0, 2}, /* ENET1_TXD3_SER1_TXD3 */
-       {0,  6, 2, 0, 2}, /* ENET1_RXD0_SER1_RXD0 */
-       {0, 10, 2, 0, 2}, /* ENET1_RXD1_SER1_RXD1 */
-       {0, 14, 2, 0, 2}, /* ENET1_RXD2_SER1_RXD2 */
-       {0, 15, 2, 0, 2}, /* ENET1_RXD3_SER1_RXD3 */
-       {0,  5, 1, 0, 2}, /* ENET1_TX_EN_SER1_RTS_B */
-       {0, 13, 1, 0, 2}, /* ENET1_TX_ER */
-       {0,  4, 2, 0, 2}, /* ENET1_RX_DV_SER1_CTS_B */
-       {0,  8, 2, 0, 2}, /* ENET1_RX_ER_SER1_CD_B */
-       {0, 17, 2, 0, 2}, /* ENET1_CRS */
-       {0, 16, 2, 0, 2}, /* ENET1_COL */
-
-       /* UCC_5_RMII */
-       {1, 11, 2, 0, 1}, /* CLK13 */
-       {1, 7,  1, 0, 2}, /* ENET5_TXD0_SER5_TXD0 */
-       {1, 10, 1, 0, 2}, /* ENET5_TXD1_SER5_TXD1 */
-       {1, 6, 2, 0, 2}, /* ENET5_RXD0_SER5_RXD0 */
-       {1, 9, 2, 0, 2}, /* ENET5_RXD1_SER5_RXD1 */
-       {1, 5, 1, 0, 2}, /* ENET5_TX_EN_SER5_RTS_B */
-       {1, 4, 2, 0, 2}, /* ENET5_RX_DV_SER5_CTS_B */
-       {1, 8, 2, 0, 2}, /* ENET5_RX_ER_SER5_CD_B */
-
-       /* TDMA - clock option is configured in OS based on board setting */
-       {1, 23, 2, 0, 2}, /* TDMA_TXD */
-       {1, 25, 2, 0, 2}, /* TDMA_RXD */
-       {1, 26, 1, 0, 2}, /* TDMA_SYNC */
-#endif
-
-       {0,  0, 0, 0, QE_IOP_TAB_END} /* END of table */
-};
-#endif
-
-int board_early_init_f(void)
-{
-       ccsr_gur_t *gur = (void __iomem *)(CONFIG_SYS_MPC85xx_GUTS_ADDR);
-
-       setbits_be32(&gur->pmuxcr,
-                       (MPC85xx_PMUXCR_SDHC_CD | MPC85xx_PMUXCR_SDHC_WP));
-
-       /* SDHC_DAT[4:7] not exposed to pins (use as SPI) */
-       clrbits_be32(&gur->pmuxcr, MPC85xx_PMUXCR_SD_DATA);
-
-       return 0;
-}
-
-int checkboard(void)
-{
-       ccsr_gur_t *gur = (void __iomem *)(CONFIG_SYS_MPC85xx_GUTS_ADDR);
-       u8 boot_status;
-
-       printf("Board: %s\n", CONFIG_BOARDNAME);
-
-       boot_status = ((gur->porbmsr) >> MPC85xx_PORBMSR_ROMLOC_SHIFT) & 0xf;
-       puts("rom_loc: ");
-       if (boot_status == PORBMSR_ROMLOC_NOR)
-               puts("nor flash");
-       else if (boot_status == PORBMSR_ROMLOC_SDHC)
-               puts("sd");
-       else
-               puts("unknown");
-       puts("\n");
-
-       return 0;
-}
-
-#ifdef CONFIG_PCI
-void pci_init_board(void)
-{
-       fsl_pcie_init_board(0);
-}
-#endif
-
-int board_early_init_r(void)
-{
-       const unsigned int flashbase = CONFIG_SYS_FLASH_BASE;
-       int flash_esel = find_tlb_idx((void *)flashbase, 1);
-
-       /*
-        * Remap Boot flash region to caching-inhibited
-        * so that flash can be erased properly.
-        */
-
-       /* Flush d-cache and invalidate i-cache of any FLASH data */
-       flush_dcache();
-       invalidate_icache();
-
-       if (flash_esel == -1) {
-               /* very unlikely unless something is messed up */
-               puts("Error: Could not find TLB for FLASH BASE\n");
-               flash_esel = 2; /* give our best effort to continue */
-       } else {
-               /* invalidate existing TLB entry for flash */
-               disable_tlb(flash_esel);
-       }
-
-       set_tlb(1, flashbase, CONFIG_SYS_FLASH_BASE_PHYS, /* tlb, epn, rpn */
-               MAS3_SW|MAS3_SR, MAS2_I|MAS2_G,           /* perms, wimge */
-               0, flash_esel, BOOKE_PAGESZ_64M, 1);/* ts, esel, tsize, iprot */
-       return 0;
-}
-
-int board_eth_init(bd_t *bis)
-{
-       struct fsl_pq_mdio_info mdio_info;
-       struct tsec_info_struct tsec_info[4];
-       ccsr_gur_t *gur __attribute__((unused)) =
-               (void __iomem *)(CONFIG_SYS_MPC85xx_GUTS_ADDR);
-       int num = 0;
-
-#ifdef CONFIG_TSEC1
-       SET_STD_TSEC_INFO(tsec_info[num], 1);
-       num++;
-#endif
-#ifdef CONFIG_TSEC2
-       SET_STD_TSEC_INFO(tsec_info[num], 2);
-       if (is_serdes_configured(SGMII_TSEC2)) {
-               printf("eTSEC2 is in sgmii mode.\n");
-               tsec_info[num].flags |= TSEC_SGMII;
-       }
-       num++;
-#endif
-#ifdef CONFIG_TSEC3
-       SET_STD_TSEC_INFO(tsec_info[num], 3);
-       num++;
-#endif
-
-       if (!num) {
-               printf("No TSECs initialized\n");
-               return 0;
-       }
-
-       mdio_info.regs = (struct tsec_mii_mng *)CONFIG_SYS_MDIO_BASE_ADDR;
-       mdio_info.name = DEFAULT_MII_NAME;
-
-       fsl_pq_mdio_init(bis, &mdio_info);
-
-       tsec_eth_init(bis, tsec_info, num);
-
-#if defined(CONFIG_UEC_ETH)
-       /* QE0 and QE3 need to be exposed for UCC1
-        * and UCC5 Eth mode (in PMUXCR register).
-        * Currently QE/LBC muxed pins assumed to be
-        * LBC for U-Boot and PMUXCR updated by OS if required */
-
-       uec_standard_init(bis);
-#endif
-
-       return pci_eth_init(bis);
-}
-
-#if defined(CONFIG_QE)
-static void fdt_board_fixup_qe_pins(void *blob)
-{
-       int node;
-
-       if (!hwconfig("qe")) {
-               /* For QE and eLBC pins multiplexing,
-                * When don't use QE function, remove
-                * qe node from dt blob.
-                */
-               node = fdt_path_offset(blob, "/qe");
-               if (node >= 0)
-                       fdt_del_node(blob, node);
-       } else {
-               /* For TWR Peripheral Modules - TWR-SER2
-                * board only can support Signal Port MII,
-                * so delete one UEC node when use MII port.
-                */
-               if (hwconfig("mii"))
-                       node = fdt_path_offset(blob, "/qe/ucc@2400");
-               else
-                       node = fdt_path_offset(blob, "/qe/ucc@2000");
-               if (node >= 0)
-                       fdt_del_node(blob, node);
-       }
-
-       return;
-}
-#endif
-
-#ifdef CONFIG_OF_BOARD_SETUP
-int ft_board_setup(void *blob, bd_t *bd)
-{
-       phys_addr_t base;
-       phys_size_t size;
-
-       ft_cpu_setup(blob, bd);
-
-       base = env_get_bootm_low();
-       size = env_get_bootm_size();
-
-       fdt_fixup_memory(blob, (u64)base, (u64)size);
-
-       FT_FSL_PCI_SETUP;
-
-#ifdef CONFIG_QE
-       do_fixup_by_compat(blob, "fsl,qe", "status", "okay",
-                       sizeof("okay"), 0);
-#endif
-#if defined(CONFIG_TWR_P1025)
-       fdt_board_fixup_qe_pins(blob);
-#endif
-       fsl_fdt_fixup_dr_usb(blob, bd);
-
-       return 0;
-}
-#endif
diff --git a/board/freescale/p1_twr/tlb.c b/board/freescale/p1_twr/tlb.c
deleted file mode 100644 (file)
index 8e403e3..0000000
+++ /dev/null
@@ -1,75 +0,0 @@
-// SPDX-License-Identifier: GPL-2.0+
-/*
- * Copyright 2013 Freescale Semiconductor, Inc.
- */
-
-#include <common.h>
-#include <asm/mmu.h>
-
-struct fsl_e_tlb_entry tlb_table[] = {
-       /* TLB 0 - for temp stack in cache */
-       SET_TLB_ENTRY(0, CONFIG_SYS_INIT_RAM_ADDR,
-                       CONFIG_SYS_INIT_RAM_ADDR_PHYS,
-                       MAS3_SX|MAS3_SW|MAS3_SR, 0,
-                       0, 0, BOOKE_PAGESZ_4K, 0),
-       SET_TLB_ENTRY(0, CONFIG_SYS_INIT_RAM_ADDR + 4 * 1024 ,
-                       CONFIG_SYS_INIT_RAM_ADDR_PHYS + 4 * 1024,
-                       MAS3_SX|MAS3_SW|MAS3_SR, 0,
-                       0, 0, BOOKE_PAGESZ_4K, 0),
-       SET_TLB_ENTRY(0, CONFIG_SYS_INIT_RAM_ADDR + 8 * 1024 ,
-                       CONFIG_SYS_INIT_RAM_ADDR_PHYS + 8 * 1024,
-                       MAS3_SX|MAS3_SW|MAS3_SR, 0,
-                       0, 0, BOOKE_PAGESZ_4K, 0),
-       SET_TLB_ENTRY(0, CONFIG_SYS_INIT_RAM_ADDR + 12 * 1024 ,
-                       CONFIG_SYS_INIT_RAM_ADDR_PHYS + 12 * 1024,
-                       MAS3_SX|MAS3_SW|MAS3_SR, 0,
-                       0, 0, BOOKE_PAGESZ_4K, 0),
-
-       /* TLB 1 */
-       /* *I*** - Covers boot page */
-       SET_TLB_ENTRY(1, 0xfffff000, 0xfffff000,
-                       MAS3_SX|MAS3_SW|MAS3_SR, MAS2_I,
-                       0, 0, BOOKE_PAGESZ_4K, 1),
-
-       /* *I*G* - CCSRBAR */
-       SET_TLB_ENTRY(1, CONFIG_SYS_CCSRBAR, CONFIG_SYS_CCSRBAR_PHYS,
-                       MAS3_SW|MAS3_SR, MAS2_I|MAS2_G,
-                       0, 1, BOOKE_PAGESZ_1M, 1),
-
-#ifndef CONFIG_SPL_BUILD
-       /* W**G* - Flash, localbus */
-       /* This will be changed to *I*G* after relocation to RAM. */
-       SET_TLB_ENTRY(1, CONFIG_SYS_FLASH_BASE, CONFIG_SYS_FLASH_BASE_PHYS,
-                       MAS3_SX|MAS3_SR, MAS2_W|MAS2_G,
-                       0, 2, BOOKE_PAGESZ_64M, 1),
-
-       /* W**G* - Flash, localbus */
-       /* This will be changed to *I*G* after relocation to RAM. */
-       SET_TLB_ENTRY(1, CONFIG_SYS_SSD_BASE, CONFIG_SYS_SSD_BASE_PHYS,
-                       MAS3_SX|MAS3_SW|MAS3_SR, MAS2_I|MAS2_G,
-                       0, 5, BOOKE_PAGESZ_1M, 1),
-
-#ifdef CONFIG_PCI
-       /* *I*G* - PCI memory 1.5G */
-       SET_TLB_ENTRY(1, CONFIG_SYS_PCIE1_MEM_VIRT, CONFIG_SYS_PCIE1_MEM_PHYS,
-                       MAS3_SW|MAS3_SR, MAS2_I|MAS2_G,
-                       0, 3, BOOKE_PAGESZ_1G, 1),
-
-       /* *I*G* - PCI I/O effective: 192K  */
-       SET_TLB_ENTRY(1, CONFIG_SYS_PCIE1_IO_VIRT, CONFIG_SYS_PCIE1_IO_PHYS,
-                       MAS3_SW|MAS3_SR, MAS2_I|MAS2_G,
-                       0, 4, BOOKE_PAGESZ_256K, 1),
-#endif
-
-#endif
-
-#ifdef CONFIG_SYS_RAMBOOT
-       /* *I*G - eSDHC boot */
-       SET_TLB_ENTRY(1, CONFIG_SYS_DDR_SDRAM_BASE, CONFIG_SYS_DDR_SDRAM_BASE,
-                       MAS3_SX|MAS3_SW|MAS3_SR, MAS2_M,
-                       0, 8, BOOKE_PAGESZ_1G, 1),
-#endif
-
-};
-
-int num_tlb_entries = ARRAY_SIZE(tlb_table);
diff --git a/configs/TWR-P1025_defconfig b/configs/TWR-P1025_defconfig
deleted file mode 100644 (file)
index e48454a..0000000
+++ /dev/null
@@ -1,64 +0,0 @@
-CONFIG_PPC=y
-CONFIG_SYS_TEXT_BASE=0xEFF40000
-CONFIG_ENV_SIZE=0x2000
-CONFIG_ENV_SECT_SIZE=0x20000
-CONFIG_MPC85xx=y
-# CONFIG_CMD_ERRATA is not set
-CONFIG_TARGET_P1_TWR=y
-CONFIG_FIT=y
-CONFIG_FIT_VERBOSE=y
-CONFIG_OF_BOARD_SETUP=y
-CONFIG_OF_STDOUT_VIA_ALIAS=y
-CONFIG_SYS_EXTRA_OPTIONS="TWR_P1025"
-CONFIG_BOOTDELAY=10
-# CONFIG_MISC_INIT_R is not set
-CONFIG_BOARD_EARLY_INIT_F=y
-CONFIG_BOARD_EARLY_INIT_R=y
-CONFIG_HUSH_PARSER=y
-# CONFIG_AUTO_COMPLETE is not set
-CONFIG_CMD_IMLS=y
-CONFIG_CMD_EEPROM=y
-CONFIG_CMD_I2C=y
-CONFIG_CMD_MMC=y
-CONFIG_CMD_PCI=y
-CONFIG_CMD_USB=y
-CONFIG_CMD_MII=y
-CONFIG_CMD_PING=y
-CONFIG_MP=y
-# CONFIG_CMD_HASH is not set
-CONFIG_CMD_EXT2=y
-CONFIG_CMD_FAT=y
-CONFIG_CMD_MTDPARTS=y
-CONFIG_MTDIDS_DEFAULT="nor0=ec000000.nor"
-CONFIG_MTDPARTS_DEFAULT="mtdparts=ec000000.nor:256k(vsc7385-firmware),256k(dtb),5632k(kernel),57856k(fs),256k(qe-ucode-firmware),1280k(u-boot)"
-CONFIG_ENV_IS_IN_FLASH=y
-CONFIG_ENV_ADDR=0xEFF20000
-CONFIG_SATA_SIL3114=y
-CONFIG_FSL_ESDHC=y
-CONFIG_MTD=y
-CONFIG_MTD_NOR_FLASH=y
-CONFIG_FLASH_CFI_DRIVER=y
-CONFIG_SYS_FLASH_USE_BUFFER_WRITE=y
-CONFIG_FLASH_CFI_MTD=y
-CONFIG_SYS_FLASH_CFI=y
-CONFIG_PHY_ATHEROS=y
-CONFIG_PHY_BROADCOM=y
-CONFIG_PHY_DAVICOM=y
-CONFIG_PHY_LXT=y
-CONFIG_PHY_MARVELL=y
-CONFIG_PHY_NATSEMI=y
-CONFIG_PHY_REALTEK=y
-CONFIG_PHY_SMSC=y
-CONFIG_PHY_VITESSE=y
-CONFIG_PHY_GIGE=y
-CONFIG_E1000=y
-CONFIG_MII=y
-CONFIG_TSEC_ENET=y
-CONFIG_SYS_QE_FMAN_FW_IN_NOR=y
-CONFIG_SYS_NS16550=y
-CONFIG_SPI=y
-CONFIG_FSL_ESPI=y
-CONFIG_USB=y
-CONFIG_USB_STORAGE=y
-CONFIG_PANIC_HANG=y
-CONFIG_OF_LIBFDT=y
diff --git a/include/configs/p1_twr.h b/include/configs/p1_twr.h
deleted file mode 100644 (file)
index d731f9c..0000000
+++ /dev/null
@@ -1,480 +0,0 @@
-/* SPDX-License-Identifier: GPL-2.0+ */
-/*
- * Copyright 2013 Freescale Semiconductor, Inc.
- */
-
-/*
- * QorIQ P1 Tower boards configuration file
- */
-#ifndef __CONFIG_H
-#define __CONFIG_H
-
-#include <linux/stringify.h>
-
-#if defined(CONFIG_TWR_P1025)
-#define CONFIG_BOARDNAME "TWR-P1025"
-#define CONFIG_SYS_LBC_LBCR    0x00080000      /* Conversion of LBC addr */
-#define CONFIG_SYS_LBC_LCRR    0x80000002      /* LB clock ratio reg */
-#endif
-
-#ifdef CONFIG_SDCARD
-#define CONFIG_RAMBOOT_SDCARD
-#define CONFIG_SYS_RAMBOOT
-#define CONFIG_RESET_VECTOR_ADDRESS    0x110bfffc
-#endif
-
-#ifndef CONFIG_RESET_VECTOR_ADDRESS
-#define CONFIG_RESET_VECTOR_ADDRESS    0xeffffffc
-#endif
-
-#ifndef CONFIG_SYS_MONITOR_BASE
-#define CONFIG_SYS_MONITOR_BASE        CONFIG_SYS_TEXT_BASE    /* start of monitor */
-#endif
-
-#define CONFIG_PCIE1   /* PCIE controller 1 (slot 1) */
-#define CONFIG_PCIE2   /* PCIE controller 2 (slot 2) */
-#define CONFIG_FSL_PCI_INIT    /* Use common FSL init code */
-#define CONFIG_PCI_INDIRECT_BRIDGE     /* indirect PCI bridge support */
-#define CONFIG_SYS_PCI_64BIT   /* enable 64-bit PCI resources */
-
-#define CONFIG_ENV_OVERWRITE
-
-#define CONFIG_SYS_SATA_MAX_DEVICE     2
-#define CONFIG_LBA48
-
-#ifndef __ASSEMBLY__
-extern unsigned long get_board_sys_clk(unsigned long dummy);
-#endif
-#define CONFIG_SYS_CLK_FREQ    get_board_sys_clk(0) /*sysclk for TWR-P1025 */
-
-#define CONFIG_DDR_CLK_FREQ    66666666
-
-#define CONFIG_HWCONFIG
-/*
- * These can be toggled for performance analysis, otherwise use default.
- */
-#define CONFIG_L2_CACHE
-#define CONFIG_BTB
-
-#define CONFIG_SYS_CCSRBAR             0xffe00000
-#define CONFIG_SYS_CCSRBAR_PHYS_LOW    CONFIG_SYS_CCSRBAR
-
-/* DDR Setup */
-
-#define CONFIG_SYS_SDRAM_SIZE_LAW      LAW_SIZE_512M
-#define CONFIG_CHIP_SELECTS_PER_CTRL   1
-
-#define CONFIG_SYS_SDRAM_SIZE          (1u << (CONFIG_SYS_SDRAM_SIZE_LAW - 19))
-#define CONFIG_SYS_DDR_SDRAM_BASE      0x00000000
-#define CONFIG_SYS_SDRAM_BASE          CONFIG_SYS_DDR_SDRAM_BASE
-
-#define CONFIG_DIMM_SLOTS_PER_CTLR     1
-
-/* Default settings for DDR3 */
-#define CONFIG_SYS_DDR_CS0_BNDS                0x0000001f
-#define CONFIG_SYS_DDR_CS0_CONFIG      0x80014202
-#define CONFIG_SYS_DDR_CS0_CONFIG_2    0x00000000
-#define CONFIG_SYS_DDR_CS1_BNDS                0x00000000
-#define CONFIG_SYS_DDR_CS1_CONFIG      0x00000000
-#define CONFIG_SYS_DDR_CS1_CONFIG_2    0x00000000
-
-#define CONFIG_SYS_DDR_DATA_INIT       0xdeadbeef
-#define CONFIG_SYS_DDR_INIT_ADDR       0x00000000
-#define CONFIG_SYS_DDR_INIT_EXT_ADDR   0x00000000
-#define CONFIG_SYS_DDR_MODE_CONTROL    0x00000000
-
-#define CONFIG_SYS_DDR_ZQ_CONTROL      0x89080600
-#define CONFIG_SYS_DDR_WRLVL_CONTROL   0x8655a608
-#define CONFIG_SYS_DDR_SR_CNTR         0x00000000
-#define CONFIG_SYS_DDR_RCW_1           0x00000000
-#define CONFIG_SYS_DDR_RCW_2           0x00000000
-#define CONFIG_SYS_DDR_CONTROL         0xc70c0000      /* Type = DDR3  */
-#define CONFIG_SYS_DDR_CONTROL_2       0x04401050
-#define CONFIG_SYS_DDR_TIMING_4                0x00220001
-#define CONFIG_SYS_DDR_TIMING_5                0x03402400
-
-#define CONFIG_SYS_DDR_TIMING_3                0x00020000
-#define CONFIG_SYS_DDR_TIMING_0                0x00220004
-#define CONFIG_SYS_DDR_TIMING_1                0x5c5b6544
-#define CONFIG_SYS_DDR_TIMING_2                0x0fa880de
-#define CONFIG_SYS_DDR_CLK_CTRL                0x03000000
-#define CONFIG_SYS_DDR_MODE_1          0x80461320
-#define CONFIG_SYS_DDR_MODE_2          0x00008000
-#define CONFIG_SYS_DDR_INTERVAL                0x09480000
-
-/*
- * Memory map
- *
- * 0x0000_0000 0x1fff_ffff     DDR             Up to 512MB cacheable
- * 0x8000_0000 0xdfff_ffff     PCI Express Mem 1.5G non-cacheable(PCIe * 3)
- * 0xffc0_0000 0xffc3_ffff     PCI IO range    256k non-cacheable
- *
- * Localbus
- * 0xe000_0000 0xe002_0000     SSD1289         128K non-cacheable
- * 0xec00_0000 0xefff_ffff     FLASH           Up to 64M non-cacheable
- *
- * 0xff90_0000 0xff97_ffff     L2 SRAM         Up to 512K cacheable
- * 0xffd0_0000 0xffd0_3fff     init ram        16K Cacheable
- * 0xffe0_0000 0xffef_ffff     CCSR            1M non-cacheable
- */
-
-/*
- * Local Bus Definitions
- */
-#define CONFIG_SYS_MAX_FLASH_SECT      512     /* 64M */
-#define CONFIG_SYS_FLASH_BASE          0xec000000
-
-#define CONFIG_SYS_FLASH_BASE_PHYS     CONFIG_SYS_FLASH_BASE
-
-#define CONFIG_FLASH_BR_PRELIM (BR_PHYS_ADDR((CONFIG_SYS_FLASH_BASE_PHYS)) \
-       | BR_PS_16 | BR_V)
-
-#define CONFIG_FLASH_OR_PRELIM 0xfc0000b1
-
-#define CONFIG_SYS_SSD_BASE    0xe0000000
-#define CONFIG_SYS_SSD_BASE_PHYS       CONFIG_SYS_SSD_BASE
-#define CONFIG_SSD_BR_PRELIM   (BR_PHYS_ADDR(CONFIG_SYS_SSD_BASE_PHYS) | \
-                                       BR_PS_16 | BR_V)
-#define CONFIG_SSD_OR_PRELIM   (OR_AM_64KB | OR_GPCM_CSNT | OR_GPCM_XACS | \
-                                OR_GPCM_ACS_DIV2 | OR_GPCM_SCY | \
-                                OR_GPCM_TRLX | OR_GPCM_EHTR | OR_GPCM_EAD)
-
-#define CONFIG_SYS_BR2_PRELIM CONFIG_SSD_BR_PRELIM
-#define CONFIG_SYS_OR2_PRELIM CONFIG_SSD_OR_PRELIM
-
-#define CONFIG_SYS_FLASH_BANKS_LIST    {CONFIG_SYS_FLASH_BASE_PHYS}
-#define CONFIG_SYS_FLASH_QUIET_TEST
-#define CONFIG_FLASH_SHOW_PROGRESS     45      /* count down from 45/5: 9..1 */
-
-#define CONFIG_SYS_MAX_FLASH_BANKS     1       /* number of banks */
-
-#undef CONFIG_SYS_FLASH_CHECKSUM
-#define CONFIG_SYS_FLASH_ERASE_TOUT    60000   /* Flash Erase Timeout (ms) */
-#define CONFIG_SYS_FLASH_WRITE_TOUT    500     /* Flash Write Timeout (ms) */
-
-#define CONFIG_SYS_FLASH_EMPTY_INFO
-
-#define CONFIG_SYS_INIT_RAM_LOCK
-#define CONFIG_SYS_INIT_RAM_ADDR       0xffd00000
-/* Initial L1 address */
-#define CONFIG_SYS_INIT_RAM_ADDR_PHYS  CONFIG_SYS_INIT_RAM_ADDR
-#define CONFIG_SYS_INIT_RAM_ADDR_PHYS_HIGH 0
-#define CONFIG_SYS_INIT_RAM_ADDR_PHYS_LOW CONFIG_SYS_INIT_RAM_ADDR_PHYS
-/* Size of used area in RAM */
-#define CONFIG_SYS_INIT_RAM_SIZE       0x00004000
-
-#define CONFIG_SYS_GBL_DATA_OFFSET     (CONFIG_SYS_INIT_RAM_SIZE - \
-                                       GENERATED_GBL_DATA_SIZE)
-#define CONFIG_SYS_INIT_SP_OFFSET      CONFIG_SYS_GBL_DATA_OFFSET
-
-#define CONFIG_SYS_MONITOR_LEN (768 * 1024)
-#define CONFIG_SYS_MALLOC_LEN  (1024 * 1024)/* Reserved for malloc */
-
-#define CONFIG_SYS_BR0_PRELIM  CONFIG_FLASH_BR_PRELIM  /* NOR Base Address */
-#define CONFIG_SYS_OR0_PRELIM  CONFIG_FLASH_OR_PRELIM  /* NOR Options */
-
-/* Serial Port
- * open - index 2
- * shorted - index 1
- */
-#undef CONFIG_SERIAL_SOFTWARE_FIFO
-#define CONFIG_SYS_NS16550_SERIAL
-#define CONFIG_SYS_NS16550_REG_SIZE    1
-#define CONFIG_SYS_NS16550_CLK         get_bus_freq(0)
-
-#define CONFIG_SYS_BAUDRATE_TABLE      \
-       {300, 600, 1200, 2400, 4800, 9600, 19200, 38400, 57600, 115200}
-
-#define CONFIG_SYS_NS16550_COM1        (CONFIG_SYS_CCSRBAR+0x4500)
-#define CONFIG_SYS_NS16550_COM2        (CONFIG_SYS_CCSRBAR+0x4600)
-
-/* I2C */
-#define CONFIG_SYS_I2C
-#define CONFIG_SYS_I2C_FSL                     /* Use FSL common I2C driver */
-#define CONFIG_SYS_FSL_I2C_SPEED       400000  /* I2C spd and slave address */
-#define CONFIG_SYS_FSL_I2C_SLAVE       0x7F
-#define CONFIG_SYS_FSL_I2C_OFFSET      0x3000
-#define CONFIG_SYS_I2C_EEPROM_ADDR     0x52
-
-/*
- * I2C2 EEPROM
- */
-#define CONFIG_SYS_FSL_I2C2_SPEED      400000  /* I2C spd and slave address */
-#define CONFIG_SYS_FSL_I2C2_SLAVE      0x7F
-#define CONFIG_SYS_FSL_I2C2_OFFSET     0x3100
-
-#define CONFIG_SYS_I2C_PCA9555_ADDR    0x23
-
-/* enable read and write access to EEPROM */
-#define CONFIG_SYS_I2C_EEPROM_ADDR_LEN 1
-#define CONFIG_SYS_EEPROM_PAGE_WRITE_BITS 3
-#define CONFIG_SYS_EEPROM_PAGE_WRITE_DELAY_MS 5
-
-#if defined(CONFIG_PCI)
-/*
- * General PCI
- * Memory space is mapped 1-1, but I/O space must start from 0.
- */
-
-/* controller 2, direct to uli, tgtid 2, Base address 9000 */
-#define CONFIG_SYS_PCIE2_NAME          "TWR-ELEV PCIe SLOT"
-#define CONFIG_SYS_PCIE2_MEM_VIRT      0xa0000000
-#define CONFIG_SYS_PCIE2_MEM_BUS       0xa0000000
-#define CONFIG_SYS_PCIE2_MEM_PHYS      0xa0000000
-#define CONFIG_SYS_PCIE2_MEM_SIZE      0x20000000      /* 512M */
-#define CONFIG_SYS_PCIE2_IO_VIRT       0xffc10000
-#define CONFIG_SYS_PCIE2_IO_BUS                0x00000000
-#define CONFIG_SYS_PCIE2_IO_PHYS       0xffc10000
-#define CONFIG_SYS_PCIE2_IO_SIZE       0x00010000      /* 64k */
-
-/* controller 1, tgtid 1, Base address a000 */
-#define CONFIG_SYS_PCIE1_NAME          "mini PCIe SLOT"
-#define CONFIG_SYS_PCIE1_MEM_VIRT      0x80000000
-#define CONFIG_SYS_PCIE1_MEM_BUS       0x80000000
-#define CONFIG_SYS_PCIE1_MEM_PHYS      0x80000000
-#define CONFIG_SYS_PCIE1_MEM_SIZE      0x20000000      /* 512M */
-#define CONFIG_SYS_PCIE1_IO_VIRT       0xffc00000
-#define CONFIG_SYS_PCIE1_IO_BUS                0x00000000
-#define CONFIG_SYS_PCIE1_IO_PHYS       0xffc00000
-#define CONFIG_SYS_PCIE1_IO_SIZE       0x00010000      /* 64k */
-
-#define CONFIG_PCI_SCAN_SHOW   /* show pci devices on startup */
-#endif /* CONFIG_PCI */
-
-#if defined(CONFIG_TSEC_ENET)
-
-#define CONFIG_TSEC1
-#define CONFIG_TSEC1_NAME      "eTSEC1"
-#undef CONFIG_TSEC2
-#undef CONFIG_TSEC2_NAME
-#define CONFIG_TSEC3
-#define CONFIG_TSEC3_NAME      "eTSEC3"
-
-#define TSEC1_PHY_ADDR 2
-#define TSEC2_PHY_ADDR 0
-#define TSEC3_PHY_ADDR 1
-
-#define TSEC1_FLAGS    (TSEC_GIGABIT | TSEC_REDUCED)
-#define TSEC2_FLAGS    (TSEC_GIGABIT | TSEC_REDUCED)
-#define TSEC3_FLAGS    (TSEC_GIGABIT | TSEC_REDUCED)
-
-#define TSEC1_PHYIDX   0
-#define TSEC2_PHYIDX   0
-#define TSEC3_PHYIDX   0
-
-#define CONFIG_ETHPRIME        "eTSEC1"
-
-#define CONFIG_HAS_ETH0
-#define CONFIG_HAS_ETH1
-#undef CONFIG_HAS_ETH2
-#endif /* CONFIG_TSEC_ENET */
-
-#ifdef CONFIG_QE
-/* QE microcode/firmware address */
-#define CONFIG_SYS_QE_FW_ADDR  0xefec0000
-#define CONFIG_SYS_QE_FMAN_FW_LENGTH   0x10000
-#endif /* CONFIG_QE */
-
-#ifdef CONFIG_TWR_P1025
-/*
- * QE UEC ethernet configuration
- */
-#define CONFIG_MIIM_ADDRESS    (CONFIG_SYS_CCSRBAR + 0x82120)
-
-#undef CONFIG_UEC_ETH
-#define CONFIG_PHY_MODE_NEED_CHANGE
-
-#define CONFIG_UEC_ETH1        /* ETH1 */
-#define CONFIG_HAS_ETH0
-
-#ifdef CONFIG_UEC_ETH1
-#define CONFIG_SYS_UEC1_UCC_NUM        0       /* UCC1 */
-#define CONFIG_SYS_UEC1_RX_CLK QE_CLK12 /* CLK12 for MII */
-#define CONFIG_SYS_UEC1_TX_CLK QE_CLK9 /* CLK9 for MII */
-#define CONFIG_SYS_UEC1_ETH_TYPE       FAST_ETH
-#define CONFIG_SYS_UEC1_PHY_ADDR       0x18    /* 0x18 for MII */
-#define CONFIG_SYS_UEC1_INTERFACE_TYPE PHY_INTERFACE_MODE_MII
-#define CONFIG_SYS_UEC1_INTERFACE_SPEED        100
-#endif /* CONFIG_UEC_ETH1 */
-
-#define CONFIG_UEC_ETH5        /* ETH5 */
-#define CONFIG_HAS_ETH1
-
-#ifdef CONFIG_UEC_ETH5
-#define CONFIG_SYS_UEC5_UCC_NUM        4       /* UCC5 */
-#define CONFIG_SYS_UEC5_RX_CLK QE_CLK_NONE
-#define CONFIG_SYS_UEC5_TX_CLK QE_CLK13 /* CLK 13 for RMII */
-#define CONFIG_SYS_UEC5_ETH_TYPE       FAST_ETH
-#define CONFIG_SYS_UEC5_PHY_ADDR       0x19    /* 0x19 for RMII */
-#define CONFIG_SYS_UEC5_INTERFACE_TYPE PHY_INTERFACE_MODE_RMII
-#define CONFIG_SYS_UEC5_INTERFACE_SPEED        100
-#endif /* CONFIG_UEC_ETH5 */
-#endif /* CONFIG_TWR-P1025 */
-
-/*
- * Dynamic MTD Partition support with mtdparts
- */
-
-/*
- * Environment
- */
-#ifdef CONFIG_SYS_RAMBOOT
-#ifdef CONFIG_RAMBOOT_SDCARD
-#define CONFIG_SYS_MMC_ENV_DEV 0
-#endif
-#endif
-
-#define CONFIG_LOADS_ECHO              /* echo on for serial download */
-#define CONFIG_SYS_LOADS_BAUD_CHANGE   /* allow baudrate change */
-
-/*
- * USB
- */
-#define CONFIG_HAS_FSL_DR_USB
-
-#if defined(CONFIG_HAS_FSL_DR_USB)
-#ifdef CONFIG_USB_EHCI_HCD
-#define CONFIG_EHCI_HCD_INIT_AFTER_RESET
-#define CONFIG_USB_EHCI_FSL
-#endif
-#endif
-
-#ifdef CONFIG_MMC
-#define CONFIG_SYS_FSL_ESDHC_ADDR      CONFIG_SYS_MPC85xx_ESDHC_ADDR
-#endif
-
-#undef CONFIG_WATCHDOG /* watchdog disabled */
-
-/*
- * Miscellaneous configurable options
- */
-#define CONFIG_SYS_LOAD_ADDR   0x2000000       /* default load address */
-
-/*
- * For booting Linux, the board info and command line data
- * have to be in the first 64 MB of memory, since this is
- * the maximum mapped by the Linux kernel during initialization.
- */
-#define CONFIG_SYS_BOOTMAPSZ   (64 << 20)      /* Initial Memory for Linux*/
-#define CONFIG_SYS_BOOTM_LEN   (64 << 20)      /* Increase max gunzip size */
-
-/*
- * Environment Configuration
- */
-#define CONFIG_HOSTNAME                "unknown"
-#define CONFIG_ROOTPATH                "/opt/nfsroot"
-#define CONFIG_BOOTFILE                "uImage"
-#define CONFIG_UBOOTPATH       u-boot.bin /* U-Boot image on TFTP server */
-
-/* default location for tftp and bootm */
-#define CONFIG_LOADADDR        1000000
-
-#define        CONFIG_EXTRA_ENV_SETTINGS       \
-"netdev=eth0\0"        \
-"uboot=" __stringify(CONFIG_UBOOTPATH) "\0"    \
-"loadaddr=1000000\0"   \
-"bootfile=uImage\0"    \
-"dtbfile=twr-p1025twr.dtb\0"   \
-"ramdiskfile=rootfs.ext2.gz.uboot\0"   \
-"qefirmwarefile=fsl_qe_ucode_1021_10_A.bin\0"  \
-"tftpflash=tftpboot $loadaddr $uboot; "        \
-       "protect off " __stringify(CONFIG_SYS_TEXT_BASE) " +$filesize; " \
-       "erase " __stringify(CONFIG_SYS_TEXT_BASE) " +$filesize; "      \
-       "cp.b $loadaddr " __stringify(CONFIG_SYS_TEXT_BASE) " $filesize; " \
-       "protect on " __stringify(CONFIG_SYS_TEXT_BASE) " +$filesize; " \
-       "cmp.b $loadaddr " __stringify(CONFIG_SYS_TEXT_BASE) " $filesize\0" \
-"kernelflash=tftpboot $loadaddr $bootfile; "   \
-       "protect off 0xefa80000 +$filesize; "   \
-       "erase 0xefa80000 +$filesize; " \
-       "cp.b $loadaddr 0xefa80000 $filesize; " \
-       "protect on 0xefa80000 +$filesize; "    \
-       "cmp.b $loadaddr 0xefa80000 $filesize\0"        \
-"dtbflash=tftpboot $loadaddr $dtbfile; "       \
-       "protect off 0xefe80000 +$filesize; "   \
-       "erase 0xefe80000 +$filesize; " \
-       "cp.b $loadaddr 0xefe80000 $filesize; " \
-       "protect on 0xefe80000 +$filesize; "    \
-       "cmp.b $loadaddr 0xefe80000 $filesize\0"        \
-"ramdiskflash=tftpboot $loadaddr $ramdiskfile; "       \
-       "protect off 0xeeb80000 +$filesize; "   \
-       "erase 0xeeb80000 +$filesize; " \
-       "cp.b $loadaddr 0xeeb80000 $filesize; " \
-       "protect on 0xeeb80000 +$filesize; "    \
-       "cmp.b $loadaddr 0xeeb80000 $filesize\0"        \
-"qefirmwareflash=tftpboot $loadaddr $qefirmwarefile; " \
-       "protect off 0xefec0000 +$filesize; "   \
-       "erase 0xefec0000 +$filesize; " \
-       "cp.b $loadaddr 0xefec0000 $filesize; " \
-       "protect on 0xefec0000 +$filesize; "    \
-       "cmp.b $loadaddr 0xefec0000 $filesize\0"        \
-"consoledev=ttyS0\0"   \
-"ramdiskaddr=2000000\0"        \
-"ramdiskfile=rootfs.ext2.gz.uboot\0"   \
-"fdtaddr=1e00000\0"    \
-"bdev=sda1\0"  \
-"norbootaddr=ef080000\0"       \
-"norfdtaddr=ef040000\0"        \
-"ramdisk_size=120000\0" \
-"usbboot=setenv bootargs root=/dev/sda1 rw rootdelay=5 " \
-"console=$consoledev,$baudrate $othbootargs ; bootm 0xefa80000 - 0xefe80000"
-
-#define CONFIG_NFSBOOTCOMMAND  \
-"setenv bootargs root=/dev/nfs rw "    \
-"nfsroot=$serverip:$rootpath " \
-"ip=$ipaddr:$serverip:$gatewayip:$netmask:$hostname:$netdev:off " \
-"console=$consoledev,$baudrate $othbootargs;" \
-"tftp $loadaddr $bootfile&&"   \
-"tftp $fdtaddr $fdtfile&&"     \
-"bootm $loadaddr - $fdtaddr"
-
-#define CONFIG_HDBOOT  \
-"setenv bootargs root=/dev/$bdev rw rootdelay=30 "     \
-"console=$consoledev,$baudrate $othbootargs;" \
-"usb start;"   \
-"ext2load usb 0:1 $loadaddr /boot/$bootfile;"  \
-"ext2load usb 0:1 $fdtaddr /boot/$fdtfile;"    \
-"bootm $loadaddr - $fdtaddr"
-
-#define CONFIG_USB_FAT_BOOT    \
-"setenv bootargs root=/dev/ram rw "    \
-"console=$consoledev,$baudrate $othbootargs " \
-"ramdisk_size=$ramdisk_size;"  \
-"usb start;"   \
-"fatload usb 0:2 $loadaddr $bootfile;" \
-"fatload usb 0:2 $fdtaddr $fdtfile;"   \
-"fatload usb 0:2 $ramdiskaddr $ramdiskfile;"   \
-"bootm $loadaddr $ramdiskaddr $fdtaddr"
-
-#define CONFIG_USB_EXT2_BOOT   \
-"setenv bootargs root=/dev/ram rw "    \
-"console=$consoledev,$baudrate $othbootargs " \
-"ramdisk_size=$ramdisk_size;"  \
-"usb start;"   \
-"ext2load usb 0:4 $loadaddr $bootfile;"        \
-"ext2load usb 0:4 $fdtaddr $fdtfile;" \
-"ext2load usb 0:4 $ramdiskaddr $ramdiskfile;" \
-"bootm $loadaddr $ramdiskaddr $fdtaddr"
-
-#define CONFIG_NORBOOT \
-"setenv bootargs root=/dev/mtdblock3 rw "      \
-"console=$consoledev,$baudrate rootfstype=jffs2 $othbootargs;" \
-"bootm $norbootaddr - $norfdtaddr"
-
-#define CONFIG_RAMBOOTCOMMAND_TFTP     \
-"setenv bootargs root=/dev/ram rw "    \
-"console=$consoledev,$baudrate $othbootargs " \
-"ramdisk_size=$ramdisk_size;"  \
-"tftp $ramdiskaddr $ramdiskfile;"      \
-"tftp $loadaddr $bootfile;"    \
-"tftp $fdtaddr $fdtfile;"      \
-"bootm $loadaddr $ramdiskaddr $fdtaddr"
-
-#define CONFIG_RAMBOOTCOMMAND  \
-"setenv bootargs root=/dev/ram rw "    \
-"console=$consoledev,$baudrate $othbootargs " \
-"ramdisk_size=$ramdisk_size;"  \
-"bootm 0xefa80000 0xeeb80000 0xefe80000"
-
-#define CONFIG_BOOTCOMMAND     CONFIG_RAMBOOTCOMMAND
-
-#endif /* __CONFIG_H */