The TQM8548_BE is a variant of the TQM8548 module with NAND and CAN interface. With NAND support, the image is significantly larger and TEXT_BASE is adjusted accordingly. U-Boot can be built for this module with "$ make TQM8548_BE_config".
Signed-off-by: Wolfgang Grandegger wg@grandegger.com --- MAKEALL | 1 + Makefile | 11 +++++++---- board/tqc/tqm85xx/config.mk | 6 ++++-- include/configs/TQM85xx.h | 12 ++++++++++-- 4 files changed, 22 insertions(+), 8 deletions(-)
Index: u-boot/Makefile =================================================================== --- u-boot.orig/Makefile +++ u-boot/Makefile @@ -2479,16 +2479,19 @@ stxssa_4M_config: unconfig TQM8540_config \ TQM8541_config \ TQM8548_config \ +TQM8548_BE_config \ TQM8555_config \ TQM8560_config: unconfig @mkdir -p $(obj)include - @CTYPE=$(subst TQM,,$(@:_config=)); \ - $(XECHO) "... TQM"$${CTYPE}; \ + @BTYPE=$(@:_config=); \ + CTYPE=$(subst TQM,,$(subst _BE,,$(@:_config=))); \ + $(XECHO) "... "$${BTYPE}" (MPC"$${CTYPE}")"; \ echo "#define CONFIG_MPC$${CTYPE}">>$(obj)include/config.h; \ - echo "#define CONFIG_TQM$${CTYPE}">>$(obj)include/config.h; \ + echo "#define CONFIG_$${BTYPE}">>$(obj)include/config.h; \ echo "#define CONFIG_HOSTNAME tqm$${CTYPE}">>$(obj)include/config.h; \ - echo "#define CONFIG_BOARDNAME "TQM$${CTYPE}"">>$(obj)include/config.h; + echo "#define CONFIG_BOARDNAME "$${BTYPE}"">>$(obj)include/config.h; @$(MKCONFIG) -a TQM85xx ppc mpc85xx tqm85xx tqc + @echo "CONFIG_$(@:_config=) = y">>$(obj)include/config.mk;
XPEDITE5200_config: unconfig @$(MKCONFIG) $(@:_config=) ppc mpc85xx xpedite5200 xes Index: u-boot/include/configs/TQM85xx.h =================================================================== --- u-boot.orig/include/configs/TQM85xx.h +++ u-boot/include/configs/TQM85xx.h @@ -41,6 +41,10 @@ #define CONFIG_E500 1 /* BOOKE e500 family */ #define CONFIG_MPC85xx 1 /* MPC8540/60/55/41 */
+#if defined(CONFIG_TQM8548_BE) +#define CONFIG_TQM8548 +#endif + #define CONFIG_PCI #define CONFIG_PCI1 /* PCI/PCI-X controller */ #ifdef CONFIG_TQM8548 @@ -71,7 +75,9 @@ * Warning: NAND support will likely increase the U-Boot image size * to more than 256 KB. Please adjust TEXT_BASE if necessary. */ -#undef CONFIG_NAND +#ifdef CONFIG_TQM8548_BE +#define CONFIG_NAND +#endif
/* * MPC8540 and MPC8548 don't have CPM module @@ -82,7 +88,9 @@
#define CONFIG_FSL_LAW 1 /* Use common FSL init code */
-#undef CONFIG_CAN_DRIVER /* CAN Driver support */ +#ifdef CONFIG_TQM8548_BE +#define CONFIG_CAN_DRIVER /* CAN Driver support */ +#endif
/* * sysclk for MPC85xx Index: u-boot/board/tqc/tqm85xx/config.mk =================================================================== --- u-boot.orig/board/tqc/tqm85xx/config.mk +++ u-boot/board/tqc/tqm85xx/config.mk @@ -23,7 +23,9 @@
# # tqm85xx board -# default CCARBAR is at 0xff700000 -# assume U-Boot is less than 256k # +ifeq ($(CONFIG_TQM8548_BE),y) +TEXT_BASE = 0xfff80000 +else TEXT_BASE = 0xfffc0000 +endif Index: u-boot/MAKEALL =================================================================== --- u-boot.orig/MAKEALL +++ u-boot/MAKEALL @@ -387,6 +387,7 @@ LIST_85xx=" \ TQM8540 \ TQM8541 \ TQM8548 \ + TQM8548_BE \ TQM8555 \ TQM8560 \ XPEDITE5200 \