diff options
author | wdenk <wdenk> | 2004-03-14 22:25:36 +0000 |
---|---|---|
committer | wdenk <wdenk> | 2004-03-14 22:25:36 +0000 |
commit | 42dfe7a1844cbad7114038aaf03828acb7a84414 (patch) | |
tree | d33893d34d2a97aa23257703733dbc9d86d48278 /board | |
parent | 855a496fe9ba431772f1ff1aef21a5c001288bb0 (diff) | |
download | u-boot-42dfe7a1844cbad7114038aaf03828acb7a84414.zip u-boot-42dfe7a1844cbad7114038aaf03828acb7a84414.tar.gz u-boot-42dfe7a1844cbad7114038aaf03828acb7a84414.tar.bz2 |
Code cleanup; make several boards compile & link.LABEL_2004_03_14_2340
Diffstat (limited to 'board')
-rw-r--r-- | board/cogent/mb.c | 2 | ||||
-rw-r--r-- | board/csb272/csb272.c | 1 | ||||
-rw-r--r-- | board/dave/B2/flash.c | 3 | ||||
-rw-r--r-- | board/dave/B2/u-boot.lds | 4 | ||||
-rw-r--r-- | board/emk/common/flash.c | 2 | ||||
-rw-r--r-- | board/emk/top5200/top5200.c | 2 | ||||
-rw-r--r-- | board/gcplus/flash.c | 2 | ||||
-rw-r--r-- | board/icecube/icecube.c | 2 | ||||
-rw-r--r-- | board/integratorap/config.mk | 2 | ||||
-rw-r--r-- | board/integratorap/integratorap.c | 468 | ||||
-rw-r--r-- | board/integratorap/u-boot.lds | 4 | ||||
-rw-r--r-- | board/integratorcp/config.mk | 2 | ||||
-rw-r--r-- | board/integratorcp/integratorcp.c | 1 | ||||
-rw-r--r-- | board/integratorcp/u-boot.lds | 4 | ||||
-rw-r--r-- | board/mpl/common/common_util.c | 2 | ||||
-rw-r--r-- | board/ocotea/ocotea.c | 1 | ||||
-rw-r--r-- | board/siemens/CCM/ccm.c | 8 | ||||
-rw-r--r-- | board/siemens/pcu_e/pcu_e.c | 10 | ||||
-rw-r--r-- | board/ssv/common/cmd_sled.c | 32 | ||||
-rw-r--r-- | board/trab/trab_fkt.c | 4 | ||||
-rw-r--r-- | board/versatile/config.mk | 2 | ||||
-rw-r--r-- | board/versatile/u-boot.lds | 4 | ||||
-rw-r--r-- | board/versatile/versatile.c | 1 |
23 files changed, 289 insertions, 274 deletions
diff --git a/board/cogent/mb.c b/board/cogent/mb.c index e84c7dd..917132b 100644 --- a/board/cogent/mb.c +++ b/board/cogent/mb.c @@ -235,7 +235,7 @@ int misc_init_f (void) long int initdram (int board_type) { -#if CONFIG_CMA111 +#ifdef CONFIG_CMA111 return (32L * 1024L * 1024L); #else unsigned char dipsw_val; diff --git a/board/csb272/csb272.c b/board/csb272/csb272.c index 120cde7..fecd7e8 100644 --- a/board/csb272/csb272.c +++ b/board/csb272/csb272.c @@ -171,4 +171,3 @@ int last_stage_init(void) return 0; /* success */ } - diff --git a/board/dave/B2/flash.c b/board/dave/B2/flash.c index 50aa6aa..ad67e86 100644 --- a/board/dave/B2/flash.c +++ b/board/dave/B2/flash.c @@ -45,9 +45,6 @@ unsigned long flash_init (void) #else unsigned long size_b0; int i; - uint pbcr; - unsigned long base_b0; - int size_val = 0; /* Init: no FLASHes known */ for (i=0; i<CFG_MAX_FLASH_BANKS; ++i) { diff --git a/board/dave/B2/u-boot.lds b/board/dave/B2/u-boot.lds index d3b6a77..f1bbd5d 100644 --- a/board/dave/B2/u-boot.lds +++ b/board/dave/B2/u-boot.lds @@ -51,7 +51,7 @@ SECTIONS armboot_end_data = .; . = ALIGN(4); + __bss_start = .; .bss : { *(.bss) } - - armboot_end = .; + _end = .; } diff --git a/board/emk/common/flash.c b/board/emk/common/flash.c index 966bb5c..28fe29d 100644 --- a/board/emk/common/flash.c +++ b/board/emk/common/flash.c @@ -353,7 +353,7 @@ ulong flash_get_size (FPWV *addr, flash_info_t *info) } break; } - + /* fall thru to here ! */ default: printf ("unknown AMD device=%x %x %x", diff --git a/board/emk/top5200/top5200.c b/board/emk/top5200/top5200.c index 94ba2b4..63a4ee4 100644 --- a/board/emk/top5200/top5200.c +++ b/board/emk/top5200/top5200.c @@ -57,7 +57,7 @@ long int initdram (int board_type) *(vu_long *)MPC5XXX_SDRAM_CTRL = CFG_DRAM_CONTROL | MODE_EN; /* precharge all banks */ *(vu_long *)MPC5XXX_SDRAM_CTRL = CFG_DRAM_CONTROL | MODE_EN | SOFT_PRE; -#if CFG_DRAM_DDR +#ifdef CFG_DRAM_DDR /* set extended mode register */ *(vu_short *)MPC5XXX_SDRAM_MODE = CFG_DRAM_EMODE; #endif diff --git a/board/gcplus/flash.c b/board/gcplus/flash.c index 5455656..36d7363 100644 --- a/board/gcplus/flash.c +++ b/board/gcplus/flash.c @@ -404,7 +404,7 @@ write_data(flash_info_t * info, ulong dest, FPW data) /* Check if Flash is (sufficiently) erased */ if ((*addr & data) != data) { - printf("not erased at %08lx (%x)\n", (ulong) addr, *addr); + printf("not erased at %08lX (%lX)\n", (ulong) addr, *addr); return (2); } /* Disable interrupts which might cause a timeout here */ diff --git a/board/icecube/icecube.c b/board/icecube/icecube.c index d2fda90..e40bcdf 100644 --- a/board/icecube/icecube.c +++ b/board/icecube/icecube.c @@ -215,7 +215,7 @@ void pci_init_board(void) void init_ide_reset (void) { debug ("init_ide_reset\n"); - + /* Configure PSC1_4 as GPIO output for ATA reset */ *(vu_long *) MPC5XXX_WU_GPIO_ENABLE |= GPIO_PSC1_4; *(vu_long *) MPC5XXX_WU_GPIO_DIR |= GPIO_PSC1_4; diff --git a/board/integratorap/config.mk b/board/integratorap/config.mk index df67491..25b79b3 100644 --- a/board/integratorap/config.mk +++ b/board/integratorap/config.mk @@ -1,5 +1,5 @@ # -# image should be loaded at 0x01000000 +# image should be loaded at 0x01000000 # TEXT_BASE = 0x01000000 diff --git a/board/integratorap/integratorap.c b/board/integratorap/integratorap.c index 960ec3a..84a4c70 100644 --- a/board/integratorap/integratorap.c +++ b/board/integratorap/integratorap.c @@ -105,146 +105,161 @@ static struct pci_config_table pci_integrator_config_table[] = { }; #endif -// V3 access routines +/* V3 access routines */ #define _V3Write16(o,v) (*(volatile unsigned short *)(PCI_V3_BASE + (unsigned int)(o)) = (unsigned short)(v)) #define _V3Read16(o) (*(volatile unsigned short *)(PCI_V3_BASE + (unsigned int)(o))) #define _V3Write32(o,v) (*(volatile unsigned int *)(PCI_V3_BASE + (unsigned int)(o)) = (unsigned int)(v)) #define _V3Read32(o) (*(volatile unsigned int *)(PCI_V3_BASE + (unsigned int)(o))) -// Compute address necessary to access PCI config space for the given -// bus and device. -#define PCI_CONFIG_ADDRESS( __bus, __devfn, __offset ) \ - ({ \ - unsigned int __address, __devicebit; \ - unsigned short __mapaddress; \ - unsigned int __dev = PCI_DEV(__devfn); /* FIXME to check!! (slot?) */ \ +/* Compute address necessary to access PCI config space for the given */ +/* bus and device. */ +#define PCI_CONFIG_ADDRESS( __bus, __devfn, __offset ) ({ \ + unsigned int __address, __devicebit; \ + unsigned short __mapaddress; \ + unsigned int __dev = PCI_DEV (__devfn); /* FIXME to check!! (slot?) */ \ \ - if (__bus == 0) { \ - /* local bus segment so need a type 0 config cycle */ \ - /* build the PCI configuration "address" with one-hot in A31-A11 */ \ - __address = PCI_CONFIG_BASE; \ - __address |= ((__devfn & 0x07) << 8); \ - __address |= __offset & 0xFF; \ - __mapaddress = 0x000A; /* 101=>config cycle, 0=>A1=A0=0 */ \ - __devicebit = (1 << (__dev + 11)); \ + if (__bus == 0) { \ + /* local bus segment so need a type 0 config cycle */ \ + /* build the PCI configuration "address" with one-hot in A31-A11 */ \ + __address = PCI_CONFIG_BASE; \ + __address |= ((__devfn & 0x07) << 8); \ + __address |= __offset & 0xFF; \ + __mapaddress = 0x000A; /* 101=>config cycle, 0=>A1=A0=0 */ \ + __devicebit = (1 << (__dev + 11)); \ \ - if ((__devicebit & 0xFF000000) != 0) { \ - /* high order bits are handled by the MAP register */ \ - __mapaddress |= (__devicebit >> 16); \ - } else { \ - /* low order bits handled directly in the address */ \ - __address |= __devicebit; \ - } \ - } else { /* bus !=0 */ \ - /* not the local bus segment so need a type 1 config cycle */ \ - /* A31-A24 are don't care (so clear to 0) */ \ - __mapaddress = 0x000B; /* 101=>config cycle, 1=>A1&A0 from PCI_CFG */ \ - __address = PCI_CONFIG_BASE; \ - __address |= ((__bus & 0xFF) << 16); /* bits 23..16 = bus number */ \ - __address |= ((__dev & 0x1F) << 11); /* bits 15..11 = device number */ \ - __address |= ((__devfn & 0x07) << 8); /* bits 10..8 = function number*/ \ - __address |= __offset & 0xFF; /* bits 7..0 = register number*/ \ - } \ - _V3Write16(V3_LB_MAP1, __mapaddress); \ + if ((__devicebit & 0xFF000000) != 0) { \ + /* high order bits are handled by the MAP register */ \ + __mapaddress |= (__devicebit >> 16); \ + } else { \ + /* low order bits handled directly in the address */ \ + __address |= __devicebit; \ + } \ + } else { /* bus !=0 */ \ + /* not the local bus segment so need a type 1 config cycle */ \ + /* A31-A24 are don't care (so clear to 0) */ \ + __mapaddress = 0x000B; /* 101=>config cycle, 1=>A1&A0 from PCI_CFG */ \ + __address = PCI_CONFIG_BASE; \ + __address |= ((__bus & 0xFF) << 16); /* bits 23..16 = bus number */ \ + __address |= ((__dev & 0x1F) << 11); /* bits 15..11 = device number */ \ + __address |= ((__devfn & 0x07) << 8); /* bits 10..8 = function number */ \ + __address |= __offset & 0xFF; /* bits 7..0 = register number */ \ + } \ + _V3Write16 (V3_LB_MAP1, __mapaddress); \ + __address; \ +}) + +/* _V3OpenConfigWindow - open V3 configuration window */ +#define _V3OpenConfigWindow() { \ + /* Set up base0 to see all 512Mbytes of memory space (not */ \ + /* prefetchable), this frees up base1 for re-use by configuration*/ \ + /* memory */ \ \ - __address; \ - }) - -// _V3OpenConfigWindow - open V3 configuration window -#define _V3OpenConfigWindow() \ - { \ - /* Set up base0 to see all 512Mbytes of memory space (not */ \ - /* prefetchable), this frees up base1 for re-use by configuration*/ \ - /* memory */ \ - \ - _V3Write32 (V3_LB_BASE0, ((INTEGRATOR_PCI_BASE & 0xFFF00000) | \ - 0x90 | V3_LB_BASE_M_ENABLE)); \ - /* Set up base1 to point into configuration space, note that MAP1 */ \ - /* register is set up by pciMakeConfigAddress(). */ \ - \ - _V3Write32 (V3_LB_BASE1, ((CPU_PCI_CNFG_ADRS & 0xFFF00000) | \ - 0x40 | V3_LB_BASE_M_ENABLE)); \ - } - -// _V3CloseConfigWindow - close V3 configuration window -#define _V3CloseConfigWindow() \ - { \ - /* Reassign base1 for use by prefetchable PCI memory */ \ - _V3Write32 (V3_LB_BASE1, (((INTEGRATOR_PCI_BASE + 0x10000000) & 0xFFF00000) \ - | 0x84 | V3_LB_BASE_M_ENABLE)); \ - _V3Write16 (V3_LB_MAP1, \ - (((INTEGRATOR_PCI_BASE + 0x10000000) & 0xFFF00000) >> 16) | 0x0006); \ - \ - /* And shrink base0 back to a 256M window (NOTE: MAP0 already correct) */ \ - \ - _V3Write32 (V3_LB_BASE0, ((INTEGRATOR_PCI_BASE & 0xFFF00000) | \ - 0x80 | V3_LB_BASE_M_ENABLE)); \ - } + _V3Write32 (V3_LB_BASE0, ((INTEGRATOR_PCI_BASE & 0xFFF00000) | \ + 0x90 | V3_LB_BASE_M_ENABLE)); \ + /* Set up base1 to point into configuration space, note that MAP1 */ \ + /* register is set up by pciMakeConfigAddress(). */ \ + \ + _V3Write32 (V3_LB_BASE1, ((CPU_PCI_CNFG_ADRS & 0xFFF00000) | \ + 0x40 | V3_LB_BASE_M_ENABLE)); \ +} +/* _V3CloseConfigWindow - close V3 configuration window */ +#define _V3CloseConfigWindow() { \ + /* Reassign base1 for use by prefetchable PCI memory */ \ + _V3Write32 (V3_LB_BASE1, (((INTEGRATOR_PCI_BASE + 0x10000000) & 0xFFF00000) \ + | 0x84 | V3_LB_BASE_M_ENABLE)); \ + _V3Write16 (V3_LB_MAP1, \ + (((INTEGRATOR_PCI_BASE + 0x10000000) & 0xFFF00000) >> 16) | 0x0006); \ + \ + /* And shrink base0 back to a 256M window (NOTE: MAP0 already correct) */ \ + \ + _V3Write32 (V3_LB_BASE0, ((INTEGRATOR_PCI_BASE & 0xFFF00000) | \ + 0x80 | V3_LB_BASE_M_ENABLE)); \ +} -static int pci_integrator_read_byte(struct pci_controller *hose, pci_dev_t dev, - int offset, unsigned char *val) +static int pci_integrator_read_byte (struct pci_controller *hose, pci_dev_t dev, + int offset, unsigned char *val) { - _V3OpenConfigWindow(); - *val = *(volatile unsigned char *)PCI_CONFIG_ADDRESS(PCI_BUS(dev), PCI_FUNC(dev), offset); - _V3CloseConfigWindow(); + _V3OpenConfigWindow (); + *val = *(volatile unsigned char *) PCI_CONFIG_ADDRESS (PCI_BUS (dev), + PCI_FUNC (dev), + offset); + _V3CloseConfigWindow (); - return 0; + return 0; } -static int pci_integrator_read__word(struct pci_controller *hose, pci_dev_t dev, - int offset, unsigned short *val) +static int pci_integrator_read__word (struct pci_controller *hose, + pci_dev_t dev, int offset, + unsigned short *val) { - _V3OpenConfigWindow(); - *val = *(volatile unsigned short *)PCI_CONFIG_ADDRESS(PCI_BUS(dev), PCI_FUNC(dev), offset); - _V3CloseConfigWindow(); + _V3OpenConfigWindow (); + *val = *(volatile unsigned short *) PCI_CONFIG_ADDRESS (PCI_BUS (dev), + PCI_FUNC (dev), + offset); + _V3CloseConfigWindow (); - return 0; + return 0; } -static int pci_integrator_read_dword(struct pci_controller *hose, pci_dev_t dev, - int offset, unsigned int *val) +static int pci_integrator_read_dword (struct pci_controller *hose, + pci_dev_t dev, int offset, + unsigned int *val) { - _V3OpenConfigWindow(); - *val = *(volatile unsigned short *)PCI_CONFIG_ADDRESS(PCI_BUS(dev), PCI_FUNC(dev), offset); - *val |= (*(volatile unsigned int *)PCI_CONFIG_ADDRESS(PCI_BUS(dev), PCI_FUNC(dev), (offset+2))) << 16; - _V3CloseConfigWindow(); + _V3OpenConfigWindow (); + *val = *(volatile unsigned short *) PCI_CONFIG_ADDRESS (PCI_BUS (dev), + PCI_FUNC (dev), + offset); + *val |= (*(volatile unsigned int *) + PCI_CONFIG_ADDRESS (PCI_BUS (dev), PCI_FUNC (dev), + (offset + 2))) << 16; + _V3CloseConfigWindow (); - return 0; + return 0; } -static int pci_integrator_write_byte(struct pci_controller *hose, pci_dev_t dev, - int offset, unsigned char val) +static int pci_integrator_write_byte (struct pci_controller *hose, + pci_dev_t dev, int offset, + unsigned char val) { - _V3OpenConfigWindow(); - *(volatile unsigned char *)PCI_CONFIG_ADDRESS(PCI_BUS(dev), PCI_FUNC(dev), offset) = val; - _V3CloseConfigWindow(); + _V3OpenConfigWindow (); + *(volatile unsigned char *) PCI_CONFIG_ADDRESS (PCI_BUS (dev), + PCI_FUNC (dev), + offset) = val; + _V3CloseConfigWindow (); - return 0; + return 0; } -static int pci_integrator_write_word(struct pci_controller *hose, pci_dev_t dev, - int offset,unsigned short val) +static int pci_integrator_write_word (struct pci_controller *hose, + pci_dev_t dev, int offset, + unsigned short val) { - _V3OpenConfigWindow(); - *(volatile unsigned short *)PCI_CONFIG_ADDRESS(PCI_BUS(dev), PCI_FUNC(dev), offset) = val; - _V3CloseConfigWindow(); + _V3OpenConfigWindow (); + *(volatile unsigned short *) PCI_CONFIG_ADDRESS (PCI_BUS (dev), + PCI_FUNC (dev), + offset) = val; + _V3CloseConfigWindow (); - return 0; + return 0; } -static int pci_integrator_write_dword(struct pci_controller *hose, pci_dev_t dev, - int offset, unsigned int val) +static int pci_integrator_write_dword (struct pci_controller *hose, + pci_dev_t dev, int offset, + unsigned int val) { - _V3OpenConfigWindow(); - *(volatile unsigned short *)PCI_CONFIG_ADDRESS(PCI_BUS(dev), PCI_FUNC(dev), offset) = (val & 0xFFFF); - *(volatile unsigned short *)PCI_CONFIG_ADDRESS(PCI_BUS(dev), PCI_FUNC(dev), (offset + 2)) = ((val >> 16) & 0xFFFF); - _V3CloseConfigWindow(); + _V3OpenConfigWindow (); + *(volatile unsigned short *) PCI_CONFIG_ADDRESS (PCI_BUS (dev), + PCI_FUNC (dev), + offset) = (val & 0xFFFF); + *(volatile unsigned short *) PCI_CONFIG_ADDRESS (PCI_BUS (dev), + PCI_FUNC (dev), + (offset + 2)) = ((val >> 16) & 0xFFFF); + _V3CloseConfigWindow (); - return 0; + return 0; } - /****************************** * PCI initialisation ******************************/ @@ -255,176 +270,184 @@ struct pci_controller integrator_hose = { #endif }; -void pci_init_board(void) +void pci_init_board (void) { - volatile int i, j; - struct pci_controller *hose = &integrator_hose; + volatile int i, j; + struct pci_controller *hose = &integrator_hose; - /* setting this register will take the V3 out of reset */ + /* setting this register will take the V3 out of reset */ - *(volatile unsigned int *)(INTEGRATOR_SC_PCIENABLE) = 1; + *(volatile unsigned int *) (INTEGRATOR_SC_PCIENABLE) = 1; - /* wait a few usecs to settle the device and the PCI bus */ + /* wait a few usecs to settle the device and the PCI bus */ - for (i = 0; i < 100 ; i++) - j = i + 1; + for (i = 0; i < 100; i++) + j = i + 1; - /* Now write the Base I/O Address Word to V3_BASE + 0x6C */ + /* Now write the Base I/O Address Word to V3_BASE + 0x6C */ - *(volatile unsigned short *)(V3_BASE + V3_LB_IO_BASE) = (unsigned short)(V3_BASE >> 16); + *(volatile unsigned short *) (V3_BASE + V3_LB_IO_BASE) = + (unsigned short) (V3_BASE >> 16); - do { - *(volatile unsigned char *)(V3_BASE + V3_MAIL_DATA) = 0xAA; - *(volatile unsigned char *)(V3_BASE + V3_MAIL_DATA + 4) = 0x55; - } while (*(volatile unsigned char *)(V3_BASE + V3_MAIL_DATA) != 0xAA || - *(volatile unsigned char *)(V3_BASE + V3_MAIL_DATA + 4) != 0x55); + do { + *(volatile unsigned char *) (V3_BASE + V3_MAIL_DATA) = 0xAA; + *(volatile unsigned char *) (V3_BASE + V3_MAIL_DATA + 4) = + 0x55; + } while (*(volatile unsigned char *) (V3_BASE + V3_MAIL_DATA) != 0xAA + || *(volatile unsigned char *) (V3_BASE + V3_MAIL_DATA + + 4) != 0x55); - /* Make sure that V3 register access is not locked, if it is, unlock it */ + /* Make sure that V3 register access is not locked, if it is, unlock it */ - if ((*(volatile unsigned short *)(V3_BASE + V3_SYSTEM) & V3_SYSTEM_M_LOCK) - == V3_SYSTEM_M_LOCK) - *(volatile unsigned short *)(V3_BASE + V3_SYSTEM) = 0xA05F; + if ((*(volatile unsigned short *) (V3_BASE + V3_SYSTEM) & + V3_SYSTEM_M_LOCK) + == V3_SYSTEM_M_LOCK) + *(volatile unsigned short *) (V3_BASE + V3_SYSTEM) = 0xA05F; - /* Ensure that the slave accesses from PCI are disabled while we */ - /* setup windows */ + /* Ensure that the slave accesses from PCI are disabled while we */ + /* setup windows */ - *(volatile unsigned short *)(V3_BASE + V3_PCI_CMD) &= - ~(V3_COMMAND_M_MEM_EN | V3_COMMAND_M_IO_EN); + *(volatile unsigned short *) (V3_BASE + V3_PCI_CMD) &= + ~(V3_COMMAND_M_MEM_EN | V3_COMMAND_M_IO_EN); - /* Clear RST_OUT to 0; keep the PCI bus in reset until we've finished */ + /* Clear RST_OUT to 0; keep the PCI bus in reset until we've finished */ - *(volatile unsigned short *)(V3_BASE + V3_SYSTEM) &= ~V3_SYSTEM_M_RST_OUT; + *(volatile unsigned short *) (V3_BASE + V3_SYSTEM) &= + ~V3_SYSTEM_M_RST_OUT; - /* Make all accesses from PCI space retry until we're ready for them */ + /* Make all accesses from PCI space retry until we're ready for them */ - *(volatile unsigned short *)(V3_BASE + V3_PCI_CFG) |= V3_PCI_CFG_M_RETRY_EN; + *(volatile unsigned short *) (V3_BASE + V3_PCI_CFG) |= + V3_PCI_CFG_M_RETRY_EN; - /* Set up any V3 PCI Configuration Registers that we absolutely have to */ - /* LB_CFG controls Local Bus protocol. */ - /* Enable LocalBus byte strobes for READ accesses too. */ - /* set bit 7 BE_IMODE and bit 6 BE_OMODE */ + /* Set up any V3 PCI Configuration Registers that we absolutely have to */ + /* LB_CFG controls Local Bus protocol. */ + /* Enable LocalBus byte strobes for READ accesses too. */ + /* set bit 7 BE_IMODE and bit 6 BE_OMODE */ - *(volatile unsigned short *)(V3_BASE + V3_LB_CFG) |= 0x0C0; + *(volatile unsigned short *) (V3_BASE + V3_LB_CFG) |= 0x0C0; - /* PCI_CMD controls overall PCI operation. */ - /* Enable PCI bus master. */ + /* PCI_CMD controls overall PCI operation. */ + /* Enable PCI bus master. */ - *(volatile unsigned short *)(V3_BASE + V3_PCI_CMD) |= 0x04; + *(volatile unsigned short *) (V3_BASE + V3_PCI_CMD) |= 0x04; - /* PCI_MAP0 controls where the PCI to CPU memory window is on Local Bus*/ + /* PCI_MAP0 controls where the PCI to CPU memory window is on Local Bus */ - *(volatile unsigned int *)(V3_BASE + V3_PCI_MAP0) = (INTEGRATOR_BOOT_ROM_BASE) | - (V3_PCI_MAP_M_ADR_SIZE_512M | - V3_PCI_MAP_M_REG_EN | - V3_PCI_MAP_M_ENABLE); + *(volatile unsigned int *) (V3_BASE + V3_PCI_MAP0) = + (INTEGRATOR_BOOT_ROM_BASE) | (V3_PCI_MAP_M_ADR_SIZE_512M | + V3_PCI_MAP_M_REG_EN | + V3_PCI_MAP_M_ENABLE); - /* PCI_BASE0 is the PCI address of the start of the window */ + /* PCI_BASE0 is the PCI address of the start of the window */ - *(volatile unsigned int *)(V3_BASE + V3_PCI_BASE0) = INTEGRATOR_BOOT_ROM_BASE; + *(volatile unsigned int *) (V3_BASE + V3_PCI_BASE0) = + INTEGRATOR_BOOT_ROM_BASE; - /* PCI_MAP1 is LOCAL address of the start of the window */ + /* PCI_MAP1 is LOCAL address of the start of the window */ - *(volatile unsigned int *)(V3_BASE + V3_PCI_MAP1) = (INTEGRATOR_HDR0_SDRAM_BASE) | - (V3_PCI_MAP_M_ADR_SIZE_1024M | V3_PCI_MAP_M_REG_EN | - V3_PCI_MAP_M_ENABLE); + *(volatile unsigned int *) (V3_BASE + V3_PCI_MAP1) = + (INTEGRATOR_HDR0_SDRAM_BASE) | (V3_PCI_MAP_M_ADR_SIZE_1024M | + V3_PCI_MAP_M_REG_EN | + V3_PCI_MAP_M_ENABLE); - /* PCI_BASE1 is the PCI address of the start of the window */ + /* PCI_BASE1 is the PCI address of the start of the window */ - *(volatile unsigned int *)(V3_BASE + V3_PCI_BASE1) = INTEGRATOR_HDR0_SDRAM_BASE; + *(volatile unsigned int *) (V3_BASE + V3_PCI_BASE1) = + INTEGRATOR_HDR0_SDRAM_BASE; - /* Set up the windows from local bus memory into PCI configuration, */ - /* I/O and Memory. */ - /* PCI I/O, LB_BASE2 and LB_MAP2 are used exclusively for this. */ + /* Set up the windows from local bus memory into PCI configuration, */ + /* I/O and Memory. */ + /* PCI I/O, LB_BASE2 and LB_MAP2 are used exclusively for this. */ - *(volatile unsigned short *)(V3_BASE +V3_LB_BASE2) = - ((CPU_PCI_IO_ADRS >> 24) << 8) | V3_LB_BASE_M_ENABLE; - *(volatile unsigned short *)(V3_BASE + V3_LB_MAP2) = 0; + *(volatile unsigned short *) (V3_BASE + V3_LB_BASE2) = + ((CPU_PCI_IO_ADRS >> 24) << 8) | V3_LB_BASE_M_ENABLE; + *(volatile unsigned short *) (V3_BASE + V3_LB_MAP2) = 0; - /* PCI Configuration, use LB_BASE1/LB_MAP1. */ + /* PCI Configuration, use LB_BASE1/LB_MAP1. */ - /* PCI Memory use LB_BASE0/LB_MAP0 and LB_BASE1/LB_MAP1 */ - /* Map first 256Mbytes as non-prefetchable via BASE0/MAP0 */ - /* (INTEGRATOR_PCI_BASE == PCI_MEM_BASE) */ + /* PCI Memory use LB_BASE0/LB_MAP0 and LB_BASE1/LB_MAP1 */ + /* Map first 256Mbytes as non-prefetchable via BASE0/MAP0 */ + /* (INTEGRATOR_PCI_BASE == PCI_MEM_BASE) */ - *(volatile unsigned int *)(V3_BASE + V3_LB_BASE0) = - INTEGRATOR_PCI_BASE | (0x80 | V3_LB_BASE_M_ENABLE); + *(volatile unsigned int *) (V3_BASE + V3_LB_BASE0) = + INTEGRATOR_PCI_BASE | (0x80 | V3_LB_BASE_M_ENABLE); - *(volatile unsigned short *)(V3_BASE + V3_LB_MAP0) = - ((INTEGRATOR_PCI_BASE >> 20) << 0x4) | 0x0006; + *(volatile unsigned short *) (V3_BASE + V3_LB_MAP0) = + ((INTEGRATOR_PCI_BASE >> 20) << 0x4) | 0x0006; - /* Map second 256 Mbytes as prefetchable via BASE1/MAP1 */ + /* Map second 256 Mbytes as prefetchable via BASE1/MAP1 */ - *(volatile unsigned int *)(V3_BASE + V3_LB_BASE1) = - INTEGRATOR_PCI_BASE | (0x84 | V3_LB_BASE_M_ENABLE); + *(volatile unsigned int *) (V3_BASE + V3_LB_BASE1) = + INTEGRATOR_PCI_BASE | (0x84 | V3_LB_BASE_M_ENABLE); - *(volatile unsigned short *)(V3_BASE + V3_LB_MAP1) = - (((INTEGRATOR_PCI_BASE + 0x10000000) >> 20) << 4) | 0x0006; + *(volatile unsigned short *) (V3_BASE + V3_LB_MAP1) = + (((INTEGRATOR_PCI_BASE + 0x10000000) >> 20) << 4) | 0x0006; - /* Allow accesses to PCI Configuration space */ - /* and set up A1, A0 for type 1 config cycles */ + /* Allow accesses to PCI Configuration space */ + /* and set up A1, A0 for type 1 config cycles */ - *(volatile unsigned short *)(V3_BASE + V3_PCI_CFG) = - ((*(volatile unsigned short *)(V3_BASE + V3_PCI_CFG)) & - ~(V3_PCI_CFG_M_RETRY_EN | V3_PCI_CFG_M_AD_LOW1) ) | - V3_PCI_CFG_M_AD_LOW0; + *(volatile unsigned short *) (V3_BASE + V3_PCI_CFG) = + ((*(volatile unsigned short *) (V3_BASE + V3_PCI_CFG)) & + ~(V3_PCI_CFG_M_RETRY_EN | V3_PCI_CFG_M_AD_LOW1)) | + V3_PCI_CFG_M_AD_LOW0; - /* now we can allow in PCI MEMORY accesses */ + /* now we can allow in PCI MEMORY accesses */ - *(volatile unsigned short *)(V3_BASE + V3_PCI_CMD) = - (*(volatile unsigned short *)(V3_BASE + V3_PCI_CMD)) | V3_COMMAND_M_MEM_EN; + *(volatile unsigned short *) (V3_BASE + V3_PCI_CMD) = + (*(volatile unsigned short *) (V3_BASE + V3_PCI_CMD)) | + V3_COMMAND_M_MEM_EN; - /* Set RST_OUT to take the PCI bus is out of reset, PCI devices can */ - /* initialise and lock the V3 system register so that no one else */ - /* can play with it */ + /* Set RST_OUT to take the PCI bus is out of reset, PCI devices can */ + /* initialise and lock the V3 system register so that no one else */ + /* can play with it */ - *(volatile unsigned short *)(V3_BASE + V3_SYSTEM) = - (*(volatile unsigned short *)(V3_BASE + V3_SYSTEM)) | V3_SYSTEM_M_RST_OUT; + *(volatile unsigned short *) (V3_BASE + V3_SYSTEM) = + (*(volatile unsigned short *) (V3_BASE + V3_SYSTEM)) | + V3_SYSTEM_M_RST_OUT; - *(volatile unsigned short *)(V3_BASE + V3_SYSTEM) = - (*(volatile unsigned short *)(V3_BASE + V3_SYSTEM)) | V3_SYSTEM_M_LOCK; + *(volatile unsigned short *) (V3_BASE + V3_SYSTEM) = + (*(volatile unsigned short *) (V3_BASE + V3_SYSTEM)) | + V3_SYSTEM_M_LOCK; - /* - * Register the hose - */ - hose->first_busno = 0; - hose->last_busno = 0xff; + /* + * Register the hose + */ + hose->first_busno = 0; + hose->last_busno = 0xff; - /* System memory space */ - pci_set_region(hose->regions + 0, - 0x00000000, 0x40000000, 0x01000000, - PCI_REGION_MEM | PCI_REGION_MEMORY); + /* System memory space */ + pci_set_region (hose->regions + 0, + 0x00000000, 0x40000000, 0x01000000, + PCI_REGION_MEM | PCI_REGION_MEMORY); - /* PCI Memory - config space */ - pci_set_region(hose->regions + 1, - 0x00000000, 0x62000000, 0x01000000, - PCI_REGION_MEM); + /* PCI Memory - config space */ + pci_set_region (hose->regions + 1, + 0x00000000, 0x62000000, 0x01000000, PCI_REGION_MEM); - /* PCI V3 regs */ - pci_set_region(hose->regions + 2, - 0x00000000, 0x61000000, 0x00080000, - PCI_REGION_MEM); + /* PCI V3 regs */ + pci_set_region (hose->regions + 2, + 0x00000000, 0x61000000, 0x00080000, PCI_REGION_MEM); - /* PCI I/O space */ - pci_set_region(hose->regions + 3, - 0x00000000, 0x60000000, 0x00010000, - PCI_REGION_IO); + /* PCI I/O space */ + pci_set_region (hose->regions + 3, + 0x00000000, 0x60000000, 0x00010000, PCI_REGION_IO); - pci_set_ops(hose, - pci_integrator_read_byte, - pci_integrator_read__word, - pci_integrator_read_dword, - pci_integrator_write_byte, - pci_integrator_write_word, - pci_integrator_write_dword); + pci_set_ops (hose, + pci_integrator_read_byte, + pci_integrator_read__word, + pci_integrator_read_dword, + pci_integrator_write_byte, + pci_integrator_write_word, pci_integrator_write_dword); - hose->region_count = 4; + hose->region_count = 4; - pci_register_hose(hose); + pci_register_hose (hose); - pciauto_config_init(hose); - pciauto_config_device(hose, 0); + pciauto_config_init (hose); + pciauto_config_device (hose, 0); - hose->last_busno = pci_hose_scan(hose); + hose->last_busno = pci_hose_scan (hose); } #endif @@ -452,4 +475,3 @@ int dram_init (void) { return 0; } - diff --git a/board/integratorap/u-boot.lds b/board/integratorap/u-boot.lds index da679c2..33931be 100644 --- a/board/integratorap/u-boot.lds +++ b/board/integratorap/u-boot.lds @@ -43,8 +43,8 @@ SECTIONS .u_boot_cmd : { *(.u_boot_cmd) } __u_boot_cmd_end = .; - armboot_end_data = .; . = ALIGN(4); + __bss_start = .; .bss : { *(.bss) } - armboot_end = .; + _end = .; } diff --git a/board/integratorcp/config.mk b/board/integratorcp/config.mk index df67491..25b79b3 100644 --- a/board/integratorcp/config.mk +++ b/board/integratorcp/config.mk @@ -1,5 +1,5 @@ # -# image should be loaded at 0x01000000 +# image should be loaded at 0x01000000 # TEXT_BASE = 0x01000000 diff --git a/board/integratorcp/integratorcp.c b/board/integratorcp/integratorcp.c index 2e62f26..6071d81 100644 --- a/board/integratorcp/integratorcp.c +++ b/board/integratorcp/integratorcp.c @@ -107,4 +107,3 @@ int dram_init (void) { return 0; } - diff --git a/board/integratorcp/u-boot.lds b/board/integratorcp/u-boot.lds index da679c2..33931be 100644 --- a/board/integratorcp/u-boot.lds +++ b/board/integratorcp/u-boot.lds @@ -43,8 +43,8 @@ SECTIONS .u_boot_cmd : { *(.u_boot_cmd) } __u_boot_cmd_end = .; - armboot_end_data = .; . = ALIGN(4); + __bss_start = .; .bss : { *(.bss) } - armboot_end = .; + _end = .; } diff --git a/board/mpl/common/common_util.c b/board/mpl/common/common_util.c index 5117394..793684d 100644 --- a/board/mpl/common/common_util.c +++ b/board/mpl/common/common_util.c @@ -232,7 +232,7 @@ mpl_prg_image(uchar *ld_addr) } puts("OK\n"); break; -#if CONFIG_BZIP2 +#ifdef CONFIG_BZIP2 case IH_COMP_BZIP2: puts("Uncompressing (BZIP2) ... "); { diff --git a/board/ocotea/ocotea.c b/board/ocotea/ocotea.c index 2e720b2..b4b5622 100644 --- a/board/ocotea/ocotea.c +++ b/board/ocotea/ocotea.c @@ -474,4 +474,3 @@ int post_hotkeys_pressed(void) return (ctrlc()); } #endif - diff --git a/board/siemens/CCM/ccm.c b/board/siemens/CCM/ccm.c index b54f3c1..3ed1b75 100644 --- a/board/siemens/CCM/ccm.c +++ b/board/siemens/CCM/ccm.c @@ -351,7 +351,7 @@ void reset_phy(void) ulong value; /* Configure all needed port pins for GPIO */ -#if CFG_ETH_MDDIS_VALUE +#ifdef CFG_ETH_MDDIS_VALUE immr->im_ioport.iop_padat |= CFG_PA_ETH_MDDIS; #else immr->im_ioport.iop_padat &= ~(CFG_PA_ETH_MDDIS | CFG_PA_ETH_RESET); /* Set low */ @@ -369,17 +369,17 @@ void reset_phy(void) value |= CFG_PB_ETH_POWERDOWN; /* PHY configuration includes MDDIS and CFG1 ... CFG3 */ -#if CFG_ETH_CFG1_VALUE +#ifdef CFG_ETH_CFG1_VALUE value |= CFG_PB_ETH_CFG1; #else value &= ~(CFG_PB_ETH_CFG1); #endif -#if CFG_ETH_CFG2_VALUE +#ifdef CFG_ETH_CFG2_VALUE value |= CFG_PB_ETH_CFG2; #else value &= ~(CFG_PB_ETH_CFG2); #endif -#if CFG_ETH_CFG3_VALUE +#ifdef CFG_ETH_CFG3_VALUE value |= CFG_PB_ETH_CFG3; #else value &= ~(CFG_PB_ETH_CFG3); diff --git a/board/siemens/pcu_e/pcu_e.c b/board/siemens/pcu_e/pcu_e.c index 033cc36..6374513 100644 --- a/board/siemens/pcu_e/pcu_e.c +++ b/board/siemens/pcu_e/pcu_e.c @@ -309,7 +309,7 @@ void reset_phy (void) /* Configure all needed port pins for GPIO */ #if PCU_E_WITH_SWAPPED_CS /* XXX */ -# if CFG_ETH_MDDIS_VALUE +# ifdef CFG_ETH_MDDIS_VALUE immr->im_ioport.iop_padat |= CFG_PA_ETH_MDDIS; # else immr->im_ioport.iop_padat &= ~(CFG_PA_ETH_MDDIS); /* Set low */ @@ -329,23 +329,23 @@ void reset_phy (void) /* PHY configuration includes MDDIS and CFG1 ... CFG3 */ #if !PCU_E_WITH_SWAPPED_CS -# if CFG_ETH_MDDIS_VALUE +# ifdef CFG_ETH_MDDIS_VALUE value |= CFG_PB_ETH_MDDIS; # else value &= ~(CFG_PB_ETH_MDDIS); # endif #endif -#if CFG_ETH_CFG1_VALUE +#ifdef CFG_ETH_CFG1_VALUE value |= CFG_PB_ETH_CFG1; #else value &= ~(CFG_PB_ETH_CFG1); #endif -#if CFG_ETH_CFG2_VALUE +#ifdef CFG_ETH_CFG2_VALUE value |= CFG_PB_ETH_CFG2; #else value &= ~(CFG_PB_ETH_CFG2); #endif -#if CFG_ETH_CFG3_VALUE +#ifdef CFG_ETH_CFG3_VALUE value |= CFG_PB_ETH_CFG3; #else value &= ~(CFG_PB_ETH_CFG3); diff --git a/board/ssv/common/cmd_sled.c b/board/ssv/common/cmd_sled.c index 6ca054c..d61fa3e 100644 --- a/board/ssv/common/cmd_sled.c +++ b/board/ssv/common/cmd_sled.c @@ -12,7 +12,7 @@ * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License @@ -28,20 +28,20 @@ #if defined(CONFIG_STATUS_LED) /* !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! - * !!!!! Q u i c k & D i r t y H a c k !!!!! + * !!!!! Q u i c k & D i r t y H a c k !!!!! * !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! - * !!!!! !!!!! - * !!!!! Next type definition was coming from original !!!!! - * !!!!! status LED driver drivers/status_led.c and !!!!! - * !!!!! should exported for using here. !!!!! - * !!!!! !!!!! + * !!!!! !!!!! + * !!!!! Next type definition was coming from original !!!!! + * !!!!! status LED driver drivers/status_led.c and !!!!! + * !!!!! should exported for using here. !!!!! + * !!!!! !!!!! * !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! */ typedef struct { - led_id_t mask; - int state; - int period; - int cnt; + led_id_t mask; + int state; + int period; + int cnt; } led_dev_t; extern led_dev_t led_dev[]; @@ -141,18 +141,18 @@ int do_sled (cmd_tbl_t * cmdtp, int flag, int argc, char *argv[]) #ifdef STATUS_LED_RED #ifdef STATUS_LED_YELLOW #ifdef STATUS_LED_GREEN -#define __NAME_STR " - name: boot|red|yellow|green\n" +#define __NAME_STR " - name: boot|red|yellow|green\n" #else -#define __NAME_STR " - name: boot|red|yellow\n" +#define __NAME_STR " - name: boot|red|yellow\n" #endif #else -#define __NAME_STR " - name: boot|red\n" +#define __NAME_STR " - name: boot|red\n" #endif #else -#define __NAME_STR " - name: boot\n" +#define __NAME_STR " - name: boot\n" #endif #else -#define __NAME_STR " - name: (no such defined)\n" +#define __NAME_STR " - name: (no such defined)\n" #endif U_BOOT_CMD (sled, 3, 0, do_sled, diff --git a/board/trab/trab_fkt.c b/board/trab/trab_fkt.c index 4769f27..f51a356 100644 --- a/board/trab/trab_fkt.c +++ b/board/trab/trab_fkt.c @@ -890,7 +890,7 @@ int do_touch (char **argv) int x, y; if (strcmp (argv[2], "tl") == 0) { -#if CONFIG_TOUCH_WAIT_PRESSED +#ifdef CONFIG_TOUCH_WAIT_PRESSED touch_wait_pressed(); #else { @@ -915,7 +915,7 @@ int do_touch (char **argv) return touch_write_clibration_values (CALIB_TL, x, y); } else if (strcmp (argv[2], "dr") == 0) { -#if CONFIG_TOUCH_WAIT_PRESSED +#ifdef CONFIG_TOUCH_WAIT_PRESSED touch_wait_pressed(); #else { diff --git a/board/versatile/config.mk b/board/versatile/config.mk index df67491..25b79b3 100644 --- a/board/versatile/config.mk +++ b/board/versatile/config.mk @@ -1,5 +1,5 @@ # -# image should be loaded at 0x01000000 +# image should be loaded at 0x01000000 # TEXT_BASE = 0x01000000 diff --git a/board/versatile/u-boot.lds b/board/versatile/u-boot.lds index da679c2..33931be 100644 --- a/board/versatile/u-boot.lds +++ b/board/versatile/u-boot.lds @@ -43,8 +43,8 @@ SECTIONS .u_boot_cmd : { *(.u_boot_cmd) } __u_boot_cmd_end = .; - armboot_end_data = .; . = ALIGN(4); + __bss_start = .; .bss : { *(.bss) } - armboot_end = .; + _end = .; } diff --git a/board/versatile/versatile.c b/board/versatile/versatile.c index ead3088..626d527 100644 --- a/board/versatile/versatile.c +++ b/board/versatile/versatile.c @@ -117,4 +117,3 @@ int dram_init (void) { return 0; } - |