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

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

Browse Source
master
Wolfgang Denk 18 years ago
parent dbf3317623 e8ee8f3ade
commit 8287b3b564
10 changed files with 41 additions and 23 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. 4
      Makefile
  2. 4
      board/freescale/m54455evb/config.mk
  3. 1
      board/m5282evb/m5282evb.c
  4. 6
      cpu/mcf52x2/start.S
  5. 4
      cpu/mcf532x/start.S
  6. 2
      include/configs/M5253EVBE.h
  7. 2
      include/configs/M5282EVB.h
  8. 2
      include/configs/M5329EVB.h
  9. 36
      include/configs/M54455EVB.h
  10. 3
      lib_m68k/m68k_linux.c

4
Makefile
Unescape View File

@ -1733,9 +1733,13 @@ M54455EVB_i66_config : unconfig
>include/config.h ; \ >include/config.h ; \
if [ "$${FLASH}" == "INTEL" ] ; then \ if [ "$${FLASH}" == "INTEL" ] ; then \
echo "#undef CFG_ATMEL_BOOT" >> $(obj)include/config.h ; \ echo "#undef CFG_ATMEL_BOOT" >> $(obj)include/config.h ; \
echo "TEXT_BASE = 0x00000000" > $(obj)board/freescale/m54455evb/config.tmp ; \
cp $(obj)board/freescale/m54455evb/u-boot.int $(obj)board/freescale/m54455evb/u-boot.lds ; \
echo "... with INTEL boot..." ; \ echo "... with INTEL boot..." ; \
else \ else \
echo "#define CFG_ATMEL_BOOT" >> $(obj)include/config.h ; \ echo "#define CFG_ATMEL_BOOT" >> $(obj)include/config.h ; \
echo "TEXT_BASE = 0x04000000" > $(obj)board/freescale/m54455evb/config.tmp ; \
cp $(obj)board/freescale/m54455evb/u-boot.atm $(obj)board/freescale/m54455evb/u-boot.lds ; \
echo "... with ATMEL boot..." ; \ echo "... with ATMEL boot..." ; \
fi; \ fi; \
echo "#define CFG_INPUT_CLKSRC $${FREQ}" >> $(obj)include/config.h ; \ echo "#define CFG_INPUT_CLKSRC $${FREQ}" >> $(obj)include/config.h ; \

4
board/freescale/m54455evb/config.mk
Unescape View File

@ -22,4 +22,6 @@
# MA 02111-1307 USA # MA 02111-1307 USA
# #
TEXT_BASE = 0 sinclude $(OBJTREE)/board/$(BOARDDIR)/config.tmp
PLATFORM_CPPFLAGS += -DTEXT_BASE=$(TEXT_BASE)

1
board/m5282evb/m5282evb.c
Unescape View File

@ -89,4 +89,5 @@ long int initdram (int board_type)
/* Write to the SDRAM Mode Register */ /* Write to the SDRAM Mode Register */
*(u32 *)(CFG_SDRAM_BASE + 0x400) = 0xA5A59696; *(u32 *)(CFG_SDRAM_BASE + 0x400) = 0xA5A59696;
} }
return dramsize;
} }

6
cpu/mcf52x2/start.S
Unescape View File

@ -58,7 +58,7 @@ _vectors:
.long 0x00000000 /* Flash offset is 0 until we setup CS0 */ .long 0x00000000 /* Flash offset is 0 until we setup CS0 */
#if defined(CONFIG_R5200) #if defined(CONFIG_R5200)
.long 0x400 .long 0x400
#elif defined(CONFIG_M5282) #elif defined(CONFIG_M5282) && (TEXT_BASE == CFG_INT_FLASH_BASE)
.long _start - TEXT_BASE .long _start - TEXT_BASE
#else #else
.long _START .long _START
@ -177,7 +177,11 @@ _after_flashbar_copy:
* therefore no VBR to set * therefore no VBR to set
*/ */
#if !defined(CONFIG_MONITOR_IS_IN_RAM) #if !defined(CONFIG_MONITOR_IS_IN_RAM)
#if defined(CONFIG_M5282) && (TEXT_BASE == CFG_INT_FLASH_BASE)
move.l #CFG_INT_FLASH_BASE, %d0
#else
move.l #CFG_FLASH_BASE, %d0 move.l #CFG_FLASH_BASE, %d0
#endif
movec %d0, %VBR movec %d0, %VBR
#endif #endif

4
cpu/mcf532x/start.S
Unescape View File

@ -131,7 +131,7 @@ _start:
movec %d0, %VBR movec %d0, %VBR
move.l #(CFG_INIT_RAM_ADDR + CFG_INIT_RAM_CTRL), %d0 move.l #(CFG_INIT_RAM_ADDR + CFG_INIT_RAM_CTRL), %d0
movec %d0, %RAMBAR0 movec %d0, %RAMBAR1
/* invalidate and disable cache */ /* invalidate and disable cache */
move.l #0x01000000, %d0 /* Invalidate cache cmd */ move.l #0x01000000, %d0 /* Invalidate cache cmd */
@ -268,7 +268,7 @@ _int_handler:
icache_enable: icache_enable:
move.l #0x01000000, %d0 /* Invalidate cache cmd */ move.l #0x01000000, %d0 /* Invalidate cache cmd */
movec %d0, %CACR /* Invalidate cache */ movec %d0, %CACR /* Invalidate cache */
move.l #(CFG_SDRAM_BASE + 0xc000 + ((CFG_SDRAM_SIZE & 0x1fe0) << 11)), %d0 move.l #(CFG_SDRAM_BASE + 0x1c000), %d0
movec %d0, %ACR0 /* Enable cache */ movec %d0, %ACR0 /* Enable cache */
move.l #0x80000200, %d0 /* Setup cache mask */ move.l #0x80000200, %d0 /* Setup cache mask */

2
include/configs/M5253EVBE.h
Unescape View File

@ -146,7 +146,7 @@
* Please note that CFG_SDRAM_BASE _must_ start at 0 * Please note that CFG_SDRAM_BASE _must_ start at 0
*/ */
#define CFG_SDRAM_BASE 0x00000000 #define CFG_SDRAM_BASE 0x00000000
#define CFG_SDRAM_SIZE 16 /* SDRAM size in MB */ #define CFG_SDRAM_SIZE 8 /* SDRAM size in MB */
#ifdef CONFIG_MONITOR_IS_IN_RAM #ifdef CONFIG_MONITOR_IS_IN_RAM
#define CFG_MONITOR_BASE 0x20000 #define CFG_MONITOR_BASE 0x20000

2
include/configs/M5282EVB.h
Unescape View File

@ -163,7 +163,7 @@
* Please note that CFG_SDRAM_BASE _must_ start at 0 * Please note that CFG_SDRAM_BASE _must_ start at 0
*/ */
#define CFG_SDRAM_BASE 0x00000000 #define CFG_SDRAM_BASE 0x00000000
#define CFG_SDRAM_SIZE 8 /* SDRAM size in MB */ #define CFG_SDRAM_SIZE 16 /* SDRAM size in MB */
#define CFG_FLASH_BASE 0xffe00000 #define CFG_FLASH_BASE 0xffe00000
#define CFG_INT_FLASH_BASE 0xf0000000 #define CFG_INT_FLASH_BASE 0xf0000000
#define CFG_INT_FLASH_ENABLE 0x21 #define CFG_INT_FLASH_ENABLE 0x21

2
include/configs/M5329EVB.h
Unescape View File

@ -175,7 +175,7 @@
* Please note that CFG_SDRAM_BASE _must_ start at 0 * Please note that CFG_SDRAM_BASE _must_ start at 0
*/ */
#define CFG_SDRAM_BASE 0x40000000 #define CFG_SDRAM_BASE 0x40000000
#define CFG_SDRAM_SIZE 16 /* SDRAM size in MB */ #define CFG_SDRAM_SIZE 32 /* SDRAM size in MB */
#define CFG_SDRAM_CFG1 0x53722730 #define CFG_SDRAM_CFG1 0x53722730
#define CFG_SDRAM_CFG2 0x56670000 #define CFG_SDRAM_CFG2 0x56670000
#define CFG_SDRAM_CTRL 0xE1092000 #define CFG_SDRAM_CTRL 0xE1092000

36
include/configs/M54455EVB.h
Unescape View File

@ -27,8 +27,8 @@
* board/config.h - configuration options, board specific * board/config.h - configuration options, board specific
*/ */
#ifndef _JAMICA54455_H #ifndef _M54455EVB_H
#define _JAMICA54455_H #define _M54455EVB_H
/* /*
* High Level Configuration Options * High Level Configuration Options
@ -75,7 +75,7 @@
#define CONFIG_CMD_MISC #define CONFIG_CMD_MISC
#define CONFIG_CMD_MII #define CONFIG_CMD_MII
#define CONFIG_CMD_NET #define CONFIG_CMD_NET
#define CONFIG_CMD_PCI #undef CONFIG_CMD_PCI
#define CONFIG_CMD_PING #define CONFIG_CMD_PING
#define CONFIG_CMD_REGINFO #define CONFIG_CMD_REGINFO
@ -129,8 +129,8 @@
"u-boot=u-boot.bin\0" \ "u-boot=u-boot.bin\0" \
"load=tftp ${loadaddr) ${u-boot}\0" \ "load=tftp ${loadaddr) ${u-boot}\0" \
"upd=run load; run prog\0" \ "upd=run load; run prog\0" \
"prog=prot off 0 2ffff;" \ "prog=prot off 4000000 402ffff;" \
"era 0 2ffff;" \ "era 4000000 402ffff;" \
"cp.b ${loadaddr} 0 ${filesize};" \ "cp.b ${loadaddr} 0 ${filesize};" \
"save\0" \ "save\0" \
"" ""
@ -174,6 +174,7 @@
#define CFG_IMMR CFG_MBAR #define CFG_IMMR CFG_MBAR
/* PCI */ /* PCI */
#ifdef CONFIG_CMD_PCI
#define CONFIG_PCI 1 #define CONFIG_PCI 1
#define CFG_PCI_MEM_BUS 0xA0000000 #define CFG_PCI_MEM_BUS 0xA0000000
@ -187,6 +188,7 @@
#define CFG_PCI_CFG_BUS 0xB0000000 #define CFG_PCI_CFG_BUS 0xB0000000
#define CFG_PCI_CFG_PHYS CFG_PCI_CFG_BUS #define CFG_PCI_CFG_PHYS CFG_PCI_CFG_BUS
#define CFG_PCI_CFG_SIZE 0x01000000 #define CFG_PCI_CFG_SIZE 0x01000000
#endif
/* FPGA - Spartan 2 */ /* FPGA - Spartan 2 */
/* experiment /* experiment
@ -268,8 +270,6 @@
/* Configuration for environment /* Configuration for environment
* Environment is embedded in u-boot in the second sector of the flash * Environment is embedded in u-boot in the second sector of the flash
*/ */
#define CFG_ENV_OFFSET 0x4000
#define CFG_ENV_SECT_SIZE 0x2000
#define CFG_ENV_IS_IN_FLASH 1 #define CFG_ENV_IS_IN_FLASH 1
#define CONFIG_ENV_OVERWRITE 1 #define CONFIG_ENV_OVERWRITE 1
#undef CFG_ENV_IS_EMBEDDED #undef CFG_ENV_IS_EMBEDDED
@ -278,13 +278,17 @@
* FLASH organization * FLASH organization
*/ */
#ifdef CFG_ATMEL_BOOT #ifdef CFG_ATMEL_BOOT
# define CFG_FLASH_BASE 0 # define CFG_FLASH_BASE CFG_CS0_BASE
# define CFG_FLASH0_BASE CFG_CS0_BASE # define CFG_FLASH0_BASE CFG_CS0_BASE
# define CFG_FLASH1_BASE CFG_CS1_BASE # define CFG_FLASH1_BASE CFG_CS1_BASE
# define CFG_ENV_ADDR (CFG_FLASH_BASE + 0x4000)
# define CFG_ENV_SECT_SIZE 0x2000
#else #else
# define CFG_FLASH_BASE CFG_FLASH0_BASE # define CFG_FLASH_BASE CFG_FLASH0_BASE
# define CFG_FLASH0_BASE CFG_CS1_BASE # define CFG_FLASH0_BASE CFG_CS1_BASE
# define CFG_FLASH1_BASE CFG_CS0_BASE # define CFG_FLASH1_BASE CFG_CS0_BASE
# define CFG_ENV_ADDR (CFG_FLASH_BASE + 0x60000)
# define CFG_ENV_SECT_SIZE 0x20000
#endif #endif
/* M54455EVB has one non CFI flash, defined CFG_FLASH_CFI will cause the system /* M54455EVB has one non CFI flash, defined CFG_FLASH_CFI will cause the system
@ -328,9 +332,9 @@
* NOTE: Enable CONFIG_CMD_JFFS2 for JFFS2 support. * NOTE: Enable CONFIG_CMD_JFFS2 for JFFS2 support.
*/ */
#ifdef CFG_ATMEL_BOOT #ifdef CFG_ATMEL_BOOT
# define CONFIG_JFFS2_DEV "nor0" # define CONFIG_JFFS2_DEV "nor1"
# define CONFIG_JFFS2_PART_SIZE 0x01000000 # define CONFIG_JFFS2_PART_SIZE 0x01000000
# define CONFIG_JFFS2_PART_OFFSET CFG_FLASH1_BASE # define CONFIG_JFFS2_PART_OFFSET (CFG_FLASH1_BASE + 0x500000)
#else #else
# define CONFIG_JFFS2_DEV "nor0" # define CONFIG_JFFS2_DEV "nor0"
# define CONFIG_JFFS2_PART_SIZE (0x01000000 - 0x500000) # define CONFIG_JFFS2_PART_SIZE (0x01000000 - 0x500000)
@ -356,20 +360,20 @@
#ifdef CFG_ATMEL_BOOT #ifdef CFG_ATMEL_BOOT
/* Atmel Flash */ /* Atmel Flash */
#define CFG_CS0_BASE 0 #define CFG_CS0_BASE 0x04000000
#define CFG_CS0_MASK 0x00070001 #define CFG_CS0_MASK 0x00070001
#define CFG_CS0_CTRL 0x00001140 #define CFG_CS0_CTRL 0x00001140
/* Intel Flash */ /* Intel Flash */
#define CFG_CS1_BASE 0x04000000 #define CFG_CS1_BASE 0x00000000
#define CFG_CS1_MASK 0x01FF0001 #define CFG_CS1_MASK 0x01FF0001
#define CFG_CS1_CTRL 0x003F3D60 #define CFG_CS1_CTRL 0x00000D60
#define CFG_ATMEL_BASE CFG_CS0_BASE #define CFG_ATMEL_BASE CFG_CS0_BASE
#else #else
/* Intel Flash */ /* Intel Flash */
#define CFG_CS0_BASE 0 #define CFG_CS0_BASE 0x00000000
#define CFG_CS0_MASK 0x01FF0001 #define CFG_CS0_MASK 0x01FF0001
#define CFG_CS0_CTRL 0x003F3D60 #define CFG_CS0_CTRL 0x00000D60
/* Atmel Flash */ /* Atmel Flash */
#define CFG_CS1_BASE 0x04000000 #define CFG_CS1_BASE 0x04000000
#define CFG_CS1_MASK 0x00070001 #define CFG_CS1_MASK 0x00070001
@ -388,4 +392,4 @@
#define CFG_CS3_MASK 0x00070001 #define CFG_CS3_MASK 0x00070001
#define CFG_CS3_CTRL 0x00000020 #define CFG_CS3_CTRL 0x00000020
#endif /* _JAMICA54455_H */ #endif /* _M54455EVB_H */

3
lib_m68k/m68k_linux.c
Unescape View File

@ -26,6 +26,7 @@
#include <image.h> #include <image.h>
#include <zlib.h> #include <zlib.h>
#include <bzlib.h> #include <bzlib.h>
#include <watchdog.h>
#include <environment.h> #include <environment.h>
#include <asm/byteorder.h> #include <asm/byteorder.h>
@ -36,6 +37,8 @@ DECLARE_GLOBAL_DATA_PTR;
#define LINUX_MAX_ENVS 256 #define LINUX_MAX_ENVS 256
#define LINUX_MAX_ARGS 256 #define LINUX_MAX_ARGS 256
#define CHUNKSZ (64 * 1024)
#ifdef CONFIG_SHOW_BOOT_PROGRESS #ifdef CONFIG_SHOW_BOOT_PROGRESS
# include <status_led.h> # include <status_led.h>
# define SHOW_BOOT_PROGRESS(arg) show_boot_progress(arg) # define SHOW_BOOT_PROGRESS(arg) show_boot_progress(arg)

Write Preview
Loading…
Cancel
Save