mpc83xx: cosmetic: MERGERBOX.h checkpatch compliance

[oweals/u-boot.git] / doc / README-integrator

diff --git a/doc/README-integrator b/doc/README-integrator
index c435c8875925b77900adccca7305413126189a2d..5a0e9349248a627935a2e5495a0d9ddff98c991e 100644 (file)
--- a/doc/README-integrator
+++ b/doc/README-integrator
@@ -18,6 +18,7 @@ Each CM consists of a ARM processor core and associated hardware e.g
        SDRAM
        RAM controllers
        clock generators etc.
        SDRAM
        RAM controllers
        clock generators etc.

+CMs may be fitted with varying amounts of SDRAM using a DIMM socket.

 
 Boot Methods :
 ------------
 
 Boot Methods :
 ------------


@@ -51,7 +52,7 @@ cpu/arm<>/start.S so that it may be used by other boards.
 However, to avoid duplicating code through all processor files, a generic core
 for ARM Integrator CMs has been added
 
 However, to avoid duplicating code through all processor files, a generic core
 for ARM Integrator CMs has been added
 

-       cpu/arm_intcm
+       arch/arm/cpu/arm_intcm

 
 Otherwise. for example,  the standard CM reset via the CM control register would
 need placing in each CM processor file......
 
 Otherwise. for example,  the standard CM reset via the CM control register would
 need placing in each CM processor file......


@@ -61,3 +62,49 @@ of the Integrator board itself, has been placed in
 
        board/integrator<>/platform.S
        board/integrator<>/integrator<>.c
 
        board/integrator<>/platform.S
        board/integrator<>/integrator<>.c

+
+Targets
+=======
+The U-Boot make targets map to the available core modules as below.
+
+Integrator/AP is no longer available from ARM.
+Core modules marked ** are also no longer available.
+
+ap720t_config          ** CM720T
+ap920t_config          ** CM920T
+ap926ejs_config        Integrator Core Module for ARM926EJ-STM
+ap946es_config         Integrator Core Module for ARM946E-STM
+cp920t_config          ** CM920T
+cp926ejs_config        Integrator Core Module for ARM926EJ-STM
+cp946es_config         Integrator Core Module for ARM946E-STM
+cp1136_config          Integrator Core Module ARM1136JF-S  TM
+
+The final groups of targets are for core modules where no explicit cpu
+code has yet been added to U-Boot i.e. they all use the same U-Boot binary
+using the generic "arm_intcm" core:
+
+ap966_config                   Integrator Core Module for ARM966E-S TM
+ap922_config                   Integrator Core Module for ARM922T TM with ETM
+ap922_XA10_config              Integrator Core Module for ARM922T using Altera Excalibur
+ap7_config                     ** CM7TDMI
+integratorap_config
+ap_config
+
+
+cp966_config                   Integrator Core Module for ARM966E-S TM
+cp922_config                   Integrator Core Module for ARM922T TM with ETM
+cp922_XA10_config              Integrator Core Module for ARM922T using Altera Excalibur
+cp1026_config                  Integrator Core Module ARM1026EJ-S TM
+integratorcp_config
+cp_config
+
+The Makefile targets call board/integrator<>/split_by_variant.sh
+to configure various defines in include/configs/integrator<>.h
+to indicate the core module & core configuration and ensure that
+board/integrator<>/u-boot.lds loads the cpu object first in the U-Boot image.
+
+*********************************
+Because of this mechanism
+> make clean
+must be run before each change in configuration
+*********************************