X-Git-Url: https://git.karo-electronics.de/?a=blobdiff_plain;f=Makefile;h=5198e12275f05de8550d3ffa6d8f349d98178d5d;hb=f9301e1cda296245ba052d7b08321199c3d0af9d;hp=9512b71ee5c4d4f10af21faf1b12904327d2f56f;hpb=45da195cf675d0b4054aeeabf7b9c0daf798841d;p=karo-tx-uboot.git diff --git a/Makefile b/Makefile index 9512b71ee5..5198e12275 100644 --- a/Makefile +++ b/Makefile @@ -12,7 +12,7 @@ # # 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 +# 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 @@ -24,7 +24,7 @@ VERSION = 1 PATCHLEVEL = 3 SUBLEVEL = 2 -EXTRAVERSION = -rc1 +EXTRAVERSION = -rc3 U_BOOT_VERSION = $(VERSION).$(PATCHLEVEL).$(SUBLEVEL)$(EXTRAVERSION) VERSION_FILE = $(obj)include/version_autogenerated.h @@ -118,6 +118,9 @@ src := endif export obj src +# Make sure CDPATH settings don't interfere +unexport CDPATH + ######################################################################### ifeq ($(obj)include/config.mk,$(wildcard $(obj)include/config.mk)) @@ -244,7 +247,7 @@ LIBS += libfdt/libfdt.a LIBS += api/libapi.a LIBS := $(addprefix $(obj),$(LIBS)) -.PHONY : $(LIBS) +.PHONY : $(LIBS) $(VERSION_FILE) # Add GCC lib PLATFORM_LIBS += -L $(shell dirname `$(CC) $(CFLAGS) -print-libgcc-file-name`) -lgcc @@ -326,6 +329,9 @@ $(LIBS): depend $(obj)include/autoconf.mk $(SUBDIRS): depend $(obj)include/autoconf.mk $(MAKE) -C $@ all +$(LDSCRIPT): depend $(obj)include/autoconf.mk + $(MAKE) -C $(dir $@) $(notdir $@) + $(NAND_SPL): $(VERSION_FILE) $(obj)include/autoconf.mk $(MAKE) -C nand_spl/board/$(BOARDDIR) all @@ -397,6 +403,10 @@ tags ctags: etags: etags -a -o $(obj)etags `find $(SUBDIRS) $(TAG_SUBDIRS) \ -name '*.[ch]' -print` +cscope: + find $(SUBDIRS) $(TAG_SUBDIRS) -name '*.[ch]' -print \ + > cscope.files + cscope -b -q -k $(obj)System.map: $(obj)u-boot @$(NM) $< | \ @@ -411,6 +421,7 @@ $(obj)System.map: $(obj)u-boot # to regenerate the autoconf.mk file. $(obj)include/autoconf.mk: $(obj)include/config.h $(VERSION_FILE) @$(XECHO) Generating include/autoconf.mk ; \ + set -e ; \ : Generate the dependancies ; \ $(CC) -M $(HOST_CFLAGS) $(CPPFLAGS) -MQ $@ include/common.h > $@.dep ; \ : Extract the config macros ; \ @@ -423,7 +434,7 @@ else # !config.mk all $(obj)u-boot.hex $(obj)u-boot.srec $(obj)u-boot.bin \ $(obj)u-boot.img $(obj)u-boot.dis $(obj)u-boot \ $(SUBDIRS) $(VERSION_FILE) gdbtools updater env depend \ -dep tags ctags etags $(obj)System.map: +dep tags ctags etags cscope $(obj)System.map: @echo "System not configured - see README" >&2 @ exit 1 endif # config.mk @@ -587,7 +598,7 @@ prs200_highboot_DDR_config: unconfig $(XECHO) "... with console on COM12" ; \ } @[ -z "$(findstring prs200,$@)" ] || \ - { echo "#define CONFIG_PRS200" >>$(obj)include/config.h ;\ + { echo "#define CONFIG_PRS200" >>$(obj)include/config.h ;\ } @$(MKCONFIG) -n $@ -a mcc200 ppc mpc5xxx mcc200 @@ -597,10 +608,10 @@ mecp5200_config: unconfig munices_config: unconfig @$(MKCONFIG) munices ppc mpc5xxx munices -o2dnt_config: +o2dnt_config: unconfig @$(MKCONFIG) o2dnt ppc mpc5xxx o2dnt -pf5200_config: unconfig +pf5200_config: unconfig @$(MKCONFIG) pf5200 ppc mpc5xxx pf5200 esd PM520_config \ @@ -623,7 +634,7 @@ smmaco4_config: unconfig @$(MKCONFIG) -a smmaco4 ppc mpc5xxx tqm5200 cm5200_config: unconfig - @./mkconfig -a cm5200 ppc mpc5xxx cm5200 + @$(MKCONFIG) -a cm5200 ppc mpc5xxx cm5200 spieval_config: unconfig @$(MKCONFIG) -a spieval ppc mpc5xxx tqm5200 @@ -729,17 +740,24 @@ motionpro_config: unconfig ######################################################################### ## MPC512x Systems ######################################################################### -ads5121_config: unconfig - @$(MKCONFIG) ads5121 ppc mpc512x ads5121 +ads5121_config \ +ads5121_PCI_config \ + : unconfig + @echo "" >$(obj)include/config.h + @if [ "$(findstring _PCI_,$@)" ] ; then \ + echo "#define CONFIG_PCI" >>$(obj)include/config.h ; \ + $(XECHO) "... with PCI enabled" ; \ + fi + @$(MKCONFIG) -a ads5121 ppc mpc512x ads5121 ######################################################################### ## MPC8xx Systems ######################################################################### -Adder_config \ +Adder_config \ Adder87x_config \ -AdderII_config \ +AdderII_config \ : unconfig @mkdir -p $(obj)include $(if $(findstring AdderII,$@), \ @@ -747,10 +765,10 @@ AdderII_config \ @$(MKCONFIG) -a Adder ppc mpc8xx adder AdderUSB_config: unconfig - @./mkconfig -a AdderUSB ppc mpc8xx adder + @$(MKCONFIG) -a AdderUSB ppc mpc8xx adder -ADS860_config \ -FADS823_config \ +ADS860_config \ +FADS823_config \ FADS850SAR_config \ MPC86xADS_config \ MPC885ADS_config \ @@ -861,7 +879,7 @@ IVMS8_config: unconfig KUP4K_config : unconfig @$(MKCONFIG) $(@:_config=) ppc mpc8xx kup4k kup -KUP4X_config : unconfig +KUP4X_config : unconfig @$(MKCONFIG) $(@:_config=) ppc mpc8xx kup4x kup LANTEC_config : unconfig @@ -1010,9 +1028,9 @@ RPXlite_DW_64_config \ RPXlite_DW_LCD_config \ RPXlite_DW_64_LCD_config \ RPXlite_DW_NVRAM_config \ -RPXlite_DW_NVRAM_64_config \ +RPXlite_DW_NVRAM_64_config \ RPXlite_DW_NVRAM_LCD_config \ -RPXlite_DW_NVRAM_64_LCD_config \ +RPXlite_DW_NVRAM_64_LCD_config \ RPXlite_DW_config: unconfig @mkdir -p $(obj)include @ >$(obj)include/config.h @@ -1046,7 +1064,7 @@ RRvision_LCD_config: unconfig SM850_config : unconfig @$(MKCONFIG) $(@:_config=) ppc mpc8xx tqm8xx -spc1920_config: +spc1920_config: unconfig @$(MKCONFIG) $(@:_config=) ppc mpc8xx spc1920 SPD823TS_config: unconfig @@ -1921,7 +1939,7 @@ M5485HFE_config : unconfig M5485EFE_config) BOOT=2;CODE=0;VID=1;USB=1;RAM=64;RAM1=0;; \ M5485FFE_config) BOOT=2;CODE=32;VID=1;USB=1;RAM=64;RAM1=64;; \ M5485GFE_config) BOOT=4;CODE=0;VID=0;USB=0;RAM=64;RAM1=0;; \ - M5485HFE_config) BOOT=2;CODE=;VID=1;USB=0;RAM=64;RAM1=0;; \ + M5485HFE_config) BOOT=2;CODE=16;VID=1;USB=0;RAM=64;RAM1=0;; \ esac; \ >include/config.h ; \ echo "#define CFG_BUSCLK 100000000" > $(obj)include/config.h ; \ @@ -1994,7 +2012,7 @@ MPC832XEMDS_ATM_config: unconfig if [ "$(findstring _ATM_,$@)" ] ; then \ $(XECHO) -n "...ATM..." ; \ echo "#define CONFIG_PQ_MDS_PIB 1" >>$(obj)include/config.h ; \ - echo "#define CONFIG_PQ_MDS_PIB_ATM 1" >>$(obj)include/config.h ; \ + echo "#define CONFIG_PQ_MDS_PIB_ATM 1" >>$(obj)include/config.h ; \ fi ; @$(MKCONFIG) -a MPC832XEMDS ppc mpc83xx mpc832xemds freescale @@ -2044,13 +2062,13 @@ MPC8360EMDS_ATM_config: unconfig if [ "$(findstring _ATM_,$@)" ] ; then \ $(XECHO) -n "...ATM..." ; \ echo "#define CONFIG_PQ_MDS_PIB 1" >>$(obj)include/config.h ; \ - echo "#define CONFIG_PQ_MDS_PIB_ATM 1" >>$(obj)include/config.h ; \ + echo "#define CONFIG_PQ_MDS_PIB_ATM 1" >>$(obj)include/config.h ; \ fi ; @$(MKCONFIG) -a MPC8360EMDS ppc mpc83xx mpc8360emds freescale MPC8360ERDK_33_config \ MPC8360ERDK_66_config \ -MPC8360ERDK_config: +MPC8360ERDK_config: unconfig @mkdir -p $(obj)include @echo "" >$(obj)include/config.h ; \ if [ "$(findstring _33_,$@)" ] ; then \ @@ -2093,7 +2111,7 @@ MPC8540EVAL_config \ MPC8540EVAL_33_config \ MPC8540EVAL_66_config \ MPC8540EVAL_33_slave_config \ -MPC8540EVAL_66_slave_config: unconfig +MPC8540EVAL_66_slave_config: unconfig @mkdir -p $(obj)include @echo "" >$(obj)include/config.h ; \ if [ "$(findstring _33_,$@)" ] ; then \ @@ -2173,7 +2191,7 @@ sbc8548_config: unconfig sbc8560_config \ sbc8560_33_config \ -sbc8560_66_config: unconfig +sbc8560_66_config: unconfig @mkdir -p $(obj)include @if [ "$(findstring _66_,$@)" ] ; then \ echo "#define CONFIG_PCI_66" >>$(obj)include/config.h ; \ @@ -2224,7 +2242,7 @@ MPC8641HPCN_config: unconfig @$(MKCONFIG) $(@:_config=) ppc mpc86xx mpc8641hpcn freescale sbc8641d_config: unconfig - @./mkconfig $(@:_config=) ppc mpc86xx sbc8641d + @$(MKCONFIG) $(@:_config=) ppc mpc86xx sbc8641d ######################################################################### ## 74xx/7xx Systems @@ -2310,8 +2328,11 @@ xtract_omap1610xxx = $(subst _cs0boot,,$(subst _cs3boot,,$(subst _cs_autoboot,,$ xtract_omap730p2 = $(subst _cs0boot,,$(subst _cs3boot,, $(subst _config,,$1))) +at91cap9adk_config : unconfig + @$(MKCONFIG) $(@:_config=) arm arm926ejs at91cap9adk atmel at91cap9 + at91rm9200dk_config : unconfig - @$(MKCONFIG) $(@:_config=) arm arm920t at91rm9200dk NULL at91rm9200 + @$(MKCONFIG) $(@:_config=) arm arm920t at91rm9200dk atmel at91rm9200 cmc_pu2_config : unconfig @$(MKCONFIG) $(@:_config=) arm arm920t cmc_pu2 NULL at91rm9200 @@ -2322,6 +2343,8 @@ csb637_config : unconfig mp2usb_config : unconfig @$(MKCONFIG) $(@:_config=) arm arm920t mp2usb NULL at91rm9200 +m501sk_config : unconfig + @$(MKCONFIG) $(@:_config=) arm arm920t m501sk NULL at91rm9200 ######################################################################## ## ARM Integrator boards - see doc/README-integrator for more info. @@ -2362,17 +2385,8 @@ mx1ads_config : unconfig mx1fs2_config : unconfig @$(MKCONFIG) $(@:_config=) arm arm920t mx1fs2 NULL imx -netstar_32_config \ netstar_config: unconfig - @mkdir -p $(obj)include - @if [ "$(findstring _32_,$@)" ] ; then \ - $(XECHO) "... 32MB SDRAM" ; \ - echo "#define PHYS_SDRAM_1_SIZE SZ_32M" >>$(obj)include/config.h ; \ - else \ - $(XECHO) "... 64MB SDRAM" ; \ - echo "#define PHYS_SDRAM_1_SIZE SZ_64M" >>$(obj)include/config.h ; \ - fi - @$(MKCONFIG) -a netstar arm arm925t netstar + @$(MKCONFIG) $(@:_config=) arm arm925t netstar omap1510inn_config : unconfig @$(MKCONFIG) $(@:_config=) arm arm925t omap1510inn @@ -2551,7 +2565,7 @@ cradle_config : unconfig csb226_config : unconfig @$(MKCONFIG) $(@:_config=) arm pxa csb226 -delta_config : +delta_config : unconfig @$(MKCONFIG) $(@:_config=) arm pxa delta innokom_config : unconfig @@ -2573,10 +2587,10 @@ logodl_config : unconfig @$(MKCONFIG) $(@:_config=) arm pxa logodl pdnb3_config \ -scpu_config: unconfig +scpu_config: unconfig @mkdir -p $(obj)include @if [ "$(findstring scpu_,$@)" ] ; then \ - echo "#define CONFIG_SCPU" >>$(obj)include/config.h ; \ + echo "#define CONFIG_SCPU" >>$(obj)include/config.h ; \ $(XECHO) "... on SCPU board variant" ; \ else \ >$(obj)include/config.h ; \ @@ -2869,7 +2883,7 @@ atngw100_config : unconfig ms7720se_config: unconfig @ >include/config.h @echo "#define CONFIG_MS7720SE 1" >> include/config.h - @./mkconfig -a $(@:_config=) sh sh3 ms7720se + @$(MKCONFIG) -a $(@:_config=) sh sh3 ms7720se ######################################################################### ## sh4 (Renesas SuperH) @@ -2877,56 +2891,53 @@ ms7720se_config: unconfig ms7750se_config: unconfig @ >$(obj)include/config.h @echo "#define CONFIG_MS7750SE 1" >> $(obj)include/config.h - @./mkconfig -a $(@:_config=) sh sh4 ms7750se + @$(MKCONFIG) -a $(@:_config=) sh sh4 ms7750se -ms7722se_config : unconfig +ms7722se_config : unconfig @ >$(obj)include/config.h @echo "#define CONFIG_MS7722SE 1" >> $(obj)include/config.h - @./mkconfig -a $(@:_config=) sh sh4 ms7722se + @$(MKCONFIG) -a $(@:_config=) sh sh4 ms7722se ######################################################################### ######################################################################### ######################################################################### clean: + @rm -f $(obj)examples/82559_eeprom $(obj)examples/eepro100_eeprom \ + $(obj)examples/hello_world $(obj)examples/interrupt \ + $(obj)examples/mem_to_mem_idma2intr \ + $(obj)examples/sched $(obj)examples/smc91111_eeprom \ + $(obj)examples/test_burst $(obj)examples/timer + @rm -f $(obj)tools/bmp_logo $(obj)tools/easylogo/easylogo \ + $(obj)tools/env/{fw_printenv,fw_setenv} \ + $(obj)tools/envcrc \ + $(obj)tools/gdb/{astest,gdbcont,gdbsend} \ + $(obj)tools/gen_eth_addr $(obj)tools/img2srec \ + $(obj)tools/mkimage $(obj)tools/mpc86x_clk \ + $(obj)tools/ncb $(obj)tools/ubsha1 + @rm -f $(obj)board/cray/L1/{bootscript.c,bootscript.image} \ + $(obj)board/netstar/{eeprom,crcek,crcit,*.srec,*.bin} \ + $(obj)board/trab/trab_fkt $(obj)board/voiceblue/eeprom \ + $(obj)board/{integratorap,integratorcp}/u-boot.lds \ + $(obj)board/{bf533-ezkit,bf533-stamp,bf537-stamp,bf561-ezkit}/u-boot.lds + @rm -f $(obj)include/bmp_logo.h $(obj)nand_spl/{u-boot-spl,u-boot-spl.map} + @rm -f $(obj)onenand_ipl/onenand-{ipl,ipl.bin,ipl-2k.bin,ipl.map} + @rm -f $(obj)api_examples/demo $(VERSION_FILE) @find $(OBJTREE) -type f \ \( -name 'core' -o -name '*.bak' -o -name '*~' \ - -o -name '*.o' -o -name '*.a' \) -print \ + -o -name '*.o' -o -name '*.a' \) -print \ | xargs rm -f - @rm -f $(obj)examples/hello_world $(obj)examples/timer \ - $(obj)examples/eepro100_eeprom $(obj)examples/sched \ - $(obj)examples/mem_to_mem_idma2intr $(obj)examples/82559_eeprom \ - $(obj)examples/smc91111_eeprom $(obj)examples/interrupt \ - $(obj)examples/test_burst - @rm -f $(obj)tools/img2srec $(obj)tools/mkimage $(obj)tools/envcrc \ - $(obj)tools/gen_eth_addr $(obj)tools/ubsha1 - @rm -f $(obj)tools/mpc86x_clk $(obj)tools/ncb - @rm -f $(obj)tools/easylogo/easylogo $(obj)tools/bmp_logo - @rm -f $(obj)tools/gdb/astest $(obj)tools/gdb/gdbcont $(obj)tools/gdb/gdbsend - @rm -f $(obj)tools/env/fw_printenv $(obj)tools/env/fw_setenv - @rm -f $(obj)board/cray/L1/bootscript.c $(obj)board/cray/L1/bootscript.image - @rm -f $(obj)board/netstar/eeprom $(obj)board/netstar/crcek $(obj)board/netstar/crcit - @rm -f $(obj)board/netstar/*.srec $(obj)board/netstar/*.bin - @rm -f $(obj)board/trab/trab_fkt $(obj)board/voiceblue/eeprom - @rm -f $(obj)board/integratorap/u-boot.lds $(obj)board/integratorcp/u-boot.lds - @rm -f $(obj)board/bf533-ezkit/u-boot.lds $(obj)board/bf533-stamp/u-boot.lds - @rm -f $(obj)board/bf537-stamp/u-boot.lds $(obj)board/bf561-ezkit/u-boot.lds - @rm -f $(obj)include/bmp_logo.h - @rm -f $(obj)nand_spl/u-boot-spl $(obj)nand_spl/u-boot-spl.map - @rm -f $(obj)onenand_ipl/onenand-ipl $(obj)onenand_ipl/onenand-ipl.bin \ - $(obj)onenand_ipl/onenand-ipl-2k.bin $(obj)onenand_ipl/onenand-ipl.map - @rm -f $(obj)api_examples/demo $(VERSION_FILE) clobber: clean @find $(OBJTREE) -type f \( -name .depend \ -o -name '*.srec' -o -name '*.bin' -o -name u-boot.img \) \ -print0 \ | xargs -0 rm -f - @rm -f $(OBJS) $(obj)*.bak $(obj)ctags $(obj)etags $(obj)TAGS - @rm -fr $(obj)*.*~ + @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)tools/crc32.c $(obj)tools/environment.c $(obj)tools/env/crc32.c $(obj)tools/sha1.c - @rm -f $(obj)tools/inca-swap-bytes $(obj)cpu/mpc824x/bedbug_603e.c + @rm -f $(obj)tools/{crc32.c,environment.c,env/crc32.c,sha1.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 @[ ! -d $(obj)nand_spl ] || find $(obj)nand_spl -lname "*" -print | xargs rm -f @[ ! -d $(obj)onenand_ipl ] || find $(obj)onenand_ipl -lname "*" -print | xargs rm -f