mirror of
https://github.com/AsahiLinux/u-boot
synced 2024-11-30 16:39:35 +00:00
Merge with git+ssh://sr@pollux.denx.org/home/sr/git/u-boot/denx/.git
This commit is contained in:
Stefan Roese
commit
7590da92b1
6 changed files with 155 additions and 26 deletions
125
CHANGELOG
125
CHANGELOG
|
|
@ -1,3 +1,124 @@
|
|||
commit f07ae7a9daef27a3d0213a4f3fe39d5342173c02
|
||||
Author: Stefan Roese <sr@denx.de>
|
||||
Date: Sat Jan 6 15:58:09 2007 +0100
|
||||
|
||||
[PATCH] 44x: Fix problem with DDR controller setup (refresh rate)
|
||||
|
||||
This patch fixes a problem with an incorrect setup for the refresh
|
||||
timer of the 44x DDR controller in the file cpu/ppc4xx/sdram.c
|
||||
|
||||
Signed-off-by: Stefan Roese <sr@denx.de>
|
||||
|
||||
commit f16c1da9577f06c5fc08651a4065537407de4635
|
||||
Author: Stefan Roese <sr@denx.de>
|
||||
Date: Sat Jan 6 15:56:13 2007 +0100
|
||||
|
||||
[PATCH] Update ALPR board files
|
||||
|
||||
This update brings the ALPR board support to the newest version.
|
||||
It also fixes a problem with the NAND driver.
|
||||
|
||||
Signed-off-by: Stefan Roese <sr@denx.de>
|
||||
|
||||
commit cd1d937f90250a32988c37b2b4af8364d25de8ed
|
||||
Author: Stefan Roese <sr@denx.de>
|
||||
Date: Fri Jan 5 11:46:05 2007 +0100
|
||||
|
||||
[PATCH] nand: Fix problem with oobsize calculation
|
||||
|
||||
Here the description from Brian Brelsford <Brian_Brelsford@dell.com>:
|
||||
|
||||
The Hynix part returns a 0x1d in the 4th ID byte. The Samsung part
|
||||
returns a 0x15. In the code fragment below bits [1:0] determine the
|
||||
page size, it is ANDed via "(extid & 0x3)" then shifted out. The
|
||||
next field is also ANDed with 0x3. However this is a one bit field
|
||||
as defined in the Hynix and Samsung parts in the 4th ID byte that
|
||||
determins the oobsize, not a two bit field. It works on Samsung as
|
||||
bits[3:2] are 01. However for the Hynix there is a 11 in these two
|
||||
bits, so the oob size gets messed up.
|
||||
|
||||
I checked the correct linux code and the suggested fix from Brian is
|
||||
also available in the linux nand mtd driver.
|
||||
|
||||
Signed-off-by: Stefan Roese <sr@denx.de>
|
||||
|
||||
commit a78bc443ae5a4a8ba87590587d5e35bf5a787b2e
|
||||
Author: Stefan Roese <sr@denx.de>
|
||||
Date: Fri Jan 5 10:40:36 2007 +0100
|
||||
|
||||
[PATCH] Clear PLB4A0_ACR[WRP] on Sequoia (440EPx)
|
||||
|
||||
This fix will make the MAL burst disabling patch for the Linux
|
||||
EMAC driver obsolete.
|
||||
|
||||
Signed-off-by: Stefan Roese <sr@denx.de>
|
||||
|
||||
commit 023889838282b6237b401664f22dd22dfba2c066
|
||||
Author: Stefan Roese <sr@denx.de>
|
||||
Date: Fri Jan 5 10:38:05 2007 +0100
|
||||
|
||||
[PATCH] Add DDR2 optimization code for Sequoia (440EPx) board
|
||||
|
||||
This code will optimize the DDR2 controller setup on a board specific
|
||||
basis.
|
||||
|
||||
Note: This code doesn't work right now on the NAND booting image for the
|
||||
Sequoia board, since it doesn't fit into the 4kBytes for the SPL image.
|
||||
|
||||
Signed-off-by: Stefan Roese <sr@denx.de>
|
||||
|
||||
commit cce4acbb68398634b8d011ed7bb0d12269c84230
|
||||
Author: Bartlomiej Sieka <tur@semihalf.com>
|
||||
Date: Thu Dec 28 19:08:21 2006 +0100
|
||||
|
||||
Few V38B changes:
|
||||
- fix a typo in V38B config file
|
||||
- move watchdog initialisation earlier in the boot process
|
||||
- add "wdt=off" to default kernel command line (disables kernel watchdog)
|
||||
|
||||
commit 92eb729bad876725aeea908d2addba0800620840
|
||||
Author: Wolfgang Denk <wd@pollux.denx.de>
|
||||
Date: Wed Dec 27 01:26:13 2006 +0100
|
||||
|
||||
Fix bug in adaption of Stefano Babic's CFI driver patch.
|
||||
|
||||
commit 9c0f42ecfe25f7ffce8ec7a815f03864d723ffe3
|
||||
Author: Wolfgang Denk <wd@pollux.denx.de>
|
||||
Date: Sun Dec 24 01:42:57 2006 +0100
|
||||
|
||||
Minor code cleanup.
|
||||
|
||||
commit d784fdb05900ada3686d5778783e1fb328e9fb66
|
||||
Author: Stefano Babic <sbabic@denx.de>
|
||||
Date: Tue Dec 12 00:22:42 2006 +0100
|
||||
|
||||
Fix cfi failure with Spansion Flash (Spansion Flash Devices have a different offset to go into CFI mode)
|
||||
|
||||
commit 1b3c360c235dc684ec06c2d5f183f0a282ce45e2
|
||||
Author: Stefan Roese <sr@denx.de>
|
||||
Date: Fri Dec 22 14:29:40 2006 +0100
|
||||
|
||||
[PATCH] Fix sequoia flash autodetection (finally correct)
|
||||
|
||||
Now 32MByte and 64MByte FLASH is know to work and other
|
||||
configurations should work too.
|
||||
|
||||
Signed-off-by: Stefan Roese <sr@denx.de>
|
||||
|
||||
commit 82e5236a8b719543643fd26d5827938ab2b94818
|
||||
Author: Wolfgang Denk <wd@pollux.denx.de>
|
||||
Date: Fri Dec 22 10:30:26 2006 +0100
|
||||
|
||||
Minor code cleanup; update CHANGELOG.
|
||||
|
||||
commit fa23044564091f05d9695beb7b5b9a931e7f41a4
|
||||
Author: Heiko Schocher <hs@pollux.denx.de>
|
||||
Date: Thu Dec 21 17:17:02 2006 +0100
|
||||
|
||||
Added support for the TQM8272 board from TQ
|
||||
|
||||
Signed-off-by: Heiko Schocher <hs@denx.de>
|
||||
|
||||
commit c84bad0ef60e7055ab0bd49b93069509cecc382a
|
||||
Author: Bartlomiej Sieka <tur@semihalf.com>
|
||||
Date: Wed Dec 20 00:29:43 2006 +0100
|
||||
|
|
@ -210,7 +331,7 @@ Date: Mon Nov 27 17:04:06 2006 +0100
|
|||
[PATCH] Allow CONFIG_OF_FLAT_TREE to boot a non-arch/powerpc kernel
|
||||
|
||||
This patch allows an arch/ppc kernel to be booted by just passing 1 or 2
|
||||
arguments to bootm. It removes the getenv("disable_of") test that used
|
||||
arguments to bootm. It removes the getenv("disable_of") test that used
|
||||
to be used for this purpose.
|
||||
|
||||
Signed-off-by: Grant Likely <grant.likely@secretlab.ca>
|
||||
|
|
@ -908,7 +1029,7 @@ Date: Tue Oct 24 23:47:37 2006 -0500
|
|||
|
||||
If a Multi-Image file contains a third image we try to use it as a
|
||||
device tree. The device tree image is assumed to be uncompressed in the
|
||||
image file. We automatically allocate space for the device tree in memory
|
||||
image file. We automatically allocate space for the device tree in memory
|
||||
and provide an 8k pad to allow more than a reasonable amount of growth.
|
||||
|
||||
Additionally, a device tree that was contained in flash will now automatically
|
||||
|
|
|
|||
4
Makefile
4
Makefile
|
|
@ -22,8 +22,8 @@
|
|||
#
|
||||
|
||||
VERSION = 1
|
||||
PATCHLEVEL = 1
|
||||
SUBLEVEL = 6
|
||||
PATCHLEVEL = 2
|
||||
SUBLEVEL = 0
|
||||
EXTRAVERSION =
|
||||
U_BOOT_VERSION = $(VERSION).$(PATCHLEVEL).$(SUBLEVEL)$(EXTRAVERSION)
|
||||
VERSION_FILE = $(obj)include/version_autogenerated.h
|
||||
|
|
|
|||
|
|
@ -77,8 +77,12 @@ int board_early_init_f (void)
|
|||
mtdcr (uicb0tr, 0x00000000); /* */
|
||||
mtdcr (uicb0vr, 0x00000001); /* */
|
||||
|
||||
/* Setup shutdown/SSD empty interrupt as inputs */
|
||||
out32(GPIO0_TCR, in32(GPIO0_TCR) & ~(CFG_GPIO_SHUTDOWN | CFG_GPIO_SSD_EMPTY));
|
||||
out32(GPIO0_ODR, in32(GPIO0_ODR) & ~(CFG_GPIO_SHUTDOWN | CFG_GPIO_SSD_EMPTY));
|
||||
|
||||
/* Setup GPIO/IRQ multiplexing */
|
||||
mtsdr(sdr_pfc0, 0x01a03e00);
|
||||
mtsdr(sdr_pfc0, 0x01a33e00);
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
|
@ -105,26 +109,11 @@ int last_stage_init(void)
|
|||
|
||||
static int board_rev(void)
|
||||
{
|
||||
int rev;
|
||||
u32 pfc0;
|
||||
|
||||
/* Setup GPIO14 & 15 as GPIO */
|
||||
mfsdr(sdr_pfc0, pfc0);
|
||||
pfc0 |= CFG_GPIO_REV0 | CFG_GPIO_REV1;
|
||||
mtsdr(sdr_pfc0, pfc0);
|
||||
|
||||
/* Setup as input */
|
||||
out32(GPIO0_TCR, in32(GPIO0_TCR) & ~(CFG_GPIO_REV0 | CFG_GPIO_REV0));
|
||||
out32(GPIO0_ODR, in32(GPIO0_ODR) & ~(CFG_GPIO_REV0 | CFG_GPIO_REV0));
|
||||
out32(GPIO0_TCR, in32(GPIO0_TCR) & ~(CFG_GPIO_REV0 | CFG_GPIO_REV1));
|
||||
out32(GPIO0_ODR, in32(GPIO0_ODR) & ~(CFG_GPIO_REV0 | CFG_GPIO_REV1));
|
||||
|
||||
rev = (in32(GPIO0_IR) >> 16) & 0x3;
|
||||
|
||||
/* Setup GPIO14 & 15 as non GPIO again */
|
||||
mfsdr(sdr_pfc0, pfc0);
|
||||
pfc0 &= ~(CFG_GPIO_REV0 | CFG_GPIO_REV1);
|
||||
mtsdr(sdr_pfc0, pfc0);
|
||||
|
||||
return rev;
|
||||
return (in32(GPIO0_IR) >> 16) & 0x3;
|
||||
}
|
||||
|
||||
int checkboard (void)
|
||||
|
|
|
|||
|
|
@ -154,7 +154,7 @@ static int alpr_nand_dev_ready(struct mtd_info *mtd)
|
|||
return 1;
|
||||
}
|
||||
|
||||
void board_nand_init(struct nand_chip *nand)
|
||||
int board_nand_init(struct nand_chip *nand)
|
||||
{
|
||||
alpr_ndfc = (struct alpr_ndfc_regs *)CFG_NAND_BASE;
|
||||
|
||||
|
|
@ -169,5 +169,7 @@ void board_nand_init(struct nand_chip *nand)
|
|||
nand->read_buf = alpr_nand_read_buf;
|
||||
nand->verify_buf = alpr_nand_verify_buf;
|
||||
nand->dev_ready = alpr_nand_dev_ready;
|
||||
|
||||
return 0;
|
||||
}
|
||||
#endif
|
||||
|
|
|
|||
|
|
@ -380,7 +380,7 @@ long int initdram(int board_type)
|
|||
mtsdram(mem_b0cr, mb0cf[i].reg);
|
||||
mtsdram(mem_tr0, 0x41094012);
|
||||
mtsdram(mem_tr1, 0x80800800); /* SS=T2 SL=STAGE 3 CD=1 CT=0x00*/
|
||||
mtsdram(mem_rtr, 0x7e000000); /* Interval 15.20µs @ 133MHz PLB*/
|
||||
mtsdram(mem_rtr, 0x04100000); /* Interval 7.8µs @ 133MHz PLB */
|
||||
mtsdram(mem_cfg1, 0x00000000); /* Self-refresh exit, disable PM*/
|
||||
udelay(400); /* Delay 200 usecs (min) */
|
||||
|
||||
|
|
|
|||
|
|
@ -166,8 +166,23 @@
|
|||
"cp.b 100000 fffc0000 40000;" \
|
||||
"setenv filesize;saveenv\0" \
|
||||
"upd=run load;run update\0" \
|
||||
"ethprime=ppc_4xx_eth3\0" \
|
||||
"ethact=ppc_4xx_eth3\0" \
|
||||
"autoload=no\0" \
|
||||
"ipconfig=dhcp;setenv serverip 11.0.0.152\0" \
|
||||
"actkernel=kernel2\0" \
|
||||
"load_fpga=fpga load 0 ffe00000 10dd9a\0" \
|
||||
"mtdargs=setenv bootargs root=/dev/mtdblock6 rw " \
|
||||
"rootfstype=jffs2 init=/sbin/init\0" \
|
||||
"kernel1_mtd=nand read 200000 0 200000;run mtdargs addip addtty"\
|
||||
";bootm 200000\0" \
|
||||
"kernel2_mtd=nand read 200000 200000 200000;run mtdargs addip " \
|
||||
"addtty;bootm 200000\0" \
|
||||
"kernel1=run ipconfig load_fpga kernel1_mtd\0" \
|
||||
"kernel2=run ipconfig load_fpga kernel2_mtd\0" \
|
||||
""
|
||||
#define CONFIG_BOOTCOMMAND "run flash_self"
|
||||
|
||||
#define CONFIG_BOOTCOMMAND "run kernel2"
|
||||
|
||||
#define CONFIG_BOOTDELAY 2 /* autoboot after 5 seconds */
|
||||
|
||||
|
|
@ -291,6 +306,8 @@
|
|||
/*-----------------------------------------------------------------------
|
||||
* Definitions for GPIO setup
|
||||
*-----------------------------------------------------------------------*/
|
||||
#define CFG_GPIO_SHUTDOWN (0x80000000 >> 6)
|
||||
#define CFG_GPIO_SSD_EMPTY (0x80000000 >> 9)
|
||||
#define CFG_GPIO_EREADY (0x80000000 >> 26)
|
||||
#define CFG_GPIO_REV0 (0x80000000 >> 14)
|
||||
#define CFG_GPIO_REV1 (0x80000000 >> 15)
|
||||
|
|
|
|||
Loading…
Reference in a new issue