global: Remove bi_sramstart/bi_sramsize

These fields are currently set on exactly two platforms today, and used
by only one of them. Update pic32mzdask to use CFG_SYS_SRAM* in the one
location it needs it and otherwise drop this field from the bd_info
struct.

Signed-off-by: Tom Rini <trini@konsulko.com>

diff --git a/Kconfig b/Kconfig
index eb55f25..bd63fea 100644 (file)
--- a/Kconfig
+++ b/Kconfig
@@ -595,27 +595,6 @@ config SYS_MEM_TOP_HIDE
          WARNING: Please make sure that this value is a multiple of the OS
          page size.
 
-config SYS_HAS_SRAM
-       bool
-       default y if TARGET_PIC32MZDASK
-       default y if TARGET_DEVKIT8000
-       help
-         Enable this to allow support for the on board SRAM.
-         SRAM base address is controlled by CONFIG_SYS_SRAM_BASE.
-         SRAM size is controlled by CONFIG_SYS_SRAM_SIZE.
-
-config SYS_SRAM_BASE
-       hex
-       default 0x80000000 if TARGET_PIC32MZDASK
-       default 0x40200000 if TARGET_DEVKIT8000
-       default 0x0
-
-config SYS_SRAM_SIZE
-       hex
-       default 0x00080000 if TARGET_PIC32MZDASK
-       default 0x10000 if TARGET_DEVKIT8000
-       default 0x0
-
 config SYS_MONITOR_LEN
        int "Maximum size in bytes reserved for U-Boot in memory"
        default 1048576 if X86

diff --git a/api/api_platform-powerpc.c b/api/api_platform-powerpc.c
index 3a04a9f..2c1ab04 100644 (file)
--- a/api/api_platform-powerpc.c
+++ b/api/api_platform-powerpc.c
@@ -43,7 +43,6 @@ int platform_sys_info(struct sys_info *si)
 
        platform_set_mr(si, gd->ram_base, gd->ram_size, MR_ATTR_DRAM);
        platform_set_mr(si, gd->bd->bi_flashstart, gd->bd->bi_flashsize, MR_ATTR_FLASH);
-       platform_set_mr(si, gd->bd->bi_sramstart, gd->bd->bi_sramsize, MR_ATTR_SRAM);
 
        return 1;
 }

diff --git a/cmd/bdinfo.c b/cmd/bdinfo.c
index 4c0e2ad..ae9e192 100644 (file)
--- a/cmd/bdinfo.c
+++ b/cmd/bdinfo.c
@@ -140,10 +140,6 @@ static int bdinfo_print_all(struct bd_info *bd)
 #endif
        bdinfo_print_num_l("boot_params", (ulong)bd->bi_boot_params);
        print_bi_dram(bd);
-       if (IS_ENABLED(CONFIG_SYS_HAS_SRAM)) {
-               bdinfo_print_num_l("sramstart", (ulong)bd->bi_sramstart);
-               bdinfo_print_num_l("sramsize", (ulong)bd->bi_sramsize);
-       }
        bdinfo_print_num_l("flashstart", (ulong)bd->bi_flashstart);
        bdinfo_print_num_l("flashsize", (ulong)bd->bi_flashsize);
        bdinfo_print_num_l("flashoffset", (ulong)bd->bi_flashoffset);

diff --git a/common/board_f.c b/common/board_f.c
index 98dc259..ebc934a 100644 (file)
--- a/common/board_f.c
+++ b/common/board_f.c
@@ -637,13 +637,6 @@ __weak int arch_setup_bdinfo(void)
 
 int setup_bdinfo(void)
 {
-       struct bd_info *bd = gd->bd;
-
-       if (IS_ENABLED(CONFIG_SYS_HAS_SRAM)) {
-               bd->bi_sramstart = CONFIG_SYS_SRAM_BASE; /* start of SRAM */
-               bd->bi_sramsize = CONFIG_SYS_SRAM_SIZE;  /* size  of SRAM */
-       }
-
        return arch_setup_bdinfo();
 }
 

diff --git a/include/asm-generic/u-boot.h b/include/asm-generic/u-boot.h
index 70303ac..8c619c1 100644 (file)
--- a/include/asm-generic/u-boot.h
+++ b/include/asm-generic/u-boot.h
@@ -30,8 +30,6 @@ struct bd_info {
        unsigned long   bi_flashstart;  /* start of FLASH memory */
        unsigned long   bi_flashsize;   /* size  of FLASH memory */
        unsigned long   bi_flashoffset; /* reserved area for startup monitor */
-       unsigned long   bi_sramstart;   /* start of SRAM memory */
-       unsigned long   bi_sramsize;    /* size  of SRAM memory */
 #ifdef CONFIG_ARM
        unsigned long   bi_arm_freq; /* arm frequency */
        unsigned long   bi_dsp_freq; /* dsp core frequency */

diff --git a/include/configs/pic32mzdask.h b/include/configs/pic32mzdask.h
index 0ae4fc5..8de930e 100644 (file)
--- a/include/configs/pic32mzdask.h
+++ b/include/configs/pic32mzdask.h
@@ -19,8 +19,11 @@
  */
 /* Initial RAM for temporary stack, global data */
 #define CFG_SYS_INIT_RAM_SIZE  0x10000
+#define CFG_SYS_SRAM_BASE      0x80000000
+#define CFG_SYS_SRAM_SIZE      0x00080000
+
 #define CFG_SYS_INIT_RAM_ADDR  \
-       (CONFIG_SYS_SRAM_BASE + CONFIG_SYS_SRAM_SIZE - CFG_SYS_INIT_RAM_SIZE)
+       (CFG_SYS_SRAM_BASE + CFG_SYS_SRAM_SIZE - CFG_SYS_INIT_RAM_SIZE)
 
 /* SDRAM Configuration (for final code, data, stack, heap) */
 #define CFG_SYS_SDRAM_BASE             0x88000000