mirror of
https://github.com/brain-hackers/u-boot-brain
synced 2024-06-09 23:36:03 +09:00
Minor coding style cleanup. Update CHANGELOG.
Signed-off-by: Wolfgang Denk <wd@denx.de>
This commit is contained in:
Wolfgang Denk
parent
a08458303e
commit
be5d72d10d
74
CHANGELOG
74
CHANGELOG
|
|
@ -1,3 +1,53 @@
|
|||
commit a08458303e7f9db67f296980036d3292c35cb45c
|
||||
Author: Haavard Skinnemoen <hskinnemoen@atmel.com>
|
||||
Date: Fri Jun 29 18:38:51 2007 +0200
|
||||
|
||||
atmel_mci: Fix data timeout value
|
||||
|
||||
Calculate the data timeout based on values from the CSD instead of
|
||||
just using a hardcoded DTOR value. This is a backport of a similar fix
|
||||
in BSP 2.0, with one additional fix: the DTOCYC value is rounded up
|
||||
instead of down.
|
||||
|
||||
Signed-off-by: Haavard Skinnemoen <hskinnemoen@atmel.com>
|
||||
|
||||
commit 0ba8eed28b575626b17e0a7882f923b83e0d7584
|
||||
Author: Haavard Skinnemoen <hskinnemoen@atmel.com>
|
||||
Date: Mon Aug 13 17:22:31 2007 +0200
|
||||
|
||||
AVR32: Include <div64.h> instead of <asm/div64.h>
|
||||
|
||||
include/asm-avr32/div64.h was recently moved to include/div64.h, but
|
||||
cpu/at32ap/interrupts.c wasn't properly updated (an earlier version of
|
||||
the patch was merged perhaps?)
|
||||
|
||||
This patch updates cpu/at32ap/interrupts.c so that the avr32 port
|
||||
compiles again.
|
||||
|
||||
Signed-off-by: Haavard Skinnemoen <hskinnemoen@atmel.com>
|
||||
|
||||
commit f0d1246ed7cb5a88522244c596d7ae7e6f161283
|
||||
Author: Haavard Skinnemoen <hskinnemoen@atmel.com>
|
||||
Date: Wed Jun 27 13:34:26 2007 +0200
|
||||
|
||||
atmel_mci: Use 512 byte blocksize if possible
|
||||
|
||||
Instead of always using the largest blocksize the card supports, check
|
||||
if it can support smaller block sizes and use 512 bytes if possible.
|
||||
Most cards do support this, and other parts of u-boot seem to have
|
||||
trouble with block sizes different from 512 bytes.
|
||||
|
||||
Also enable underrun/overrun protection.
|
||||
|
||||
Signed-off-by: Haavard Skinnemoen <hskinnemoen@atmel.com>
|
||||
Acked-by: Hans-Christian Egtvedt <hcegtvedt@atmel.com>
|
||||
|
||||
commit 9986bc3e40e899bea372a99a2bca4071bdf2e24b
|
||||
Author: Wolfgang Denk <wd@denx.de>
|
||||
Date: Sun Aug 12 21:34:50 2007 +0200
|
||||
|
||||
Update CHANGELOG
|
||||
|
||||
commit 77d19a8bf3b0b1e401cb9f23c81e2ef419705c1a
|
||||
Author: Wolfgang Denk <wd@denx.de>
|
||||
Date: Sun Aug 12 21:34:34 2007 +0200
|
||||
|
|
@ -3928,6 +3978,30 @@ Date: Fri Jan 5 09:15:34 2007 +0100
|
|||
|
||||
Signed-off-by Dan Malek, <dan@embeddedalley.com>
|
||||
|
||||
commit f2134f8e9eb006bdcd729e89f309c07b2fa45180
|
||||
Author: Haavard Skinnemoen <hskinnemoen@atmel.com>
|
||||
Date: Wed May 2 13:31:53 2007 +0200
|
||||
|
||||
macb: Don't restart autonegotiation if we already have link
|
||||
|
||||
Rework macb_phy_init so that it doesn't attempt to re-negotiate if the
|
||||
link is already up.
|
||||
|
||||
Signed-off-by: Haavard Skinnemoen <hskinnemoen@atmel.com>
|
||||
|
||||
commit 04fcb5d38bc90779cd9a710d60702075986f0e29
|
||||
Author: Haavard Skinnemoen <hskinnemoen@atmel.com>
|
||||
Date: Wed May 2 13:22:38 2007 +0200
|
||||
|
||||
macb: Introduce a few barriers when dealing with DMA descriptors
|
||||
|
||||
There were a few theoretical possibilities that the compiler might
|
||||
optimize away DMA descriptor reads and/or writes and thus cause
|
||||
synchronization problems with the hardware. Insert barriers where
|
||||
we depend on reads/writes actually hitting memory.
|
||||
|
||||
Signed-off-by: Haavard Skinnemoen <hskinnemoen@atmel.com>
|
||||
|
||||
commit ffa621a0d12a1ccd81c936c567f8917a213787a8
|
||||
Author: Andy Fleming <afleming@freescale.com>
|
||||
Date: Sat Feb 24 01:08:13 2007 -0600
|
||||
|
|
|
|||
|
|
@ -122,7 +122,7 @@ long int initdram(int board_type)
|
|||
mem_conf_t *mem_conf;
|
||||
|
||||
mem_conf = get_mem_config(board_type);
|
||||
|
||||
|
||||
/* configure SDRAM start/end for detection */
|
||||
*(vu_long *)MPC5XXX_SDRAM_CS0CFG = 0x0000001e; /* 2G at 0x0 */
|
||||
|
||||
|
|
@ -303,7 +303,7 @@ int checkboard(void)
|
|||
hw_id_t hw_id_tmp;
|
||||
char module_name_tmp[MODULE_NAME_MAXLEN] = "";
|
||||
|
||||
/*
|
||||
/*
|
||||
* We need I2C to access HW ID data from EEPROM, so we call i2c_init()
|
||||
* here despite the fact that it will be called again later on. We
|
||||
* also use a little trick to silence I2C-related output.
|
||||
|
|
@ -321,7 +321,7 @@ int checkboard(void)
|
|||
else
|
||||
printf("Board: unrecognized cm5200 module (%s)\n",
|
||||
module_name_tmp);
|
||||
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -138,7 +138,7 @@ static char **hw_id_list[] = {
|
|||
cmu1_qa_hw_id,
|
||||
};
|
||||
|
||||
/* indices to the above list - keep in sync */
|
||||
/* indices to the above list - keep in sync */
|
||||
enum {
|
||||
CM1_QA,
|
||||
CM11_QA,
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
/*
|
||||
* (C) Copyright 2007 Markus Kappeler <markus.kappeler@objectxp.com>
|
||||
*
|
||||
* Adapted for U-Boot 1.2 by Piotr Kruszynski <ppk@semihalf.com>
|
||||
* Adapted for U-Boot 1.2 by Piotr Kruszynski <ppk@semihalf.com>
|
||||
*
|
||||
* See file CREDITS for list of people who contributed to this
|
||||
* project.
|
||||
|
|
|
|||
|
|
@ -41,7 +41,7 @@ mpc5xxx. For these the config option
|
|||
|
||||
CFG_OHCI_BE_CONTROLLER
|
||||
|
||||
needs to be defined.
|
||||
needs to be defined.
|
||||
|
||||
|
||||
PCI Controllers
|
||||
|
|
@ -55,6 +55,3 @@ PCI Controllers need to do byte swapping on register accesses, so they
|
|||
should to define:
|
||||
|
||||
CFG_OHCI_SWAP_REG_ACCESS
|
||||
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -209,7 +209,7 @@ int nand_erase_opts(nand_info_t *meminfo, const nand_erase_options_t *opts)
|
|||
}
|
||||
|
||||
if (!opts->quiet) {
|
||||
unsigned long long n =(unsigned long long)
|
||||
unsigned long long n =(unsigned long long)
|
||||
(erase.addr+meminfo->erasesize-opts->offset)
|
||||
* 100;
|
||||
int percent = (int)do_div(n, erase_length);
|
||||
|
|
@ -476,8 +476,8 @@ int nand_write_opts(nand_info_t *meminfo, const nand_write_options_t *opts)
|
|||
imglen -= readlen;
|
||||
|
||||
if (!opts->quiet) {
|
||||
unsigned long long n = (unsigned long long)
|
||||
(opts->length-imglen) * 100;
|
||||
unsigned long long n = (unsigned long long)
|
||||
(opts->length-imglen) * 100;
|
||||
int percent = (int)do_div(n, opts->length);
|
||||
/* output progress message only at whole percent
|
||||
* steps to reduce the number of messages printed
|
||||
|
|
@ -651,8 +651,8 @@ int nand_read_opts(nand_info_t *meminfo, const nand_read_options_t *opts)
|
|||
}
|
||||
|
||||
if (!opts->quiet) {
|
||||
unsigned long long n = (unsigned long long)
|
||||
(opts->length-imglen) * 100;
|
||||
unsigned long long n = (unsigned long long)
|
||||
(opts->length-imglen) * 100;
|
||||
int percent = (int)do_div(n ,opts->length);
|
||||
/* output progress message only at whole percent
|
||||
* steps to reduce the number of messages printed
|
||||
|
|
|
|||
|
|
@ -132,8 +132,6 @@ int got_rhsc;
|
|||
/* device which was disconnected */
|
||||
struct usb_device *devgone;
|
||||
|
||||
|
||||
|
||||
/*-------------------------------------------------------------------------*/
|
||||
|
||||
/* AMD-756 (D2 rev) reports corrupt register contents in some cases.
|
||||
|
|
@ -157,7 +155,6 @@ static inline u32 roothub_status (struct ohci *hc)
|
|||
static u32 roothub_portstatus (struct ohci *hc, int i)
|
||||
{ return read_roothub (hc, portstatus [i], 0xffe0fce0); }
|
||||
|
||||
|
||||
/* forward declaration */
|
||||
static int hc_interrupt (void);
|
||||
static void
|
||||
|
|
@ -412,8 +409,6 @@ static void ohci_dump (ohci_t *controller, int verbose)
|
|||
ep_print_int_eds (controller, "hcca");
|
||||
dbg ("hcca frame #%04x", controller->hcca->frame_no);
|
||||
ohci_dump_roothub (controller, 1);
|
||||
}
|
||||
|
||||
|
||||
#endif /* DEBUG */
|
||||
|
||||
|
|
@ -701,7 +696,6 @@ static void periodic_unlink ( struct ohci *ohci, volatile struct ed *ed,
|
|||
}
|
||||
}
|
||||
|
||||
|
||||
/* unlink an ed from one of the HC chains.
|
||||
* just the link to the ed is unlinked.
|
||||
* the link from the ed still points to another operational ed or 0
|
||||
|
|
@ -759,7 +753,6 @@ static int ep_unlink (ohci_t *ohci, ed_t *edi)
|
|||
return 0;
|
||||
}
|
||||
|
||||
|
||||
/*-------------------------------------------------------------------------*/
|
||||
|
||||
/* add/reinit an endpoint; this should be done once at the
|
||||
|
|
@ -939,7 +932,6 @@ static void td_submit_job (struct usb_device *dev, unsigned long pipe, void *buf
|
|||
* Done List handling functions
|
||||
*-------------------------------------------------------------------------*/
|
||||
|
||||
|
||||
/* calculate the transfer length and update the urb */
|
||||
|
||||
static void dl_transfer_length(td_t * td)
|
||||
|
|
@ -951,7 +943,6 @@ static void dl_transfer_length(td_t * td)
|
|||
tdBE = m32_swap (td->hwBE);
|
||||
tdCBP = m32_swap (td->hwCBP);
|
||||
|
||||
|
||||
if (!(usb_pipetype (lurb_priv->pipe) == PIPE_CONTROL &&
|
||||
((td->index == 0) || (td->index == lurb_priv->length - 1)))) {
|
||||
if (tdBE != 0) {
|
||||
|
|
@ -1094,7 +1085,6 @@ static __u8 root_hub_dev_des[] =
|
|||
0x01 /* __u8 bNumConfigurations; */
|
||||
};
|
||||
|
||||
|
||||
/* Configuration descriptor */
|
||||
static __u8 root_hub_config_des[] =
|
||||
{
|
||||
|
|
@ -1172,7 +1162,6 @@ static unsigned char root_hub_str_index1[] =
|
|||
|
||||
/* Hub class-specific descriptor is constructed dynamically */
|
||||
|
||||
|
||||
/*-------------------------------------------------------------------------*/
|
||||
|
||||
#define OK(x) len = (x); break
|
||||
|
|
|
|||
|
|
@ -31,7 +31,6 @@
|
|||
#define CONFIG_MPC5200 1 /* (more precisely an MPC5200 CPU) */
|
||||
#define CONFIG_CM5200 1 /* ... on CM5200 platform */
|
||||
|
||||
|
||||
/*
|
||||
* Supported commands
|
||||
*/
|
||||
|
|
@ -60,7 +59,6 @@
|
|||
#define CFG_BAUDRATE_TABLE { 9600, 19200, 38400, 57600, 115200, 230400 }
|
||||
#define CONFIG_SILENT_CONSOLE 1 /* needed to silence i2c_init() */
|
||||
|
||||
|
||||
/*
|
||||
* Ethernet configuration
|
||||
*/
|
||||
|
|
@ -71,7 +69,6 @@
|
|||
#define CONFIG_MISC_INIT_R 1
|
||||
#define CONFIG_MAC_OFFSET 0x35 /* MAC address offset in I2C EEPROM */
|
||||
|
||||
|
||||
/*
|
||||
* POST support
|
||||
*/
|
||||
|
|
@ -80,11 +77,9 @@
|
|||
/* List of I2C addresses to be verified by POST */
|
||||
#define I2C_ADDR_LIST { CFG_I2C_SLAVE, CFG_I2C_IO, CFG_I2C_EEPROM }
|
||||
|
||||
|
||||
/* display image timestamps */
|
||||
#define CONFIG_TIMESTAMP 1
|
||||
|
||||
|
||||
/*
|
||||
* Autobooting
|
||||
*/
|
||||
|
|
@ -137,19 +132,16 @@
|
|||
""
|
||||
#define CONFIG_BOOTCOMMAND "run flash_flash"
|
||||
|
||||
|
||||
/*
|
||||
* Low level configuration
|
||||
*/
|
||||
|
||||
|
||||
/*
|
||||
* Clock configuration
|
||||
*/
|
||||
#define CFG_MPC5XXX_CLKIN 33000000 /* SYS_XTAL_IN = 33MHz */
|
||||
#define CFG_IPBCLK_EQUALS_XLBCLK 1 /* IPB = 133MHz */
|
||||
|
||||
|
||||
/*
|
||||
* Memory map
|
||||
*/
|
||||
|
|
@ -184,7 +176,7 @@
|
|||
*/
|
||||
#define CFG_FLASH_CFI 1
|
||||
#define CFG_FLASH_CFI_DRIVER 1
|
||||
#define CFG_FLASH_BASE 0xfc000000
|
||||
#define CFG_FLASH_BASE 0xfc000000
|
||||
/* we need these despite using CFI */
|
||||
#define CFG_MAX_FLASH_BANKS 1 /* max num of flash banks */
|
||||
#define CFG_MAX_FLASH_SECT 256 /* max num of sectors on one chip */
|
||||
|
|
@ -215,7 +207,6 @@
|
|||
#define CFG_CS_BURST 0x00000000
|
||||
#define CFG_CS_DEADCYCLE 0x00000001
|
||||
|
||||
|
||||
/*
|
||||
* SDRAM configuration
|
||||
* settings for k4s561632E-xx75, assuming XLB = 132 MHz
|
||||
|
|
@ -225,8 +216,6 @@
|
|||
#define SDRAM_CONFIG1 0xE2333900
|
||||
#define SDRAM_CONFIG2 0x8EE70000
|
||||
|
||||
|
||||
|
||||
/*
|
||||
* MTD configuration
|
||||
*/
|
||||
|
|
@ -238,7 +227,6 @@
|
|||
"2m(kernel),27904k(rootfs)," \
|
||||
"-(config)"
|
||||
|
||||
|
||||
/*
|
||||
* I2C configuration
|
||||
*/
|
||||
|
|
@ -249,13 +237,11 @@
|
|||
#define CFG_I2C_IO 0x38 /* PCA9554AD I2C I/O port address */
|
||||
#define CFG_I2C_EEPROM 0x53 /* I2C EEPROM device address */
|
||||
|
||||
|
||||
/*
|
||||
* RTC configuration
|
||||
*/
|
||||
#define CONFIG_RTC_MPC5200 1 /* use internal MPC5200 RTC */
|
||||
|
||||
|
||||
/*
|
||||
* USB configuration
|
||||
*/
|
||||
|
|
@ -284,7 +270,6 @@
|
|||
#define CFG_ENV_ADDR_REDUND (CFG_ENV_ADDR + CFG_ENV_SECT_SIZE)
|
||||
#define CFG_ENV_SIZE_REDUND (CFG_ENV_SIZE)
|
||||
|
||||
|
||||
/*
|
||||
* Pin multiplexing configuration
|
||||
*/
|
||||
|
|
@ -302,7 +287,6 @@
|
|||
*/
|
||||
#define CFG_GPS_PORT_CONFIG 0x10559C44
|
||||
|
||||
|
||||
/*
|
||||
* Miscellaneous configurable options
|
||||
*/
|
||||
|
|
@ -322,7 +306,6 @@
|
|||
#define CFG_LOAD_ADDR 0x100000 /* default load address */
|
||||
#define CFG_HZ 1000 /* decrementer freq: 1 ms ticks */
|
||||
|
||||
|
||||
/*
|
||||
* Various low-level settings
|
||||
*/
|
||||
|
|
@ -334,7 +317,6 @@
|
|||
|
||||
#define CFG_XLB_PIPELINING 1 /* enable transaction pipeling */
|
||||
|
||||
|
||||
/*
|
||||
* Cache Configuration
|
||||
*/
|
||||
|
|
@ -343,7 +325,6 @@
|
|||
#define CFG_CACHELINE_SHIFT 5 /* log base 2 of the above value */
|
||||
#endif
|
||||
|
||||
|
||||
/*
|
||||
* Flat Device Tree support
|
||||
*/
|
||||
|
|
|
|||
|
|
@ -534,4 +534,3 @@ int fdt_get_reservemap(void *fdt, int n, struct fdt_reserve_entry *re)
|
|||
}
|
||||
|
||||
#endif /* CONFIG_OF_LIBFDT */
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue
Block a user