GitHub-Mirror/u-boot
2
0
Fork 0
mirror of https://github.com/Fishwaldo/u-boot.git synced 2025-03-20 22:21:41 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'master' of git://git.denx.de/u-boot-coldfire

Browse source
This commit is contained in:
Wolfgang Denk 2009-03-18 00:40:57 +01:00
commit efb47346d4
19 changed files with 33 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
board/freescale/m5329evb/nand.c
View file

@ -47,10 +47,12 @@ static void nand_hwcontrol(struct mtd_info *mtdinfo, int cmd, unsigned int ctrl)
ulong IO_ADDR_W = (ulong) this->IO_ADDR_W; ulong IO_ADDR_W = (ulong) this->IO_ADDR_W;
IO_ADDR_W &= ~(SET_ALE | SET_CLE); IO_ADDR_W &= ~(SET_ALE | SET_CLE);
*nCE &= 0xFFFB;
if (ctrl & NAND_NCE) if (ctrl & NAND_NCE)
*nCE &= 0xFFFB;
else
*nCE |= 0x0004; *nCE |= 0x0004;
if (ctrl & NAND_CLE) if (ctrl & NAND_CLE)
IO_ADDR_W |= SET_CLE; IO_ADDR_W |= SET_CLE;
if (ctrl & NAND_ALE) if (ctrl & NAND_ALE)
@ -78,7 +80,7 @@ int board_nand_init(struct nand_chip *nand)
gpio->pclrr_timer = 0; gpio->pclrr_timer = 0;
gpio->podr_timer = 0; gpio->podr_timer = 0;
nand->chip_delay = 50; nand->chip_delay = 60;
nand->ecc.mode = NAND_ECC_SOFT; nand->ecc.mode = NAND_ECC_SOFT;
nand->cmd_ctrl = nand_hwcontrol; nand->cmd_ctrl = nand_hwcontrol;

6
board/freescale/m5373evb/nand.c
View file

@ -47,10 +47,12 @@ static void nand_hwcontrol(struct mtd_info *mtdinfo, int cmd, unsigned int ctrl)
ulong IO_ADDR_W = (ulong) this->IO_ADDR_W; ulong IO_ADDR_W = (ulong) this->IO_ADDR_W;
IO_ADDR_W &= ~(SET_ALE | SET_CLE); IO_ADDR_W &= ~(SET_ALE | SET_CLE);
*nCE &= 0xFFFB;
if (ctrl & NAND_NCE) if (ctrl & NAND_NCE)
*nCE &= 0xFFFB;
else
*nCE |= 0x0004; *nCE |= 0x0004;
if (ctrl & NAND_CLE) if (ctrl & NAND_CLE)
IO_ADDR_W |= SET_CLE; IO_ADDR_W |= SET_CLE;
if (ctrl & NAND_ALE) if (ctrl & NAND_ALE)
@ -82,7 +84,7 @@ int board_nand_init(struct nand_chip *nand)
gpio->pclrr_timer = 0; gpio->pclrr_timer = 0;
gpio->podr_timer = 0; gpio->podr_timer = 0;
nand->chip_delay = 50; nand->chip_delay = 60;
nand->ecc.mode = NAND_ECC_SOFT; nand->ecc.mode = NAND_ECC_SOFT;
nand->cmd_ctrl = nand_hwcontrol; nand->cmd_ctrl = nand_hwcontrol;

4
cpu/mcf5227x/config.mk
View file

@ -24,8 +24,8 @@
# #
PLATFORM_RELFLAGS += -ffixed-d7 -msep-data PLATFORM_RELFLAGS += -ffixed-d7 -msep-data
ifeq ($(findstring 4.2,$(shell $(CC) --version)),4.2) ifneq ($(findstring 4.1,$(shell $(CC) --version)),4.1)
PLATFORM_CPPFLAGS += -mcpu=5208 -fPIC PLATFORM_CPPFLAGS += -mcpu=52277 -fPIC
else else
PLATFORM_CPPFLAGS += -m5307 -fPIC PLATFORM_CPPFLAGS += -m5307 -fPIC
endif endif

2
cpu/mcf523x/config.mk
View file

@ -24,7 +24,7 @@
# #
PLATFORM_RELFLAGS += -ffixed-d7 -msep-data PLATFORM_RELFLAGS += -ffixed-d7 -msep-data
ifeq ($(findstring 4.2,$(shell $(CC) --version)),4.2) ifneq ($(findstring 4.1,$(shell $(CC) --version)),4.1)
PLATFORM_CPPFLAGS += -mcpu=5235 -fPIC PLATFORM_CPPFLAGS += -mcpu=5235 -fPIC
else else
PLATFORM_CPPFLAGS += -m5307 -fPIC PLATFORM_CPPFLAGS += -m5307 -fPIC

2
cpu/mcf52x2/config.mk
View file

@ -34,7 +34,7 @@ is5275:=$(shell grep CONFIG_M5275 $(TOPDIR)/include/$(cfg))
is5282:=$(shell grep CONFIG_M5282 $(TOPDIR)/include/$(cfg)) is5282:=$(shell grep CONFIG_M5282 $(TOPDIR)/include/$(cfg))
ifeq ($(findstring 4.2,$(shell $(CC) --version)),4.2) ifneq ($(findstring 4.1,$(shell $(CC) --version)),4.1)
ifneq (,$(findstring CONFIG_M5249,$(is5249))) ifneq (,$(findstring CONFIG_M5249,$(is5249)))
PLATFORM_CPPFLAGS += -mcpu=5249 PLATFORM_CPPFLAGS += -mcpu=5249

2
cpu/mcf532x/config.mk
View file

@ -24,7 +24,7 @@
# #
PLATFORM_RELFLAGS += -ffixed-d7 -msep-data PLATFORM_RELFLAGS += -ffixed-d7 -msep-data
ifeq ($(findstring 4.2,$(shell $(CC) --version)),4.2) ifneq ($(findstring 4.1,$(shell $(CC) --version)),4.1)
PLATFORM_CPPFLAGS += -mcpu=5329 -fPIC PLATFORM_CPPFLAGS += -mcpu=5329 -fPIC
else else
PLATFORM_CPPFLAGS += -m5307 -fPIC PLATFORM_CPPFLAGS += -m5307 -fPIC

2
cpu/mcf5445x/config.mk
View file

@ -24,7 +24,7 @@
# #
PLATFORM_RELFLAGS += -ffixed-d7 -msep-data PLATFORM_RELFLAGS += -ffixed-d7 -msep-data
ifeq ($(findstring 4.2,$(shell $(CC) --version)),4.2) ifneq ($(findstring 4.1,$(shell $(CC) --version)),4.1)
PLATFORM_CPPFLAGS += -mcpu=54455 -fPIC PLATFORM_CPPFLAGS += -mcpu=54455 -fPIC
else else
PLATFORM_CPPFLAGS += -m5407 -fPIC PLATFORM_CPPFLAGS += -m5407 -fPIC

4
cpu/mcf5445x/start.S
View file

@ -243,9 +243,9 @@ wait1000:
nop nop
#elif defined(CONFIG_M54451EVB) #elif defined(CONFIG_M54451EVB)
/* Issue LEMR */ /* Issue LEMR */
move.l #(CONFIG_SYS_SDRAM_MODE), (%a2) move.l #(CONFIG_SYS_SDRAM_MODE), (%a1)
nop nop
move.l #(CONFIG_SYS_SDRAM_EMOD), (%a2) move.l #(CONFIG_SYS_SDRAM_EMOD), (%a1)
nop nop
#endif #endif

2
cpu/mcf547x_8x/config.mk
View file

@ -24,7 +24,7 @@
# #
PLATFORM_RELFLAGS += -ffixed-d7 -msep-data PLATFORM_RELFLAGS += -ffixed-d7 -msep-data
ifeq ($(findstring 4.2,$(shell $(CC) --version)),4.2) ifneq ($(findstring 4.1,$(shell $(CC) --version)),4.1)
PLATFORM_CPPFLAGS += -mcpu=5485 -fPIC PLATFORM_CPPFLAGS += -mcpu=5485 -fPIC
else else
PLATFORM_CPPFLAGS += -m5407 -fPIC PLATFORM_CPPFLAGS += -m5407 -fPIC

6
cpu/mcf547x_8x/cpu_init.c
View file

@ -49,14 +49,14 @@ void cpu_init_f(void)
volatile xlbarb_t *xlbarb = (volatile xlbarb_t *) MMAP_XARB; volatile xlbarb_t *xlbarb = (volatile xlbarb_t *) MMAP_XARB;
xlbarb->adrto = 0x2000; xlbarb->adrto = 0x2000;
xlbarb->datto = 0x2000; xlbarb->datto = 0x2500;
xlbarb->busto = 0x3000; xlbarb->busto = 0x3000;
xlbarb->cfg = XARB_SR_AT | XARB_SR_DT; xlbarb->cfg = XARB_CFG_AT | XARB_CFG_DT;
/* Master Priority Enable */ /* Master Priority Enable */
xlbarb->pri = 0;
xlbarb->prien = 0xff; xlbarb->prien = 0xff;
xlbarb->pri = 0;
#if (defined(CONFIG_SYS_CS0_BASE) && defined(CONFIG_SYS_CS0_MASK) && defined(CONFIG_SYS_CS0_CTRL)) #if (defined(CONFIG_SYS_CS0_BASE) && defined(CONFIG_SYS_CS0_MASK) && defined(CONFIG_SYS_CS0_CTRL))
fbcs->csar0 = CONFIG_SYS_CS0_BASE; fbcs->csar0 = CONFIG_SYS_CS0_BASE;

4
include/asm-m68k/m5301x.h
View file

@ -601,4 +601,8 @@
#define RTC_OCEN_OSCBYP (0x00000010) #define RTC_OCEN_OSCBYP (0x00000010)
#define RTC_OCEN_CLKEN (0x00000008) #define RTC_OCEN_CLKEN (0x00000008)
/* SDRAM */
#define SDRAMC_SDCR_CKE (0x40000000)
#define SDRAMC_SDCR_REF (0x10000000)
#endif /* m5301x_h */ #endif /* m5301x_h */

1
include/configs/M52277EVB.h
View file

@ -246,6 +246,7 @@
/* Initial Memory map for Linux */ /* Initial Memory map for Linux */
#define CONFIG_SYS_BOOTMAPSZ (CONFIG_SYS_SDRAM_BASE + (CONFIG_SYS_SDRAM_SIZE << 20)) #define CONFIG_SYS_BOOTMAPSZ (CONFIG_SYS_SDRAM_BASE + (CONFIG_SYS_SDRAM_SIZE << 20))
#define CONFIG_SYS_BOOTM_LEN (CONFIG_SYS_SDRAM_SIZE << 20)
/* /*
* Configuration for environment * Configuration for environment

1
include/configs/M5235EVB.h
View file

@ -197,6 +197,7 @@
*/ */
/* Initial Memory map for Linux */ /* Initial Memory map for Linux */
#define CONFIG_SYS_BOOTMAPSZ (CONFIG_SYS_SDRAM_BASE + (CONFIG_SYS_SDRAM_SIZE << 20)) #define CONFIG_SYS_BOOTMAPSZ (CONFIG_SYS_SDRAM_BASE + (CONFIG_SYS_SDRAM_SIZE << 20))
#define CONFIG_SYS_BOOTM_LEN (CONFIG_SYS_SDRAM_SIZE << 20)
/*----------------------------------------------------------------------- /*-----------------------------------------------------------------------
* FLASH organization * FLASH organization

1
include/configs/M5253DEMO.h
View file

@ -200,6 +200,7 @@
* the maximum mapped by the Linux kernel during initialization ?? * the maximum mapped by the Linux kernel during initialization ??
*/ */
#define CONFIG_SYS_BOOTMAPSZ (CONFIG_SYS_SDRAM_BASE + (CONFIG_SYS_SDRAM_SIZE << 20)) #define CONFIG_SYS_BOOTMAPSZ (CONFIG_SYS_SDRAM_BASE + (CONFIG_SYS_SDRAM_SIZE << 20))
#define CONFIG_SYS_BOOTM_LEN (CONFIG_SYS_SDRAM_SIZE << 20)
/* FLASH organization */ /* FLASH organization */
#define CONFIG_SYS_FLASH_BASE (CONFIG_SYS_CS0_BASE) #define CONFIG_SYS_FLASH_BASE (CONFIG_SYS_CS0_BASE)

1
include/configs/M5253EVBE.h
View file

@ -164,6 +164,7 @@
* the maximum mapped by the Linux kernel during initialization ?? * the maximum mapped by the Linux kernel during initialization ??
*/ */
#define CONFIG_SYS_BOOTMAPSZ (CONFIG_SYS_SDRAM_BASE + (CONFIG_SYS_SDRAM_SIZE << 20)) #define CONFIG_SYS_BOOTMAPSZ (CONFIG_SYS_SDRAM_BASE + (CONFIG_SYS_SDRAM_SIZE << 20))
#define CONFIG_SYS_BOOTM_LEN (CONFIG_SYS_SDRAM_SIZE << 20)
/* FLASH organization */ /* FLASH organization */
#define CONFIG_SYS_FLASH_BASE CONFIG_SYS_CS0_BASE #define CONFIG_SYS_FLASH_BASE CONFIG_SYS_CS0_BASE

3
include/configs/M5275EVB.h
View file

@ -190,7 +190,8 @@
* have to be in the first 8 MB of memory, since this is * have to be in the first 8 MB of memory, since this is
* the maximum mapped by the Linux kernel during initialization ?? * the maximum mapped by the Linux kernel during initialization ??
*/ */
#define CONFIG_SYS_BOOTMAPSZ (8 << 20) /* Initial mmap for Linux */ #define CONFIG_SYS_BOOTMAPSZ (CONFIG_SYS_SDRAM_BASE + (CONFIG_SYS_SDRAM_SIZE << 20))
#define CONFIG_SYS_BOOTM_LEN (CONFIG_SYS_SDRAM_SIZE << 20)
/*----------------------------------------------------------------------- /*-----------------------------------------------------------------------
* FLASH organization * FLASH organization

1
include/configs/M53017EVB.h
View file

@ -196,6 +196,7 @@
* the maximum mapped by the Linux kernel during initialization ?? * the maximum mapped by the Linux kernel during initialization ??
*/ */
#define CONFIG_SYS_BOOTMAPSZ (CONFIG_SYS_SDRAM_BASE + (CONFIG_SYS_SDRAM_SIZE << 20)) #define CONFIG_SYS_BOOTMAPSZ (CONFIG_SYS_SDRAM_BASE + (CONFIG_SYS_SDRAM_SIZE << 20))
#define CONFIG_SYS_BOOTM_LEN (CONFIG_SYS_SDRAM_SIZE << 20)
/*----------------------------------------------------------------------- /*-----------------------------------------------------------------------
* FLASH organization * FLASH organization

1
include/configs/M5329EVB.h
View file

@ -196,6 +196,7 @@
* the maximum mapped by the Linux kernel during initialization ?? * the maximum mapped by the Linux kernel during initialization ??
*/ */
#define CONFIG_SYS_BOOTMAPSZ (CONFIG_SYS_SDRAM_BASE + (CONFIG_SYS_SDRAM_SIZE << 20)) #define CONFIG_SYS_BOOTMAPSZ (CONFIG_SYS_SDRAM_BASE + (CONFIG_SYS_SDRAM_SIZE << 20))
#define CONFIG_SYS_BOOTM_LEN (CONFIG_SYS_SDRAM_SIZE << 20)
/*----------------------------------------------------------------------- /*-----------------------------------------------------------------------
* FLASH organization * FLASH organization

1
include/configs/M5373EVB.h
View file

@ -196,6 +196,7 @@
* the maximum mapped by the Linux kernel during initialization ?? * the maximum mapped by the Linux kernel during initialization ??
*/ */
#define CONFIG_SYS_BOOTMAPSZ (CONFIG_SYS_SDRAM_BASE + (CONFIG_SYS_SDRAM_SIZE << 20)) #define CONFIG_SYS_BOOTMAPSZ (CONFIG_SYS_SDRAM_BASE + (CONFIG_SYS_SDRAM_SIZE << 20))
#define CONFIG_SYS_BOOTM_LEN (CONFIG_SYS_SDRAM_SIZE << 20)
/*----------------------------------------------------------------------- /*-----------------------------------------------------------------------
* FLASH organization * FLASH organization