powerpc: Drop CONFIG_SYS_ALLOC_DPRAM

This is not defined anywhere in U-Boot. Drop this dead code.

Signed-off-by: Simon Glass <sjg@chromium.org>

diff --git a/arch/powerpc/cpu/mpc8260/spi.c b/arch/powerpc/cpu/mpc8260/spi.c
index 8c91a713bba4a96d92112c02ec91bdeda45af922..c7fb4e9a6c073f16d308d9902e9079f5499e7481 100644 (file)
--- a/arch/powerpc/cpu/mpc8260/spi.c
+++ b/arch/powerpc/cpu/mpc8260/spi.c
@@ -181,14 +181,7 @@ void spi_init_f (void)
        spi->spi_tbc    = 0;
        spi->spi_txtmp  = 0;
 
-       /* Allocate space for one transmit and one receive buffer
-        * descriptor in the DP ram
-        */
-#ifdef CONFIG_SYS_ALLOC_DPRAM
-       dpaddr = m8260_cpm_dpalloc (sizeof(cbd_t)*2, 8);
-#else
        dpaddr = CPM_SPI_BASE;
-#endif
 
 /* 3 */
        /* Set up the SPI parameters in the parameter ram */

diff --git a/arch/powerpc/cpu/mpc8xx/Makefile b/arch/powerpc/cpu/mpc8xx/Makefile
index f83fd5ecf4d2045a8d039163e18d3123add3631f..6f81fee571b55c9110aa09c81d804551f5dbc610 100644 (file)
--- a/arch/powerpc/cpu/mpc8xx/Makefile
+++ b/arch/powerpc/cpu/mpc8xx/Makefile
@@ -10,7 +10,6 @@
 extra-y += start.o
 extra-y += traps.o
 obj-y  += bedbug_860.o
-obj-y  += commproc.o
 obj-y  += cpu.o
 obj-y  += cpu_init.o
 obj-y  += fec.o

diff --git a/arch/powerpc/cpu/mpc8xx/commproc.c b/arch/powerpc/cpu/mpc8xx/commproc.c
deleted file mode 100644 (file)
index f8581d1..0000000
--- a/arch/powerpc/cpu/mpc8xx/commproc.c
+++ /dev/null
@@ -1,69 +0,0 @@
-/*
- * (C) Copyright 2000-2002
- * Wolfgang Denk, DENX Software Engineering, wd@denx.de.
- *
- * SPDX-License-Identifier:    GPL-2.0+
- */
-
-#include <common.h>
-#include <commproc.h>
-
-DECLARE_GLOBAL_DATA_PTR;
-
-#ifdef CONFIG_SYS_ALLOC_DPRAM
-
-int dpram_init (void)
-{
-       /* Reclaim the DP memory for our use. */
-       gd->arch.dp_alloc_base = CPM_DATAONLY_BASE;
-       gd->arch.dp_alloc_top  = CPM_DATAONLY_BASE + CPM_DATAONLY_SIZE;
-
-       return (0);
-}
-
-/* Allocate some memory from the dual ported ram.  We may want to
- * enforce alignment restrictions, but right now everyone is a good
- * citizen.
- */
-uint dpram_alloc (uint size)
-{
-       uint addr = gd->arch.dp_alloc_base;
-
-       if ((gd->arch.dp_alloc_base + size) >= gd->arch.dp_alloc_top)
-               return (CPM_DP_NOSPACE);
-
-       gd->arch.dp_alloc_base += size;
-
-       return addr;
-}
-
-uint dpram_base (void)
-{
-       return gd->arch.dp_alloc_base;
-}
-
-/* Allocate some memory from the dual ported ram.  We may want to
- * enforce alignment restrictions, but right now everyone is a good
- * citizen.
- */
-uint dpram_alloc_align (uint size, uint align)
-{
-       uint addr, mask = align - 1;
-
-       addr = (gd->arch.dp_alloc_base + mask) & ~mask;
-
-       if ((addr + size) >= gd->arch.dp_alloc_top)
-               return (CPM_DP_NOSPACE);
-
-       gd->arch.dp_alloc_base = addr + size;
-
-       return addr;
-}
-
-uint dpram_base_align (uint align)
-{
-       uint mask = align - 1;
-
-       return (gd->arch.dp_alloc_base + mask) & ~mask;
-}
-#endif /* CONFIG_SYS_ALLOC_DPRAM */

diff --git a/arch/powerpc/cpu/mpc8xx/fec.c b/arch/powerpc/cpu/mpc8xx/fec.c
index 0940906b1d4b6ba6fa8674c6e38a319000165d6b..b27310fffb97bb46b03652a7dafe5a08472b8b80 100644 (file)
--- a/arch/powerpc/cpu/mpc8xx/fec.c
+++ b/arch/powerpc/cpu/mpc8xx/fec.c
@@ -570,14 +570,8 @@ static int fec_init (struct eth_device *dev, bd_t * bd)
        rxIdx = 0;
        txIdx = 0;
 
-       if (!rtx) {
-#ifdef CONFIG_SYS_ALLOC_DPRAM
-               rtx = (RTXBD *) (immr->im_cpm.cp_dpmem +
-                                dpram_alloc_align (sizeof (RTXBD), 8));
-#else
-               rtx = (RTXBD *) (immr->im_cpm.cp_dpmem + CPM_FEC_BASE);
-#endif
-       }
+       if (!rtx)
+               rtx = (RTXBD *)(immr->im_cpm.cp_dpmem + CPM_FEC_BASE);
        /*
         * Setup Receiver Buffer Descriptors (13.14.24.18)
         * Settings:

diff --git a/arch/powerpc/cpu/mpc8xx/i2c.c b/arch/powerpc/cpu/mpc8xx/i2c.c
index 3dff4ab4ac426245733072b74fd321bb5291fed4..54d5cb513022674c5f419d4ce5314cada829db23 100644 (file)
--- a/arch/powerpc/cpu/mpc8xx/i2c.c
+++ b/arch/powerpc/cpu/mpc8xx/i2c.c
@@ -190,17 +190,7 @@ void i2c_init(int speed, int slaveaddr)
        iip->iic_rpbase = 0;
 #endif
 
-#ifdef CONFIG_SYS_ALLOC_DPRAM
-       dpaddr = iip->iic_rbase;
-       if (dpaddr == 0) {
-               /* need to allocate dual port ram */
-               dpaddr = dpram_alloc_align((NUM_RX_BDS * sizeof(I2C_BD)) +
-                                          (NUM_TX_BDS * sizeof(I2C_BD)) +
-                                          MAX_TX_SPACE, 8);
-       }
-#else
        dpaddr = CPM_I2C_BASE;
-#endif
 
        /*
         * initialise data in dual port ram:

diff --git a/arch/powerpc/cpu/mpc8xx/scc.c b/arch/powerpc/cpu/mpc8xx/scc.c
index 3474637fac9311f0c0df7f1554458c55f0a3cc41..17bcc2fe0a14ef0cadbe660dcf04e0285c9bc615 100644 (file)
--- a/arch/powerpc/cpu/mpc8xx/scc.c
+++ b/arch/powerpc/cpu/mpc8xx/scc.c
@@ -199,14 +199,8 @@ static int scc_init (struct eth_device *dev, bd_t * bis)
        rxIdx = 0;
        txIdx = 0;
 
-       if (!rtx) {
-#ifdef CONFIG_SYS_ALLOC_DPRAM
-               rtx = (RTXBD *) (immr->im_cpm.cp_dpmem +
-                                dpram_alloc_align (sizeof (RTXBD), 8));
-#else
-               rtx = (RTXBD *) (immr->im_cpm.cp_dpmem + CPM_SCC_BASE);
-#endif
-       }
+       if (!rtx)
+               rtx = (RTXBD *)(immr->im_cpm.cp_dpmem + CPM_SCC_BASE);
 
 #if (defined(PA_ENET_RXD) && defined(PA_ENET_TXD))
        /* Configure port A pins for Txd and Rxd.

diff --git a/arch/powerpc/cpu/mpc8xx/serial.c b/arch/powerpc/cpu/mpc8xx/serial.c
index 94c785f611c6ed93a684c94d7325f5a003bf70a3..b6e12d0d854fae3f2b347b81f73e4885e21bc1b4 100644 (file)
--- a/arch/powerpc/cpu/mpc8xx/serial.c
+++ b/arch/powerpc/cpu/mpc8xx/serial.c
@@ -176,15 +176,7 @@ static int smc_init (void)
        /* Set the physical address of the host memory buffers in
         * the buffer descriptors.
         */
-
-#ifdef CONFIG_SYS_ALLOC_DPRAM
-       /* allocate
-        * size of struct serialbuffer with bd rx/tx, buffer rx/tx and rx index
-        */
-       dpaddr = dpram_alloc_align((sizeof(serialbuffer_t)), 8);
-#else
-       dpaddr = CPM_SERIAL_BASE ;
-#endif
+       dpaddr = CPM_SERIAL_BASE;
 
        rtx = (serialbuffer_t *)&cp->cp_dpmem[dpaddr];
        /* Allocate space for two buffer descriptors in the DP ram.
@@ -421,12 +413,7 @@ static int scc_init (void)
 #endif
 
        /* Allocate space for two buffer descriptors in the DP ram. */
-
-#ifdef CONFIG_SYS_ALLOC_DPRAM
-       dpaddr = dpram_alloc_align (sizeof(cbd_t)*2 + 2, 8) ;
-#else
-       dpaddr = CPM_SERIAL2_BASE ;
-#endif
+       dpaddr = dpram_alloc_align(sizeof(cbd_t)*2 + 2, 8);
 
        /* Enable SDMA. */
        im->im_siu_conf.sc_sdcr = 0x0001;

diff --git a/arch/powerpc/cpu/mpc8xx/spi.c b/arch/powerpc/cpu/mpc8xx/spi.c
index 6267c0e204d82ea01b34b7faceeabbba1e531a13..35b425e7c14783ac4b1c13be155686bb44652dfd 100644 (file)
--- a/arch/powerpc/cpu/mpc8xx/spi.c
+++ b/arch/powerpc/cpu/mpc8xx/spi.c
@@ -187,14 +187,7 @@ void spi_init_f (void)
        spi->spi_tbc    = 0;
        spi->spi_txtmp  = 0;
 
-       /* Allocate space for one transmit and one receive buffer
-        * descriptor in the DP ram
-        */
-#ifdef CONFIG_SYS_ALLOC_DPRAM
-       dpaddr = dpram_alloc_align (sizeof(cbd_t)*2, 8);
-#else
        dpaddr = CPM_SPI_BASE;
-#endif
 
 /* 3 */
        /* Set up the SPI parameters in the parameter ram */

diff --git a/arch/powerpc/include/asm/global_data.h b/arch/powerpc/include/asm/global_data.h
index 4090975bf5e79224b837bb5321d2bfe371e23805..3943d0e92b9e4f01829796c107bfd2abb7290042 100644 (file)
--- a/arch/powerpc/include/asm/global_data.h
+++ b/arch/powerpc/include/asm/global_data.h
@@ -96,7 +96,7 @@ struct arch_global_data {
        unsigned long arbiter_event_attributes;
        unsigned long arbiter_event_address;
 #endif
-#if defined(CONFIG_SYS_ALLOC_DPRAM) || defined(CONFIG_CPM2)
+#if defined(CONFIG_CPM2)
        unsigned int dp_alloc_base;
        unsigned int dp_alloc_top;
 #endif

diff --git a/common/board_f.c b/common/board_f.c
index 5e2b8d14d47983c832363cbb12b51b3634d1f81b..8c9453cb7efb52c1ff5b5dd156cf1f1187e00382 100644 (file)
--- a/common/board_f.c
+++ b/common/board_f.c
@@ -884,11 +884,6 @@ static init_fnc_t init_sequence_f[] = {
                defined(CONFIG_SH) || defined(CONFIG_SPARC)
        timer_init,             /* initialize timer */
 #endif
-#ifdef CONFIG_SYS_ALLOC_DPRAM
-#if !defined(CONFIG_CPM2)
-       dpram_init,
-#endif
-#endif
 #if defined(CONFIG_BOARD_POSTCLK_INIT)
        board_postclk_init,
 #endif

diff --git a/include/commproc.h b/include/commproc.h
index 9582746153a78a19aeab7cd39b636452518568dd..9d4cb109adde161251a9ae18ac6625ae6b5f9f9d 100644 (file)
--- a/include/commproc.h
+++ b/include/commproc.h
@@ -51,20 +51,6 @@
 /*
  * DPRAM defines and allocation functions
  */
-
-/* The dual ported RAM is multi-functional.  Some areas can be (and are
- * being) used for microcode.  There is an area that can only be used
- * as data ram for buffer descriptors, which is all we use right now.
- * Currently the first 512 and last 256 bytes are used for microcode.
- */
-#ifdef  CONFIG_SYS_ALLOC_DPRAM
-
-#define CPM_DATAONLY_BASE      ((uint)0x0800)
-#define CPM_DATAONLY_SIZE      ((uint)0x0700)
-#define CPM_DP_NOSPACE         ((uint)0x7fffffff)
-
-#else
-
 #define CPM_SERIAL_BASE                0x0800
 #define CPM_I2C_BASE           0x0820
 #define CPM_SPI_BASE           0x0840
@@ -74,8 +60,6 @@
 #define CPM_POST_BASE          0x0980
 #define CPM_WLKBD_BASE         0x0a00
 
-#endif
-
 #ifndef CONFIG_SYS_CPM_POST_WORD_ADDR
 #define CPM_POST_WORD_ADDR     0x07FC
 #else

diff --git a/post/cpu/mpc8xx/ether.c b/post/cpu/mpc8xx/ether.c
index 1b75eb6fb81f2925ba65ce2171961091f3236029..47f6f32246586c8dff0350812bbce80e93886ef3 100644 (file)
--- a/post/cpu/mpc8xx/ether.c
+++ b/post/cpu/mpc8xx/ether.c
@@ -119,12 +119,7 @@ static void scc_init (int scc_index)
        rxIdx = 0;
        txIdx = 0;
 
-#ifdef CONFIG_SYS_ALLOC_DPRAM
-       rtx = (RTXBD *) (immr->im_cpm.cp_dpmem +
-                                        dpram_alloc_align (sizeof (RTXBD), 8));
-#else
        rtx = (RTXBD *) (immr->im_cpm.cp_dpmem + CPM_SCC_BASE);
-#endif
 
 #if 0
 

diff --git a/post/cpu/mpc8xx/uart.c b/post/cpu/mpc8xx/uart.c
index e54a4cacfabe2d3c8736a0c50b158644c01d7fa7..64ca7e4b98be5d41d4795f9eb8b8e91be555f87b 100644 (file)
--- a/post/cpu/mpc8xx/uart.c
+++ b/post/cpu/mpc8xx/uart.c
@@ -103,12 +103,7 @@ static void smc_init (int smc_index)
        /* Set the physical address of the host memory buffers in
         * the buffer descriptors.
         */
-
-#ifdef CONFIG_SYS_ALLOC_DPRAM
-       dpaddr = dpram_alloc_align (sizeof (cbd_t) * 2 + 2, 8);
-#else
        dpaddr = CPM_POST_BASE;
-#endif
 
        /* Allocate space for two buffer descriptors in the DP ram.
         * For now, this address seems OK, but it may have to
@@ -276,15 +271,7 @@ static void scc_init (int scc_index)
         */
        sp->scc_gsmrl &= ~(SCC_GSMRL_ENR | SCC_GSMRL_ENT);
 
-
-       /* Allocate space for two buffer descriptors in the DP ram.
-        */
-
-#ifdef CONFIG_SYS_ALLOC_DPRAM
-       dpaddr = dpram_alloc_align (sizeof (cbd_t) * 2 + 2, 8);
-#else
        dpaddr = CPM_POST_BASE;
-#endif
 
        /* Enable SDMA.
         */

diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt
index f40c43299015d11e11445b8e2f62816152ac3cc2..b7463a808f1081447b2fe4d43e11ccd000cd6bc5 100644 (file)
--- a/scripts/config_whitelist.txt
+++ b/scripts/config_whitelist.txt
@@ -3162,7 +3162,6 @@ CONFIG_SYS_ACR_RPTCNT
 CONFIG_SYS_ADDRESS_MAP_A
 CONFIG_SYS_ADV7611_I2C
 CONFIG_SYS_AHB_BASE
-CONFIG_SYS_ALLOC_DPRAM
 CONFIG_SYS_ALT_BOOT
 CONFIG_SYS_ALT_FLASH
 CONFIG_SYS_ALT_MEMTEST