ppc/85xx: Simplify the top makefile for 36-bit config for P2020DS

[u-boot] / Makefile

diff --git a/Makefile b/Makefile
index 3c53f0dbc6452ce40a714211c760a341df6f525f..1e256698f05fd4b4a92b7e6cc08aa6998e95147f 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -324,6 +324,10 @@ $(obj)u-boot.img:  $(obj)u-boot.bin
                        sed -e 's/"[     ]*$$/ for $(BOARD) board"/') \
                -d $< $@
 
+$(obj)u-boot.kwb:       $(obj)u-boot.bin
+               $(obj)tools/mkimage -n $(KWD_CONFIG) -T kwbimage \
+               -a $(TEXT_BASE) -e $(TEXT_BASE) -d $< $@
+
 $(obj)u-boot.sha1:     $(obj)u-boot.bin
                $(obj)tools/ubsha1 $(obj)u-boot.bin
 
@@ -1304,14 +1308,6 @@ CATcenter_33_config:     unconfig
 CMS700_config: unconfig
        @$(MKCONFIG) $(@:_config=) ppc ppc4xx cms700 esd
 
-# Compact-Center & DevCon-Center use different U-Boot images
-compactcenter_config \
-devconcenter_config:   unconfig
-       @mkdir -p $(obj)include
-       @echo "#define CONFIG_$$(echo $(subst ,,$(@:_config=)) | \
-               tr '[:lower:]' '[:upper:]')" >$(obj)include/config.h
-       @$(MKCONFIG) -n $@ -a compactcenter ppc ppc4xx compactcenter gdsys
-
 CPCI2DP_config:        unconfig
        @$(MKCONFIG) $(@:_config=) ppc ppc4xx cpci2dp esd
 
@@ -1396,6 +1392,14 @@ HH405_config:    unconfig
 HUB405_config: unconfig
        @$(MKCONFIG) $(@:_config=) ppc ppc4xx hub405 esd
 
+# Compact-Center(codename intip) & DevCon-Center use different U-Boot images
+intip_config \
+devconcenter_config:   unconfig
+       @mkdir -p $(obj)include
+       @echo "#define CONFIG_$$(echo $(subst ,,$(@:_config=)) | \
+               tr '[:lower:]' '[:upper:]')" >$(obj)include/config.h
+       @$(MKCONFIG) -n $@ -a intip ppc ppc4xx intip gdsys
+
 JSE_config:    unconfig
        @$(MKCONFIG) $(@:_config=) ppc ppc4xx jse
 
@@ -2444,9 +2448,7 @@ ATUM8548_config:  unconfig
 
 MPC8536DS_36BIT_config \
 MPC8536DS_config:       unconfig
-       @mkdir -p $(obj)include
-       @echo "#define CONFIG_$(@:_config=) 1"  >$(obj)include/config.h
-       @$(MKCONFIG) -a MPC8536DS ppc mpc85xx mpc8536ds freescale
+       @$(MKCONFIG) -t $(@:_config=) MPC8536DS ppc mpc85xx mpc8536ds freescale
 
 MPC8540ADS_config:     unconfig
        @$(MKCONFIG) $(@:_config=) ppc mpc85xx mpc8540ads freescale
@@ -2512,21 +2514,11 @@ MPC8569MDS_config:      unconfig
 
 MPC8572DS_36BIT_config \
 MPC8572DS_config:       unconfig
-       @mkdir -p $(obj)include
-       @if [ "$(findstring _36BIT_,$@)" ] ; then \
-               echo "#define CONFIG_PHYS_64BIT" >>$(obj)include/config.h ; \
-               $(XECHO) "... enabling 36-bit physical addressing." ; \
-       fi
-       @$(MKCONFIG) -a MPC8572DS ppc mpc85xx mpc8572ds freescale
+       @$(MKCONFIG) -t $(@:_config=) MPC8572DS ppc mpc85xx mpc8572ds freescale
 
 P2020DS_36BIT_config \
 P2020DS_config:                unconfig
-       @mkdir -p $(obj)include
-       @if [ "$(findstring _36BIT_,$@)" ] ; then \
-               echo "#define CONFIG_PHYS_64BIT" >>$(obj)include/config.h ; \
-               $(XECHO) "... enabling 36-bit physical addressing." ; \
-       fi
-       @$(MKCONFIG) -a P2020DS ppc mpc85xx p2020ds freescale
+       @$(MKCONFIG) -t $(@:_config=) P2020DS ppc mpc85xx p2020ds freescale
 
 P1011RDB_config:       unconfig
        @mkdir -p $(obj)include
@@ -2955,6 +2947,9 @@ davinci_sonata_config :   unconfig
 davinci_dm355evm_config :      unconfig
        @$(MKCONFIG) $(@:_config=) arm arm926ejs dm355evm davinci davinci
 
+davinci_dm365evm_config :      unconfig
+       @$(MKCONFIG) $(@:_config=) arm arm926ejs dm365evm davinci davinci
+
 imx27lite_config:      unconfig
        @$(MKCONFIG) $(@:_config=) arm arm926ejs imx27lite logicpd mx27
 
@@ -3145,23 +3140,26 @@ SMN42_config    :       unconfig
 ## ARM CORTEX Systems
 #########################################################################
 
+devkit8000_config :    unconfig
+       @$(MKCONFIG) $(@:_config=) arm arm_cortexa8 devkit8000 timll omap3
+
 omap3_beagle_config :  unconfig
        @$(MKCONFIG) $(@:_config=) arm arm_cortexa8 beagle ti omap3
 
 omap3_overo_config :   unconfig
-       @$(MKCONFIG) $(@:_config=) arm arm_cortexa8 overo omap3 omap3
+       @$(MKCONFIG) $(@:_config=) arm arm_cortexa8 overo NULL omap3
 
 omap3_evm_config :     unconfig
        @$(MKCONFIG) $(@:_config=) arm arm_cortexa8 evm ti omap3
 
 omap3_pandora_config : unconfig
-       @$(MKCONFIG) $(@:_config=) arm arm_cortexa8 pandora omap3 omap3
+       @$(MKCONFIG) $(@:_config=) arm arm_cortexa8 pandora NULL omap3
 
 omap3_zoom1_config :   unconfig
-       @$(MKCONFIG) $(@:_config=) arm arm_cortexa8 zoom1 omap3 omap3
+       @$(MKCONFIG) $(@:_config=) arm arm_cortexa8 zoom1 logicpd omap3
 
 omap3_zoom2_config :   unconfig
-       @$(MKCONFIG) $(@:_config=) arm arm_cortexa8 zoom2 omap3 omap3
+       @$(MKCONFIG) $(@:_config=) arm arm_cortexa8 zoom2 logicpd omap3
 
 #########################################################################
 ## XScale Systems
@@ -3256,7 +3254,7 @@ apollon_config            : unconfig
        @echo "CONFIG_ONENAND_U_BOOT = y" >> $(obj)include/config.mk
 
 imx31_litekit_config   : unconfig
-       @$(MKCONFIG) $(@:_config=) arm arm1136 imx31_litekit NULL mx31
+       @$(MKCONFIG) $(@:_config=) arm arm1136 imx31_litekit logicpd mx31
 
 imx31_phycore_eet_config \
 imx31_phycore_config   : unconfig
@@ -3531,11 +3529,6 @@ microblaze-generic_config:       unconfig
        @mkdir -p $(obj)include
        @$(MKCONFIG) -a $(@:_config=) microblaze microblaze microblaze-generic xilinx
 
-suzaku_config: unconfig
-       @mkdir -p $(obj)include
-       @echo "#define CONFIG_SUZAKU 1" > $(obj)include/config.h
-       @$(MKCONFIG) -a $(@:_config=) microblaze microblaze suzaku AtmarkTechno
-
 #========================================================================
 # Blackfin
 #========================================================================
@@ -3545,7 +3538,7 @@ BFIN_BOARDS = bf518f-ezbrd bf526-ezbrd bf527-ezkit bf533-ezkit bf533-stamp \
        bf537-pnav bf537-stamp bf538f-ezkit bf548-ezkit bf561-ezkit
 
 # Bluetechnix tinyboards
-BFIN_BOARDS += cm-bf527 cm-bf533 cm-bf537e cm-bf548 cm-bf561 tcm-bf537
+BFIN_BOARDS += cm-bf527 cm-bf533 cm-bf537e cm-bf537u cm-bf548 cm-bf561 tcm-bf537
 
 # Misc third party boards
 BFIN_BOARDS += bf537-minotaur bf537-srv1 blackstamp
@@ -3711,6 +3704,7 @@ grsim_leon2_config : unconfig
 
 clean:
        @rm -f $(obj)examples/standalone/82559_eeprom                     \
+              $(obj)examples/standalone/atmel_df_pow2                    \
               $(obj)examples/standalone/eepro100_eeprom                  \
               $(obj)examples/standalone/hello_world                      \
               $(obj)examples/standalone/interrupt                        \
@@ -3752,6 +3746,7 @@ clobber:  clean
        @rm -f $(OBJS) $(obj)*.bak $(obj)ctags $(obj)etags $(obj)TAGS \
                $(obj)cscope.* $(obj)*.*~
        @rm -f $(obj)u-boot $(obj)u-boot.map $(obj)u-boot.hex $(ALL)
+       @rm -f $(obj)u-boot.kwb
        @rm -f $(obj)tools/{env/crc32.c,inca-swap-bytes}
        @rm -f $(obj)cpu/mpc824x/bedbug_603e.c
        @rm -f $(obj)include/asm/proc $(obj)include/asm/arch $(obj)include/asm