Merge branch 'master' of git://git.denx.de/u-boot-arm
This commit is contained in:
50
Makefile
50
Makefile
@@ -2897,6 +2897,23 @@ at91sam9g45ekes_config : unconfig
|
||||
pm9263_config : unconfig
|
||||
@$(MKCONFIG) $(@:_config=) arm arm926ejs pm9263 ronetix at91
|
||||
|
||||
SBC35_A9G20_NANDFLASH_config \
|
||||
SBC35_A9G20_EEPROM_config \
|
||||
SBC35_A9G20_config : unconfig
|
||||
@mkdir -p $(obj)include
|
||||
@echo "#define CONFIG_$(@:_config=) 1" >$(obj)include/config.h
|
||||
@$(MKCONFIG) -a sbc35_a9g20 arm arm926ejs sbc35_a9g20 calao at91
|
||||
|
||||
TNY_A9G20_NANDFLASH_config \
|
||||
TNY_A9G20_EEPROM_config \
|
||||
TNY_A9G20_config \
|
||||
TNY_A9260_NANDFLASH_config \
|
||||
TNY_A9260_EEPROM_config \
|
||||
TNY_A9260_config : unconfig
|
||||
@mkdir -p $(obj)include
|
||||
@echo "#define CONFIG_$(@:_config=) 1" >$(obj)include/config.h
|
||||
@$(MKCONFIG) -a tny_a9260 arm arm926ejs tny_a9260 calao at91
|
||||
|
||||
########################################################################
|
||||
## ARM Integrator boards - see doc/README-integrator for more info.
|
||||
integratorap_config \
|
||||
@@ -2938,6 +2955,12 @@ 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
|
||||
|
||||
lpd7a400_config \
|
||||
lpd7a404_config: unconfig
|
||||
@$(MKCONFIG) $(@:_config=) arm lh7a40x lpd7a40x
|
||||
@@ -2967,7 +2990,7 @@ nhk8815_onenand_config: unconfig
|
||||
@$(MKCONFIG) -a nhk8815 arm arm926ejs nhk8815 st nomadik
|
||||
|
||||
omap1510inn_config : unconfig
|
||||
@$(MKCONFIG) $(@:_config=) arm arm925t omap1510inn
|
||||
@$(MKCONFIG) $(@:_config=) arm arm925t omap1510inn ti
|
||||
|
||||
xtract_omap1610xxx = $(subst _cs0boot,,$(subst _cs3boot,,$(subst _cs_autoboot,,$(subst _config,,$1))))
|
||||
|
||||
@@ -2990,10 +3013,10 @@ omap1610h2_cs_autoboot_config: unconfig
|
||||
echo "#define CONFIG_CS3_BOOT" >> $(obj)include/config.h ; \
|
||||
$(XECHO) "... configured for CS3 boot"; \
|
||||
fi;
|
||||
@$(MKCONFIG) -a $(call xtract_omap1610xxx,$@) arm arm926ejs omap1610inn NULL omap
|
||||
@$(MKCONFIG) -a $(call xtract_omap1610xxx,$@) arm arm926ejs omap1610inn ti omap
|
||||
|
||||
omap5912osk_config : unconfig
|
||||
@$(MKCONFIG) $(@:_config=) arm arm926ejs omap5912osk NULL omap
|
||||
@$(MKCONFIG) $(@:_config=) arm arm926ejs omap5912osk ti omap
|
||||
|
||||
xtract_omap730p2 = $(subst _cs0boot,,$(subst _cs3boot,, $(subst _config,,$1)))
|
||||
|
||||
@@ -3008,7 +3031,7 @@ omap730p2_cs3boot_config : unconfig
|
||||
echo "#define CONFIG_CS3_BOOT" >> $(obj)include/config.h ; \
|
||||
$(XECHO) "... configured for CS3 boot"; \
|
||||
fi;
|
||||
@$(MKCONFIG) -a $(call xtract_omap730p2,$@) arm arm926ejs omap730p2 NULL omap
|
||||
@$(MKCONFIG) -a $(call xtract_omap730p2,$@) arm arm926ejs omap730p2 ti omap
|
||||
|
||||
rd6281a_config: unconfig
|
||||
@$(MKCONFIG) $(@:_config=) arm arm926ejs $(@:_config=) Marvell kirkwood
|
||||
@@ -3125,23 +3148,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 omap3 omap3
|
||||
@$(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 omap3 omap3
|
||||
@$(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
|
||||
@@ -3236,7 +3262,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
|
||||
@@ -3261,7 +3287,7 @@ mx31pdk_nand_config : unconfig
|
||||
@$(MKCONFIG) -a mx31pdk arm arm1136 mx31pdk freescale mx31
|
||||
|
||||
omap2420h4_config : unconfig
|
||||
@$(MKCONFIG) $(@:_config=) arm arm1136 omap2420h4 NULL omap24xx
|
||||
@$(MKCONFIG) $(@:_config=) arm arm1136 omap2420h4 ti omap24xx
|
||||
|
||||
qong_config : unconfig
|
||||
@$(MKCONFIG) $(@:_config=) arm arm1136 qong davedenx mx31
|
||||
|
||||
Reference in New Issue
Block a user