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

Coding style cleanup

Browse Source 
Signed-off-by: Stefan Roese <sr@denx.de>
master
Stefan Roese 18 years ago
parent 157cda4d0c
commit 35d22f957a
11 changed files with 153 additions and 152 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
      MAKEALL
  2. 8
      Makefile
  3. 1
      board/netstal/common/nm_bsp.c
  4. 1
      board/netstal/hcu4/config.mk
  5. 80
      board/netstal/hcu4/hcu4.c
  6. 1
      board/netstal/hcu5/config.mk
  7. 177
      board/netstal/hcu5/hcu5.c
  8. 4
      board/netstal/hcu5/init.S
  9. 23
      board/netstal/hcu5/sdram.c
  10. 4
      include/configs/hcu4.h
  11. 4
      include/configs/hcu5.h

2
MAKEALL
Unescape View File

@ -91,7 +91,7 @@ LIST_4xx=" \
PPChameleonEVB sbc405 sc3 sequoia \
sequoia_nand taishan VOH405 VOM405 \
W7OLMC W7OLMG walnut WUH405 \
XPEDITE1K yellowstone yosemite yucca \
XPEDITE1K yellowstone yosemite yucca \
"
#########################################################################

8
Makefile
Unescape View File

@ -1040,7 +1040,7 @@ ADCIOP_config: unconfig
@$(MKCONFIG) $(@:_config=) ppc ppc4xx adciop esd
alpr_config: unconfig
@./mkconfig $(@:_config=) ppc ppc4xx alpr prodrive
@$(MKCONFIG) $(@:_config=) ppc ppc4xx alpr prodrive
AP1000_config:unconfig
@$(MKCONFIG) $(@:_config=) ppc ppc4xx ap1000 amirix
@ -1135,10 +1135,10 @@ G2000_config: unconfig
@$(MKCONFIG) $(@:_config=) ppc ppc4xx g2000
hcu4_config: unconfig
@./mkconfig $(@:_config=) ppc ppc4xx hcu4 netstal
@$(MKCONFIG) $(@:_config=) ppc ppc4xx hcu4 netstal
hcu5_config: unconfig
@./mkconfig $(@:_config=) ppc ppc4xx hcu5 netstal
@$(MKCONFIG) $(@:_config=) ppc ppc4xx hcu5 netstal
HH405_config: unconfig
@$(MKCONFIG) $(@:_config=) ppc ppc4xx hh405 esd
@ -1258,7 +1258,7 @@ rainier_nand_config: unconfig
@echo "CONFIG_NAND_U_BOOT = y" >> $(obj)include/config.mk
sc3_config:unconfig
@./mkconfig $(@:_config=) ppc ppc4xx sc3
@$(MKCONFIG) $(@:_config=) ppc ppc4xx sc3
taishan_config: unconfig
@$(MKCONFIG) $(@:_config=) ppc ppc4xx taishan amcc

1
board/netstal/common/nm_bsp.c
Unescape View File

@ -39,4 +39,3 @@ U_BOOT_CMD(
"Help for Netstal Maschinen BSP specific command.\n"
);
#endif

1
board/netstal/hcu4/config.mk
Unescape View File

@ -26,4 +26,3 @@ TEXT_BASE = 0xFFFa0000
ifeq ($(debug),1)
PLATFORM_CPPFLAGS += -DDEBUG -g
endif

80
board/netstal/hcu4/hcu4.c
Unescape View File

@ -27,10 +27,30 @@
DECLARE_GLOBAL_DATA_PTR;
#define HCU_MACH_VERSIONS_REGISTER (0x7C000000 + 0xF00000)
#define mtsdram(reg, data) { mtdcr(memcfga,reg);mtdcr(memcfgd,data); }
#define mfsdram(value, reg) { mtdcr(memcfga,reg); value = mfdcr(memcfgd); }
#define SDRAM_LEN 32*1024*1024 /* 32 MB -RAM */
#define DO_UGLY_SDRAM_WORKAROUND
enum {
/* HW_GENERATION_HCU wird nicht mehr unterstuetzt */
HW_GENERATION_HCU2 = 0x10,
HW_GENERATION_HCU3 = 0x10,
HW_GENERATION_HCU4 = 0x20,
HW_GENERATION_MCU = 0x08,
HW_GENERATION_MCU20 = 0x0a,
HW_GENERATION_MCU25 = 0x09,
};
void sysLedSet(u32 value);
long int spd_sdram(int(read_spd)(uint addr))
long int spd_sdram(int(read_spd)(uint addr));
#ifdef CONFIG_SPD_EEPROM
#define DEBUG
#define DEBUG
#endif
#if defined(DEBUG)
@ -86,26 +106,15 @@ int board_pre_init (void)
{
return board_early_init_f ();
}
#endif
enum {
/* HW_GENERATION_HCU wird nicht mehr unterstuetzt */
HW_GENERATION_HCU2 = 0x10,
HW_GENERATION_HCU3 = 0x10,
HW_GENERATION_HCU4 = 0x20,
HW_GENERATION_MCU = 0x08,
HW_GENERATION_MCU20 = 0x0a,
HW_GENERATION_MCU25 = 0x09,
};
int checkboard (void)
{
#define HCU_MACH_VERSIONS_REGISTER ( 0x7C000000 + 0xF00000 )
unsigned j;
uint16_t *boardVersReg = (uint16_t *) HCU_MACH_VERSIONS_REGISTER;
uint16_t generation = *boardVersReg & 0xf0;
uint16_t index = *boardVersReg & 0x0f;
unsigned int j;
u16 *boardVersReg = (u16 *) HCU_MACH_VERSIONS_REGISTER;
u16 generation = *boardVersReg & 0xf0;
u16 index = *boardVersReg & 0x0f;
/* Force /RTS to active. The board it not wired quite
correctly to use cts/rtc flow control, so just force the
/RST active and forget about it. */
@ -117,24 +126,26 @@ int checkboard (void)
printf ("HCU4: index %d\n\n", index);
/* GPIO here noch nicht richtig initialisert !!! */
sysLedSet(0);
for (j=0; j < 7;j++) {
for (j = 0; j < 7; j++) {
sysLedSet(1 << j);
udelay(50*1000);
udelay(50 * 1000);
}
return 0;
}
u32 sysLedGet(void)
{
return( ~( (*(u32 *)GPIO0_OR)) >> 23) & 0xff;
return (~((*(u32 *)GPIO0_OR)) >> 23) & 0xff;
}
void sysLedSet(u32 value /* value to place in LEDs */)
{
u32 tmp = ~value;
u32 *ledReg;
tmp = (tmp << 23) | 0x7FFFFF;
ledReg = (u32 *)GPIO0_OR;
tmp = (tmp << 23) | 0x7FFFFF;
ledReg = (u32 *)GPIO0_OR;
*ledReg = tmp;
}
@ -147,13 +158,11 @@ void sdram_init(void)
return;
}
#define mtsdram(reg, data) { mtdcr(memcfga,reg);mtdcr(memcfgd,data); }
#define mfsdram(value, reg) { mtdcr(memcfga,reg); value = mfdcr(memcfgd); }
#if defined(DEBUG)
void show_sdram_registers(void)
{
u32 value;
printf ("SDRAM Controller Registers --\n");
mfsdram(value, mem_mcopt1);
printf (" SDRAM0_CFG : 0x%08x\n", value);
@ -170,8 +179,6 @@ void show_sdram_registers(void)
}
#endif
#define SDRAM_LEN 32*1024*1024 /* 32 MB -RAM */
/*
* this is even after checkboard. It returns the size of the SDRAM
* that we have installed. This function is called by board_init_f
@ -244,9 +251,10 @@ long int fixed_hcu4_sdram (int board_type)
static u32 getSerialNr(void)
{
u32 *serial = (u32 *)CFG_FLASH_BASE;
if (*serial == 0xffffffff) {
if (*serial == 0xffffffff)
return get_ticks();
}
return *serial;
}
@ -260,12 +268,14 @@ int misc_init_r(void)
char *s = getenv("ethaddr");
char *e;
int i;
u32 serial = getSerialNr();
u32 serial = getSerialNr();
for (i = 0; i < 6; ++i) {
gd->bd->bi_enetaddr[i] = s ? simple_strtoul (s, &e, 16) : 0;
if (s)
s = (*e) ? e + 1 : e;
}
if (gd->bd->bi_enetaddr[3] == 0 &&
gd->bd->bi_enetaddr[4] == 0 &&
gd->bd->bi_enetaddr[5] == 0) {
@ -288,13 +298,14 @@ int misc_init_r(void)
return 0;
}
#define DO_UGLY_SDRAM_WORKAROUND
#ifdef DO_UGLY_SDRAM_WORKAROUND
#include "i2c.h"
#include "i2c.h"
void set_spd_default_value(unsigned int spd_addr,uchar def_val)
{
uchar value;
int res = i2c_read(SPD_EEPROM_ADDRESS, spd_addr, 1, &value, 1) ;
if (res == 0 && value == 0xff) {
res = i2c_write(SPD_EEPROM_ADDRESS,
spd_addr, 1, &def_val, 1) ;
@ -387,7 +398,6 @@ long int initdram(int board_type)
bcu4_testdram(dram_size);
printf("%s %d MB of SDRAM\n", __FUNCTION__, dram_size/(1024*1024));
#endif
return dram_size;
}

1
board/netstal/hcu5/config.mk
Unescape View File

@ -28,4 +28,3 @@ PLATFORM_CPPFLAGS += -DCONFIG_440=1
ifeq ($(debug),1)
PLATFORM_CPPFLAGS += -DDEBUG -g
endif

177
board/netstal/hcu5/hcu5.c
Unescape View File

@ -29,12 +29,34 @@ void sysLedSet(u32 value);
extern flash_info_t flash_info[CFG_MAX_FLASH_BANKS];
#define mtcpr0(reg, data) do { mtdcr(CPR0_CFGADDR,reg); \
mtdcr(CPR0_CFGDATA,data); } while (0)
#define mfcpr0(reg, data) do { mtdcr(CPR0_CFGADDR,reg); \
data = mfdcr(CPR0_CFGDATA); } while (0)
#undef BOOTSTRAP_OPTION_A_ACTIVE
#define SDR0_CP440 0x0180
#define SYSTEM_RESET 0x30000000
#define CHIP_RESET 0x20000000
#define SDR0_ECID0 0x0080
#define SDR0_ECID1 0x0081
#define SDR0_ECID2 0x0082
#define SDR0_ECID3 0x0083
#define SYS_IO_ADDRESS 0xcce00000
#define DEFAULT_ETH_ADDR "ethaddr"
/* ethaddr for first or etha1ddr for second ethernet */
enum {
/* HW_GENERATION_HCU1 is no longer supported */
HW_GENERATION_HCU2 = 0x10,
HW_GENERATION_HCU3 = 0x10,
HW_GENERATION_HCU4 = 0x20,
HW_GENERATION_HCU5 = 0x30,
HW_GENERATION_MCU = 0x08,
HW_GENERATION_MCU20 = 0x0a,
HW_GENERATION_MCU25 = 0x09,
};
#define SDR0_CP440 0x0180
/*
* This function is run very early, out of flash, and before devices are
@ -50,7 +72,6 @@ int board_early_init_f(void)
{
u32 reg;
#undef BOOTSTRAP_OPTION_A_ACTIVE
#ifdef BOOTSTRAP_OPTION_A_ACTIVE
/* Booting with Bootstrap Option A
* First boot, with CPR0_ICFG_RLI_MASK == 0
@ -64,27 +85,26 @@ int board_early_init_f(void)
u32 cpr0icfg;
u32 dbcr;
mfcpr0(CPR0_ICFG, cpr0icfg);
if ( ! (cpr0icfg & CPR0_ICFG_RLI_MASK ) ) {
mtcpr0(CPR0_MALD, 0x02000000);
mtcpr0(CPR0_OPBD, 0x02000000);
mtcpr0(CPR0_PERD, 0x05000000); /* 1:5 */
mtcpr0(CPR0_PLLC, 0x40000238);
mtcpr0(CPR0_PLLD, 0x01010414);
mtcpr0(CPR0_PRIMAD, 0x01000000);
mtcpr0(CPR0_PRIMBD, 0x01000000);
mtcpr0(CPR0_SPCID, 0x03000000);
mtsdr(SDR0_PFC0, 0x00003E00); /* [CTE] = 0 */
mtsdr(SDR0_CP440, 0x0EAAEA02); /* [Nto1] = 1*/
mtcpr0(CPR0_ICFG, cpr0icfg | CPR0_ICFG_RLI_MASK);
mfcpr(CPR0_ICFG, cpr0icfg);
if (!(cpr0icfg & CPR0_ICFG_RLI_MASK)) {
mtcpr(CPR0_MALD, 0x02000000);
mtcpr(CPR0_OPBD, 0x02000000);
mtcpr(CPR0_PERD, 0x05000000); /* 1:5 */
mtcpr(CPR0_PLLC, 0x40000238);
mtcpr(CPR0_PLLD, 0x01010414);
mtcpr(CPR0_PRIMAD, 0x01000000);
mtcpr(CPR0_PRIMBD, 0x01000000);
mtcpr(CPR0_SPCID, 0x03000000);
mtsdr(SDR0_PFC0, 0x00003E00); /* [CTE] = 0 */
mtsdr(SDR0_CP440, 0x0EAAEA02); /* [Nto1] = 1*/
mtcpr(CPR0_ICFG, cpr0icfg | CPR0_ICFG_RLI_MASK);
/*
* Initiate system reset in debug control register DBCR
*/
dbcr = mfspr(dbcr0);
#define SYSTEM_RESET 0x30000000
#define CHIP_RESET 0x20000000
mtspr(dbcr0, dbcr | CHIP_RESET );
mtspr(dbcr0, dbcr | CHIP_RESET);
}
mtsdr(SDR0_CP440, 0x0EAAEA02); /* [Nto1] = 1*/
#endif
@ -162,60 +182,42 @@ int board_early_init_f(void)
return 0;
}
#ifdef CONFIG_BOARD_PRE_INIT
int board_pre_init (void)
int board_pre_init(void)
{
return board_early_init_f ();
return board_early_init_f();
}
#endif
enum {
/* HW_GENERATION_HCU1 is no longer supported */
HW_GENERATION_HCU2 = 0x10,
HW_GENERATION_HCU3 = 0x10,
HW_GENERATION_HCU4 = 0x20,
HW_GENERATION_HCU5 = 0x30,
HW_GENERATION_MCU = 0x08,
HW_GENERATION_MCU20 = 0x0a,
HW_GENERATION_MCU25 = 0x09,
};
int checkboard (void)
int checkboard(void)
{
#define SDR0_ECID0 0x0080
#define SDR0_ECID1 0x0081
#define SDR0_ECID2 0x0082
#define SDR0_ECID3 0x0083
unsigned j;
uint16_t *hwVersReg = (uint16_t *) HCU_HW_VERSION_REGISTER;
uint16_t *boardVersReg = (uint16_t *) HCU_CPLD_VERSION_REGISTER;
uint16_t generation = *boardVersReg & 0xf0;
uint16_t index = *boardVersReg & 0x0f;
ulong ecid0, ecid1, ecid2, ecid3;
printf ("Netstal Maschinen AG: ");
unsigned int j;
u16 *hwVersReg = (u16 *) HCU_HW_VERSION_REGISTER;
u16 *boardVersReg = (u16 *) HCU_CPLD_VERSION_REGISTER;
u16 generation = *boardVersReg & 0xf0;
u16 index = *boardVersReg & 0x0f;
u32 ecid0, ecid1, ecid2, ecid3;
printf("Netstal Maschinen AG: ");
if (generation == HW_GENERATION_HCU3)
printf ("HCU3: index %d", index);
printf("HCU3: index %d", index);
else if (generation == HW_GENERATION_HCU4)
printf ("HCU4: index %d", index);
printf("HCU4: index %d", index);
else if (generation == HW_GENERATION_HCU5)
printf ("HCU5: index %d", index);
printf (" HW 0x%02x\n", *hwVersReg & 0xff);
printf("HCU5: index %d", index);
printf(" HW 0x%02x\n", *hwVersReg & 0xff);
mfsdr(SDR0_ECID0, ecid0);
mfsdr(SDR0_ECID1, ecid1);
mfsdr(SDR0_ECID2, ecid2);
mfsdr(SDR0_ECID3, ecid3);
printf("Chip ID 0x%x 0x%x 0x%x 0x%x\n", ecid0, ecid1, ecid2, ecid3);
for (j=0; j < 6;j++) {
printf("Chip ID 0x%x 0x%x 0x%x 0x%x\n", ecid0, ecid1, ecid2, ecid3);
for (j = 0;j < 6; j++) {
sysLedSet(1 << j);
udelay(200*1000);
udelay(200 * 1000);
}
return 0;
}
#define SYS_IO_ADDRESS 0xcce00000
u32 sysLedGet(void)
{
return in16(SYS_IO_ADDRESS) & 0x3f;
@ -232,9 +234,10 @@ void sysLedSet(u32 value /* value to place in LEDs */)
static u32 getSerialNr(void)
{
u32 *serial = (u32 *)CFG_FLASH_BASE;
if (*serial == 0xffffffff) {
if (*serial == 0xffffffff)
return get_ticks();
}
return *serial;
}
@ -242,45 +245,44 @@ static u32 getSerialNr(void)
/*---------------------------------------------------------------------------+
* misc_init_r.
*---------------------------------------------------------------------------*/
#define DEFAULT_ETH_ADDR "ethaddr"
/* ethaddr for first or etha1ddr for second ethernet */
int misc_init_r(void)
{
char *s = getenv(DEFAULT_ETH_ADDR);
char *e;
int i;
u32 serial = getSerialNr();
u32 serial = getSerialNr();
unsigned long usb2d0cr = 0;
unsigned long usb2phy0cr, usb2h0cr = 0;
unsigned long sdr0_pfc1;
for (i = 0; i < 6; ++i) {
gd->bd->bi_enetaddr[i] = s ? simple_strtoul (s, &e, 16) : 0;
gd->bd->bi_enetaddr[i] = s ? simple_strtoul(s, &e, 16) : 0;
if (s)
s = (*e) ? e + 1 : e;
}
if (gd->bd->bi_enetaddr[3] == 0 &&
gd->bd->bi_enetaddr[4] == 0 &&
gd->bd->bi_enetaddr[5] == 0) {
char ethaddr[22];
/* Must be in sync with CONFIG_ETHADDR */
gd->bd->bi_enetaddr[0] = 0x00;
gd->bd->bi_enetaddr[1] = 0x60;
gd->bd->bi_enetaddr[2] = 0x13;
gd->bd->bi_enetaddr[3] = (serial >> 16) & 0xff;
gd->bd->bi_enetaddr[4] = (serial >> 8) & 0xff;
gd->bd->bi_enetaddr[3] = (serial >> 16) & 0xff;
gd->bd->bi_enetaddr[4] = (serial >> 8) & 0xff;
/* byte[5].bit 0 must be zero */
gd->bd->bi_enetaddr[5] = (serial >> 0) & 0xfe;
sprintf (ethaddr, "%02X:%02X:%02X:%02X:%02X:%02X\0",
gd->bd->bi_enetaddr[0], gd->bd->bi_enetaddr[1],
gd->bd->bi_enetaddr[2], gd->bd->bi_enetaddr[3],
gd->bd->bi_enetaddr[4], gd->bd->bi_enetaddr[5]) ;
gd->bd->bi_enetaddr[5] = (serial >> 0) & 0xfe;
sprintf(ethaddr, "%02X:%02X:%02X:%02X:%02X:%02X\0",
gd->bd->bi_enetaddr[0], gd->bd->bi_enetaddr[1],
gd->bd->bi_enetaddr[2], gd->bd->bi_enetaddr[3],
gd->bd->bi_enetaddr[4], gd->bd->bi_enetaddr[5]) ;
printf("%s: Setting eth %s serial 0x%x\n", __FUNCTION__,
ethaddr, serial);
setenv (DEFAULT_ETH_ADDR, ethaddr);
setenv(DEFAULT_ETH_ADDR, ethaddr);
}
#ifdef CFG_ENV_IS_IN_FLASH
/* Monitor protection ON by default */
(void)flash_protect(FLAG_PROTECT_SET,
@ -334,9 +336,9 @@ int misc_init_r(void)
mtsdr(SDR0_USB2H0CR, usb2h0cr);
/*clear resets*/
udelay (1000);
udelay(1000);
mtsdr(SDR0_SRST1, 0x00000000);
udelay (1000);
udelay(1000);
mtsdr(SDR0_SRST0, 0x00000000);
printf("USB: Host(int phy) Device(ext phy)\n");
@ -356,7 +358,7 @@ int misc_init_r(void)
* certain pre-initialization actions.
*
************************************************************************/
#if defined(CONFIG_PCI) && defined(CFG_PCI_PRE_INIT)
#if defined(CONFIG_PCI)
int pci_pre_init(struct pci_controller *hose)
{
unsigned long addr;
@ -374,7 +376,7 @@ int pci_pre_init(struct pci_controller *hose)
mfsdr(sdr_amp1, addr);
mtsdr(sdr_amp1, (addr & 0x000000FF) | 0x0000FF00);
addr = mfdcr(plb3_acr);
// mtdcr(plb3_acr, addr & ~plb1_acr_wrp_mask); /* ngngng */
/* mtdcr(plb3_acr, addr & ~plb1_acr_wrp_mask); */ /* ngngng */
mtdcr(plb3_acr, addr | 0x80000000); /* Sequoia */
/*-------------------------------------------------------------------+
@ -383,7 +385,7 @@ int pci_pre_init(struct pci_controller *hose)
mfsdr(sdr_amp0, addr);
mtsdr(sdr_amp0, (addr & 0x000000FF) | 0x0000FF00);
addr = mfdcr(plb4_acr) | 0xa0000000; /* Was 0x8---- */
// mtdcr(plb4_acr, addr & ~plb1_acr_wrp_mask); /* ngngng */
/* mtdcr(plb4_acr, addr & ~plb1_acr_wrp_mask); */ /* ngngng */
mtdcr(plb4_acr, addr); /* Sequoia */
/*-------------------------------------------------------------------+
@ -393,24 +395,23 @@ int pci_pre_init(struct pci_controller *hose)
addr = (mfdcr(plb0_acr) & ~plb0_acr_ppm_mask) | plb0_acr_ppm_fair;
addr = (addr & ~plb0_acr_hbu_mask) | plb0_acr_hbu_enabled;
addr = (addr & ~plb0_acr_rdp_mask) | plb0_acr_rdp_4deep;
// addr = (addr & ~plb0_acr_wrp_mask) ; /* ngngng */
/* addr = (addr & ~plb0_acr_wrp_mask); */ /* ngngng */
addr = (addr & ~plb0_acr_wrp_mask) | plb0_acr_wrp_2deep; /* Sequoia */
// mtdcr(plb0_acr, addr); /* Sequoia */
mtdcr(plb0_acr, 0); // PATCH HAB: WRITE PIPELINING OFF
/* mtdcr(plb0_acr, addr); */ /* Sequoia */
mtdcr(plb0_acr, 0); /* PATCH HAB: WRITE PIPELINING OFF */
/* Segment1 */
addr = (mfdcr(plb1_acr) & ~plb1_acr_ppm_mask) | plb1_acr_ppm_fair;
addr = (addr & ~plb1_acr_hbu_mask) | plb1_acr_hbu_enabled;
addr = (addr & ~plb1_acr_rdp_mask) | plb1_acr_rdp_4deep;
addr = (addr & ~plb1_acr_wrp_mask) ;
// mtdcr(plb1_acr, addr); /* Sequoia */
mtdcr(plb1_acr, 0); // PATCH HAB: WRITE PIPELINING OFF
/* mtdcr(plb1_acr, addr); */ /* Sequoia */
mtdcr(plb1_acr, 0); /* PATCH HAB: WRITE PIPELINING OFF */
return 1;
}
#endif /* defined(CONFIG_PCI) && defined(CFG_PCI_PRE_INIT) */
#endif /* defined(CONFIG_PCI) */
/*************************************************************************
* pci_target_init
@ -476,7 +477,6 @@ void pci_target_init(struct pci_controller *hose)
pci_write_config_word(0, PCI_ERREN, 0);
pci_write_config_dword(0, PCI_BRDGOPT2, 0x00000101);
}
#endif /* defined(CONFIG_PCI) && defined(CFG_PCI_TARGET_INIT) */
@ -523,4 +523,3 @@ int is_pci_host(struct pci_controller *hose)
return 1;
}
#endif /* defined(CONFIG_PCI) */

4
board/netstal/hcu5/init.S
Unescape View File

@ -55,7 +55,7 @@ tlbtab:
tlbentry( CFG_PCI_MEMBASE3, SZ_256M, CFG_PCI_MEMBASE3, 1, AC_R|AC_W|SA_G|SA_I )
/* TLB-entry for EBC (CFG_CPLD) */
// tlbentry( CFG_CPLD, SZ_1K, CFG_CPLD, 1, AC_R|AC_W|AC_X|SA_G|SA_I )
/* tlbentry( CFG_CPLD, SZ_1K, CFG_CPLD, 1, AC_R|AC_W|AC_X|SA_G|SA_I ) */
/* CAN */
tlbentry( CFG_CS_1, SZ_16M, CFG_CS_1, 1, AC_R|AC_W|AC_X|SA_G|SA_I )
/* IMC + CPLD */
@ -77,5 +77,3 @@ tlbtab:
/* TLB for SDRAM will be added by initdram (sdram.c) */
tlbtab_end

23
board/netstal/hcu5/sdram.c
Unescape View File

@ -216,8 +216,9 @@ long int initdram (int board_type)
{
#define HCU_HW_SDRAM_CONFIG_MASK 0x7
#define INVALID_HW_CONFIG "Invalid HW-Config"
uint16_t *hwVersReg = (uint16_t *) HCU_HW_VERSION_REGISTER;
unsigned int dram_size=0;
u16 *hwVersReg = (u16 *) HCU_HW_VERSION_REGISTER;
unsigned int dram_size = 0;
mtsdram(DDR0_02, 0x00000000);
/* Values must be kept in sync with Excel-table <<A0001492.>> ! */
@ -229,15 +230,15 @@ long int initdram (int board_type)
switch (*hwVersReg & HCU_HW_SDRAM_CONFIG_MASK) {
case 0:
dram_size = 128 * 1024 * 1024 ;
mtsdram(DDR0_06, 0x0102C80D); // 128MB RAM
mtsdram(DDR0_11, 0x000FC800); // 128MB RAM
mtsdram(DDR0_43, 0x030A0300); // 128MB RAM
mtsdram(DDR0_06, 0x0102C80D); /* 128MB RAM */
mtsdram(DDR0_11, 0x000FC800); /* 128MB RAM */
mtsdram(DDR0_43, 0x030A0300); /* 128MB RAM */
break;
case 1:
dram_size = 256 * 1024 * 1024 ;
mtsdram(DDR0_06, 0x0102C812); // 256MB RAM
mtsdram(DDR0_11, 0x0014C800); // 256MB RAM
mtsdram(DDR0_43, 0x030A0200); // 256MB RAM
mtsdram(DDR0_06, 0x0102C812); /* 256MB RAM */
mtsdram(DDR0_11, 0x0014C800); /* 256MB RAM */
mtsdram(DDR0_43, 0x030A0200); /* 256MB RAM */
break;
default:
sdram_panic(INVALID_HW_CONFIG);
@ -245,8 +246,10 @@ long int initdram (int board_type)
}
dram_size -= 16 * 1024 * 1024;
mtsdram(DDR0_07, 0x00090100);
// TCPD=200 cycles of clock input is required to lock the DLL.
// CKE must be HIGH the entire time.mtsdram(DDR0_08, 0x02C80001);
/*
* TCPD=200 cycles of clock input is required to lock the DLL.
* CKE must be HIGH the entire time.mtsdram(DDR0_08, 0x02C80001);
*/
mtsdram(DDR0_08, 0x02C80001);
mtsdram(DDR0_09, 0x00011D5F);
mtsdram(DDR0_10, 0x00000100);

4
include/configs/hcu4.h
Unescape View File

@ -312,8 +312,6 @@
#define CONFIG_PORT_ADDR 0xF0000500
/*-----------------------------------------------------------------------
* Cache Configuration
*----------------------------------------------------------------------*/
@ -333,7 +331,7 @@
#define CFG_HUSH_PARSER /* use "hush" command parser */
#ifdef CFG_HUSH_PARSER
#define CFG_PROMPT_HUSH_PS2 "> "
#define CFG_PROMPT_HUSH_PS2 "> "
#endif
#if (CONFIG_COMMANDS & CFG_CMD_KGDB)

4
include/configs/hcu5.h
Unescape View File

@ -236,8 +236,6 @@
#define CONFIG_DOS_PARTITION
#define CONFIG_ISO_PARTITION
// CFG_CMD_FLASH |
#define CONFIG_COMMANDS (CONFIG_CMD_DFL | \
CFG_CMD_ASKENV | \
CFG_CMD_BSP | \
@ -301,7 +299,6 @@
#define CFG_PCI_TARGBASE 0x80000000 /* PCIaddr mapped to CFG_PCI_MEMBASE*/
/* Board-specific PCI */
#define CFG_PCI_PRE_INIT /* enable board pci_pre_init() */
#define CFG_PCI_TARGET_INIT
#define CFG_PCI_MASTER_INIT
@ -389,4 +386,3 @@
#define CONFIG_KGDB_SER_INDEX 2 /* which serial port to use */
#endif
#endif /* __CONFIG_H */

Write Preview
Loading…
Cancel
Save