Merge commit 'wd/master'

diff --combined MAKEALL
index 2b9b21fad129ca6b89ad1bb39d3b940964795521,0af989a81827aef14a31982ed3dd54488dc2b9e2..4cbddc2a7595399ccc075b3b33580b8f46fed963
--- 1/MAKEALL
--- 2/MAKEALL
+++ b/MAKEALL
@@@ -168,7 -168,6 +168,6 @@@ LIST_4xx="         
        CPCI4052        \
        CPCI405AB       \
        CPCI405DT       \
-       CPCI440         \
        CPCIISER4       \
        CRAYL1          \
        csb272          \
@@@ -180,6 -179,8 +179,8 @@@
        ERIC            \
        EXBITGEN        \
        G2000           \
+       haleakala       \
+       haleakala_nand  \
        hcu4            \
        hcu5            \
        HH405           \
@@@ -187,8 -188,12 +188,12 @@@
        JSE             \
        KAREF           \
        katmai          \
+       kilauea         \
+       kilauea_nand    \
+       korat           \
        luan            \
        lwmon5          \
+       makalu          \
        METROBOX        \
        MIP405          \
        MIP405T         \
@@@ -203,6 -208,7 +208,7 @@@
        PIP405          \
        PLU405          \
        PMC405          \
+       PMC440          \
        PPChameleonEVB  \
        rainier         \
        sbc405          \
@@@ -342,7 -348,6 +348,7 @@@ LIST_85xx="                
  #########################################################################
  
  LIST_86xx="           \
 +      MPC8610HPCD     \
        MPC8641HPCN     \
        sbc8641d        \
  "
@@@ -643,6 -648,8 +649,8 @@@ LIST_coldfire="                    
  
  LIST_avr32="          \
        atstk1002       \
+       atstk1003       \
+       atstk1004       \
  "
  
  #########################################################################
@@@ -656,6 -663,23 +664,23 @@@ LIST_blackfin="          
        bf561-ezkit     \
  "
  
+ #########################################################################
+ ## SH Systems
+ #########################################################################
+ 
+ LIST_sh4="            \
+       ms7750se        \
+       ms7722se        \
+ "
+ 
+ LIST_sh3=""
+ 
+ 
+ LIST_sh="             \
+       ${LIST_sh3}     \
+       ${LIST_sh4}     \
+ "
+ 
  #-----------------------------------------------------------------------
  
  #----- for now, just run PPC by default -----
@@@ -690,7 -714,9 +715,9 @@@ d
        mips|mips_el| \
        nios|nios2| \
        ppc|5xx|5xxx|512x|8xx|8220|824x|8260|83xx|85xx|86xx|4xx|7xx|74xx| \
-       x86|I486|TSEC)
+       x86|I486|TSEC| \
+       sh|sh4|sh3 \
+       )
                        for target in `eval echo '$LIST_'${arg}`
                        do
                                build_target ${target}

diff --combined Makefile
index 2e117327225a9e7ad13b33d9c73cc2093fb3dde1,189e1de23cbc8f72082a029cfce3bed1482ff7e0..35e90315f4ce1d2607b3d459854d0422add3b5f9
--- 1/Makefile
--- 2/Makefile
+++ b/Makefile
@@@ -152,6 -152,9 +152,9 @@@ endi
  ifeq ($(ARCH),avr32)
  CROSS_COMPILE = avr32-linux-
  endif
+ ifeq ($(ARCH),sh)
+ CROSS_COMPILE = sh4-linux-
+ endif
  endif
  endif
  
@@@ -1160,9 -1163,6 +1163,6 @@@ CPCI405AB_config:       unconfi
        @$(MKCONFIG) $(@:_config=) ppc ppc4xx cpci405 esd
        @echo "BOARD_REVISION = $(@:_config=)"  >> $(obj)include/config.mk
  
- CPCI440_config:       unconfig
-       @$(MKCONFIG) $(@:_config=) ppc ppc4xx cpci440 esd
- 
  CPCIISER4_config:     unconfig
        @$(MKCONFIG) $(@:_config=) ppc ppc4xx cpciiser4 esd
  
@@@ -1217,12 -1217,32 +1217,32 @@@ KAREF_config: unconfi
  katmai_config:        unconfig
        @$(MKCONFIG) $(@:_config=) ppc ppc4xx katmai amcc
  
+ # Kilauea & Haleakala images are identical (recognized via PVR)
+ kilauea_config \
+ haleakala_config: unconfig
+       @$(MKCONFIG) -n $@ -a kilauea ppc ppc4xx kilauea amcc
+ 
+ kilauea_nand_config \
+ haleakala_nand_config: unconfig
+       @mkdir -p $(obj)include $(obj)board/amcc/kilauea
+       @mkdir -p $(obj)nand_spl/board/amcc/kilauea
+       @echo "#define CONFIG_NAND_U_BOOT" > $(obj)include/config.h
+       @$(MKCONFIG) -n $@ -a kilauea ppc ppc4xx kilauea amcc
+       @echo "TEXT_BASE = 0x01000000" > $(obj)board/amcc/kilauea/config.tmp
+       @echo "CONFIG_NAND_U_BOOT = y" >> $(obj)include/config.mk
+ 
+ korat_config: unconfig
+       @$(MKCONFIG) $(@:_config=) ppc ppc4xx korat
+ 
  luan_config:  unconfig
        @$(MKCONFIG) $(@:_config=) ppc ppc4xx luan amcc
  
  lwmon5_config:        unconfig
        @$(MKCONFIG) $(@:_config=) ppc ppc4xx lwmon5
  
+ makalu_config:        unconfig
+       @$(MKCONFIG) $(@:_config=) ppc ppc4xx makalu amcc
+ 
  METROBOX_config: unconfig
        @$(MKCONFIG) $(@:_config=) ppc ppc4xx metrobox sandburst
  
@@@ -1266,6 -1286,9 +1286,9 @@@ PLU405_config:  unconfi
  PMC405_config:        unconfig
        @$(MKCONFIG) $(@:_config=) ppc ppc4xx pmc405 esd
  
+ PMC440_config:        unconfig
+       @$(MKCONFIG) $(@:_config=) ppc ppc4xx pmc440 esd
+ 
  PPChameleonEVB_config         \
  PPChameleonEVB_BA_25_config   \
  PPChameleonEVB_ME_25_config   \
@@@ -1659,14 -1682,14 +1682,14 @@@ TQM8265_AA_config:  unconfi
        fi; \
        echo "#define CONFIG_$${CFREQ}MHz"      >>$(obj)include/config.h ; \
        echo "... with $${CFREQ}MHz system clock" ; \
-       if [ "$${CACHE}" == "yes" ] ; then \
+       if [ "$${CACHE}" = "yes" ] ; then \
                echo "#define CONFIG_L2_CACHE"  >>$(obj)include/config.h ; \
                echo "... with L2 Cache support" ; \
        else \
                echo "#undef CONFIG_L2_CACHE"   >>$(obj)include/config.h ; \
                echo "... without L2 Cache support" ; \
        fi; \
-       if [ "$${BMODE}" == "60x" ] ; then \
+       if [ "$${BMODE}" = "60x" ] ; then \
                echo "#define CONFIG_BUSMODE_60x" >>$(obj)include/config.h ; \
                echo "... with 60x Bus Mode" ; \
        else \
@@@ -1780,7 -1803,7 +1803,7 @@@ M54455EVB_i66_config :  unconfi
        M54455EVB_i66_config)           FLASH=INTEL; FREQ=66666666;; \
        esac; \
        >include/config.h ; \
-       if [ "$${FLASH}" == "INTEL" ] ; then \
+       if [ "$${FLASH}" = "INTEL" ] ; then \
                echo "#undef CFG_ATMEL_BOOT" >> $(obj)include/config.h ; \
                echo "TEXT_BASE = 0x00000000" > $(obj)board/freescale/m54455evb/config.tmp ; \
                cp $(obj)board/freescale/m54455evb/u-boot.int $(obj)board/freescale/m54455evb/u-boot.lds ; \
@@@ -1911,7 -1934,7 +1934,7 @@@ TQM834x_config: unconfi
  #########################################################################
  
  MPC8540ADS_config:    unconfig
-       @$(MKCONFIG) $(@:_config=) ppc mpc85xx mpc8540ads
+       @$(MKCONFIG) $(@:_config=) ppc mpc85xx mpc8540ads freescale
  
  MPC8540EVAL_config \
  MPC8540EVAL_33_config \
@@@ -1935,7 -1958,7 +1958,7 @@@ MPC8540EVAL_66_slave_config:      uncon
        @$(MKCONFIG) -a MPC8540EVAL ppc mpc85xx mpc8540eval
  
  MPC8560ADS_config:    unconfig
-       @$(MKCONFIG) $(@:_config=) ppc mpc85xx mpc8560ads
+       @$(MKCONFIG) $(@:_config=) ppc mpc85xx mpc8560ads freescale
  
  MPC8541CDS_legacy_config \
  MPC8541CDS_config:    unconfig
@@@ -1945,7 -1968,7 +1968,7 @@@
                echo "#define CONFIG_LEGACY" >>$(obj)include/config.h ; \
                echo "... legacy" ; \
        fi
-       @$(MKCONFIG) -a MPC8541CDS ppc mpc85xx mpc8541cds cds
+       @$(MKCONFIG) -a MPC8541CDS ppc mpc85xx mpc8541cds freescale
  
  MPC8544DS_config:     unconfig
        @$(MKCONFIG) $(@:_config=) ppc mpc85xx mpc8544ds freescale
@@@ -1958,7 -1981,7 +1981,7 @@@ MPC8548CDS_config:      unconfi
                echo "#define CONFIG_LEGACY" >>$(obj)include/config.h ; \
                echo "... legacy" ; \
        fi
-       @$(MKCONFIG) -a MPC8548CDS ppc mpc85xx mpc8548cds cds
+       @$(MKCONFIG) -a MPC8548CDS ppc mpc85xx mpc8548cds freescale
  
  MPC8555CDS_legacy_config \
  MPC8555CDS_config:    unconfig
@@@ -1968,10 -1991,10 +1991,10 @@@
                echo "#define CONFIG_LEGACY" >>$(obj)include/config.h ; \
                echo "... legacy" ; \
        fi
-       @$(MKCONFIG) -a MPC8555CDS ppc mpc85xx mpc8555cds cds
+       @$(MKCONFIG) -a MPC8555CDS ppc mpc85xx mpc8555cds freescale
  
  MPC8568MDS_config:    unconfig
-       @$(MKCONFIG) $(@:_config=) ppc mpc85xx mpc8568mds
+       @$(MKCONFIG) $(@:_config=) ppc mpc85xx mpc8568mds freescale
  
  PM854_config: unconfig
        @$(MKCONFIG) $(@:_config=) ppc mpc85xx pm854
@@@ -2038,9 -2061,6 +2061,9 @@@ TQM8560_config:         unconfi
  ## MPC86xx Systems
  #########################################################################
  
 +MPC8610HPCD_config:   unconfig
 +      @$(MKCONFIG) $(@:_config=) ppc mpc86xx mpc8610hpcd freescale
 +
  MPC8641HPCN_config:    unconfig
        @$(MKCONFIG) $(@:_config=) ppc mpc86xx mpc8641hpcn freescale
  
@@@ -2659,7 -2679,30 +2682,30 @@@ bf561-ezkit_config:   unconfi
  #########################################################################
  
  atstk1002_config      :       unconfig
-       @$(MKCONFIG) $(@:_config=) avr32 at32ap atstk1000 atmel at32ap7000
+       @$(MKCONFIG) $(@:_config=) avr32 at32ap atstk1000 atmel at32ap700x
+ 
+ atstk1003_config      :       unconfig
+       @$(MKCONFIG) $(@:_config=) avr32 at32ap atstk1000 atmel at32ap700x
+ 
+ atstk1004_config      :       unconfig
+       @$(MKCONFIG) $(@:_config=) avr32 at32ap atstk1000 atmel at32ap700x
+ 
+ #########################################################################
+ #########################################################################
+ #########################################################################
+ 
+ #########################################################################
+ ## sh4 (Renesas SuperH)
+ #########################################################################
+ ms7750se_config: unconfig
+       @ >include/config.h
+       @echo "#define CONFIG_MS7750SE 1" >> include/config.h
+       @./mkconfig -a $(@:_config=) sh sh4 ms7750se
+ 
+ ms7722se_config :       unconfig
+       @ >include/config.h
+       @echo "#define CONFIG_MS7722SE 1" >> include/config.h
+       @./mkconfig -a $(@:_config=) sh sh4 ms7722se
  
  #########################################################################
  #########################################################################

diff --combined include/asm-ppc/processor.h
index 07c1de05b336066d54b9ff5d34ad65f79f1315b0,f58b38aace65de1b11941643cd11cdb05e52f07c..9fbbdf8c56ad0e9229281ab963cca721a1e58dd4
--- 1/include/asm-ppc/processor.h
--- 2/include/asm-ppc/processor.h
+++ b/include/asm-ppc/processor.h
@@@ -91,6 -91,11 +91,11 @@@
  
  /* Special Purpose Registers (SPRNs)*/
  
+ /* PPC440 Architecture is BOOK-E */
+ #ifdef CONFIG_440
+ #define CONFIG_BOOKE
+ #endif
+ 
  #define SPRN_CDBCR    0x3D7   /* Cache Debug Control Register */
  #define SPRN_CTR      0x009   /* Count Register */
  #define SPRN_DABR     0x3F5   /* Data Address Breakpoint Register */
@@@ -765,6 -770,10 +770,10 @@@
  #define PVR_405EP_RA  0x51210950
  #define PVR_405GPR_RB 0x50910951
  #define PVR_405EZ_RA  0x41511460
+ #define PVR_405EXR1_RA        0x12911473 /* 405EXr rev A with Security */
+ #define PVR_405EXR2_RA        0x12911471 /* 405EXr rev A without Security */
+ #define PVR_405EX1_RA 0x12911477 /* 405EX rev A with Security */
+ #define PVR_405EX2_RA 0x12911475 /* 405EX rev A without Security */
  #define PVR_440GP_RB  0x40120440
  #define PVR_440GP_RC  0x40120481
  #define PVR_440EP_RA  0x42221850
@@@ -875,7 -884,6 +884,7 @@@
  #define SVR_8544_E    0x803C
  #define SVR_8548      0x8031
  #define SVR_8548_E    0x8039
 +#define SVR_8610      0x80A0
  #define SVR_8641      0x8090
  #define SVR_8568_E    0x807D