Whitebox
/
u-boot
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

sh: add common dram_init() function for all boards

Browse Source 
Generic board support assumes a different method of specifying
DRAM size on board, also it can be shared among all boards, notably
only sh7763rdp board has a custom legacy dram_init(), however
the difference is only in printing some additional information,
this feature can be removed.

Signed-off-by: Vladimir Zapolskiy <vz@mleia.com>
Reviewed-by: Simon Glass <sjg@chromium.org>
master
Vladimir Zapolskiy 8 years ago committed by Tom Rini
parent 18a40e8470
commit cdbb0cf8ec
23 changed files with 18 additions and 230 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 2
      arch/sh/lib/Makefile
  2. 17
      arch/sh/lib/board.c
  3. 11
      board/alphaproject/ap_sh4a_4a/ap_sh4a_4a.c
  4. 10
      board/espt/espt.c
  5. 10
      board/mpr2/mpr2.c
  6. 10
      board/ms7720se/ms7720se.c
  7. 10
      board/ms7722se/ms7722se.c
  8. 10
      board/ms7750se/ms7750se.c
  9. 10
      board/renesas/MigoR/migo_r.c
  10. 10
      board/renesas/ap325rxa/ap325rxa.c
  11. 10
      board/renesas/ecovec/ecovec.c
  12. 11
      board/renesas/r0p7734/r0p7734.c
  13. 10
      board/renesas/r2dplus/r2dplus.c
  14. 10
      board/renesas/r7780mp/r7780mp.c
  15. 10
      board/renesas/rsk7203/rsk7203.c
  16. 10
      board/renesas/rsk7264/rsk7264.c
  17. 10
      board/renesas/rsk7269/rsk7269.c
  18. 11
      board/renesas/sh7752evb/sh7752evb.c
  19. 11
      board/renesas/sh7753evb/sh7753evb.c
  20. 25
      board/renesas/sh7757lcr/sh7757lcr.c
  21. 10
      board/renesas/sh7763rdp/sh7763rdp.c
  22. 10
      board/renesas/sh7785lcr/sh7785lcr.c
  23. 10
      board/shmin/shmin.c

2
arch/sh/lib/Makefile
Unescape View File

@ -5,7 +5,7 @@
# SPDX-License-Identifier: GPL-2.0+
#
obj-y += board.o
obj-$(CONFIG_CMD_BOOTM) += bootm.o
ifeq ($(CONFIG_CPU_SH2),y)
obj-y += time_sh2.o

17
arch/sh/lib/board.c
Unescape View File

@ -0,0 +1,17 @@
/*
* Copyright (C) 2016 Vladimir Zapolskiy <vz@mleia.com>
*
* SPDX-License-Identifier: GPL-2.0+
*/
#include <common.h>
DECLARE_GLOBAL_DATA_PTR;
int dram_init(void)
{
gd->ram_size = get_ram_size((long *)CONFIG_SYS_SDRAM_BASE,
CONFIG_SYS_SDRAM_SIZE);
return 0;
}

11
board/alphaproject/ap_sh4a_4a/ap_sh4a_4a.c
Unescape View File

@ -11,8 +11,6 @@
#include <netdev.h>
#include <i2c.h>
DECLARE_GLOBAL_DATA_PTR;
#define MODEMR (0xFFCC0020)
#define MODEMR_MASK (0x6)
#define MODEMR_533MHZ (0x2)
@ -172,12 +170,3 @@ int board_late_init(void)
return 0;
}
int dram_init(void)
{
gd->bd->bi_memstart = CONFIG_SYS_SDRAM_BASE;
gd->bd->bi_memsize = CONFIG_SYS_SDRAM_SIZE;
printf("DRAM: %dMB\n", CONFIG_SYS_SDRAM_SIZE / (1024 * 1024));
return 0;
}

10
board/espt/espt.c
Unescape View File

@ -11,8 +11,6 @@
#include <asm/io.h>
#include <asm/processor.h>
DECLARE_GLOBAL_DATA_PTR;
int checkboard(void)
{
puts("BOARD: ESPT-GIGA\n");
@ -24,14 +22,6 @@ int board_init(void)
return 0;
}
int dram_init(void)
{
gd->bd->bi_memstart = CONFIG_SYS_SDRAM_BASE;
gd->bd->bi_memsize = CONFIG_SYS_SDRAM_SIZE;
printf("DRAM: %dMB\n", CONFIG_SYS_SDRAM_SIZE / (1024 * 1024));
return 0;
}
void led_set_state(unsigned short value)
{
}

10
board/mpr2/mpr2.c
Unescape View File

@ -11,8 +11,6 @@
#include <asm/io.h>
#include <asm/processor.h>
DECLARE_GLOBAL_DATA_PTR;
int checkboard(void)
{
puts("BOARD: MPR2\n");
@ -138,11 +136,3 @@ int board_init(void)
return 0;
}
int dram_init(void)
{
gd->bd->bi_memstart = CONFIG_SYS_SDRAM_BASE;
gd->bd->bi_memsize = CONFIG_SYS_SDRAM_SIZE;
printf("SDRAM: %dMB\n", CONFIG_SYS_SDRAM_SIZE / (1024 * 1024));
return 0;
}

10
board/ms7720se/ms7720se.c
Unescape View File

@ -17,8 +17,6 @@
#include <asm/io.h>
#include <asm/processor.h>
DECLARE_GLOBAL_DATA_PTR;
#define LED_BASE 0xB0800000
int checkboard(void)
@ -32,14 +30,6 @@ int board_init(void)
return 0;
}
int dram_init(void)
{
gd->bd->bi_memstart = CONFIG_SYS_SDRAM_BASE;
gd->bd->bi_memsize = CONFIG_SYS_SDRAM_SIZE;
printf("DRAM: %dMB\n", CONFIG_SYS_SDRAM_SIZE / (1024 * 1024));
return 0;
}
void led_set_state(unsigned short value)
{
outw(value & 0xFF, LED_BASE);

10
board/ms7722se/ms7722se.c
Unescape View File

@ -15,8 +15,6 @@
#include <asm/io.h>
#include <asm/processor.h>
DECLARE_GLOBAL_DATA_PTR;
#define LED_BASE 0xB0800000
int checkboard(void)
@ -33,14 +31,6 @@ int board_init(void)
return 0;
}
int dram_init(void)
{
gd->bd->bi_memstart = CONFIG_SYS_SDRAM_BASE;
gd->bd->bi_memsize = CONFIG_SYS_SDRAM_SIZE;
printf("DRAM: %dMB\n", CONFIG_SYS_SDRAM_SIZE / (1024 * 1024));
return 0;
}
void led_set_state(unsigned short value)
{
writew(value & 0xFF, LED_BASE);

10
board/ms7750se/ms7750se.c
Unescape View File

@ -8,8 +8,6 @@
#include <common.h>
#include <asm/processor.h>
DECLARE_GLOBAL_DATA_PTR;
int checkboard(void)
{
puts("BOARD: SH7750/SH7750S/SH7750R Solution Engine\n");
@ -21,14 +19,6 @@ int board_init(void)
return 0;
}
int dram_init (void)
{
gd->bd->bi_memstart = CONFIG_SYS_SDRAM_BASE;
gd->bd->bi_memsize = CONFIG_SYS_SDRAM_SIZE;
printf("DRAM: %dMB\n", CONFIG_SYS_SDRAM_SIZE / (1024 * 1024));
return 0;
}
int board_late_init(void)
{
return 0;

10
board/renesas/MigoR/migo_r.c
Unescape View File

@ -15,8 +15,6 @@
#include <asm/io.h>
#include <asm/processor.h>
DECLARE_GLOBAL_DATA_PTR;
int checkboard(void)
{
puts("BOARD: Renesas MigoR\n");
@ -28,14 +26,6 @@ int board_init(void)
return 0;
}
int dram_init (void)
{
gd->bd->bi_memstart = CONFIG_SYS_SDRAM_BASE;
gd->bd->bi_memsize = CONFIG_SYS_SDRAM_SIZE;
printf("DRAM: %dMB\n", CONFIG_SYS_SDRAM_SIZE / (1024 * 1024));
return 0;
}
void led_set_state (unsigned short value)
{
}

10
board/renesas/ap325rxa/ap325rxa.c
Unescape View File

@ -10,8 +10,6 @@
#include <asm/io.h>
#include <asm/processor.h>
DECLARE_GLOBAL_DATA_PTR;
/* PRI control register */
#define PRPRICR5 0xFF800048 /* LMB */
#define PRPRICR5_D 0x2a
@ -130,14 +128,6 @@ int board_init(void)
return 0;
}
int dram_init(void)
{
gd->bd->bi_memstart = CONFIG_SYS_SDRAM_BASE;
gd->bd->bi_memsize = CONFIG_SYS_SDRAM_SIZE;
printf("DRAM: %dMB\n", CONFIG_SYS_SDRAM_SIZE / (1024 * 1024));
return 0;
}
void led_set_state(unsigned short value)
{
}

10
board/renesas/ecovec/ecovec.c
Unescape View File

@ -22,16 +22,6 @@ int checkboard(void)
return 0;
}
int dram_init(void)
{
DECLARE_GLOBAL_DATA_PTR;
gd->bd->bi_memstart = CONFIG_SYS_SDRAM_BASE;
gd->bd->bi_memsize = CONFIG_SYS_SDRAM_SIZE;
printf("DRAM: %dMB\n", CONFIG_SYS_SDRAM_SIZE / (1024 * 1024));
return 0;
}
static void debug_led(u8 led)
{
/* PDGR[0-4] is debug LED */

11
board/renesas/r0p7734/r0p7734.c
Unescape View File

@ -11,8 +11,6 @@
#include <netdev.h>
#include <i2c.h>
DECLARE_GLOBAL_DATA_PTR;
#define MODEMR (0xFFCC0020)
#define MODEMR_MASK (0x6)
#define MODEMR_533MHZ (0x2)
@ -61,15 +59,6 @@ int board_late_init(void)
return 0;
}
int dram_init(void)
{
gd->bd->bi_memstart = CONFIG_SYS_SDRAM_BASE;
gd->bd->bi_memsize = CONFIG_SYS_SDRAM_SIZE;
printf("DRAM: %dMB\n", CONFIG_SYS_SDRAM_SIZE / (1024 * 1024));
return 0;
}
#ifdef CONFIG_SMC911X
int board_eth_init(bd_t *bis)
{

10
board/renesas/r2dplus/r2dplus.c
Unescape View File

@ -12,8 +12,6 @@
#include <asm/io.h>
#include <asm/pci.h>
DECLARE_GLOBAL_DATA_PTR;
int checkboard(void)
{
puts("BOARD: Renesas Solutions R2D Plus\n");
@ -25,14 +23,6 @@ int board_init(void)
return 0;
}
int dram_init(void)
{
gd->bd->bi_memstart = CONFIG_SYS_SDRAM_BASE;
gd->bd->bi_memsize = CONFIG_SYS_SDRAM_SIZE;
printf("DRAM: %dMB\n", CONFIG_SYS_SDRAM_SIZE / (1024 * 1024));
return 0;
}
int board_late_init(void)
{
return 0;

10
board/renesas/r7780mp/r7780mp.c
Unescape View File

@ -13,8 +13,6 @@
#include <netdev.h>
#include "r7780mp.h"
DECLARE_GLOBAL_DATA_PTR;
int checkboard(void)
{
#if defined(CONFIG_R7780MP)
@ -33,14 +31,6 @@ int board_init(void)
return 0;
}
int dram_init(void)
{
gd->bd->bi_memstart = CONFIG_SYS_SDRAM_BASE;
gd->bd->bi_memsize = CONFIG_SYS_SDRAM_SIZE;
printf("DRAM: %dMB\n", CONFIG_SYS_SDRAM_SIZE / (1024 * 1024));
return 0;
}
void led_set_state(unsigned short value)
{

10
board/renesas/rsk7203/rsk7203.c
Unescape View File

@ -13,8 +13,6 @@
#include <asm/io.h>
#include <asm/processor.h>
DECLARE_GLOBAL_DATA_PTR;
int checkboard(void)
{
puts("BOARD: Renesas Technology RSK7203\n");
@ -26,14 +24,6 @@ int board_init(void)
return 0;
}
int dram_init(void)
{
gd->bd->bi_memstart = CONFIG_SYS_SDRAM_BASE;
gd->bd->bi_memsize = CONFIG_SYS_SDRAM_SIZE;
printf("DRAM: %dMB\n", CONFIG_SYS_SDRAM_SIZE / (1024 * 1024));
return 0;
}
void led_set_state(unsigned short value)
{
}

10
board/renesas/rsk7264/rsk7264.c
Unescape View File

@ -14,8 +14,6 @@
#include <asm/io.h>
#include <asm/processor.h>
DECLARE_GLOBAL_DATA_PTR;
int checkboard(void)
{
puts("BOARD: Renesas Technology RSK7264\n");
@ -27,14 +25,6 @@ int board_init(void)
return 0;
}
int dram_init(void)
{
gd->bd->bi_memstart = CONFIG_SYS_SDRAM_BASE;
gd->bd->bi_memsize = CONFIG_SYS_SDRAM_SIZE;
printf("DRAM: %dMB\n", CONFIG_SYS_SDRAM_SIZE / (1024 * 1024));
return 0;
}
void led_set_state(unsigned short value)
{
}

10
board/renesas/rsk7269/rsk7269.c
Unescape View File

@ -15,8 +15,6 @@
#include <asm/io.h>
#include <asm/processor.h>
DECLARE_GLOBAL_DATA_PTR;
int checkboard(void)
{
puts("BOARD: Renesas RSK7269\n");
@ -28,14 +26,6 @@ int board_init(void)
return 0;
}
int dram_init(void)
{
gd->bd->bi_memstart = CONFIG_SYS_SDRAM_BASE;
gd->bd->bi_memsize = CONFIG_SYS_SDRAM_SIZE;
printf("DRAM: %dMB\n", CONFIG_SYS_SDRAM_SIZE / (1024 * 1024));
return 0;
}
void led_set_state(unsigned short value)
{
}

11
board/renesas/sh7752evb/sh7752evb.c
Unescape View File

@ -159,17 +159,6 @@ int board_init(void)
return 0;
}
int dram_init(void)
{
DECLARE_GLOBAL_DATA_PTR;
gd->bd->bi_memstart = CONFIG_SYS_SDRAM_BASE;
gd->bd->bi_memsize = CONFIG_SYS_SDRAM_SIZE;
printf("DRAM: %dMB\n", CONFIG_SYS_SDRAM_SIZE / (1024 * 1024));
return 0;
}
int board_mmc_init(bd_t *bis)
{
struct gpio_regs *gpio = GPIO_BASE;

11
board/renesas/sh7753evb/sh7753evb.c
Unescape View File

@ -175,17 +175,6 @@ int board_init(void)
return 0;
}
int dram_init(void)
{
DECLARE_GLOBAL_DATA_PTR;
gd->bd->bi_memstart = CONFIG_SYS_SDRAM_BASE;
gd->bd->bi_memsize = CONFIG_SYS_SDRAM_SIZE;
printf("DRAM: %dMB\n", CONFIG_SYS_SDRAM_SIZE / (1024 * 1024));
return 0;
}
int board_mmc_init(bd_t *bis)
{
struct gpio_regs *gpio = GPIO_BASE;

25
board/renesas/sh7757lcr/sh7757lcr.c
Unescape View File

@ -224,31 +224,6 @@ int board_init(void)
return 0;
}
int dram_init(void)
{
DECLARE_GLOBAL_DATA_PTR;
gd->bd->bi_memstart = CONFIG_SYS_SDRAM_BASE;
gd->bd->bi_memsize = CONFIG_SYS_SDRAM_SIZE;
printf("DRAM: %dMB\n", CONFIG_SYS_SDRAM_SIZE / (1024 * 1024));
printf(" Physical address\n");
printf(" 0x%08x - 0x%08x : Accessible Space as ECC Area\n",
SH7757LCR_SDRAM_PHYS_TOP,
SH7757LCR_SDRAM_PHYS_TOP + SH7757LCR_SDRAM_SIZE - 1);
printf(" 0x%08x - 0x%08x : No Access Area\n",
SH7757LCR_SDRAM_PHYS_TOP + SH7757LCR_SDRAM_SIZE,
SH7757LCR_SDRAM_PHYS_TOP + SH7757LCR_SDRAM_SIZE * 2 - 1);
printf(" 0x%08x - 0x%08x : Non-ECC Area for DVC/AVC\n",
SH7757LCR_SDRAM_PHYS_TOP + SH7757LCR_SDRAM_ECC_SETTING * 2,
SH7757LCR_SDRAM_PHYS_TOP + SH7757LCR_SDRAM_ECC_SETTING * 2 +
SH7757LCR_SDRAM_DVC_SIZE - 1);
printf(" 0x%08x - 0x%08x : Non-ECC Area for G200eR2\n",
SH7757LCR_SDRAM_PHYS_TOP + SH7757LCR_GRA_OFFSET,
SH7757LCR_SDRAM_PHYS_TOP + SH7757LCR_GRA_OFFSET + 0x00ffffff);
return 0;
}
int board_mmc_init(bd_t *bis)
{
return mmcif_mmc_init();

10
board/renesas/sh7763rdp/sh7763rdp.c
Unescape View File

@ -12,8 +12,6 @@
#include <asm/io.h>
#include <asm/processor.h>
DECLARE_GLOBAL_DATA_PTR;
#define CPU_CMDREG 0xB1000006
#define PDCR 0xffef0006
#define PECR 0xffef0008
@ -51,14 +49,6 @@ int board_init(void)
return 0;
}
int dram_init(void)
{
gd->bd->bi_memstart = CONFIG_SYS_SDRAM_BASE;
gd->bd->bi_memsize = CONFIG_SYS_SDRAM_SIZE;
printf("DRAM: %dMB\n", CONFIG_SYS_SDRAM_SIZE / (1024 * 1024));
return 0;
}
void led_set_state(unsigned short value)
{
}

10
board/renesas/sh7785lcr/sh7785lcr.c
Unescape View File

@ -10,8 +10,6 @@
#include <asm/pci.h>
#include <netdev.h>
DECLARE_GLOBAL_DATA_PTR;
int checkboard(void)
{
puts("BOARD: Renesas Technology Corp. R0P7785LC0011RL\n");
@ -23,14 +21,6 @@ int board_init(void)
return 0;
}
int dram_init(void)
{
gd->bd->bi_memstart = CONFIG_SYS_SDRAM_BASE;
gd->bd->bi_memsize = CONFIG_SYS_SDRAM_SIZE;
printf("DRAM: %dMB\n", CONFIG_SYS_SDRAM_SIZE / (1024 * 1024));
return 0;
}
static struct pci_controller hose;
void pci_init_board(void)
{

10
board/shmin/shmin.c
Unescape View File

@ -33,16 +33,6 @@ int board_init(void)
return 0;
}
int dram_init(void)
{
DECLARE_GLOBAL_DATA_PTR;
gd->bd->bi_memstart = CONFIG_SYS_SDRAM_BASE;
gd->bd->bi_memsize = CONFIG_SYS_SDRAM_SIZE;
printf("DRAM: %dMB\n", CONFIG_SYS_SDRAM_SIZE / (1024 * 1024));
return 0;
}
int board_eth_init(bd_t *bis)
{
return ne2k_register();

Write Preview
Loading…
Cancel
Save