From a865bcdac89278cac4dfc07dec8299403110499d Mon Sep 17 00:00:00 2001
From: Wolfgang Grandegger <wg@grandegger.com>
Date: Wed, 11 Feb 2009 18:38:22 +0100
Subject: [PATCH] MPC85xx: TQM8548: add support for the TQM8548_AG module

The TQM8548_AG is a variant of the TQM8548 module with 1 GiB memory,
CAN and without PCI/PCI-X and RTC. U-Boot can be built for this module
with "$ make TQM8548_AG_config".

Signed-off-by: Wolfgang Grandegger <wg@grandegger.com>
---
 MAKEALL                   |  1 +
 Makefile                  |  3 ++-
 include/configs/TQM85xx.h | 11 +++++++++--
 3 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/MAKEALL b/MAKEALL
index f3d48ce9eb..d58b15ce25 100755
--- a/MAKEALL
+++ b/MAKEALL
@@ -387,6 +387,7 @@ LIST_85xx="		\
 	TQM8540		\
 	TQM8541		\
 	TQM8548		\
+	TQM8548_AG	\
 	TQM8548_BE	\
 	TQM8555		\
 	TQM8560		\
diff --git a/Makefile b/Makefile
index 4e96ef67d0..ee82c5d9c4 100644
--- a/Makefile
+++ b/Makefile
@@ -2479,12 +2479,13 @@ stxssa_4M_config:	unconfig
 TQM8540_config		\
 TQM8541_config		\
 TQM8548_config		\
+TQM8548_AG_config	\
 TQM8548_BE_config	\
 TQM8555_config		\
 TQM8560_config:		unconfig
 	@mkdir -p $(obj)include
 	@BTYPE=$(@:_config=); \
-	CTYPE=$(subst TQM,,$(subst _BE,,$(@:_config=))); \
+	CTYPE=$(subst TQM,,$(subst _AG,,$(subst _BE,,$(@:_config=)))); \
 	$(XECHO) "... "$${BTYPE}" (MPC"$${CTYPE}")"; \
 	echo "#define CONFIG_MPC$${CTYPE}">>$(obj)include/config.h; \
 	echo "#define CONFIG_$${BTYPE}">>$(obj)include/config.h; \
diff --git a/include/configs/TQM85xx.h b/include/configs/TQM85xx.h
index 6a48d8f7d9..3b2272c231 100644
--- a/include/configs/TQM85xx.h
+++ b/include/configs/TQM85xx.h
@@ -41,12 +41,14 @@
 #define CONFIG_E500		1	/* BOOKE e500 family		*/
 #define CONFIG_MPC85xx		1	/* MPC8540/60/55/41		*/
 
-#if defined(CONFIG_TQM8548_BE)
+#if defined(CONFIG_TQM8548_AG) || defined(CONFIG_TQM8548_BE)
 #define CONFIG_TQM8548
 #endif
 
 #define CONFIG_PCI
+#ifndef CONFIG_TQM8548_AG
 #define CONFIG_PCI1			/* PCI/PCI-X controller		*/
+#endif
 #ifdef CONFIG_TQM8548
 #define CONFIG_PCIE1			/* PCI Express interface	*/
 #endif
@@ -88,7 +90,7 @@
 
 #define CONFIG_FSL_LAW		1	/* Use common FSL init code	*/
 
-#ifdef CONFIG_TQM8548_BE
+#if defined(CONFIG_TQM8548_AG) || defined(CONFIG_TQM8548_BE)
 #define	CONFIG_CAN_DRIVER		/* CAN Driver support		*/
 #endif
 
@@ -144,6 +146,9 @@
  */
 #define CONFIG_SYS_DDR_SDRAM_BASE	0x00000000	/* DDR is system memory	*/
 #define CONFIG_SYS_SDRAM_BASE		CONFIG_SYS_DDR_SDRAM_BASE
+#ifdef CONFIG_TQM8548_AG
+#define CONFIG_VERY_BIG_RAM
+#endif
 
 #define CONFIG_NUM_DDR_CONTROLLERS	1
 #define CONFIG_DIMM_SLOTS_PER_CTLR	1
@@ -613,7 +618,9 @@
 #define CONFIG_CMD_DHCP
 #define CONFIG_CMD_NFS
 #define CONFIG_CMD_SNTP
+#ifndef CONFIG_TQM8548_AG
 #define CONFIG_CMD_DATE
+#endif
 #define CONFIG_CMD_EEPROM
 #define CONFIG_CMD_DTT
 #define CONFIG_CMD_MII
-- 
2.25.1