[U-Boot-Users] [PATCH 1/2] Update the RRvision port to a modern version of u-boot.
Gary Jennejohn
garyj at denx.de
Thu Jun 19 10:56:26 CEST 2008
The port now uses the CFI-driver so board/RRvision/flash.c has been removed.
Signed-off-by: Gary Jennejohn <garyj at denx.de>
---
Makefile | 385 +++++++++++++++++++++++++++++++
board/RRvision/Makefile | 4 +-
board/RRvision/RRvision.c | 9 +-
board/RRvision/flash.c | 522 ------------------------------------------
common/lcd.c | 9 +-
cpu/mpc8xx/cpu_init.c | 2 +-
cpu/mpc8xx/fec.c | 8 +
cpu/mpc8xx/lcd.c | 185 ++++++++++++++-
cpu/mpc8xx/video.c | 22 ++-
include/configs/RRvision.h | 210 +++++++++++++----
include/configs/TTTech_env.h | 99 ++++++++
tools/Makefile | 20 ++
12 files changed, 891 insertions(+), 584 deletions(-)
delete mode 100644 board/RRvision/flash.c
create mode 100644 include/configs/TTTech_env.h
diff --git a/Makefile b/Makefile
index 8bfc891..538153c 100644
--- a/Makefile
+++ b/Makefile
@@ -1058,6 +1058,391 @@ RRvision_LCD_config: unconfig
@echo "#define CONFIG_SHARP_LQ104V7DS01" >>$(obj)include/config.h
@$(MKCONFIG) -a RRvision ppc mpc8xx RRvision
+RRvision_LCD104V1DG61_config: unconfig
+ @echo "#define CONFIG_LCD" >$(obj)include/config.h
+ @echo "#define CONFIG_SHARP_LQ104V1DG61" >>$(obj)include/config.h
+ @$(MKCONFIG) -a RRvision ppc mpc8xx RRvision
+
+RRvision_LCD104_config: unconfig
+ @echo "#define CONFIG_LCD" >$(obj)include/config.h
+ @echo "#define CONFIG_HLD1045" >>$(obj)include/config.h
+ @$(MKCONFIG) -a RRvision ppc mpc8xx RRvision
+
+RRvision_LCD5_config: unconfig
+ @echo "#define CONFIG_LCD" >$(obj)include/config.h
+ @echo "#define CONFIG_SHARP_LQ050Q5DR01" >>$(obj)include/config.h
+ @$(MKCONFIG) -a RRvision ppc mpc8xx RRvision
+
+RRvision_LCD65_config: unconfig
+ @echo "#define CONFIG_LCD" >$(obj)include/config.h
+ @echo "#define CONFIG_SHARP_LQ065T9DR51U" >>$(obj)include/config.h
+ @$(MKCONFIG) -a RRvision ppc mpc8xx RRvision
+
+RRvision_LCD7_config: unconfig
+ @echo "#define CONFIG_LCD" >$(obj)include/config.h
+ @echo "#define CONFIG_SHARP_LQ070Q5TR01" >>$(obj)include/config.h
+ @$(MKCONFIG) -a RRvision ppc mpc8xx RRvision
+
+RRvision_LCD7AUO_config: unconfig
+ @echo "#define CONFIG_LCD" >$(obj)include/config.h
+ @echo "#define CONFIG_AUO_T070W1D1" >>$(obj)include/config.h
+ @$(MKCONFIG) -a RRvision ppc mpc8xx RRvision
+
+RRvision_LCDUMSH_config: unconfig
+ @echo "#define CONFIG_LCD" >$(obj)include/config.h
+ @echo "#define CONFIG_UMSH_7189JD1F" >>$(obj)include/config.h
+ @echo "#define LCD_BPP LCD_MONOCHROME" >>$(obj)include/config.h
+ @$(MKCONFIG) -a RRvision ppc mpc8xx RRvision
+
+RRvision_LCD_NL8060BC26_config: unconfig
+ @echo "#define CONFIG_LCD" >$(obj)include/config.h
+ @echo "#define CONFIG_NEC_NL8060BC26" >>$(obj)include/config.h
+ @$(MKCONFIG) -a RRvision ppc mpc8xx RRvision
+
+RRvision_LCD_PM070WL3_config: unconfig
+ @echo "#define CONFIG_LCD" >$(obj)include/config.h
+ @echo "#define CONFIG_PM070WL3" >>$(obj)include/config.h
+ @$(MKCONFIG) -a RRvision ppc mpc8xx RRvision
+
+RRvision_codesys_config: unconfig
+ @echo "#define CONFIG_CODESYS" >$(obj)include/config.h
+ @$(MKCONFIG) -a RRvision ppc mpc8xx RRvision
+
+RRvision_LCD_codesys_config: unconfig
+ @echo "#define CONFIG_LCD" >$(obj)include/config.h
+ @echo "#define CONFIG_SHARP_LQ104V7DS01" >>$(obj)include/config.h
+ @echo "#define CONFIG_CODESYS" >>$(obj)include/config.h
+ @$(MKCONFIG) -a RRvision ppc mpc8xx RRvision
+
+RRvision_LCD104V1DG61_codesys_config: unconfig
+ @echo "#define CONFIG_LCD" >$(obj)include/config.h
+ @echo "#define CONFIG_SHARP_LQ104V1DG61" >>$(obj)include/config.h
+ @echo "#define CONFIG_CODESYS" >>$(obj)include/config.h
+ @$(MKCONFIG) -a RRvision ppc mpc8xx RRvision
+
+RRvision_LCD104_codesys_config: unconfig
+ @echo "#define CONFIG_LCD" >$(obj)include/config.h
+ @echo "#define CONFIG_HLD1045" >>$(obj)include/config.h
+ @echo "#define CONFIG_CODESYS" >>$(obj)include/config.h
+ @$(MKCONFIG) -a RRvision ppc mpc8xx RRvision
+
+RRvision_LCD5_codesys_config: unconfig
+ @echo "#define CONFIG_LCD" >$(obj)include/config.h
+ @echo "#define CONFIG_SHARP_LQ050Q5DR01" >>$(obj)include/config.h
+ @echo "#define CONFIG_CODESYS" >>$(obj)include/config.h
+ @$(MKCONFIG) -a RRvision ppc mpc8xx RRvision
+
+RRvision_LCD65_codesys_config: unconfig
+ @echo "#define CONFIG_LCD" >$(obj)include/config.h
+ @echo "#define CONFIG_SHARP_LQ065T9DR51U" >>$(obj)include/config.h
+ @echo "#define CONFIG_CODESYS" >>$(obj)include/config.h
+ @$(MKCONFIG) -a RRvision ppc mpc8xx RRvision
+
+RRvision_LCD7_codesys_config: unconfig
+ @echo "#define CONFIG_LCD" >$(obj)include/config.h
+ @echo "#define CONFIG_SHARP_LQ070Q5TR01" >>$(obj)include/config.h
+ @echo "#define CONFIG_CODESYS" >>$(obj)include/config.h
+ @$(MKCONFIG) -a RRvision ppc mpc8xx RRvision
+
+RRvision_LCD7AUO_codesys_config: unconfig
+ @echo "#define CONFIG_LCD" >$(obj)include/config.h
+ @echo "#define CONFIG_AUO_T070W1D1" >>$(obj)include/config.h
+ @echo "#define CONFIG_CODESYS" >>$(obj)include/config.h
+ @$(MKCONFIG) -a RRvision ppc mpc8xx RRvision
+
+RRvision_LCDUMSH_codesys_config: unconfig
+ @echo "#define CONFIG_LCD" >$(obj)include/config.h
+ @echo "#define CONFIG_UMSH_7189JD1F" >>$(obj)include/config.h
+ @echo "#define LCD_BPP LCD_MONOCHROME" >>$(obj)include/config.h
+ @echo "#define CONFIG_CODESYS" >>$(obj)include/config.h
+ @$(MKCONFIG) -a RRvision ppc mpc8xx RRvision
+
+RRvision_LCD_NL8060BC26_codesys_config: unconfig
+ @echo "#define CONFIG_LCD" >$(obj)include/config.h
+ @echo "#define CONFIG_NEC_NL8060BC26" >>$(obj)include/config.h
+ @echo "#define CONFIG_CODESYS" >>$(obj)include/config.h
+ @$(MKCONFIG) -a RRvision ppc mpc8xx RRvision
+
+RRvision_LCD_PM070WL3_codesys_config: unconfig
+ @echo "#define CONFIG_LCD" >$(obj)include/config.h
+ @echo "#define CONFIG_PM070WL3" >>$(obj)include/config.h
+ @echo "#define CONFIG_CODESYS" >>$(obj)include/config.h
+ @$(MKCONFIG) -a RRvision ppc mpc8xx RRvision
+
+RRvision_BIGMEM_config: unconfig
+ @echo "#define CONFIG_TTTECH_BIGMEM" >$(obj)include/config.h
+ @$(MKCONFIG) -a RRvision ppc mpc8xx RRvision
+
+RRvision_LCD_BIGMEM_config: unconfig
+ @echo "#define CONFIG_LCD" >$(obj)include/config.h
+ @echo "#define CONFIG_SHARP_LQ104V7DS01" >>$(obj)include/config.h
+ @echo "#define CONFIG_TTTECH_BIGMEM" >>$(obj)include/config.h
+ @$(MKCONFIG) -a RRvision ppc mpc8xx RRvision
+
+RRvision_LCD104V1DG61_BIGMEM_config: unconfig
+ @echo "#define CONFIG_LCD" >$(obj)include/config.h
+ @echo "#define CONFIG_SHARP_LQ104V1DG61" >>$(obj)include/config.h
+ @echo "#define CONFIG_TTTECH_BIGMEM" >>$(obj)include/config.h
+ @$(MKCONFIG) -a RRvision ppc mpc8xx RRvision
+
+RRvision_LCD104_BIGMEM_config: unconfig
+ @echo "#define CONFIG_LCD" >$(obj)include/config.h
+ @echo "#define CONFIG_HLD1045" >>$(obj)include/config.h
+ @echo "#define CONFIG_TTTECH_BIGMEM" >>$(obj)include/config.h
+ @$(MKCONFIG) -a RRvision ppc mpc8xx RRvision
+
+RRvision_LCD5_BIGMEM_config: unconfig
+ @echo "#define CONFIG_LCD" >$(obj)include/config.h
+ @echo "#define CONFIG_SHARP_LQ050Q5DR01" >>$(obj)include/config.h
+ @echo "#define CONFIG_TTTECH_BIGMEM" >>$(obj)include/config.h
+ @$(MKCONFIG) -a RRvision ppc mpc8xx RRvision
+
+RRvision_LCD65_BIGMEM_config: unconfig
+ @echo "#define CONFIG_LCD" >$(obj)include/config.h
+ @echo "#define CONFIG_SHARP_LQ065T9DR51U" >>$(obj)include/config.h
+ @echo "#define CONFIG_TTTECH_BIGMEM" >>$(obj)include/config.h
+ @$(MKCONFIG) -a RRvision ppc mpc8xx RRvision
+
+RRvision_LCD7_BIGMEM_config: unconfig
+ @echo "#define CONFIG_LCD" >$(obj)include/config.h
+ @echo "#define CONFIG_SHARP_LQ070Q5TR01" >>$(obj)include/config.h
+ @echo "#define CONFIG_TTTECH_BIGMEM" >>$(obj)include/config.h
+ @$(MKCONFIG) -a RRvision ppc mpc8xx RRvision
+
+RRvision_LCD7AUO_BIGMEM_config: unconfig
+ @echo "#define CONFIG_LCD" >$(obj)include/config.h
+ @echo "#define CONFIG_AUO_T070W1D1" >>$(obj)include/config.h
+ @echo "#define CONFIG_TTTECH_BIGMEM" >>$(obj)include/config.h
+ @$(MKCONFIG) -a RRvision ppc mpc8xx RRvision
+
+RRvision_LCDUMSH_BIGMEM_config: unconfig
+ @echo "#define CONFIG_LCD" >$(obj)include/config.h
+ @echo "#define CONFIG_UMSH_7189JD1F" >>$(obj)include/config.h
+ @echo "#define LCD_BPP LCD_MONOCHROME" >>$(obj)include/config.h
+ @echo "#define CONFIG_TTTECH_BIGMEM" >>$(obj)include/config.h
+ @$(MKCONFIG) -a RRvision ppc mpc8xx RRvision
+
+RRvision_LCD_NL8060BC26_BIGMEM_config: unconfig
+ @echo "#define CONFIG_LCD" >$(obj)include/config.h
+ @echo "#define CONFIG_NEC_NL8060BC26" >>$(obj)include/config.h
+ @echo "#define CONFIG_TTTECH_BIGMEM" >>$(obj)include/config.h
+ @$(MKCONFIG) -a RRvision ppc mpc8xx RRvision
+
+RRvision_LCD_PM070WL3_BIGMEM_config: unconfig
+ @echo "#define CONFIG_LCD" >$(obj)include/config.h
+ @echo "#define CONFIG_PM070WL3" >>$(obj)include/config.h
+ @echo "#define CONFIG_TTTECH_BIGMEM" >>$(obj)include/config.h
+ @$(MKCONFIG) -a RRvision ppc mpc8xx RRvision
+
+RRvision_prodtest_config: unconfig
+ @echo "#define CONFIG_PRODTEST" >$(obj)include/config.h
+ @$(MKCONFIG) -a RRvision ppc mpc8xx RRvision
+
+RRvision_LCD_prodtest_config: unconfig
+ @echo "#define CONFIG_PRODTEST" >$(obj)include/config.h
+ @echo "#define CONFIG_LCD" >>$(obj)include/config.h
+ @echo "#define CONFIG_SHARP_LQ104V7DS01" >>$(obj)include/config.h
+ @$(MKCONFIG) -a RRvision ppc mpc8xx RRvision
+
+RRvision_LCD104V1DG61_prodtest_config: unconfig
+ @echo "#define CONFIG_PRODTEST" >$(obj)include/config.h
+ @echo "#define CONFIG_LCD" >>$(obj)include/config.h
+ @echo "#define CONFIG_SHARP_LQ104V1DG61" >>$(obj)include/config.h
+ @$(MKCONFIG) -a RRvision ppc mpc8xx RRvision
+
+RRvision_LCD104_prodtest_config: unconfig
+ @echo "#define CONFIG_PRODTEST" >$(obj)include/config.h
+ @echo "#define CONFIG_LCD" >>$(obj)include/config.h
+ @echo "#define CONFIG_HLD1045" >>$(obj)include/config.h
+ @$(MKCONFIG) -a RRvision ppc mpc8xx RRvision
+
+RRvision_LCD5_prodtest_config: unconfig
+ @echo "#define CONFIG_PRODTEST" >$(obj)include/config.h
+ @echo "#define CONFIG_LCD" >>$(obj)include/config.h
+ @echo "#define CONFIG_SHARP_LQ050Q5DR01" >>$(obj)include/config.h
+ @$(MKCONFIG) -a RRvision ppc mpc8xx RRvision
+
+RRvision_LCD65_prodtest_config: unconfig
+ @echo "#define CONFIG_PRODTEST" >$(obj)include/config.h
+ @echo "#define CONFIG_LCD" >>$(obj)include/config.h
+ @echo "#define CONFIG_SHARP_LQ065T9DR51U" >>$(obj)include/config.h
+ @$(MKCONFIG) -a RRvision ppc mpc8xx RRvision
+
+RRvision_LCD7_prodtest_config: unconfig
+ @echo "#define CONFIG_PRODTEST" >$(obj)include/config.h
+ @echo "#define CONFIG_LCD" >>$(obj)include/config.h
+ @echo "#define CONFIG_SHARP_LQ070Q5TR01" >>$(obj)include/config.h
+ @$(MKCONFIG) -a RRvision ppc mpc8xx RRvision
+
+RRvision_LCD7AUO_prodtest_config: unconfig
+ @echo "#define CONFIG_PRODTEST" >$(obj)include/config.h
+ @echo "#define CONFIG_LCD" >>$(obj)include/config.h
+ @echo "#define CONFIG_AUO_T070W1D1" >>$(obj)include/config.h
+ @$(MKCONFIG) -a RRvision ppc mpc8xx RRvision
+
+RRvision_LCDUMSH_prodtest_config: unconfig
+ @echo "#define CONFIG_PRODTEST" >$(obj)include/config.h
+ @echo "#define CONFIG_LCD" >>$(obj)include/config.h
+ @echo "#define CONFIG_UMSH_7189JD1F" >>$(obj)include/config.h
+ @echo "#define LCD_BPP LCD_MONOCHROME" >>$(obj)include/config.h
+ @$(MKCONFIG) -a RRvision ppc mpc8xx RRvision
+
+RRvision_LCD_NL8060BC26_prodtest_config: unconfig
+ @echo "#define CONFIG_PRODTEST" >$(obj)include/config.h
+ @echo "#define CONFIG_LCD" >>$(obj)include/config.h
+ @echo "#define CONFIG_NEC_NL8060BC26" >>$(obj)include/config.h
+ @$(MKCONFIG) -a RRvision ppc mpc8xx RRvision
+
+RRvision_LCD_PM070WL3_prodtest_config: unconfig
+ @echo "#define CONFIG_PRODTEST" >$(obj)include/config.h
+ @echo "#define CONFIG_LCD" >>$(obj)include/config.h
+ @echo "#define CONFIG_PM070WL3" >>$(obj)include/config.h
+ @$(MKCONFIG) -a RRvision ppc mpc8xx RRvision
+
+RRvision_codesys_prodtest_config: unconfig
+ @echo "#define CONFIG_PRODTEST" >$(obj)include/config.h
+ @echo "#define CONFIG_CODESYS" >>$(obj)include/config.h
+ @$(MKCONFIG) -a RRvision ppc mpc8xx RRvision
+
+RRvision_LCD_codesys_prodtest_config: unconfig
+ @echo "#define CONFIG_PRODTEST" >$(obj)include/config.h
+ @echo "#define CONFIG_LCD" >$(obj)include/config.h
+ @echo "#define CONFIG_SHARP_LQ104V7DS01" >>$(obj)include/config.h
+ @echo "#define CONFIG_CODESYS" >>$(obj)include/config.h
+ @$(MKCONFIG) -a RRvision ppc mpc8xx RRvision
+
+RRvision_LCD104V1DG61_codesys_prodtest_config: unconfig
+ @echo "#define CONFIG_PRODTEST" >$(obj)include/config.h
+ @echo "#define CONFIG_LCD" >$(obj)include/config.h
+ @echo "#define CONFIG_SHARP_LQ104V1DG61" >>$(obj)include/config.h
+ @echo "#define CONFIG_CODESYS" >>$(obj)include/config.h
+ @$(MKCONFIG) -a RRvision ppc mpc8xx RRvision
+
+RRvision_LCD104_codesys_prodtest_config: unconfig
+ @echo "#define CONFIG_PRODTEST" >$(obj)include/config.h
+ @echo "#define CONFIG_LCD" >>$(obj)include/config.h
+ @echo "#define CONFIG_HLD1045" >>$(obj)include/config.h
+ @echo "#define CONFIG_CODESYS" >>$(obj)include/config.h
+ @$(MKCONFIG) -a RRvision ppc mpc8xx RRvision
+
+RRvision_LCD5_codesys_prodtest_config: unconfig
+ @echo "#define CONFIG_PRODTEST" >$(obj)include/config.h
+ @echo "#define CONFIG_LCD" >>$(obj)include/config.h
+ @echo "#define CONFIG_SHARP_LQ050Q5DR01" >>$(obj)include/config.h
+ @echo "#define CONFIG_CODESYS" >>$(obj)include/config.h
+ @$(MKCONFIG) -a RRvision ppc mpc8xx RRvision
+
+RRvision_LCD65_codesys_prodtest_config: unconfig
+ @echo "#define CONFIG_PRODTEST" >$(obj)include/config.h
+ @echo "#define CONFIG_LCD" >>$(obj)include/config.h
+ @echo "#define CONFIG_SHARP_LQ065T9DR51U" >>$(obj)include/config.h
+ @echo "#define CONFIG_CODESYS" >>$(obj)include/config.h
+ @$(MKCONFIG) -a RRvision ppc mpc8xx RRvision
+
+RRvision_LCD7_codesys_prodtest_config: unconfig
+ @echo "#define CONFIG_PRODTEST" >$(obj)include/config.h
+ @echo "#define CONFIG_LCD" >>$(obj)include/config.h
+ @echo "#define CONFIG_SHARP_LQ070Q5TR01" >>$(obj)include/config.h
+ @echo "#define CONFIG_CODESYS" >>$(obj)include/config.h
+ @$(MKCONFIG) -a RRvision ppc mpc8xx RRvision
+
+RRvision_LCD7AUO_codesys_prodtest_config: unconfig
+ @echo "#define CONFIG_PRODTEST" >$(obj)include/config.h
+ @echo "#define CONFIG_LCD" >>$(obj)include/config.h
+ @echo "#define CONFIG_AUO_T070W1D1" >>$(obj)include/config.h
+ @echo "#define CONFIG_CODESYS" >>$(obj)include/config.h
+ @$(MKCONFIG) -a RRvision ppc mpc8xx RRvision
+
+RRvision_LCDUMSH_codesys_prodtest_config: unconfig
+ @echo "#define CONFIG_PRODTEST" >$(obj)include/config.h
+ @echo "#define CONFIG_LCD" >>$(obj)include/config.h
+ @echo "#define CONFIG_UMSH_7189JD1F" >>$(obj)include/config.h
+ @echo "#define LCD_BPP LCD_MONOCHROME" >>$(obj)include/config.h
+ @echo "#define CONFIG_CODESYS" >>$(obj)include/config.h
+ @$(MKCONFIG) -a RRvision ppc mpc8xx RRvision
+
+RRvision_LCD_NL8060BC26__codesys_prodtest_config: unconfig
+ @echo "#define CONFIG_PRODTEST" >$(obj)include/config.h
+ @echo "#define CONFIG_LCD" >>$(obj)include/config.h
+ @echo "#define CONFIG_NEC_NL8060BC26" >>$(obj)include/config.h
+ @echo "#define CONFIG_CODESYS" >>$(obj)include/config.h
+ @$(MKCONFIG) -a RRvision ppc mpc8xx RRvision
+
+RRvision_LCD_PM070WL3_codesys_prodtest_config: unconfig
+ @echo "#define CONFIG_PRODTEST" >$(obj)include/config.h
+ @echo "#define CONFIG_LCD" >>$(obj)include/config.h
+ @echo "#define CONFIG_PM070WL3" >>$(obj)include/config.h
+ @echo "#define CONFIG_CODESYS" >>$(obj)include/config.h
+ @$(MKCONFIG) -a RRvision ppc mpc8xx RRvision
+
+RRvision_BIGMEM_prodtest_config: unconfig
+ @echo "#define CONFIG_PRODTEST" >$(obj)include/config.h
+ @echo "#define CONFIG_TTTECH_BIGMEM" >>$(obj)include/config.h
+ @$(MKCONFIG) -a RRvision ppc mpc8xx RRvision
+
+RRvision_LCD_BIGMEM_prodtest_config: unconfig
+ @echo "#define CONFIG_PRODTEST" >$(obj)include/config.h
+ @echo "#define CONFIG_LCD" >>$(obj)include/config.h
+ @echo "#define CONFIG_SHARP_LQ104V7DS01" >>$(obj)include/config.h
+ @echo "#define CONFIG_TTTECH_BIGMEM" >>$(obj)include/config.h
+ @$(MKCONFIG) -a RRvision ppc mpc8xx RRvision
+
+RRvision_LCD104V1DG61_BIGMEM_prodtest_config: unconfig
+ @echo "#define CONFIG_PRODTEST" >$(obj)include/config.h
+ @echo "#define CONFIG_LCD" >>$(obj)include/config.h
+ @echo "#define CONFIG_SHARP_LQ104V1DG61" >>$(obj)include/config.h
+ @echo "#define CONFIG_TTTECH_BIGMEM" >>$(obj)include/config.h
+ @$(MKCONFIG) -a RRvision ppc mpc8xx RRvision
+
+RRvision_LCD104_BIGMEM_prodtest_config: unconfig
+ @echo "#define CONFIG_PRODTEST" >$(obj)include/config.h
+ @echo "#define CONFIG_LCD" >>$(obj)include/config.h
+ @echo "#define CONFIG_HLD1045" >>$(obj)include/config.h
+ @echo "#define CONFIG_TTTECH_BIGMEM" >>$(obj)include/config.h
+ @$(MKCONFIG) -a RRvision ppc mpc8xx RRvision
+
+RRvision_LCD5_BIGMEM_prodtest_config: unconfig
+ @echo "#define CONFIG_PRODTEST" >$(obj)include/config.h
+ @echo "#define CONFIG_LCD" >>$(obj)include/config.h
+ @echo "#define CONFIG_SHARP_LQ050Q5DR01" >>$(obj)include/config.h
+ @echo "#define CONFIG_TTTECH_BIGMEM" >>$(obj)include/config.h
+ @$(MKCONFIG) -a RRvision ppc mpc8xx RRvision
+
+RRvision_LCD65_BIGMEM_prodtest_config: unconfig
+ @echo "#define CONFIG_PRODTEST" >$(obj)include/config.h
+ @echo "#define CONFIG_LCD" >>$(obj)include/config.h
+ @echo "#define CONFIG_SHARP_LQ065T9DR51U" >>$(obj)include/config.h
+ @echo "#define CONFIG_TTTECH_BIGMEM" >>$(obj)include/config.h
+ @$(MKCONFIG) -a RRvision ppc mpc8xx RRvision
+
+RRvision_LCD7_BIGMEM_prodtest_config: unconfig
+ @echo "#define CONFIG_PRODTEST" >$(obj)include/config.h
+ @echo "#define CONFIG_LCD" >>$(obj)include/config.h
+ @echo "#define CONFIG_SHARP_LQ070Q5TR01" >>$(obj)include/config.h
+ @echo "#define CONFIG_TTTECH_BIGMEM" >>$(obj)include/config.h
+ @$(MKCONFIG) -a RRvision ppc mpc8xx RRvision
+
+RRvision_LCD7AUO_BIGMEM_prodtest_config: unconfig
+ @echo "#define CONFIG_PRODTEST" >$(obj)include/config.h
+ @echo "#define CONFIG_LCD" >>$(obj)include/config.h
+ @echo "#define CONFIG_AUO_T070W1D1" >>$(obj)include/config.h
+ @echo "#define CONFIG_TTTECH_BIGMEM" >>$(obj)include/config.h
+ @$(MKCONFIG) -a RRvision ppc mpc8xx RRvision
+
+RRvision_LCD_NL8060BC26_BIGMEM_prodtest_config: unconfig
+ @echo "#define CONFIG_PRODTEST" >$(obj)include/config.h
+ @echo "#define CONFIG_LCD" >>$(obj)include/config.h
+ @echo "#define CONFIG_NEC_NL8060BC26" >>$(obj)include/config.h
+ @echo "#define CONFIG_TTTECH_BIGMEM" >>$(obj)include/config.h
+ @$(MKCONFIG) -a RRvision ppc mpc8xx RRvision
+
+RRvision_LCD_PM070WL3_BIGMEM_prodtest_config: unconfig
+ @echo "#define CONFIG_PRODTEST" >$(obj)include/config.h
+ @echo "#define CONFIG_LCD" >>$(obj)include/config.h
+ @echo "#define CONFIG_PM070WL3" >>$(obj)include/config.h
+ @echo "#define CONFIG_TTTECH_BIGMEM" >>$(obj)include/config.h
+ @$(MKCONFIG) -a RRvision ppc mpc8xx RRvision
+
SM850_config : unconfig
@$(MKCONFIG) $(@:_config=) ppc mpc8xx tqm8xx tqc
diff --git a/board/RRvision/Makefile b/board/RRvision/Makefile
index cf07cf4..b6f0efc 100644
--- a/board/RRvision/Makefile
+++ b/board/RRvision/Makefile
@@ -1,5 +1,5 @@
#
-# (C) Copyright 2000-2006
+# (C) Copyright 2000-2008
# Wolfgang Denk, DENX Software Engineering, wd at denx.de.
#
# See file CREDITS for list of people who contributed to this
@@ -25,7 +25,7 @@ include $(TOPDIR)/config.mk
LIB = $(obj)lib$(BOARD).a
-COBJS = $(BOARD).o flash.o
+COBJS = $(BOARD).o
SRCS := $(SOBJS:.o=.S) $(COBJS:.o=.c)
OBJS := $(addprefix $(obj),$(COBJS))
diff --git a/board/RRvision/RRvision.c b/board/RRvision/RRvision.c
index c0b772d..e0f422d 100644
--- a/board/RRvision/RRvision.c
+++ b/board/RRvision/RRvision.c
@@ -1,5 +1,5 @@
/*
- * (C) Copyright 2001-2002
+ * (C) Copyright 2001-2008
* Wolfgang Denk, DENX Software Engineering, wd at denx.de.
*
* See file CREDITS for list of people who contributed to this
@@ -198,11 +198,10 @@ phys_size_t initdram (int board_type)
memctl->memc_br1 = (CFG_SDRAM_BASE & BR_BA_MSK) | BR_MS_UPMA | BR_V;
/*
- * No bank 1
- *
- * invalidate bank
+ * Mapping C2/C2NF Chip (TTTech Computertechnik AG)
*/
- memctl->memc_br3 = 0;
+ memctl->memc_or3 = CFG_OR3_C2;
+ memctl->memc_br3 = CFG_BR3_C2;
/* adjust refresh rate depending on SDRAM type, one bank */
reg = memctl->memc_mptpr;
diff --git a/board/RRvision/flash.c b/board/RRvision/flash.c
deleted file mode 100644
index d8e07e6..0000000
--- a/board/RRvision/flash.c
+++ /dev/null
@@ -1,522 +0,0 @@
-/*
- * (C) Copyright 2000-2002
- * Wolfgang Denk, DENX Software Engineering, wd at denx.de.
- *
- * See file CREDITS for list of people who contributed to this
- * project.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of
- * the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
- * MA 02111-1307 USA
- */
-
-#define DEBUG
-
-#include <common.h>
-#include <mpc8xx.h>
-
-#ifndef CFG_ENV_ADDR
-#define CFG_ENV_ADDR (CFG_FLASH_BASE + CFG_ENV_OFFSET)
-#endif
-
-flash_info_t flash_info[CFG_MAX_FLASH_BANKS]; /* info for FLASH chips */
-
-/*-----------------------------------------------------------------------
- * Functions
- */
-static ulong flash_get_size (vu_long *addr, flash_info_t *info);
-static int write_word (flash_info_t *info, ulong dest, ulong data);
-
-/*-----------------------------------------------------------------------
- */
-
-unsigned long flash_init (void)
-{
- volatile immap_t *immap = (immap_t *)CFG_IMMR;
- volatile memctl8xx_t *memctl = &immap->im_memctl;
- unsigned long size;
- int i;
-
- /* Init: no FLASHes known */
- for (i=0; i<CFG_MAX_FLASH_BANKS; ++i) {
- flash_info[i].flash_id = FLASH_UNKNOWN;
- }
-
- /* Static FLASH Bank configuration here - FIXME XXX */
-
- size = flash_get_size((vu_long *)FLASH_BASE0_PRELIM, &flash_info[0]);
-
- if (flash_info[0].flash_id == FLASH_UNKNOWN) {
- printf ("## Unknown FLASH on Bank 0 - Size = 0x%08lx = %ld MB\n",
- size, size<<20);
- }
-
- /* Remap FLASH according to real size */
- memctl->memc_or0 = CFG_OR_TIMING_FLASH | (-size & OR_AM_MSK);
- memctl->memc_br0 = (CFG_FLASH_BASE & BR_BA_MSK) | BR_MS_GPCM | BR_V;
-
- /* Re-do sizing to get full correct info */
- size = flash_get_size((vu_long *)CFG_FLASH_BASE, &flash_info[0]);
-
-#if CFG_MONITOR_BASE >= CFG_FLASH_BASE
- /* monitor protection ON by default */
- flash_protect(FLAG_PROTECT_SET,
- CFG_MONITOR_BASE,
- CFG_MONITOR_BASE+monitor_flash_len-1,
- &flash_info[0]);
-#endif
-
-#ifdef CFG_ENV_IS_IN_FLASH
- /* ENV protection ON by default */
- flash_protect(FLAG_PROTECT_SET,
- CFG_ENV_ADDR,
- CFG_ENV_ADDR+CFG_ENV_SIZE-1,
- &flash_info[0]);
-#endif
-
- flash_info[0].size = size;
-
- return (size);
-}
-
-/*-----------------------------------------------------------------------
- */
-void flash_print_info (flash_info_t *info)
-{
- int i;
-
- if (info->flash_id == FLASH_UNKNOWN) {
- puts ("missing or unknown FLASH type\n");
- return;
- }
-
- switch (info->flash_id & FLASH_VENDMASK) {
- case FLASH_MAN_AMD: puts ("AMD "); break;
- case FLASH_MAN_FUJ: puts ("FUJITSU "); break;
- default: puts ("Unknown Vendor "); break;
- }
-
- switch (info->flash_id & FLASH_TYPEMASK) {
- case FLASH_AM400B: puts ("AM29LV400B (4 Mbit, bottom boot sect)\n");
- break;
- case FLASH_AM400T: puts ("AM29LV400T (4 Mbit, top boot sector)\n");
- break;
- case FLASH_AM800B: puts ("AM29LV800B (8 Mbit, bottom boot sect)\n");
- break;
- case FLASH_AM800T: puts ("AM29LV800T (8 Mbit, top boot sector)\n");
- break;
- case FLASH_AM160B: puts ("AM29LV160B (16 Mbit, bottom boot sect)\n");
- break;
- case FLASH_AM160T: puts ("AM29LV160T (16 Mbit, top boot sector)\n");
- break;
- case FLASH_AM320B: puts ("AM29LV320B (32 Mbit, bottom boot sect)\n");
- break;
- case FLASH_AM320T: puts ("AM29LV320T (32 Mbit, top boot sector)\n");
- break;
- default: puts ("Unknown Chip Type\n");
- break;
- }
-
- printf (" Size: %ld MB in %d Sectors\n",
- info->size >> 20, info->sector_count);
-
- puts (" Sector Start Addresses:");
- for (i=0; i<info->sector_count; ++i) {
- if ((i % 5) == 0)
- puts ("\n ");
- printf (" %08lX%s",
- info->start[i],
- info->protect[i] ? " (RO)" : " "
- );
- }
- puts ("\n");
- return;
-}
-
-/*-----------------------------------------------------------------------
- */
-
-
-/*-----------------------------------------------------------------------
- */
-
-/*
- * The following code cannot be run from FLASH!
- */
-
-static ulong flash_get_size (vu_long *addr, flash_info_t *info)
-{
- short i;
- ulong value;
- ulong base = (ulong)addr;
-
- /* Write auto select command: read Manufacturer ID */
- addr[0x0555] = 0x00AA00AA;
- addr[0x02AA] = 0x00550055;
- addr[0x0555] = 0x00900090;
-
- value = addr[0];
-
- switch (value) {
- case AMD_MANUFACT:
- info->flash_id = FLASH_MAN_AMD;
- break;
- case FUJ_MANUFACT:
- info->flash_id = FLASH_MAN_FUJ;
- break;
- default:
- info->flash_id = FLASH_UNKNOWN;
- info->sector_count = 0;
- info->size = 0;
- return (0); /* no or unknown flash */
- }
-
- value = addr[1]; /* device ID */
-
- switch (value) {
- case AMD_ID_LV400T:
- info->flash_id += FLASH_AM400T;
- info->sector_count = 11;
- info->size = 0x00100000;
- break; /* => 1 MB */
-
- case AMD_ID_LV400B:
- info->flash_id += FLASH_AM400B;
- info->sector_count = 11;
- info->size = 0x00100000;
- break; /* => 1 MB */
-
- case AMD_ID_LV800T:
- info->flash_id += FLASH_AM800T;
- info->sector_count = 19;
- info->size = 0x00200000;
- break; /* => 2 MB */
-
- case AMD_ID_LV800B:
- info->flash_id += FLASH_AM800B;
- info->sector_count = 19;
- info->size = 0x00200000;
- break; /* => 2 MB */
-
- case AMD_ID_LV160T:
- info->flash_id += FLASH_AM160T;
- info->sector_count = 35;
- info->size = 0x00400000;
- break; /* => 4 MB */
-
- case AMD_ID_LV160B:
- info->flash_id += FLASH_AM160B;
- info->sector_count = 35;
- info->size = 0x00400000;
- break; /* => 4 MB */
- case AMD_ID_LV320T:
- info->flash_id += FLASH_AM320T;
- info->sector_count = 71;
- info->size = 0x00800000;
- break; /* => 8 MB */
-
- case AMD_ID_LV320B:
- info->flash_id += FLASH_AM320B;
- info->sector_count = 71;
- info->size = 0x00800000;
- break; /* => 8 MB */
- default:
- info->flash_id = FLASH_UNKNOWN;
- return (0); /* => no or unknown flash */
- }
-
- /* set up sector start address table */
- switch (value) {
- case AMD_ID_LV400B:
- case AMD_ID_LV800B:
- case AMD_ID_LV160B:
- /* set sector offsets for bottom boot block type */
- info->start[0] = base + 0x00000000;
- info->start[1] = base + 0x00008000;
- info->start[2] = base + 0x0000C000;
- info->start[3] = base + 0x00010000;
- for (i = 4; i < info->sector_count; i++) {
- info->start[i] = base + (i * 0x00020000) - 0x00060000;
- }
- break;
- case AMD_ID_LV400T:
- case AMD_ID_LV800T:
- case AMD_ID_LV160T:
- /* set sector offsets for top boot block type */
- i = info->sector_count - 1;
- info->start[i--] = base + info->size - 0x00008000;
- info->start[i--] = base + info->size - 0x0000C000;
- info->start[i--] = base + info->size - 0x00010000;
- for (; i >= 0; i--) {
- info->start[i] = base + i * 0x00020000;
- }
- break;
- case AMD_ID_LV320B:
- for (i = 0; i < info->sector_count; i++) {
- info->start[i] = base;
- /*
- * The first 8 sectors are 8 kB,
- * all the other ones are 64 kB
- */
- base += (i < 8)
- ? 2 * ( 8 << 10)
- : 2 * (64 << 10);
- }
- break;
- case AMD_ID_LV320T:
- for (i = 0; i < info->sector_count; i++) {
- info->start[i] = base;
- /*
- * The last 8 sectors are 8 kB,
- * all the other ones are 64 kB
- */
- base += (i < (info->sector_count - 8))
- ? 2 * (64 << 10)
- : 2 * ( 8 << 10);
- }
- break;
- default:
- return (0);
- break;
- }
-
- /* check for protected sectors */
- for (i = 0; i < info->sector_count; i++) {
- /* read sector protection at sector address, (A7 .. A0) = 0x02 */
- /* D0 = 1 if protected */
- addr = (volatile unsigned long *)(info->start[i]);
- info->protect[i] = addr[2] & 1;
- }
-
- /*
- * Prevent writes to uninitialized FLASH.
- */
- if (info->flash_id != FLASH_UNKNOWN) {
- addr = (volatile unsigned long *)info->start[0];
-
- *addr = 0x00F000F0; /* reset bank */
- }
-
- return (info->size);
-}
-
-
-/*-----------------------------------------------------------------------
- */
-
-int flash_erase (flash_info_t *info, int s_first, int s_last)
-{
- vu_long *addr = (vu_long*)(info->start[0]);
- int flag, prot, sect, l_sect;
- ulong start, now, last;
-
- if ((s_first < 0) || (s_first > s_last)) {
- if (info->flash_id == FLASH_UNKNOWN) {
- puts ("- missing\n");
- } else {
- puts ("- no sectors to erase\n");
- }
- return 1;
- }
-
- if ((info->flash_id == FLASH_UNKNOWN) ||
- (info->flash_id > FLASH_AMD_COMP)) {
- printf ("Can't erase unknown flash type %08lx - aborted\n",
- info->flash_id);
- return 1;
- }
-
- prot = 0;
- for (sect=s_first; sect<=s_last; ++sect) {
- if (info->protect[sect]) {
- prot++;
- }
- }
-
- if (prot) {
- printf ("- Warning: %d protected sectors will not be erased!\n",
- prot);
- } else {
- puts ("\n");
- }
-
- l_sect = -1;
-
- /* Disable interrupts which might cause a timeout here */
- flag = disable_interrupts();
-
- addr[0x0555] = 0x00AA00AA;
- addr[0x02AA] = 0x00550055;
- addr[0x0555] = 0x00800080;
- addr[0x0555] = 0x00AA00AA;
- addr[0x02AA] = 0x00550055;
-
- /* Start erase on unprotected sectors */
- for (sect = s_first; sect<=s_last; sect++) {
- if (info->protect[sect] == 0) { /* not protected */
- addr = (vu_long*)(info->start[sect]);
- addr[0] = 0x00300030;
- l_sect = sect;
- }
- }
-
- /* re-enable interrupts if necessary */
- if (flag)
- enable_interrupts();
-
- /* wait at least 80us - let's wait 1 ms */
- udelay (1000);
-
- /*
- * We wait for the last triggered sector
- */
- if (l_sect < 0)
- goto DONE;
-
- start = get_timer (0);
- last = start;
- addr = (vu_long*)(info->start[l_sect]);
- while ((addr[0] & 0x00800080) != 0x00800080) {
- if ((now = get_timer(start)) > CFG_FLASH_ERASE_TOUT) {
- puts ("Timeout\n");
- return 1;
- }
- /* show that we're waiting */
- if ((now - last) > 1000) { /* every second */
- putc ('.');
- last = now;
- }
- }
-
-DONE:
- /* reset to read mode */
- addr = (volatile unsigned long *)info->start[0];
- addr[0] = 0x00F000F0; /* reset bank */
-
- puts (" done\n");
- return 0;
-}
-
-/*-----------------------------------------------------------------------
- * Copy memory to flash, returns:
- * 0 - OK
- * 1 - write timeout
- * 2 - Flash not erased
- */
-
-int write_buff (flash_info_t *info, uchar *src, ulong addr, ulong cnt)
-{
- ulong cp, wp, data;
- int i, l, rc;
-
- wp = (addr & ~3); /* get lower word aligned address */
-
- /*
- * handle unaligned start bytes
- */
- if ((l = addr - wp) != 0) {
- data = 0;
- for (i=0, cp=wp; i<l; ++i, ++cp) {
- data = (data << 8) | (*(uchar *)cp);
- }
- for (; i<4 && cnt>0; ++i) {
- data = (data << 8) | *src++;
- --cnt;
- ++cp;
- }
- for (; cnt==0 && i<4; ++i, ++cp) {
- data = (data << 8) | (*(uchar *)cp);
- }
-
- if ((rc = write_word(info, wp, data)) != 0) {
- return (rc);
- }
- wp += 4;
- }
-
- /*
- * handle word aligned part
- */
- while (cnt >= 4) {
- data = 0;
- for (i=0; i<4; ++i) {
- data = (data << 8) | *src++;
- }
- if ((rc = write_word(info, wp, data)) != 0) {
- return (rc);
- }
- wp += 4;
- cnt -= 4;
- }
-
- if (cnt == 0) {
- return (0);
- }
-
- /*
- * handle unaligned tail bytes
- */
- data = 0;
- for (i=0, cp=wp; i<4 && cnt>0; ++i, ++cp) {
- data = (data << 8) | *src++;
- --cnt;
- }
- for (; i<4; ++i, ++cp) {
- data = (data << 8) | (*(uchar *)cp);
- }
-
- return (write_word(info, wp, data));
-}
-
-/*-----------------------------------------------------------------------
- * Write a word to Flash, returns:
- * 0 - OK
- * 1 - write timeout
- * 2 - Flash not erased
- */
-static int write_word (flash_info_t *info, ulong dest, ulong data)
-{
- vu_long *addr = (vu_long*)(info->start[0]);
- ulong start;
- int flag;
-
- /* Check if Flash is (sufficiently) erased */
- if ((*((vu_long *)dest) & data) != data) {
- return (2);
- }
- /* Disable interrupts which might cause a timeout here */
- flag = disable_interrupts();
-
- addr[0x0555] = 0x00AA00AA;
- addr[0x02AA] = 0x00550055;
- addr[0x0555] = 0x00A000A0;
-
- *((vu_long *)dest) = data;
-
- /* re-enable interrupts if necessary */
- if (flag)
- enable_interrupts();
-
- /* data polling for D7 */
- start = get_timer (0);
- while ((*((vu_long *)dest) & 0x00800080) != (data & 0x00800080)) {
- if (get_timer(start) > CFG_FLASH_WRITE_TOUT) {
- return (1);
- }
- }
- return (0);
-}
-
-/*-----------------------------------------------------------------------
- */
diff --git a/common/lcd.c b/common/lcd.c
index ebf377a..e54d4f5 100644
--- a/common/lcd.c
+++ b/common/lcd.c
@@ -70,6 +70,13 @@
# if (CONSOLE_COLOR_WHITE >= BMP_LOGO_OFFSET)
# error Default Color Map overlaps with Logo Color Map
# endif
+
+# ifndef CONFIG_LCD_LOGO_X
+# define CONFIG_LCD_LOGO_X 0
+# endif
+# ifndef CONFIG_LCD_LOGO_Y
+# define CONFIG_LCD_LOGO_Y 0
+# endif
#endif
DECLARE_GLOBAL_DATA_PTR;
@@ -768,7 +775,7 @@ static void *lcd_logo (void)
#endif /* CONFIG_SPLASH_SCREEN */
#ifdef CONFIG_LCD_LOGO
- bitmap_plot (0, 0);
+ bitmap_plot (CONFIG_LCD_LOGO_X, CONFIG_LCD_LOGO_Y);
#endif /* CONFIG_LCD_LOGO */
#ifdef CONFIG_MPC823
diff --git a/cpu/mpc8xx/cpu_init.c b/cpu/mpc8xx/cpu_init.c
index fb3414a..400c2bc 100644
--- a/cpu/mpc8xx/cpu_init.c
+++ b/cpu/mpc8xx/cpu_init.c
@@ -62,7 +62,7 @@ void cpu_init_f (volatile immap_t * immr)
#endif /* CONFIG_WATCHDOG */
/* SIUMCR - contains debug pin configuration (11-6) */
-#ifndef CONFIG_SVM_SC8xx
+#if !defined (CONFIG_SVM_SC8xx) && !defined (CONFIG_RRVISION)
immr->im_siu_conf.sc_siumcr |= CFG_SIUMCR;
#else
immr->im_siu_conf.sc_siumcr = CFG_SIUMCR;
diff --git a/cpu/mpc8xx/fec.c b/cpu/mpc8xx/fec.c
index 37eb481..59da088 100644
--- a/cpu/mpc8xx/fec.c
+++ b/cpu/mpc8xx/fec.c
@@ -837,6 +837,8 @@ static void fec_halt(struct eth_device* dev)
#define PHY_ID_LSI80225B 0x0016f880 /* LSI 80225/B */
#define PHY_ID_DM9161 0x0181B880 /* Davicom DM9161 */
#define PHY_ID_KSM8995M 0x00221450 /* MICREL KS8995MA */
+#define PHY_ID_DP83846A 0x20005c20 /* NatSem DP83846A */
+#define PHY_ID_DP83847 0x20005c30 /* NatSem DP83847 */
/* send command to phy using mii, wait for result */
static uint
@@ -924,6 +926,12 @@ static int mii_discover_phy(struct eth_device *dev)
case PHY_ID_KSM8995M:
printf("MICREL KS8995M\n");
break;
+ case PHY_ID_DP83846A:
+ printf("NatSem DP83846A\n");
+ break;
+ case PHY_ID_DP83847:
+ printf("NatSem DP83847\n");
+ break;
default:
printf("0x%08x\n", phytype);
break;
---
Gary Jennejohn
*********************************************************************
DENX Software Engineering GmbH, MD: Wolfgang Denk & Detlev Zundel
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: +49-8142-66989-0 Fax: +49-8142-66989-80 Email: office at denx.de
*********************************************************************
More information about the U-Boot
mailing list