Signed-off-by: Axel Beierlein <beierl...@goetting.de>
---
Makefile | 7 +++++++
board/tqc/tqm5200/tqm5200.c | 9 ++++++++-
include/configs/TQM5200.h | 33 ++++++++++++++++++++++++++-------
3 files changed, 41 insertions(+), 8 deletions(-)
diff --git a/Makefile b/Makefile
index 2a06440..7f197dd 100644
--- a/Makefile
+++ b/Makefile
@@ -764,6 +764,7 @@ Total5200_Rev2_lowboot_config: unconfig
}
@$(MKCONFIG) -a Total5200 ppc mpc5xxx total5200
+HG43630_config \
cam5200_config \
cam5200_niosflash_config \
fo300_config \
@@ -808,6 +809,12 @@ TQM5200_STK100_config: unconfig
@[ -z "$(findstring HIGHBOOT,$@)" ] || \
{ echo "TEXT_BASE = 0xFFF00000" >$(obj)board/tqm5200/config.tmp
; \
}
+ @[ -z "$(findstring HG43630,$@)" ] || \
+ { echo "#define CONFIG_HG43630" >>$(obj)include/config.h ; \
+ echo "#define CONFIG_TQM5200S"
>>$(obj)include/config.h ; \
+ echo "#define CONFIG_TQM5200_B"
>>$(obj)include/config.h ; \
+ $(XECHO) "... TQM5200S on Goetting HG43630 Board" ; \
+ }
@$(MKCONFIG) -n $@ -a TQM5200 ppc mpc5xxx tqm5200 tqc
uc101_config: unconfig
diff --git a/board/tqc/tqm5200/tqm5200.c b/board/tqc/tqm5200/tqm5200.c
index faa2e02..0d69e86 100644
--- a/board/tqc/tqm5200/tqm5200.c
+++ b/board/tqc/tqm5200/tqm5200.c
@@ -255,6 +255,10 @@ int checkboard (void)
# error "UNKNOWN"
#endif
+#ifdef CONFIG_HG43630
+#define CARRIER_NAME "HG43630"
+#endif
+
puts ( "Board: " MODULE_NAME " (TQ-Components GmbH)\n"
" on a " CARRIER_NAME " carrier board\n");
@@ -646,7 +650,7 @@ void video_get_info_str (int line_number, char *info)
{
if (line_number == 1) {
strcpy (info, " Board: TQM5200 (TQ-Components GmbH)");
-#if defined (CONFIG_STK52XX) || defined (CONFIG_TB5200) ||
defined(CONFIG_FO300)
+#if defined (CONFIG_STK52XX) || defined (CONFIG_TB5200) ||
defined(CONFIG_FO300) || defined(CONFIG_HG43630)
} else if (line_number == 2) {
#if defined (CONFIG_STK52XX)
strcpy (info, " on a STK52xx carrier board");
@@ -657,6 +661,9 @@ void video_get_info_str (int line_number, char *info)
#if defined (CONFIG_FO300)
strcpy (info, " on a FO300 carrier board");
#endif
+#if defined (CONFIG_HG43630)
+ strcpy (info, " on a HG43630 carrier board");
+#endif
#endif
}
else {
diff --git a/include/configs/TQM5200.h b/include/configs/TQM5200.h
index a4336a7..0f5ff77 100644
--- a/include/configs/TQM5200.h
+++ b/include/configs/TQM5200.h
@@ -71,7 +71,7 @@
/* switch is open */
#endif /* CONFIG_FO300 */
-#ifdef CONFIG_STK52XX
+#if defined(CONFIG_STK52XX) && !defined(CONFIG_HG43630)
#define CONFIG_PS2KBD /* AT-PS/2 Keyboard */
#define CONFIG_PS2MULT /* .. on PS/2 Multiplexer */
#define CONFIG_PS2SERIAL 6 /* .. on PSC6 */
@@ -85,6 +85,7 @@
* 0x50000000 - 0x50ffffff - PCI IO Space
*/
#ifdef CONFIG_STK52XX
+#ifndef CONFIG_HG43630
#define CONFIG_PCI 1
#define CONFIG_PCI_PNP 1
/* #define CONFIG_PCI_SCAN_SHOW 1 */
@@ -96,7 +97,7 @@
#define CONFIG_PCI_IO_BUS 0x50000000
#define CONFIG_PCI_IO_PHYS CONFIG_PCI_IO_BUS
#define CONFIG_PCI_IO_SIZE 0x01000000
-
+#endif/* ifndef(CONFIG_HG43630)*/
#define CONFIG_NET_MULTI 1
#define CONFIG_EEPRO100 1
#define CONFIG_SYS_RX_ETH_BUFFER 8 /* use 8 rx buffer on eepro100 */
@@ -132,7 +133,7 @@
#define CONFIG_ISO_PARTITION
/* USB */
-#if defined(CONFIG_STK52XX) || defined(CONFIG_FO300)
+#if defined(CONFIG_STK52XX) || defined(CONFIG_FO300) &&
!defined(CONFIG_HG43630)
#define CONFIG_USB_OHCI_NEW
#define CONFIG_SYS_OHCI_BE_CONTROLLER
#define CONFIG_USB_STORAGE
@@ -196,7 +197,7 @@
#define CONFIG_PCIAUTO_SKIP_HOST_BRIDGE 1
#endif
-#if defined(CONFIG_MINIFAP) || defined(CONFIG_STK52XX) || defined(CONFIG_FO300)
+#if defined(CONFIG_MINIFAP) || defined(CONFIG_STK52XX) ||
defined(CONFIG_FO300)
#define CONFIG_CMD_IDE
#define CONFIG_CMD_FAT
#define CONFIG_CMD_EXT2
@@ -223,6 +224,11 @@
*/
#define CONFIG_BOOTDELAY 5 /* autoboot after 5 seconds */
+#if defined(CONFIG_HG43630)
+#define CONFIG_AUTOBOOT_KEYED
+#define CONFIG_AUTOBOOT_STOP_STR "HG"
+#endif
+
#define CONFIG_PREBOOT "echo;" \
"echo Type \\\"run flash_nfs\\\" to mount root filesystem over NFS;" \
"echo"
@@ -262,6 +268,7 @@
"kernel_addr=FC140000\0" \
"ramdisk_addr=FC600000\0"
#else /* !CONFIG_TQM5200_B */
+
#define ENV_FLASH_LAYOUT \
"fdt_addr=FC0A0000\0" \
"kernel_addr=FC0C0000\0" \
@@ -415,6 +422,15 @@
#ifdef CONFIG_STK52XX
# if defined(CONFIG_TQM5200_B)
# if defined(CONFIG_SYS_LOWBOOT)
+# if defined(CONFIG_HG43630)
+# define MTDPARTS_DEFAULT "mtdparts=TQM5200-0:512k(u-boot)," \
+ "512k(env)," \
+ "2m(kernel)," \
+ "16m(ramfs1)," \
+ "5m(ramfs2)," \
+ "8m(jffs2)" \
+
+# else
# define MTDPARTS_DEFAULT "mtdparts=TQM5200-0:1m(firmware)," \
"256k(dtb)," \
"2304k(kernel)," \
@@ -422,6 +438,7 @@
"2m(initrd)," \
"8m(misc)," \
"16m(big-fs)"
+# endif /* CONFIG_HG43630 */
# else /* highboot */
# define MTDPARTS_DEFAULT "mtdparts=TQM5200-0:2560k(kernel)," \
"3584k(small-fs)," \
@@ -700,13 +717,16 @@
#undef CONFIG_IDE_8xx_DIRECT /* Direct IDE not supported */
#undef CONFIG_IDE_LED /* LED for ide not supported */
-
#define CONFIG_IDE_RESET /* reset for ide supported */
#define CONFIG_IDE_PREINIT
+#ifndef CONFIG_HG43630
#define CONFIG_SYS_IDE_MAXBUS 1 /* max. 1 IDE bus
*/
#define CONFIG_SYS_IDE_MAXDEVICE 2 /* max. 2 drives per IDE bus
*/
-
+#else
+#define CONFIG_SYS_IDE_MAXBUS 0
+#define CONFIG_SYS_IDE_MAXDEVICE 0
+#endif /* CONFIG_HG43630 */
#define CONFIG_SYS_ATA_IDE0_OFFSET 0x0000
#define CONFIG_SYS_ATA_BASE_ADDR MPC5XXX_ATA
@@ -725,7 +745,6 @@
/* Support ATAPI devices */
#define CONFIG_ATAPI 1
-
/*-----------------------------------------------------------------------
* Open firmware flat tree support
*-----------------------------------------------------------------------
--
1.5.6.3
_______________________________________________
U-Boot mailing list
U-Boot@lists.denx.de
http://lists.denx.de/mailman/listinfo/u-boot
