summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorWolfgang Denk <wd@pollux.denx.de>2006-07-19 18:01:38 +0200
committerWolfgang Denk <wd@pollux.denx.de>2006-07-19 18:01:38 +0200
commit978b10964c1a4b3bf97fa5198ba62b36bd173cbe (patch)
treef1dd5f48a8f7fd189d3a025dd4a0d2232cee9bb7
parent45a212c4d73452beac30d4e405a9657b07d7edb3 (diff)
downloadbarebox-978b10964c1a4b3bf97fa5198ba62b36bd173cbe.tar.gz
barebox-978b10964c1a4b3bf97fa5198ba62b36bd173cbe.tar.xz
Add support for high-boot on TQM5200 and TQM5200S boards.
Hint: the CPLD on the TQM5200 must be programmed with a software version supporting the high boot option! The new TQM5200S is already supporting this option. On the TQM5200 this option will be supported in configurations with MPC5200 rev B processors. To actually "high boot", set jumper X30 on the STK52xx. Patch by Martin Krause, 12 Jul 2006
-rw-r--r--CHANGELOG9
-rw-r--r--Makefile4
-rw-r--r--board/tqm5200/config.mk5
-rw-r--r--include/configs/TQM5200.h6
4 files changed, 19 insertions, 5 deletions
diff --git a/CHANGELOG b/CHANGELOG
index d3d6c8bfd1..291204b72f 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -2,11 +2,20 @@
Changes since U-Boot 1.1.4:
======================================================================
+* Add support for high-boot on TQM5200 and TQM5200S boards.
+ Hint: the CPLD on the TQM5200 must be programmed with a software
+ version supporting the high boot option! The new TQM5200S is
+ already supporting this option. On the TQM5200 this option will be
+ supported in configurations with MPC5200 rev B processors.
+ To actually "high boot", set jumper X30 on the STK52xx.
+ Patch by Martin Krause, 12 Jul 2006
+
* Add support for new TQM5200 revisions
- Support for TQM5200S (short version without graphic controller)
- Support for modules with 'N' type S29GL128N Spansion flashes
(requires changes to flash layout)
- Support for MPC5200B cpu (mostly support for second SDRAM bank)
+ Patch by Martin Krause, 07 Jul 2006
* Fix support for PS/2 keyboard on TQM85xx boards
The PS/2 keyobard driver for the TQM85xx modules only supports the
diff --git a/Makefile b/Makefile
index e39af35f77..4188ff638c 100644
--- a/Makefile
+++ b/Makefile
@@ -407,6 +407,7 @@ Total5200_Rev2_lowboot_config: unconfig
TQM5200_config \
TQM5200_STK100_config \
TQM5200_B_config \
+TQM5200_B_HIGHBOOT_config \
MiniFAP_config: unconfig
@ >include/config.h
@[ -z "$(findstring MiniFAP,$@)" ] || \
@@ -421,6 +422,9 @@ MiniFAP_config: unconfig
{ echo "#define CONFIG_TQM5200_B" >>include/config.h ; \
echo "... with MPC5200B processor" ; \
}
+ @[ -z "$(findstring HIGHBOOT,$@)" ] || \
+ { echo "TEXT_BASE = 0xFFF00000" >board/tqm5200/config.tmp ; \
+ }
@echo "#define CONFIG_CS_AUTOCONF">>include/config.h ;
@echo "... with automatic CS configuration" ;
@./mkconfig -a TQM5200 ppc mpc5xxx tqm5200
diff --git a/board/tqm5200/config.mk b/board/tqm5200/config.mk
index 585a99a8c7..84ddee80d9 100644
--- a/board/tqm5200/config.mk
+++ b/board/tqm5200/config.mk
@@ -28,12 +28,17 @@
#
# 0xFC000000 boot low (standard configuration with room for max 64 MByte
# Flash ROM)
+# 0xFFF00000 boot high (for a backup copy of U-Boot)
# 0x00100000 boot from RAM (for testing only)
#
+sinclude $(TOPDIR)/board/$(BOARDDIR)/config.tmp
+
ifndef TEXT_BASE
## Standard: boot low
TEXT_BASE = 0xFC000000
+## For a backup copy of U-Boot at the end of flash: boot high
+# TEXT_BASE = 0xFFF00000
## For testing: boot from RAM
# TEXT_BASE = 0x00100000
endif
diff --git a/include/configs/TQM5200.h b/include/configs/TQM5200.h
index 032177e306..0ef0b9155e 100644
--- a/include/configs/TQM5200.h
+++ b/include/configs/TQM5200.h
@@ -308,7 +308,7 @@
/*
* Flash configuration
*/
-#define CFG_FLASH_BASE TEXT_BASE /* 0xFC000000 */
+#define CFG_FLASH_BASE 0xFC000000
/* use CFI flash driver */
#define CFG_FLASH_CFI 1 /* Flash is CFI conformant */
@@ -319,15 +319,11 @@
#define CFG_MAX_FLASH_SECT 512 /* max num of sects on one chip */
#define CFG_FLASH_USE_BUFFER_WRITE 1
-#if !defined(CFG_LOWBOOT)
-#define CFG_ENV_ADDR (CFG_FLASH_BASE + 0x00760000 + 0x00800000)
-#else /* CFG_LOWBOOT */
#if defined(CONFIG_TQM5200_B)
#define CFG_ENV_ADDR (CFG_FLASH_BASE + 0x00080000)
#else
#define CFG_ENV_ADDR (CFG_FLASH_BASE + 0x00060000)
#endif /* CONFIG_TQM5200_B */
-#endif /* CFG_LOWBOOT */
#define CFG_MAX_FLASH_BANKS 1 /* max num of flash banks
(= chip selects) */